rails_pwnerer 0.5.7 → 0.5.8

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.8. Fixed crashing in base/process.rb when sys-proctable isn't there (scaffolding time). 
+
 v0.5.7. Better procedure for removing an instance.
 
 v0.5.6. Replaced mongrel_cluster startup script with our own. Now mongrels survive reboots.

data/Manifest

@@ -26,6 +26,7 @@ lib/pwnage/ctl_executor.rb
 lib/pwnage/dev_executor.rb
 lib/pwnage/executor.rb
 lib/pwnage/scaffolds/config.rb
+lib/pwnage/scaffolds/dir_permissions.rb
 lib/pwnage/scaffolds/dirs.rb
 lib/pwnage/scaffolds/gems.rb
 lib/pwnage/scaffolds/hook_daemon.rb

data/README

@@ -27,7 +27,7 @@ Life with +rails_pwnerer+:
 1) Install a bootstrap version of ruby and rubygems
 (one command should be enough, but rubygems doesn't work in Ubuntu 8.04):
 
-sudo apt-get -y install rubygems
+sudo apt-get -y install rubygems1.8
 
 sudo gem update --system (you'll have to retry this if you get an error)
 
@@ -39,6 +39,15 @@ sudo gem install rails_pwnerer
 3) Get your server production-ready:
 sudo rpwn scaffold
 
+If this doesn't work, you have a retarded Debian version of rubygems.
+Workaround:
+a) gem which rails_pwnerer
+b) see where the gem lives (e.g. /var/lib/gems/1.8/gems/rails_pwnerer)
+c) run rpwn from there:
+sudo /var/lib/gems/1.8/bin/rails_pwnerer scaffold
+
+After you scaffold, you'll get good rubygems which put rpwn in your path.
+
 4) Install your application:
 sudo rpwn install svn+ssh://your.repository.host/path/to/your_application
 

data/lib/pwnage/base/atomics.rb

@@ -13,7 +13,7 @@ module RailsPwnage::Base
       ts_checksum = Digest::MD5.hexdigest("#{raw_data[1]}.#{raw_data[2]}")
       return [nil, Time.at(0, 0)] unless ts_checksum == raw_data[3]
       return [raw_data[0], Time.at(raw_data[1], raw_data[2])]
-    rescue
+    rescue Exception
       # fail if the YAML can't be processed or something else goes wrong
       return [nil, Time.at(0, 0)]
     end

data/lib/pwnage/base/gems.rb

@@ -16,7 +16,20 @@ module RailsPwnage::Base
     system "gem update --system"
     # patch Ubuntu's broken rubygems installation
     system "cp /usr/bin/gem1.8 /usr/bin/gem"
-  end  
+  end
+  
+  # locates the main file in a gem (used to locate the gem)
+  def path_to_gem(gem_name, discard_suffix = '')
+    # TODO: use the rubygems API instead of this hack
+    
+    # look for the main file in the gem
+    output = `gem which '#{gem_name}'`
+    # discard the given suffix
+    if output[-(discard_suffix.lenth)..-1] == discard_suffix
+      output[-(discard_suffix.lenth)..-1] = ''
+    end
+    return output
+  end
 end
 
 module RailsPwnage::Base  

data/lib/pwnage/base/process.rb

@@ -24,7 +24,7 @@ begin
       end
     end
   end
-rescue
+rescue Exception
   # the sys-proctable gem isn't available during scaffolding
   module RailsPwnage::Base
     def process_info(pid = nil)

data/lib/pwnage/executor.rb

@@ -12,6 +12,8 @@ class RailsPwnage::Executor
         Config.go
       when 'dirs'
         Dirs.go
+      when 'dirs2'
+        DirPermissions.go
       when 'gems'
         Gems.go
       when 'daemon'
@@ -34,6 +36,7 @@ class RailsPwnage::Executor
         Gems.go
         Dirs.go
         Config.go
+        DirPermissions.go
         MysqlConfig.go
         HookDaemon.go
       end

data/lib/pwnage/scaffolds/config.rb

@@ -25,6 +25,8 @@ class RailsPwnage::Scaffolds::Config
     host_info[:dbroot_name] = 'root'
     # password for creating / dropping databases
     host_info[:dbroot_pass] = ''
+    # the user owning the /prod subtrees
+    host_info[:pwnerer_user] = 'victor'
     
     RailsPwnage::Config.flush_db :host    
     

data/lib/pwnage/scaffolds/dir_permissions.rb

@@ -0,0 +1,23 @@
+# sets up the user permissions on the dir skeleton
+
+require 'fileutils'
+
+class RailsPwnage::Scaffolds::DirPermissions
+  include RailsPwnage::Base
+
+  # runner
+  def run
+    pwnerer_uid = uid_for_username(RailsPwnage::Config[:host][:pwnerer_user])
+    Dir.chdir('/') do
+      [:config,  :apps, :backups].map { |k| RailsPwnage::Config.path_to k }.each do |path|
+        FileUtils.mkpath path
+        File.chown(pwnerer_uid, nil, path)
+      end
+    end
+  end
+
+  # standalone runner
+  def self.go
+    self.new.run
+  end
+end

