auser-poolparty 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.1.1 * Updated Scheduler to include ThreadPool for threaded safety
 v0.1.0 * Added poolnotify
        * Updating gem on github
 v0.0.9 * Changed configuration style to rsync all files across every instance

data/README.txt

@@ -93,26 +93,24 @@ For more help, check http://poolpartyrb.com
 == REQUIREMENTS:
 
 * aws/s3
-* SQS
 * aska
 * EC2
 
 == INSTALL:
 
-  gem install poolparty
+  gem install auser-poolparty
 
 == ROADMAP
 
-* v0.0.5 - Released!
-* v0.0.6 - Speed the configuration on the instances
-* v0.0.7 - Callback support
-* v0.0.8 - Add SQS task support
+v0.1.5 - Add AMI bundling tasks
 
 == THANKS
 
 Ron Evans, http://deadprogrammersociety.blogspot.com/ for his enthusiasm
 Tim Goh, http://citrusbyte.com for sanity checks and thoughts
-Daniel Fischer, http://citrusbyte.com for initial site design
+PJ Cabrera, http://pjtrix.com for excitement, thoughts and contribution
+Blake Mizerany, http://sinatrarb.com/, for his support and ideas
+Nicolás 'Foca' Sanguinetti, http://nicolassanguinetti.info/
 
 == LICENSE:
 

data/Rakefile

@@ -1,14 +1,16 @@
 require 'rubygems'
-require "lib/poolparty"
+require "./lib/poolparty"
+
 begin
   require 'echoe'
   
   Echoe.new("poolparty") do |s|
-    s.author = "Ari Lerner"
+    s.author = ["Ari Lerner"]
+    s.rubyforge_name = "poolparty"
     s.email = "ari.lerner@citrusbyte.com"
     s.summary = "Run your entire application off EC2, managed and auto-scaling"
     s.url = "http://poolpartyrb.com"
-    s.dependencies = ["aws-s3", "amazon-ec2", "auser-aska", "git", "crafterm-sprinkle", "SystemTimer"]
+    s.dependencies = ["aws-s3", "amazon-ec2", "auser-aska", "git", "crafterm-sprinkle", "SystemTimer", "open4"]
     s.install_message = %q{
       
       Get ready to jump in the pool, you just installed PoolParty!
@@ -20,20 +22,34 @@ begin
 
       For more information, check http://poolpartyrb.com
       On IRC: 
-        irc.freenode.net
-        #poolpartyrb
+        irc.freenode.net / #poolpartyrb
+        
       *** Ari Lerner @ <ari.lerner@citrusbyte.com> ***
     }
   end
-  
 rescue LoadError => boom
   puts "You are missing a dependency required for meta-operations on this gem."
 end
 
-task :default => :test
-
 PoolParty.include_tasks
 
+# add spec tasks, if you have rspec installed
+begin
+  require 'spec/rake/spectask'
+ 
+  Spec::Rake::SpecTask.new("spec") do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--color']
+  end
+ 
+  Spec::Rake::SpecTask.new("rcov_spec") do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--color']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', '^spec,/gems/']
+  end
+end
+
 namespace(:pkg) do
   ## Rake task to create/update a .manifest file in your project, as well as update *.gemspec
   desc %{Update ".manifest" with the latest list of project filenames. Respect\
@@ -64,9 +80,8 @@ namespace(:pkg) do
     File.open('Manifest', 'w') {|f| f << list.join("\n") }
   end
   desc "Build gemspec for github"
-  task :gemspec => :manifest do
+  task :gemspec => [:manifest, :gem] do
     require "yaml"
-    `rake manifest gem`
     data = YAML.load(open("poolparty.gemspec").read).to_ruby
     File.open("poolparty.gemspec", "w+") {|f| f << data }
   end
@@ -82,12 +97,12 @@ namespace(:pkg) do
     File.open("poolparty.gemspec", "w+") {|f| f << data }
   end
   desc "Get ready to release the gem"
-  task :prerelease => :gemspec_update do
+  task :prerelease => [:gemspec_update] do
     `git add .`
     `git ci -a -m "Updated gemspec for github"`
   end
   desc "Release them gem to the gem server"
-  task :release => :prerelease do
+  task :release => [:prerelease] do
     `git push origin master`
   end
 end

data/bin/instance

@@ -13,13 +13,13 @@ Usage: instance [OPTIONS] { #{commandables.join(" | ")} }
     EOU
     })
     
