rails_pwnerer 0.5.8 → 0.5.9

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.9. Better method for locating gems.
+
 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.

data/Manifest

@@ -34,7 +34,7 @@ lib/pwnage/scaffolds/hook_dyndns.rb
 lib/pwnage/scaffolds/mysql_config.rb
 lib/pwnage/scaffolds/packages.rb
 lib/pwnage/scaffolds/rubygems.rb
-lib/rails_pwnage.rb
+lib/rails_pwnerer.rb
 LICENSE
 Manifest
 Rakefile

data/README

@@ -41,9 +41,9 @@ 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:
+
+a) Find the path to the gems: gem environment gemdir (e.g. /var/lib/gems/1.8/gems/)
+b) run bin/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.

data/bin/rpwn

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

data/bin/rpwnctl

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

data/bin/rpwndev

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

data/lib/pwnage/base/gems.rb

@@ -14,21 +14,28 @@ module RailsPwnage::Base
   # update the metadata for all the gems 
   def update_gems()
     system "gem update --system"
-    # patch Ubuntu's broken rubygems installation
-    system "cp /usr/bin/gem1.8 /usr/bin/gem"
   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}'`
+    # method 1: peek inside rubygems' treasure chest
+    begin
+      gem_pattern = File.join `gem environment gemdir`.strip, 'gems', gem_name
+      gem_path = Dir.glob(gem_pattern + '*').max
+    rescue
+      gem_path = nil
+    end    
+    return gem_path unless gem_path.nil? or gem_path.empty?
+    
+    # method 2: look for the main file in the gem
+    gem_path = `gem which '#{gem_name}'`.strip
     # discard the given suffix
-    if output[-(discard_suffix.lenth)..-1] == discard_suffix
-      output[-(discard_suffix.lenth)..-1] = ''
+    if gem_path[-(discard_suffix.length)..-1] == discard_suffix
+      gem_path[-(discard_suffix.length)..-1] = ''
     end
-    return output
+    return gem_path
   end
 end
 

data/lib/pwnage/executor.rb

@@ -23,6 +23,7 @@ class RailsPwnage::Executor
       when 'packages'
         Packages.go
       when 'rubygems'
+        RubyGems.pre_go
         RubyGems.go
       when 'ddns'
         if args.length < 5
@@ -30,7 +31,8 @@ class RailsPwnage::Executor
         else
           HookDyndns.go args[2], args[3], args[4]
         end
-      else
+      when nil
+        RubyGems.pre_go
         Packages.go
         RubyGems.go
         Gems.go
@@ -39,6 +41,8 @@ class RailsPwnage::Executor
         DirPermissions.go
         MysqlConfig.go
         HookDaemon.go
+      else
+        print "Unrecognized scaffold command #{args[1]}\n"        
       end
       
     when 'install', 'micro'

data/lib/pwnage/scaffolds/hook_daemon.rb

@@ -5,7 +5,7 @@ class RailsPwnage::Scaffolds::HookDaemon
     
   # runner
   def run
-    daemon_ctl = path_to_gem('rails_pwnage', 'lib/rails_pwnage.rb') + 'bin/rpwnctl'
+    daemon_ctl = File.join path_to_gem('rails_pwnerer', '/lib/rails_pwnerer.rb'), 'bin/rpwnctl'
     hook_boot_script daemon_ctl, 'rpwn'
   end
 

data/lib/pwnage/scaffolds/packages.rb

@@ -35,8 +35,8 @@ class RailsPwnage::Scaffolds::Packages
     # wipe the old version (and pray we don't die until we're done, otherwise we're on a ruby-less system)
     remove_packages %w(ruby1.8 libruby1.8)
         
-    # install ruby from source (get
-    install_packages %w(ruby1.8 rdoc libsetup-ruby1.8 ruby-pkg-tools rubygems irb), :source => true    
+    # install ruby from source
+    install_packages %w(ruby1.8 rdoc libsetup-ruby1.8 ruby-pkg-tools rubygems1.8 rubygems irb), :source => true    
   end
   
   # the packages for a mysql server and development libraries

data/lib/pwnage/scaffolds/rubygems.rb

@@ -46,19 +46,33 @@ 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')
+    # get the old path set by pre-go
+    old_gems = @@old_gems
     
     # remove the (retarded) Debian gems package and install from source    
     remove_packages %w(rubygems)
     install_rubygems
     
+    # patch Ubuntu's broken rubygems installation
+    system "cp /usr/bin/gem1.8 /usr/bin/gem"    
+    
     # remove the gems that are trailing behind
-    new_gems = path_to_gem('rubygems', '/1.8/rubygems.rb')
+    new_gems = File.dirname(File.dirname(path_to_gem('sources', '/lib/sources.rb')))
     return if new_gems == old_gems # don't wipe the new dir by mistake
     FileUtils.rm_r old_gems 
   end
   
+  def preflight
+    # save old lib path, in case we need to wipe it
+    # we need to do this because setting up packages might wipe Ubuntu's gems
+    @@old_gems = File.dirname(File.dirname(path_to_gem('sources', '/lib/sources.rb')))        
+  end
+  
+  # called before packages get installed
+  def self.pre_go
+    self.new.preflight
+  end
+  
   # standalone runner
   def self.go
     self.new.run

data/rails_pwnerer.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Rails_pwnerer-0.5.8
+# Gem::Specification for Rails_pwnerer-0.5.9
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - Victor Costan
 autorequire: 
 bindir: bin
 
-date: 2008-08-20 00:00:00 -04:00
+date: 2008-08-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ extra_rdoc_files:
 - lib/pwnage/scaffolds/mysql_config.rb
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
-- lib/rails_pwnage.rb
+- lib/rails_pwnerer.rb
 - LICENSE
 - README
 files: 
@@ -110,7 +110,7 @@ files:
 - lib/pwnage/scaffolds/mysql_config.rb
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
-- lib/rails_pwnage.rb
+- lib/rails_pwnerer.rb
 - LICENSE
 - Manifest
 - Rakefile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-20 00:00:00 -04:00
+date: 2008-08-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,7 +67,7 @@ extra_rdoc_files:
 - lib/pwnage/scaffolds/mysql_config.rb
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
-- lib/rails_pwnage.rb
+- lib/rails_pwnerer.rb
 - LICENSE
 - README
 files: 
@@ -107,7 +107,7 @@ files:
 - lib/pwnage/scaffolds/mysql_config.rb
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
-- lib/rails_pwnage.rb
+- lib/rails_pwnerer.rb
 - LICENSE
 - Manifest
 - Rakefile