data/lib/pwnage/scaffolds/dirs.rb

@@ -7,11 +7,9 @@ class RailsPwnage::Scaffolds::Dirs
 
   # runner
   def run
-    pwnerer_uid = uid_for_username(RailsPwnage::Config.pwnerer_user)
     Dir.chdir('/') do
       [:config,  :apps, :backups].map { |k| RailsPwnage::Config.path_to k }.each do |path|
         FileUtils.mkpath path
-        File.chown(pwnerer_uid, nil, path)
       end
     end
   end

data/lib/pwnage/scaffolds/hook_daemon.rb

@@ -2,20 +2,10 @@
 
 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'
+    daemon_ctl = path_to_gem('rails_pwnage', 'lib/rails_pwnage.rb') + 'bin/rpwnctl'
     hook_boot_script daemon_ctl, 'rpwn'
   end
 

data/lib/pwnage/scaffolds/packages.rb

@@ -66,9 +66,9 @@ class RailsPwnage::Scaffolds::Packages
     install_management
     install_tools
     install_ruby
-    install_mysql
     install_sqlite3
     install_balancer
+    install_mysql
   end
 
   # standalone runner

data/lib/pwnage/scaffolds/rubygems.rb

@@ -1,5 +1,5 @@
+require 'fileutils'
 require 'net/http'
-require 'pp'
 
 class RailsPwnage::Scaffolds::RubyGems
   include RailsPwnage::Base
@@ -46,9 +46,17 @@ class RailsPwnage::Scaffolds::RubyGems
   end
   
   def run
+    # save old lib path, in case we need to wipe it
+    old_gems = path_to_gem('rubygems', '/1.8/rubygems.rb')
+    
     # remove the (retarded) Debian gems package and install from source    
     remove_packages %w(rubygems)
     install_rubygems
+    
+    # remove the gems that are trailing behind
+    new_gems = path_to_gem('rubygems', '/1.8/rubygems.rb')
+    return if new_gems == old_gems # don't wipe the new dir by mistake
+    FileUtils.rm_r old_gems 
   end
   
   # standalone runner

data/lib/rails_pwnage.rb

@@ -28,6 +28,7 @@ require 'pwnage/config/repository.rb'
 
 require 'pwnage/scaffolds/config.rb'
 require 'pwnage/scaffolds/dirs.rb'
+require 'pwnage/scaffolds/dir_permissions.rb'
 require 'pwnage/scaffolds/gems.rb'
 require 'pwnage/scaffolds/hook_daemon.rb'
 require 'pwnage/scaffolds/hook_dyndns.rb'

data/rails_pwnerer.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Rails_pwnerer-0.5.7
+# Gem::Specification for Rails_pwnerer-0.5.8
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - Victor Costan
 autorequire: 
 bindir: bin
 
-date: 2008-08-17 00:00:00 -04:00
+date: 2008-08-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ extra_rdoc_files:
 - lib/pwnage/dev_executor.rb
 - lib/pwnage/executor.rb
 - lib/pwnage/scaffolds/config.rb
+- lib/pwnage/scaffolds/dir_permissions.rb
 - lib/pwnage/scaffolds/dirs.rb
 - lib/pwnage/scaffolds/gems.rb
 - lib/pwnage/scaffolds/hook_daemon.rb
@@ -101,6 +102,7 @@ files:
 - lib/pwnage/dev_executor.rb
 - lib/pwnage/executor.rb
 - lib/pwnage/scaffolds/config.rb
+- lib/pwnage/scaffolds/dir_permissions.rb
 - lib/pwnage/scaffolds/dirs.rb
 - lib/pwnage/scaffolds/gems.rb
 - lib/pwnage/scaffolds/hook_daemon.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-17 00:00:00 -04:00
+date: 2008-08-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,7 @@ extra_rdoc_files:
 - lib/pwnage/dev_executor.rb
 - lib/pwnage/executor.rb
 - lib/pwnage/scaffolds/config.rb
+- lib/pwnage/scaffolds/dir_permissions.rb
 - lib/pwnage/scaffolds/dirs.rb
 - lib/pwnage/scaffolds/gems.rb
 - lib/pwnage/scaffolds/hook_daemon.rb
@@ -98,6 +99,7 @@ files:
 - lib/pwnage/dev_executor.rb
 - lib/pwnage/executor.rb
 - lib/pwnage/scaffolds/config.rb
+- lib/pwnage/scaffolds/dir_permissions.rb
 - lib/pwnage/scaffolds/dirs.rb
 - lib/pwnage/scaffolds/gems.rb
 - lib/pwnage/scaffolds/hook_daemon.rb