[DRE-commits] [SCM] ruby-gon.git branch, master, updated. 67b61b6e672cc4268ad1a27d70c03fc43c0125d2

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 3e7568846f9553f1e84bd59335d02bf2d114e140
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jun 1 02:11:38 2013 +0200

    patches: move js files according to FHS, not overload loadpath with lib/

diff --git a/debian/patches/change_watch_js_location.patch b/debian/patches/change_watch_js_location.patch
new file mode 100644
index 0000000..c8f99cb
--- /dev/null
+++ b/debian/patches/change_watch_js_location.patch
@@ -0,0 +1,18 @@
+Description: change location of watch.js to respect Debian file system
+ hierarchy
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2013-06-01
+
+--- a/lib/gon/watch.rb
++++ b/lib/gon/watch.rb
+@@ -2,7 +2,7 @@
+   class Watch < Gon
+     class << self
+ 
+-      JS_FUNCTION = File.read(File.expand_path('../../../js/watch.js', __FILE__))
++      JS_FUNCTION = File.read(File.expand_path('../../../../../share/javascript/ruby-gon/watch.js', __FILE__))
+ 
+       def render
+         JS_FUNCTION + "window.gon.watchedVariables=#{all_variables.to_json};"
diff --git a/debian/patches/remove_lib_from_loadpath_for_spec.patch b/debian/patches/remove_lib_from_loadpath_for_spec.patch
new file mode 100644
index 0000000..665716c
--- /dev/null
+++ b/debian/patches/remove_lib_from_loadpath_for_spec.patch
@@ -0,0 +1,23 @@
+Description: remove lib/ from $LOAD_PATH for specs
+ Since the files are patched to change some paths, we must use the installed library
+ in debian/ruby-gon
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2013-06-01
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,8 +1,12 @@
++# remove lib/ from loadpath, added by rspec
++$:.delete(File.expand_path("../../lib",__FILE__))
++
+ require 'gon'
+ require 'jbuilder'
+ require 'rabl'
+ require 'rabl-rails'
+ 
++
+ # rabl has a conflict with rabl-rails as rabl-rails causes Rails
+ # to be defined. In order to run all specs at once, we'll need to
+ # load/unload rabl and rabl-rails whenever we switch from testing
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3aed63e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+change_watch_js_location.patch
+remove_lib_from_loadpath_for_spec.patch

-- 
ruby-gon.git