rails_pwnerer 0.6.30 → 0.6.31

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.31. Debian package installer tries to bypass proxy if necessary.
+
 v0.6.30. Fixed crash if the highline gem is not available.
 
 v0.6.29. Support for checking out from Perforce.

data/README

@@ -25,14 +25,8 @@ application.
 
 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 rubygems1.8
-
-sudo gem update --system (you'll have to retry this if you get an error)
-
-sudo apt-get -y install ruby (yes you read it right, this comes last)
+1) Install a bootstrap version of ruby and rubygems:
+sudo apt-get -y install rubygems
 
 2) Install +rails_pwnerer+:
 sudo gem install rails_pwnerer
@@ -40,8 +34,8 @@ sudo gem install rails_pwnerer
 3) Get your server production-ready:
 sudo rpwn scaffold
 
-If this doesn't work, blame your OS distribution (rubygems was prevented
-from creating a wrapper for rpwn, and our cheat against common preventions failed).
+If this doesn't work, blame your OS distribution (rubygems was blocked
+from creating a wrapper for rpwn, and our cheat against common blocks failed).
 Manual workaround:
 
 a) Find the path to the gems: gem environment gemdir (e.g. /var/lib/gems/1.8/gems/)

data/Rakefile

@@ -9,7 +9,12 @@ Echoe.new('rails_pwnerer') do |p|
   p.email = 'victor@costan.us'
   p.summary = 'Rails deployment tool/hack.'
   p.url = 'http://www.costan.us/rails_pwnage'
-  # p.dependencies = ['rails >=2.0']
+  p.runtime_dependencies = []
+  p.dependencies = []
+  # remove echoe, because it becomes a runtime dependency for rubygems < 1.2
+  p.development_dependencies = []
+  # override echoe's default of 1.2
+  p.rubygems_version = '>= 0'
   p.extensions = ['ext/rpwn_setup_notice/extconf.rb']
   p.eval = proc do |p|
     p.default_executable = 'bin/rpwn'

data/lib/pwnage/base/dirs.rb

@@ -31,7 +31,7 @@ module RailsPwnage::Base
   
   # executes a block in a temporary directory
   def with_temp_dir(options = {})
-    temp_dir = "#{options[:root] ? '/' : ''}rbpwn_#{Time.now.to_i}"
+    temp_dir = "#{options[:root] ? '/' : ''}rbpwn_#{(Time.now.to_f * 1000).to_i}"
     Dir.mkdir temp_dir
     Dir.chdir(temp_dir) { yield }  
     FileUtils.rm_r temp_dir

data/lib/pwnage/base/packages.rb

@@ -1,44 +1,118 @@
 # extends Base with OS package-related functions
 
+require 'English'
+
 module RailsPwnage::Base
   # TODO: this works for debian-only
 
-  # installs a package
-  def install_package(package_name, options = {})
+  # Builds apt-get parameters for a set of options.
+  def apt_params_for(options = {})
+    params = ""
+    params << "-o Acquire::http::Proxy=false" if options[:no_proxy]
+  end
+  
+  def install_package_impl(package_name, options)
+    apt_params = apt_params_for options
     if options[:source]
       with_temp_dir(:root => true) do
-        system "apt-get build-dep -y #{package_name}"
-        system "apt-get source -b #{package_name}"
-        system "dpkg -i #{Dir.glob('*.deb', File::FNM_DOTMATCH).join(' ')} < /dev/null"
+        Kernel.system "apt-get build-dep -y #{apt_params} #{package_name}"
+        return false unless $CHILD_STATUS.success?
+        Kernel.system "apt-get source -b  #{apt_params} #{package_name}"
+        return false unless $CHILD_STATUS.success?        
+        Kernel.system "dpkg -i #{Dir.glob('*.deb', File::FNM_DOTMATCH).join(' ')} < /dev/null"
+        return false unless $CHILD_STATUS.success?
       end
     else
-      system "apt-get install -y #{package_name} < /dev/null"
+      Kernel.system "apt-get install -y  #{apt_params} #{package_name} < /dev/null"
+      return false unless $CHILD_STATUS.success?
     end
+    return true
   end
   
-  # upgrades a package to the latest version
-  def upgrade_package(package_name, options = {})    
+  # Installs a package.
+  # Returns true for success, false for failure.   
+  def install_package(package_name, options = {})
+    return true if install_package_impl(package_name, options)
     if options[:source]
