rails_pwnerer 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.6. Replaced mongrel_cluster startup script with our own. Now mongrels survive reboots.
+
 v0.5.5. Stronger database passwords, better mySQL configuration.
 
 v0.5.4. Bugfix release: the manifest was busted in 0.5.3.

data/Manifest

@@ -1,4 +1,5 @@
 bin/rpwn
+bin/rpwnctl
 bin/rpwndev
 CHANGELOG
 lib/pwnage/app/cluster_config.rb
@@ -21,13 +22,14 @@ lib/pwnage/config/main.rb
 lib/pwnage/config/paths.rb
 lib/pwnage/config/ports.rb
 lib/pwnage/config/repository.rb
+lib/pwnage/ctl_executor.rb
 lib/pwnage/dev_executor.rb
 lib/pwnage/executor.rb
 lib/pwnage/scaffolds/config.rb
 lib/pwnage/scaffolds/dirs.rb
 lib/pwnage/scaffolds/gems.rb
+lib/pwnage/scaffolds/hook_daemon.rb
 lib/pwnage/scaffolds/hook_dyndns.rb
-lib/pwnage/scaffolds/hook_mongrels.rb
 lib/pwnage/scaffolds/mysql_config.rb
 lib/pwnage/scaffolds/packages.rb
 lib/pwnage/scaffolds/rubygems.rb

data/bin/rpwnctl

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'rails_pwnage'
+
+RailsPwnage::CtlExecutor.new.run ARGV

data/lib/pwnage/app/cluster_config.rb

@@ -43,11 +43,9 @@ class RailsPwnage::App::ClusterConfig
     
     Dir.chdir(app_path) do
       # create the mongrel_cluster configuration
-      system "mongrel_rails cluster::configure -e production -N #{mongrels} -p #{first_port} -a 127.0.0.1 -c #{app_path} --user #{pwnerer_user} --group #{pwnerer_group}"
-      
-      # copy the configuration to the launch directory
-      launch_config = File.join RailsPwnage::Config.path_to(:mongrel_configs), "#{app_name}.#{instance_name}.yml"
-      FileUtils.cp 'config/mongrel_cluster.yml', launch_config
+      Kernel.system("mongrel_rails cluster::configure -e production" +
+          " -N #{mongrels} -p #{first_port} -a 127.0.0.1 -c #{app_path}" + 
+          " --user #{pwnerer_user} --group #{pwnerer_group}")
     end
   end
   
@@ -73,17 +71,25 @@ class RailsPwnage::App::ClusterConfig
           pid = File.open(fname, 'r') { |f| f.read.strip! }
           # avoid killing innocent victims
           if pinfo[pid].nil? or patterns.all? { |pattern| pinfo[pid][:cmdline].index pattern } 
+            print "Killing #{pid}: #{pinfo[pid][:cmdline]}\n"
             Process.kill 'TERM', pid.to_i
           end
         rescue
           # just in case the file gets wiped before we see it
         end
+        begin
+          print "Deleting #{fname}\n"
+          File.delete fname if File.exists? fname
+        rescue
+          # prevents crashing if the file is wiped after we call exists?
+        end
       end
       
       # Phase 2: look through the process table and kill anything that looks good
       pinfo = process_info()
       pinfo.each do |pid, info|
         next unless patterns.all? { |pattern| info[:cmdline].index pattern }
+        print "Killing #{pid}: #{pinfo[pid][:cmdline]}\n"
         Process.kill 'TERM', pid.to_i
       end
     end
@@ -95,7 +101,7 @@ class RailsPwnage::App::ClusterConfig
     return unless app_config and File.exists? app_config[:app_path]
     
     Dir.chdir app_config[:app_path] do
-      system 'mongrel_rails cluster::stop'
+      Kernel.system 'mongrel_rails cluster::stop'
     end
     sleep 0.5
     kill_stray_mongrels app_name, instance_name
@@ -116,7 +122,7 @@ class RailsPwnage::App::ClusterConfig
     end
     
     Dir.chdir app_config[:app_path] do
-      system 'mongrel_rails cluster::start'
+      Kernel.system 'mongrel_rails cluster::start'
     end    
   end
 

data/lib/pwnage/base/startup.rb

@@ -16,9 +16,8 @@ module RailsPwnage::Base
   end
   
   # hooks a script into the boot sequence
-  def hook_boot_script(script_location)
+  def hook_boot_script(script_location, script_name = File.basename(script_location))
     # copy the script to /etc/init.d and chmod +x
-    script_name = File.basename script_location    
     target_script = path_to_boot_script script_name
     FileUtils.cp script_location, target_script
     File.chmod 0755, target_script