-PoolParty.load
+PoolParty.load_app
 
 master = PoolParty::Master.new
 list = PoolParty::Optioner.parse(ARGV.dup, %w(-v --verbose))
 num = list.reject {|a| commandables.include?(a) }.pop
 
-instance = master.get_node(num)
+instance = master.get_node( num || 0 )
 
 unless instance
   puts "Cloud is not running"

data/bin/pool

@@ -1,11 +1,10 @@
 #!/usr/bin/ruby
-require 'rubygems'
-$:.unshift(File.join(File.dirname(__FILE__), "lib"))
+$:.unshift(File.join(File.dirname(__FILE__)))
 require 'poolparty'
 
 def display_config_data
   PoolParty.message <<-EOM
-Starting #{PoolParty::Application.app_name ? "#{PoolParty::Application.app_name} " : "" }cloud
+PoolParty cloud: #{PoolParty::Application.app_name ? "#{PoolParty::Application.app_name} " : "" }
   On #{PoolParty::Application.ami}
   Minimum instances: #{PoolParty::Application.minimum_instances}
   Maximum instances: #{PoolParty::Application.maximum_instances}
@@ -16,6 +15,7 @@ Starting #{PoolParty::Application.app_name ? "#{PoolParty::Application.app_name}
   Monitors available:
   --------------
   #{PoolParty.registered_monitors.collect {|a| "   #{a}"}}
+  
   Plugins:
   --------------
 #{Dir["#{PoolParty::Application.plugin_dir}/*"].collect {|a| "   #{File.basename(a)}"}.join("\n")}
@@ -30,8 +30,8 @@ Usage: pool [OPTIONS] {start | stop | list | clouds_list | maintain | restart |
 -----------------------------------------------------------------
     EOU
     })
-    
-PoolParty.load
+
+PoolParty.load_app
 master = PoolParty::Master.new
 list = PoolParty::Optioner.parse(ARGV.dup, %w(-v))
 
@@ -74,7 +74,9 @@ list.each do |cmd|
   when "switch"
     list.shift
     context = list.shift
-    context ? `source ~/.#{context}_pool_keys` : puts("You must supply a context to switch to")
+    keyfilename = ".#{context}_pool_keys"
+    PoolParty.message "switching cloud to #{context}"
+    context ? Kernel.system("source $HOME/#{keyfilename}") : puts("You must supply a context to switch to")
   else
     puts master.list
   end

data/config/reconfigure_instances_script.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+echo "Setting up pem files"
+:setup_pems
 # Move the hosts file
 echo "Moving the hosts file into place"
 :move_hostfile
@@ -15,9 +17,6 @@ echo "If this is the master, I'm configuring it as the master now"
 # Configure haproxy
 echo "Configuring and starting haproxy"
 :configure_haproxy
-# Set this hostname as appropriate in the cloud
-echo "Setting new hostname"
-:set_hostname
 # Configure heartbeat
 echo "Moving all the resource.d files into place"
 :configure_resource_d
@@ -33,5 +32,6 @@ echo "Configuring monit"
 # Update the plugins
 echo "Updating plugins"
 :update_plugins
+# Run user tasks
 echo "Running user tasks"
 :user_tasks

data/config/sample-config.yml

@@ -8,7 +8,7 @@
 :minimum_instances: 2
 :maximum_instances: 3
 :ec2_dir: "/Users/auser/.ec2"
-:keypair: auser
+:keypair: testappkeypair
 :os: ubuntu
 :host_port: 80
 :client_port: 8001

data/lib/core/array.rb

@@ -7,7 +7,10 @@ class Array
   def collect_with_index &block
     self.enum_for(:each_with_index).collect &block
   end
-  def runnable
-    self.join(" \n ").runnable
+  def runnable(quiet=true)
+    self.join(" \n ").runnable(quiet)
+  end
+  def nice_runnable(quiet=true)
+    self.join(" \n ").nice_runnable(quiet)
   end
 end

data/lib/core/hash.rb

@@ -6,6 +6,6 @@ class Hash
     merge(other_hash.delete_if {|k,v| has_key?(k) })
   end
   def safe_merge!(other_hash)