-      remove_package(package_name)
+      if options[:no_proxy]
+        # already bypassing proxy, fall back to binary package
+        return install_package(package_name, options.merge(:source => false))
+      else
+        # try bypassing proxy
+        return install_package(package_name, options.merge(:no_proxy => true))
+      end
+    else
+      if options[:no_proxy]
+        # out of alternatives
+        return false
+      else
+        # 
+        return install_package(package_name, options.merge(:no_proxy => true))        
+      end
+    end
+  end
+
+  def upgrade_package_impl(package_name, options)
+    apt_params = apt_params_for options    
+    Kernel.system "apt-get upgrade -y #{apt_params} #{package_name.nil ? '' : package_name} < /dev/null"
+    return $CHILD_STATUS.success?
+  end
+  
+  # Upgrades a package to the latest version.
+  def upgrade_package(package_name, options = {})
+    return install_package(package_name, options) if options[:source]
+    return true if upgrade_package_impl(package_name, options)
       
-      install_package(package_name, :source => true)
+    if options[:no_proxy]
+      # out of alternatives
+      return false
     else
-      system "apt-get upgrade -y #{package_name.nil ? '' : package_name} < /dev/null"
+      # 
+      return upgrade_package(package_name, options.merge(:no_proxy => true))        
     end
   end
   
-  def upgrade_all_packages()
-    system "apt-get upgrade -y < /dev/null"
+  def upgrade_all_packages_impl(options)
+    apt_params = apt_params_for options    
+    Kernel.system "apt-get upgrade -y #{apt_params} < /dev/null"
+    return $CHILD_STATUS.success?
+  end
+
+  def upgrade_all_packages(options = {})
+    return true if upgrade_all_packages_impl(options)
+    
+    if options[:no_proxy]
+      # out of alternatives
+      return false
+    else
+      # 
+      return upgrade_all_packages(options.merge(:no_proxy => true))
+    end    
   end
   
   def remove_package(package_name, options = {})
     system "apt-get remove -y #{package_name}" unless package_name.nil?      
   end
   
-  # update the metadata for all the packages 
-  def update_package_metadata()
-    system "apt-get update -y < /dev/null"
-  end  
+  def update_package_metadata_impl(options)
+    apt_params = apt_params_for options
+    Kernel.system "apt-get update -y #{apt_params} < /dev/null"
+    return $CHILD_STATUS.success?
+  end
+  
+  # Updates the metadata for all the packages.
+  # Returns true for success, false for failure. 
+  def update_package_metadata(options = {})
+    return true if update_package_metadata_impl options
+    
+    if options[:no_proxy]
+      # out of alternatives
+      return false
+    else
+      # try bypassing proxy
+      return update_package_metadata(options.merge(:no_proxy => true))
+    end
+  end
   
   # add a source to the package system
   def add_package_source(source_url, source_repos = [], options = {})

data/lib/pwnage/scaffolds/config.rb

@@ -16,9 +16,9 @@ class RailsPwnage::Scaffolds::Config
     # host info    
     host_info = RailsPwnage::Config.create_db :host
     # the default instance name
-    host_info[:instance] = Socket.gethostname()
+    host_info[:instance] = Socket.gethostname().split('.').first
     # the computer's name (if we ever do status reports)
-    host_info[:name] = Socket.gethostname().split('.').first
+    host_info[:name] = Socket.gethostname()
     # username for creating / dropping databases
     host_info[:dbroot_name] = 'root'
     # password for creating / dropping databases

data/lib/pwnage/scaffolds/packages.rb

@@ -40,8 +40,9 @@ class RailsPwnage::Scaffolds::Packages
   
   # the packages comprising ruby
   def install_ruby
+    # NOTE: not wiping ruby anymore, because a lot of stuff depends on it... just hoping apt will replace it quietly
     # 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)
+    # remove_packages %w(ruby1.8 libruby1.8) -- this shouldn't be needed anymore
         
     # install ruby from source
     install_packages %w(ruby1.8 rdoc libsetup-ruby1.8 ruby-pkg-tools rubygems1.8 rubygems irb), :source => true    

data/rails_pwnerer.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.30"
+  s.version = "0.6.31"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
   s.date = %q{2009-02-03}
   s.default_executable = %q{bin/rpwn}
@@ -27,11 +27,8 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.30
+  version: 0.6.31
 platform: ruby
 authors: 
 - Victor Costan
@@ -11,17 +11,8 @@ cert_chain: []
 
 date: 2009-02-03 00:00:00 -05:00
 default_executable: bin/rpwn
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: Rails deployment tool/hack.
 email: victor@costan.us
 executables: 
@@ -161,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []