rubber 1.5.9 → 1.5.10

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.5.9
+-----
+
+fix find to handle filenames with spaces, prune bundle from permissions change <56b72ae> [Matt Conway]
+
 1.5.8
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.9
+1.5.10

data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -26,3 +26,8 @@ rvm_prefix: /usr/local/rvm
   
 # lets us setup global envoronment to use rvm (also needed when running sudo)
 rvm_prepare: "source #{rvm_prefix}/scripts/rvm"
+
+# dirty hack to get the rvm gem home rather than bundler gem home
+# When we run rubber:config it loads rails/bundler, which forces the bundler gem home, yet deployment only gems
+# like passenger need to be installed in rvm gem home rather than bundler
+rvm_gem_home: "#{$rubber_rvm_gem_home ||= `unset GEM_HOME; bash -l -c 'rvm gemdir'`.strip}"

data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf

@@ -18,7 +18,7 @@ END
 end
 
 def output_values
-  status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats | tail -1`
+  status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats | tail -1`
   unless $?.success?
     $stderr.puts "failed executing passenger-memory-stats"
     exit 1

data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf

@@ -3,5 +3,5 @@
   @additive = ["# munin passenger start", "# munin passenger end"]
 %>
 
-nobody  ALL=(ALL) NOPASSWD: <%= ENV['GEM_HOME'] %>/bin/passenger-status
-nobody  ALL=(ALL) NOPASSWD: <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats
+nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-status
+nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats

data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf

@@ -21,7 +21,7 @@ END
 end
 
 def output_values
-  status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-status`
+  status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-status`
   unless $?.success?
     $stderr.puts "failed executing passenger-status"
     exit 1

data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf

@@ -2,9 +2,9 @@
   @path = '/etc/apache2/mods-available/passenger.conf'
   @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf'
 %>
-LoadModule passenger_module <%= `echo #{rubber_env.passenger_lib}` %>
-PassengerRoot <%= `echo #{rubber_env.passenger_root}` %>
-PassengerRuby <%= `echo #{rubber_env.passenger_ruby}` %>
+LoadModule passenger_module <%= rubber_env.passenger_lib %>
+PassengerRoot <%= rubber_env.passenger_root %>
+PassengerRuby <%= rubber_env.passenger_ruby %>
 PassengerUseGlobalQueue on
 
 # max number of rails instances per appserver

data/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,5 +1,5 @@
 passenger_version: 2.2.11
-passenger_root: "$GEM_HOME/gems/passenger-#{passenger_version}"
+passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
 passenger_ruby: "#{ruby_prefix}/bin/passenger_ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
 passenger_listen_port: 7000

data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -26,3 +26,8 @@ rvm_prefix: /usr/local/rvm
   
 # lets us setup global envoronment to use rvm (also needed when running sudo)
 rvm_prepare: "source #{rvm_prefix}/scripts/rvm"
+
+# dirty hack to get the rvm gem home rather than bundler gem home
+# When we run rubber:config it loads rails/bundler, which forces the bundler gem home, yet deployment only gems
+# like passenger need to be installed in rvm gem home rather than bundler
+rvm_gem_home: "#{$rubber_rvm_gem_home ||= `unset GEM_HOME; bash -l -c 'rvm gemdir'`.strip}"

data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf

@@ -18,7 +18,7 @@ END
 end
 
 def output_values
-  status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats | tail -1`
+  status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats | tail -1`
   unless $?.success?
     $stderr.puts "failed executing passenger-memory-stats"
     exit 1

data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf

@@ -3,5 +3,5 @@
   @additive = ["# munin passenger start", "# munin passenger end"]
 %>
 
-nobody  ALL=(ALL) NOPASSWD: <%= ENV['GEM_HOME'] %>/bin/passenger-status
-nobody  ALL=(ALL) NOPASSWD: <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats
+nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-status
+nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats

data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf

@@ -21,7 +21,7 @@ END
 end
 
 def output_values
-  status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-status`
+  status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-status`
   unless $?.success?
     $stderr.puts "failed executing passenger-status"
     exit 1

data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf

@@ -2,9 +2,9 @@
   @path = '/etc/apache2/mods-available/passenger.conf'
   @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf'
 %>
-LoadModule passenger_module <%= `echo #{rubber_env.passenger_lib}` %>
-PassengerRoot <%= `echo #{rubber_env.passenger_root}` %>
-PassengerRuby <%= `echo #{rubber_env.passenger_ruby}` %>
+LoadModule passenger_module <%= rubber_env.passenger_lib %>
+PassengerRoot <%= rubber_env.passenger_root %>
+PassengerRuby <%= rubber_env.passenger_ruby %>
 PassengerUseGlobalQueue on
 
 # max number of rails instances per appserver

data/lib/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,5 +1,5 @@
 passenger_version: 2.2.11
-passenger_root: "$GEM_HOME/gems/passenger-#{passenger_version}"
+passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
 passenger_ruby: "#{ruby_prefix}/bin/passenger_ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
 passenger_listen_port: 7000

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 9
-  version: 1.5.9
+  - 10
+  version: 1.5.10
 platform: ruby
 authors: 
 - Matt Conway