rails_pwnerer 0.6.69 → 0.6.70

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.70. Bugfix for CPU enumeration in VM.
+
 v0.6.69. More tweaks in the debian package list.
 
 v0.6.68. Bugfix in untested package installation code, plus new test.

data/lib/rails_pwnerer/base/cpus.rb

@@ -52,8 +52,8 @@ module RailsPwnerer::Base
       cpus << {
           :freq => p.cpu_mhz.to_f,
           :id => p.processor.to_i,
-          :cpu => p.physical_id.to_i,
-          :core => p.core_id.to_i,
+          :cpu => p.respond_to?(:physical_id) ? p.physical_id.to_i : 0,
+          :core => p.respond_to?(:core_id) ? p.core_id.to_i : 0,
           :num_cores => p.cpu_cores.to_i
       }
     end

data/lib/rails_pwnerer/scaffolds/gems.rb

@@ -4,59 +4,44 @@ class RailsPwnerer::Scaffolds::Gems
   include RailsPwnerer::Base
   
   def install_self
-    # need to reinstall self because ruby gets swapped while the gem is running
+    # The gem repository gets wiped on new Debian and Ubuntu installs, so we
+    # need to reinstall ourselves.
     install_gems %w(rails_pwnerer)
   end
   
-  def install_servers
-    install_gems %w(memcache-client rack rack-test rack-mount unicorn thin)
-  end
-  
-  def install_dbi
+  def install_databases
     install_gems %w(mysql mysql2 pg sqlite3-ruby)
-  end
-  
-  def install_text_tools
-    install_gems %w(tzinfo builder erubis mail text-format i18n)
+    install_gems %w(memcache-client)
   end
   
   def install_packagers
     install_gems %w(rake thor bundler)
   end
   
-  def install_tools
-    # we need this to do controlled app container startups
-    install_gems %w(sys-proctable)
-    
-    # used to determine the number of available CPUs and cores
-    install_gems %w(sys-cpu)
-    
-    # used to get version control passwords
+  def install_servers
+    install_gems %w(thin unicorn)
+  end
+  
+  def install_tools    
+    # Get passwords from admins.
     install_gems %w(highline termios)
 
-    # some code can use this instead of Net::HTTP and be faster
-    install_gems %w(curb)
-    
-    # some code can use one of these for XML / HTML parsing and be faster
-    install_gems %w(nokogiri hpricot)    
+    # Debug gems on production machines.
+    install_gems %w(echoe jeweler ruby-debug ruby-debug-ide)
     
-    # useful for building gems and debugging
-    install_gems %w(echoe ruby-debug-ide)
-        
-    # useful for development, testing, monitoring
-    install_gems %w(mechanize)
+    # Determine number of CPUs and cores.
+    install_gems %w(sys-cpu)
   end
   
   # runner
   def run
     update_gems
     install_self
-    install_dbi
+    install_databases
     install_packagers
-    install_text_tools
     install_servers
-    install_gems %w(rails)
     install_tools
+    install_gems %w(rails)
   end
   
   # standalone runner

data/lib/rails_pwnerer/scaffolds/packages.rb

@@ -94,10 +94,6 @@ class RailsPwnerer::Scaffolds::Packages
     package 'irb', 'irb1.8'
     package 'ruby-dev', 'ruby1.8-dev'
     package 'rubygems', 'rubygems1.8'
-    
-    # Debian package tool. Might be helpful if we decide to auto-convert
-    # gems into debian packages.
-    package 'ruby-pkg-tools'
   end
         
   # Package for front-end servers.

data/rails_pwnerer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.69"
+  s.version = "0.6.70"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  hash: 141
+  hash: 139
   prerelease: false
   segments: 
   - 0
   - 6
-  - 69
-  version: 0.6.69
+  - 70
+  version: 0.6.70
 platform: ruby
 authors: 
 - Victor Costan