-    merge!(other_hash.delete_if {|k,v| has_key?(k) })
+    merge!(other_hash.delete_if {|k,v| has_key?(k) && !v.nil? })
   end
 end

data/lib/core/string.rb

@@ -17,8 +17,12 @@ class String
   def arrayable
     self.strip.split(/\n/)
   end
-  def runnable
-    self.strip.gsub(/\n/, " && ")
+  def runnable(quite=true)
+    # map {|l| l << "#{" >/dev/null 2>/dev/null" if quite}" }.
+    self.strip.split(/\n/).join(" && ")
+  end
+  def nice_runnable(quite=true)
+    self.split(/ && /).join("\n")
   end
   def classify
     self.capitalize

data/lib/helpers/plugin_spec_helper.rb

@@ -6,8 +6,10 @@ module PoolParty
       @klass = klass.send :new
       klass.stub!(:new).and_return @klass
       
-      define_master
+      @master = Master.new      
       @instances = define_instances(num)
+      
+      Master.stub!(:new).and_return @master
 
       @master.stub!(:execute_tasks).and_return true
       @master.stub!(:launch_minimum_instances).and_return true
@@ -19,13 +21,9 @@ module PoolParty
       Kernel.stub!(:system).and_return "true"
 
       Provider.stub!(:install_poolparty).and_return true
-      Provider.stub!(:install_userpackages).and_return true
 
       [@klass, @master, @instances]
     end
-    def self.define_master
-      @master ||= Master.new
-    end
     def self.define_instances(num)
       # Too many gross evals
       returning [] do |arr|
@@ -34,6 +32,7 @@ module PoolParty
             @instance#{i} = RemoteInstance.new
             @instance#{i}.stub!(:ssh).and_return "true"
             @instance#{i}.stub!(:scp).and_return "true"
+            @instance#{i}.stub!(:run).and_return "true"
             @instance#{i}.stub!(:name).and_return "node#{i}"
             @instance#{i}.stub!(:ip).and_return "127.0.0.#{i}"
           EOE

data/lib/modules/sprinkle_overrides.rb

@@ -1,32 +1,27 @@
-require "sprinkle"
-module Sprinkle
-  module Installers
-    class Source < Installer
-
-      def custom_dir(dir)
-        @custom_dir = dir
-      end
-      
-      def base_dir
-        if @custom_dir
-          return @custom_dir
-        elsif @source.split('/').last =~ /(.*)\.(tar\.gz|tgz|tar\.bz2|tb2)/
-          return $1
-        end
-        raise "Unknown base path for source archive: #{@source}, please update code knowledge"
-      end
-    end
-    
-    class Gem < Installer
-      protected
-        def install_sequence
-          cmd = "gem install -y #{gem}"
-          cmd << " --version '#{version}'" if version
-          cmd << " --source #{source}" if source
-          cmd
-        end
+Sprinkle::Installers::Source.extend Module.new do
+  def custom_dir(dir)
+    @custom_dir = dir
+  end
+  
+  def base_dir
+    if @custom_dir
+      return @custom_dir
+    elsif @source.split('/').last =~ /(.*)\.(tar\.gz|tgz|tar\.bz2|tb2)/
+      return $1
     end
-    
-    
+    raise "Unknown base path for source archive: #{@source}, please update code knowledge"
+  end  
+end  
+Sprinkle::Installers::Gem.extend Module.new do
+  def platform(platform=nil)
+    @platform ||= platform
   end
+  protected
+    def install_sequence
+      cmd = "gem install -y #{gem}"
+      cmd << " --version '#{version}'" if version
+      cmd << " --source #{source}" if source
+      cmd << " --platform #{platform}" if platform
+      cmd
+    end
 end

data/lib/poolparty/application.rb

@@ -15,22 +15,20 @@ module PoolParty
       # Default config file assumed to be at config/config.yml
       def make_options(opts={})
         loading_options = opts.delete(:optsparse) || {}
-        loading_options.merge!( opts.delete(:argv) || {} )
+        loading_options.merge!( opts || {})
+        
+        load_options!(loading_options) # Load command-line options
+        config_file_location = (default_options[:config_file] || opts[:config_file])
         
-        config_file_location = (default_options[:config_file] || opts[:config_file])        
         # If the config_file options are specified and not empty
         unless config_file_location.nil? || config_file_location.empty?
           require "yaml"
           # Try loading the file if it exists
           filedata = File.open("#{config_file_location}").read if File.file?("#{config_file_location}")