data/lib/pwnage/ctl_executor.rb

@@ -0,0 +1,19 @@
+class RailsPwnage::CtlExecutor  
+  # standalone runner
+  def run(args)
+    case args[0]
+    when 'start'
+      RailsPwnage::App::ClusterConfig.new.control_all :start      
+    when 'stop'
+      RailsPwnage::App::ClusterConfig.new.control_all :stop
+    when 'restart'
+      RailsPwnage::App::ClusterConfig.new.control_all :stop
+      RailsPwnage::App::ClusterConfig.new.control_all :start      
+    when 'reload'
+      RailsPwnage::App::ClusterConfig.new.control_all :stop
+      RailsPwnage::App::ClusterConfig.new.control_all :start      
+    else
+      print "Unrecognized command #{args[0]}\n"
+    end
+  end
+end

data/lib/pwnage/executor.rb

@@ -14,8 +14,8 @@ class RailsPwnage::Executor
         Dirs.go
       when 'gems'
         Gems.go
-      when 'mongrels'
-        HookMongrels.go
+      when 'daemon'
+        HookDaemon.go
       when 'mysql'
         MysqlConfig.go
       when 'packages'
@@ -35,7 +35,7 @@ class RailsPwnage::Executor
         Dirs.go
         Config.go
         MysqlConfig.go
-        HookMongrels.go
+        HookDaemon.go
       end
       
     when 'install', 'micro'

data/lib/pwnage/scaffolds/hook_daemon.rb

@@ -0,0 +1,26 @@
+# sets up rpwnctl (controlling the yet-to-be-written daemon) to startup at boot time
+
+class RailsPwnage::Scaffolds::HookDaemon
+  include RailsPwnage::Base
+
+  # compute the path to mongrel_cluster
+  def path_to_gem
+    # TODO: use the rubygems API instead of this hack
+    
+    # look for lib/rails_pwnage.rb in our gem
+    output = `gem which 'rails_pwnage'`
+    # now lock down the path
+    output.split.last.gsub!('lib/rails_pwnage.rb', '')
+  end
+    
+  # runner
+  def run
+    daemon_ctl = self.path_to_gem + 'bin/rpwnctl'
+    hook_boot_script daemon_ctl, 'rpwn'
+  end
+
+  # standalone runner
+  def self.go
+    self.new.run
+  end
+end

data/lib/rails_pwnage.rb

@@ -29,7 +29,7 @@ require 'pwnage/config/repository.rb'
 require 'pwnage/scaffolds/config.rb'
 require 'pwnage/scaffolds/dirs.rb'
 require 'pwnage/scaffolds/gems.rb'
-require 'pwnage/scaffolds/hook_mongrels.rb'
+require 'pwnage/scaffolds/hook_daemon.rb'
 require 'pwnage/scaffolds/hook_dyndns.rb'
 require 'pwnage/scaffolds/mysql_config.rb'
 require 'pwnage/scaffolds/packages.rb'
@@ -43,5 +43,6 @@ require 'pwnage/app/gems.rb'
 require 'pwnage/app/nginx_config.rb'
 require 'pwnage/app/svn.rb'
 
+require 'pwnage/ctl_executor.rb'
 require 'pwnage/dev_executor.rb'
 require 'pwnage/executor.rb'

data/rails_pwnerer.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Rails_pwnerer-0.5.5
+# Gem::Specification for Rails_pwnerer-0.5.6
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Victor Costan
 autorequire: 
 bindir: bin
 
-date: 2008-08-16 00:00:00 -04:00
+date: 2008-08-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,11 +29,13 @@ description: Rails deployment tool/hack.
 email: victor@costan.us
 executables: 
 - rpwn
+- rpwnctl
 - rpwndev
 extensions: []
 
 extra_rdoc_files: 
 - bin/rpwn
+- bin/rpwnctl
 - bin/rpwndev
 - CHANGELOG
 - lib/pwnage/app/cluster_config.rb
@@ -56,13 +58,14 @@ extra_rdoc_files:
 - lib/pwnage/config/paths.rb
 - lib/pwnage/config/ports.rb
 - lib/pwnage/config/repository.rb
+- lib/pwnage/ctl_executor.rb
 - lib/pwnage/dev_executor.rb
 - lib/pwnage/executor.rb
 - lib/pwnage/scaffolds/config.rb
 - lib/pwnage/scaffolds/dirs.rb
 - lib/pwnage/scaffolds/gems.rb
+- lib/pwnage/scaffolds/hook_daemon.rb
 - lib/pwnage/scaffolds/hook_dyndns.rb
