rails_pwnerer 0.6.81 → 0.6.82

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.82. Switched to zerg_support for process management + mysql encoding bugfix.
+
 v0.6.81. Removed extra check for database resets. It just stands in the way.
 
 v0.6.80. UTF-8 when creating mysql databases.

data/lib/rails_pwnerer/app/db/mysql.rb

@@ -77,7 +77,7 @@ ENDSQL
        !(/mysql/ =~ configuration['production']['adapter'])
       configuration['production']['adapter'] = 'mysql2'
     end
-    configuration['production']['encoding'] ||= 'utf-8'
+    configuration['production']['encoding'] ||= 'utf8'
     configuration['production'].merge! 'database' => db_name, 'username' => db_user, 'password' => db_pass
     configuration['production'].merge! mysql_host_info()    
     File.open(config_file, 'w') { |f| YAML.dump(configuration, f) }

data/lib/rails_pwnerer/base/process.rb

@@ -1,41 +1,11 @@
 # extends Base with process management features 
-
-begin
-  require 'sys/proctable'
-rescue Exception
-  # the sys-proctable gem isn't available during scaffolding
-  # (or if the compilation breaks for some reason); mock it
-  
-  module Sys
-  end
-
-  module Sys::ProcTable
-    class ProcInfo
-      def initialize(pid, cmdline)
-        @pid = pid
-        @cmdline = cmdline
-      end
-      attr_reader :pid, :cmdline
-    end
-  
-    def self.ps
-      retval = []
-      ps_output = `ps ax`
-      ps_output.each_line do |pline|
-        pdata = pline.split(nil, 5)
-        pinfo = ProcInfo.new(pdata[0].strip, pdata[4].strip)
-        retval << pinfo
-      end
-      return retval
-    end
-  end
-end
+require 'zerg_support'
 
 module RailsPwnerer::Base  
   # returns information about a process
   def process_info(pid = nil)
     info = Hash.new
-    Sys::ProcTable.ps.each do |process|
+    Zerg::Support::ProcTable.ps.each do |process|
       item = { :cmdline => process.cmdline, :pid => process.pid.to_s }
 
       if pid.nil?
@@ -50,4 +20,8 @@ module RailsPwnerer::Base
       return nil
     end
   end
+  
+  def kill_tree
+    Zerg::Support::Process.kill_tree pid
+  end
 end

data/lib/rails_pwnerer/scaffolds/gems.rb

@@ -7,6 +7,9 @@ class RailsPwnerer::Scaffolds::Gems
     # The gem repository gets wiped on new Debian and Ubuntu installs, so we
     # need to reinstall ourselves.
     install_gems %w(rails_pwnerer)
+
+    # Process management.
+    install_gems %w(zerg_support)
   end
   
   def install_databases

data/lib/rails_pwnerer/util/kill_process_set.rb

@@ -1,3 +1,5 @@
+require 'zerg_support'
+
 module RailsPwnerer::Util
   # Complex procedure for killing a process or a bunch of process replicas
   # kill_command is the script that's supposed to kill the process / processes (tried first)
@@ -38,7 +40,7 @@ module RailsPwnerer::Util
         # avoid killing innocent victims
         if pinfo[pid].nil? or process_patterns.all? { |pattern| process_cmdline.index pattern } 
           print "Killing #{pid}: #{process_cmdline}\n" if options[:verbose]
-          Process.kill 'TERM', pid.to_i
+          kill_tree pid.to_i
         end
       rescue
         # just in case the file gets wiped before we see it
@@ -56,7 +58,7 @@ module RailsPwnerer::Util
     pinfo.each do |pid, info|
       next unless process_patterns.all? { |pattern| info[:cmdline].index pattern }
       print "Killing #{pid}: #{pinfo[pid][:cmdline]}\n" if options[:verbose]
-      Process.kill 'TERM', pid.to_i
+      kill_tree pid.to_i
     end
   end
 end

data/rails_pwnerer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.81"
+  s.version = "0.6.82"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2010-10-17}
+  s.date = %q{2010-10-21}
   s.default_executable = %q{bin/rpwn}
   s.description = %q{Rails deployment hack.}
   s.email = %q{victor@costan.us}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  hash: 165
+  hash: 163
   prerelease: false
   segments: 
   - 0
   - 6
-  - 81
-  version: 0.6.81
+  - 82
+  version: 0.6.82
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-10-21 00:00:00 -04:00
 default_executable: bin/rpwn
 dependencies: 
 - !ruby/object:Gem::Dependency