-          # We want the command-line to overwrite the config file
-          default_options.merge!( YAML.load(filedata) ) if filedata
+          default_options.merge!( YAML.load(filedata) ) if filedata rescue ""
         end
-        
-        default_options.merge!(opts)
-        load_options!(loading_options) # Load command-line options        
-        default_options.merge!(local_user_data) unless local_user_data.nil?
-        
+        # We want the command-line to overwrite the config file
+        default_options.merge!(local_user_data) unless local_user_data.nil?        
         OpenStruct.new(default_options)
       end
 
@@ -39,8 +37,8 @@ module PoolParty
         require 'optparse'
         OptionParser.new do |op|
           op.banner = opts[:banner] if opts[:banner]
-          op.on('-A key', '--access-key key', "Ec2 access key (ENV['ACCESS_KEY'])") { |key| default_options[:access_key] = key }
-          op.on('-S key', '--secret-access-key key', "Ec2 secret access key (ENV['SECRET_ACCESS_KEY'])") { |key| default_options[:secret_access_key] = key }
+          op.on('-A key', '--access-key key', "Ec2 access key (ENV['AWS_ACCESS_KEY'])") { |key| default_options[:access_key] = key }
+          op.on('-S key', '--secret-access-key key', "Ec2 secret access key (ENV['AWS_SECRET_ACCESS'])") { |key| default_options[:secret_access_key] = key }
           op.on('-I ami', '--image-id id', "AMI instance (default: 'ami-40bc5829')") {|id| default_options[:ami] = id }
           op.on('-k keypair', '--keypair name', "Keypair name (ENV['KEYPAIR_NAME'])") { |key| default_options[:keypair] = key }
           op.on('-b bucket', '--bucket bucket', "Application bucket") { |bucket| default_options[:shared_bucket] = bucket }
@@ -60,7 +58,7 @@ module PoolParty
           op.on('-s size', '--size size', "Run specific sized instance") {|s| default_options[:size] = s}
           op.on('-a name', '--name name', "Application name") {|n| default_options[:app_name] = n}
           op.on('-u username', '--username name', "Login with the user (default: root)") {|s| default_options[:user] = s}
-          op.on('-d user-data','--user-data data', "Extra data to send each of the instances (default: "")") { |data| default_options[:user_data] = data }
+          op.on('-d user-data','--user-data data', "Extra data to send each of the instances (default: "")") { |data| default_options[:user_data] = data.to_str }
           op.on('-i', '--install-on-boot', 'Install the PoolParty and custom software on boot (default: false)') {|b| default_options[:install_on_load] = true}
           op.on('-t seconds', '--polling-time', "Time between polling in seconds (default 50)") {|t| default_options[:polling_time] = t }
           op.on('-v', '--[no-]verbose', 'Run verbosely (default: false)') {|v| default_options[:verbose] = true}
@@ -97,8 +95,8 @@ module PoolParty
           :minimum_instances => 2,
           :maximum_instances => 4,
           :public_ip => "",
-          :access_key => ENV["AWS_ACCESS_KEY_ID"],
-          :secret_access_key => ENV["AWS_SECRET_ACCESS_ID"],
+          :access_key => ENV["AWS_ACCESS_KEY"],
+          :secret_access_key => ENV["AWS_SECRET_ACCESS"],
           :config_file => if ENV["CONFIG_FILE"] && !ENV["CONFIG_FILE"].empty?
             ENV["CONFIG_FILE"]
           elsif File.file?("config/config.yml")
@@ -108,13 +106,13 @@ module PoolParty
           end,
           :username => "root",
           :ec2_dir => ENV["EC2_HOME"],
-          :keypair => ENV["KEYPAIR_NAME"],
+          :keypair => (ENV["KEYPAIR_NAME"].nil? || ENV["KEYPAIR_NAME"].empty?) ? File.basename(`pwd`).strip : ENV["KEYPAIR_NAME"].empty?,
           :ami => 'ami-44bd592d',
           :shared_bucket => "",
           :expand_when => "web < 1.5\n memory > 0.85",
           :contract_when => "cpu < 0.20\n memory < 0.10",
           :os => "ubuntu",