-- lib/pwnage/scaffolds/hook_mongrels.rb
 - lib/pwnage/scaffolds/mysql_config.rb
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
@@ -71,6 +74,7 @@ extra_rdoc_files:
 - README
 files: 
 - bin/rpwn
+- bin/rpwnctl
 - bin/rpwndev
 - CHANGELOG
 - lib/pwnage/app/cluster_config.rb
@@ -93,13 +97,14 @@ files:
 - lib/pwnage/config/paths.rb
 - lib/pwnage/config/ports.rb
 - lib/pwnage/config/repository.rb
+- lib/pwnage/ctl_executor.rb
 - lib/pwnage/dev_executor.rb
 - lib/pwnage/executor.rb
 - lib/pwnage/scaffolds/config.rb
 - lib/pwnage/scaffolds/dirs.rb
 - lib/pwnage/scaffolds/gems.rb
+- lib/pwnage/scaffolds/hook_daemon.rb
 - lib/pwnage/scaffolds/hook_dyndns.rb
-- lib/pwnage/scaffolds/hook_mongrels.rb
 - lib/pwnage/scaffolds/mysql_config.rb
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-16 00:00:00 -04:00
+date: 2008-08-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,13 @@ description: Rails deployment tool/hack.
 email: victor@costan.us
 executables: 
 - rpwn
+- rpwnctl
 - rpwndev
 extensions: []
 
 extra_rdoc_files: 
 - bin/rpwn
+- bin/rpwnctl
 - bin/rpwndev
 - CHANGELOG
 - lib/pwnage/app/cluster_config.rb
@@ -53,13 +55,14 @@ extra_rdoc_files:
 - lib/pwnage/config/paths.rb
 - lib/pwnage/config/ports.rb
 - lib/pwnage/config/repository.rb
+- lib/pwnage/ctl_executor.rb
 - lib/pwnage/dev_executor.rb
 - lib/pwnage/executor.rb
 - lib/pwnage/scaffolds/config.rb
 - lib/pwnage/scaffolds/dirs.rb
 - lib/pwnage/scaffolds/gems.rb
+- lib/pwnage/scaffolds/hook_daemon.rb
 - lib/pwnage/scaffolds/hook_dyndns.rb
-- lib/pwnage/scaffolds/hook_mongrels.rb
 - lib/pwnage/scaffolds/mysql_config.rb
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
@@ -68,6 +71,7 @@ extra_rdoc_files:
 - README
 files: 
 - bin/rpwn
+- bin/rpwnctl
 - bin/rpwndev
 - CHANGELOG
 - lib/pwnage/app/cluster_config.rb
@@ -90,13 +94,14 @@ files:
 - lib/pwnage/config/paths.rb
 - lib/pwnage/config/ports.rb
 - lib/pwnage/config/repository.rb
+- lib/pwnage/ctl_executor.rb
 - lib/pwnage/dev_executor.rb
 - lib/pwnage/executor.rb
 - lib/pwnage/scaffolds/config.rb
 - lib/pwnage/scaffolds/dirs.rb
 - lib/pwnage/scaffolds/gems.rb
+- lib/pwnage/scaffolds/hook_daemon.rb
 - lib/pwnage/scaffolds/hook_dyndns.rb
-- lib/pwnage/scaffolds/hook_mongrels.rb
 - lib/pwnage/scaffolds/mysql_config.rb
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb

data/lib/pwnage/scaffolds/hook_mongrels.rb

@@ -1,38 +0,0 @@
-# sets up mongrel_cluster to startup at boot time
-
-class RailsPwnage::Scaffolds::HookMongrels
-  include RailsPwnage::Base
-
-  # compute the path to mongrel_cluster
-  def path_to_gem
-    # TODO: use the rubygems API instead of this hack
-    
-    # look for lib/init.rb in mongrel_cluster (hopefully this won't break)
-    output = `gem which 'mongrel_cluster/init'`
-    # now lock down the path
-    output.split.last.gsub!('lib/mongrel_cluster/init.rb', '')
-  end
-  
-  # add mongrel_cluster to the startup
-  def hook_bootscript
-    mongrel_script = self.path_to_gem + 'resources/mongrel_cluster'
-    hook_boot_script mongrel_script
-  end
-  
-  # build the configuration
-  def make_config
-    config_dir = RailsPwnage::Config.path_to(:mongrel_configs) 
-    Dir.mkdir config_dir unless File.exists? config_dir
-  end
-
-  # runner
-  def run
-    make_config
-    hook_bootscript    
-  end
-
-  # standalone runner
-  def self.go
-    self.new.run
-  end
-end