rails_pwnerer 0.6.88 → 0.6.89

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.89. Restored compatibility with Rails 2 apps.
+
 v0.6.88. Use bundle exec when starting / stopping the app server.
 
 v0.6.87. Added /etc/gemrc to stop wasting time building RDocs on servers.

data/lib/rails_pwnerer/app/cluster_config.rb

@@ -53,8 +53,9 @@ class RailsPwnerer::App::ClusterConfig
       # TODO: stop processes in parallel
       frontends.times do |f|
         fe_port = first_port + f
-        cmdline = "bundle exec thin stop -a 127.0.0.1 -p #{fe_port} -d " +
+        cmdline = "thin stop -a 127.0.0.1 -p #{fe_port} -d " +
                   "-P tmp/pids/fe.#{fe_port}.pid"
+        cmdline = 'bundle exec ' + cmdline if File.exist?('Gemfile')
         cmdline_patterns[1] = "(127.0.0.1:#{fe_port})"
         RailsPwnerer::Util.kill_process_set(cmdline, "tmp/pids/fe.#{fe_port}.pid",
                            cmdline_patterns, :verbose => false, :sleep_delay => 0.2)
@@ -82,8 +83,8 @@ class RailsPwnerer::App::ClusterConfig
       RailsPwnerer::App::NginxConfig.new.update app_name, instance_name
     end
     
-    static_cmd = "bundle exec thin start -a 127.0.0.1 -c #{app_path} " +
-                 "-u #{pwnerer_user} -g #{pwnerer_group} -e #{environment} -d "
+    static_cmd = "thin start -a 127.0.0.1 -c #{app_path} -u #{pwnerer_user} " +
+                 "-g #{pwnerer_group} -e #{environment} -d "
     
     # TODO: start the servers simultaneously
     Dir.chdir app_path do
@@ -92,6 +93,7 @@ class RailsPwnerer::App::ClusterConfig
       else    
         static_cmd << '-A rails '
       end
+      static_cmd = 'bundle exec ' + static_cmd if File.exist?('Gemfile')
       
       frontends.times do |f|
         fe_port = first_port + f

data/lib/rails_pwnerer/base/process.rb

@@ -21,7 +21,7 @@ module RailsPwnerer::Base
     end
   end
   
-  def kill_tree
+  def kill_tree(pid)
     Zerg::Support::Process.kill_tree pid
   end
 end

data/rails_pwnerer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.88"
+  s.version = "0.6.89"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  hash: 183
+  hash: 181
   prerelease: 
   segments: 
   - 0
   - 6
-  - 88
-  version: 0.6.88
+  - 89
+  version: 0.6.89
 platform: ruby
 authors: 
 - Victor Costan