-          :plugin_dir => "vendor",
+          :plugin_dir => "plugins",
           :install_on_load => false,
           :working_directory => Dir.pwd
         }
@@ -125,29 +123,41 @@ module PoolParty
       end
       alias_method :managed_services, :master_managed_services
       def launching_user_data
-        {:polling_time => polling_time, 
+        hash_to_launch_with.to_yaml
+      end
+      def hash_to_launch_with
+        @hash ||= { :polling_time => polling_time, 
           :access_key => access_key, 
           :secret_access_key => secret_access_key,
-          :user_data => user_data}.to_yaml
+          :user_data => user_data,
+          :keypair_path => "/mnt"
+        }
       end
-      def local_user_data        
-        begin
-          @@timer.timeout(3.seconds) do
-            @local_user_data ||=YAML.load(open("http://169.254.169.254/latest/user-data").read)
-          end
-        rescue Exception => e
-          @local_user_data = {}
+      def local_user_data 
+        unless @local_user_data
+          begin
+            @@timer.timeout(3.seconds) do
+              @local_user_data ||=YAML.load(open("http://169.254.169.254/latest/user-data").read)
+            end
+          rescue Exception => e
+            @local_user_data = {}
+          end          
         end
+        @local_user_data
       end
       # For testing purposes
       def reset!
+        @options = nil
         @local_user_data = nil
       end
       # Keypair path
       # Idiom:
-      #  /Users/username/.ec2/id_rsa-name
+      #  /Users/username/.ec2/[name]
       def keypair_path
-        "#{ec2_dir}/id_rsa#{keypair ? "-#{keypair}" : "" }"
+        options.keypair_path ? options.keypair_path : "#{ec2_dir}/#{keypair_name}"
+      end
+      def keypair_name
+        "id_rsa-#{keypair}"
       end
       # Are we in development or test mode
       %w(development production test).each do |env|

data/lib/poolparty/master.rb

@@ -67,9 +67,17 @@ module PoolParty
       build_and_send_config_files_in_temp_directory
       remote_configure_instances
       
-      Master.with_nodes do |node|
+      nodes.each do |node|
         node.configure
-      end
+      end      
+    end
+    before :install_cloud, :add_ssh_key
+    after :configure_cloud, :remove_ssh_key
+    def add_ssh_key(i)
+      Kernel.system("ssh-add #{Application.keypair_path} >/dev/null 2>/dev/null")
+    end
+    def remove_ssh_key(i)
+      Kernel.system("ssh-add -d #{Application.keypair_name} >/dev/null 2>/dev/null")
     end
     def install_cloud(bool=false)
       if Application.install_on_load? || bool
@@ -77,14 +85,13 @@ module PoolParty
         # update packages.
         update_apt_string =<<-EOE        
           touch /etc/apt/sources.list
-          echo 'deb http://mirrors.cs.wmich.edu/ubuntu hardy main universe' >> /etc/apt/sources.list
-          sudo apt-get update --fix-missing
+          echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
+          apt-get update --fix-missing
         EOE
         
         ssh(update_apt_string)
         
-        Provider.install_poolparty(cloud_ips)
-        Provider.install_userpackages(cloud_ips)
+        Provider.install_poolparty
         
         # For plugins
         nodes.each do |node|
@@ -174,18 +181,20 @@ module PoolParty
         Kernel.system("tar -czf #{base_tmp_dir}/plugins.tar.gz #{File.basename(Application.plugin_dir)}")
       end
       
-      File.copy(get_config_file_for("cloud_master_takeover"), "#{base_tmp_dir}/cloud_master_takeover")
-      File.copy(get_config_file_for("heartbeat.conf"), "#{base_tmp_dir}/ha.cf")
+      if Master.requires_heartbeat?
+        build_and_copy_heartbeat_authkeys_file
+        File.copy(get_config_file_for("cloud_master_takeover"), "#{base_tmp_dir}/cloud_master_takeover")
+        File.copy(get_config_file_for("heartbeat.conf"), "#{base_tmp_dir}/ha.cf")
+      end
       
       File.copy(Application.config_file, "#{base_tmp_dir}/config.yml") if Application.config_file && File.exists?(Application.config_file)
       File.copy(Application.keypair_path, "#{base_tmp_dir}/keypair") if File.exists?(Application.keypair_path)
       
-      File.copy(get_config_file_for("monit.conf"), "#{base_tmp_dir}/monitrc")
-      
+      copy_pem_files_to_tmp_dir
+            
       copy_config_files_in_directory_to_tmp_dir("config/resource.d")
-      copy_config_files_in_directory_to_tmp_dir("config/monit.d")
-      
-      build_and_copy_heartbeat_authkeys_file
+      # copy_config_files_in_directory_to_tmp_dir("config/monit.d")
+            
       build_haproxy_file
       Master.build_user_global_files
         
@@ -200,6 +209,15 @@ module PoolParty
         end
       end
     end
+    def copy_pem_files_to_tmp_dir
+      %w(EC2_CERT EC2_PRIVATE_KEY).each do |key|
+        begin
+          file = `echo $#{key}`.strip
+          File.copy(file, "#{base_tmp_dir}/#{File.basename(file)}")
+        rescue Exception => e
+        end
+      end
+    end
     def cleanup_tmp_directory(c)
       Dir["#{base_tmp_dir}/*"].each {|f| FileUtils.rm_rf f} if File.directory?("tmp/")
     end
@@ -286,7 +304,7 @@ chmod +x #{script_file}
     # Build basic configuration script for the node
     def build_reconfigure_instances_script_for(node)
       write_to_file_for("configuration", node) do
-        open(Application.sh_reconfigure_instances_script).read.strip ^ node.configure_tasks
+        open(Application.sh_reconfigure_instances_script).read.strip ^ node.configure_tasks( !PoolParty.verbose? )
       end        
     end
     
@@ -399,6 +417,9 @@ chmod +x #{script_file}
       def get_master
         new.nodes[0]
       end
+      def cloud_ips
+        new.cloud_ips
+      end
       def get_next_node(node)
         new.get_next_node(node)
       end

data/lib/poolparty/plugin.rb

@@ -31,12 +31,8 @@ module PoolParty
       PoolParty::RemoteInstance.user_tasks << str
     end
     
-    def self.install_package_string(str)
-      PoolParty::Provider.define_user_package str
-    end
-    
-    def self.define_package_string(str)
-      PoolParty::Provider.define_user_install str
+    def self.define_custom_package name=:userpackage, &block
+      PoolParty::Provider.define_custom_package name, &block
     end
     
     def self.define_global_file(name, &block)
@@ -47,6 +43,15 @@ module PoolParty
       PoolParty::Master.define_node_user_file(name, &block)
     end
     
+    def add_user_data(h={})
+      case h.class.to_s
+      when "String"
+        PoolParty::Application.user_data << h
+      when "Hash"
+        PoolParty::Application.hash_to_launch_with.merge!(h)
+      end      
+    end
+        
     def read_config_file(filename)
       return {} unless filename
       YAML.load(open(filename).read)

data/lib/poolparty/plugin_manager.rb

@@ -51,7 +51,7 @@ module PoolParty
     end
     
     def self.plugin_dirs
-      Dir["#{PoolParty.user_dir}/vendor/*"]
+      Dir["#{PoolParty.user_dir}/plugin/*"]
     end
         
     def self.plugin_directory(path)
@@ -61,7 +61,7 @@ module PoolParty
       FileUtils.mkdir_p base_plugin_dir rescue ""
     end
     def self.base_plugin_dir
-      File.join(PoolParty.root_dir, "vendor")
+      File.join(PoolParty.root_dir, "plugin")
     end
   end
 end

data/lib/poolparty/provider/{packages/haproxy.rb → haproxy.rb}

@@ -1,5 +1,5 @@
 # Install haproxy
 package :haproxy, :provides => :proxy do
   description 'Haproxy proxy'
-  apt %w( haproxy )
+  apt %w( haproxy )  
 end

data/lib/poolparty/provider/{packages/ruby.rb → ruby.rb}

@@ -18,7 +18,7 @@ package :rubygems do
   #   custom_install 'ruby setup.rb'
   # end
   apt %w( rubygems )
-  post :install, "gem update --system", "gem sources -a http://gems.github.com"
+  post :install, "sed -i s/require\ 'rubygems'/require\ 'rubygems'\nrequire\ 'rubygems\/gem_runner'/g", "gem update --system", "gem sources -a http://gems.github.com"
   requires :ruby
 end