auser-poolparty 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.1.2 * Added development tasks for easy setup
 v0.1.1 * Updated Scheduler to include ThreadPool for threaded safety
 v0.1.0 * Added poolnotify
        * Updating gem on github

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2008 <Ari Lerner>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/{README.txt → README}

@@ -102,6 +102,7 @@ For more help, check http://poolpartyrb.com
 
 == ROADMAP
 
+v0.1.4 - Add documentation
 v0.1.5 - Add AMI bundling tasks
 
 == THANKS

data/Rakefile

@@ -10,7 +10,7 @@ begin
     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", "open4"]
+    s.dependencies = ["aws-s3", "amazon-ec2", "auser-aska", "git", "sprinkle", "SystemTimer", "open4"]
     s.install_message = %q{
       
       Get ready to jump in the pool, you just installed PoolParty!
@@ -22,7 +22,8 @@ begin
 
       For more information, check http://poolpartyrb.com
       On IRC: 
-        irc.freenode.net / #poolpartyrb
+        irc.freenode.net
+        #poolpartyrb
         
       *** Ari Lerner @ <ari.lerner@citrusbyte.com> ***
     }

data/lib/helpers/plugin_spec_helper.rb

@@ -1,7 +1,7 @@
 module PoolParty
   class PluginSpecHelper
     def self.define_stubs(klass, num=1)
-      require File.dirname(__FILE__) + "/../../spec/helpers/ec2_mock"
+      require File.dirname(__FILE__) + '/../../spec/helpers/ec2_mock'
       
       @klass = klass.send :new
       klass.stub!(:new).and_return @klass

data/lib/modules/ec2_wrapper.rb

@@ -14,7 +14,8 @@ module PoolParty
           :user_data => "#{Application.launching_user_data}",
           :minCount => 1,
           :maxCount => 1,
-          :key_name => Application.keypair,
+          :key_name => "#{Application.keypair}",
+          :availability_zone => nil,
           :size => "#{Application.size}")
         begin
           item = instance#.instancesSet.item
@@ -31,8 +32,6 @@ module PoolParty
       end
       # Instance description
       def describe_instance(id)
-        # instance = ec2.describe_instances(:instance_id => id)
-        # item = instance.reservationSet.item.first.instancesSet.item.first
         EC2ResponseObject.get_hash_from_response(ec2.describe_instances(:instance_id => id))
       end
       # Get instance by id
@@ -43,12 +42,12 @@ module PoolParty
       def get_instances_description
         @cached_descriptions ||= EC2ResponseObject.get_descriptions(ec2.describe_instances)
       end
-      def reset!
-        @cached_descriptions = nil
-      end
       # EC2 connections
       def ec2
         @ec2 ||= EC2::Base.new(:access_key_id => Application.access_key, :secret_access_key => Application.secret_access_key)
+      end
+      def reset!
+        @cached_descriptions = nil
       end      
     end
     

data/lib/poolparty.rb

@@ -13,7 +13,7 @@ require "aska"
 begin
   require 'crafterm-sprinkle'
 rescue LoadError
-  require "sprinkle"
+  require 'sprinkle'
 end
 require "pp"
 require "tempfile"
@@ -48,7 +48,7 @@ module PoolParty
   class Version #:nodoc:
     @major = 0
     @minor = 1
-    @tiny  = 1
+    @tiny  = 2
 
     def self.string
       [@major, @minor, @tiny].join('.')

data/lib/poolparty/application.rb

@@ -105,8 +105,8 @@ module PoolParty
             nil
           end,
           :username => "root",
-          :ec2_dir => ENV["EC2_HOME"],
-          :keypair => (ENV["KEYPAIR_NAME"].nil? || ENV["KEYPAIR_NAME"].empty?) ? File.basename(`pwd`).strip : ENV["KEYPAIR_NAME"].empty?,
+          :ec2_dir => (ENV["EC2_HOME"].nil? || ENV["EC2_HOME"].empty?) ? "~/.ec2" : ENV["EC2_HOME"],
+          :keypair => (ENV["KEYPAIR_NAME"].nil? || ENV["KEYPAIR_NAME"].empty?) ? File.basename(`pwd`).strip : ENV["KEYPAIR_NAME"],
           :ami => 'ami-44bd592d',
           :shared_bucket => "",
           :expand_when => "web < 1.5\n memory > 0.85",
@@ -130,20 +130,18 @@ module PoolParty
           :access_key => access_key, 
           :secret_access_key => secret_access_key,
           :user_data => user_data,
+          :keypair => keypair,
           :keypair_path => "/mnt"
         }
       end
       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          
+        @local_user_data ||= begin
+          @@timer.timeout(2.seconds) do
+            YAML.load(open("http://169.254.169.254/latest/user-data").read)
+          end
+        rescue Exception => e
+          {}
         end
-        @local_user_data
       end
       # For testing purposes
       def reset!

data/lib/poolparty/init.rb

@@ -1,6 +1,6 @@
 =begin rdoc
   Load the files in order
 =end
-%w(optioner application thread_pool scheduler provider remoter remoting remote_instance master monitors tasks plugin plugin_manager).each do |f|
+%w(optioner application thread_pool scheduler provider remoter remoting remote_instance master monitors tasks plugin).each do |f|
   require File.join(File.dirname(__FILE__), f)
 end

data/lib/poolparty/master.rb

@@ -188,7 +188,7 @@ module PoolParty
       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(Application.keypair_path, "#{base_tmp_dir}/keypair") if File.exists?(Application.keypair_path)      
       
       copy_pem_files_to_tmp_dir
             
@@ -197,6 +197,8 @@ module PoolParty
             
       build_haproxy_file
       Master.build_user_global_files
+      
+      build_nodes_list
         
       Master.with_nodes do |node|
         build_hosts_file_for(node)
@@ -283,6 +285,11 @@ chmod +x #{script_file}
         "#{nodes.collect {|node| node.ip == n.ip ? node.local_hosts_entry : node.hosts_entry}.join("\n")}"
       end
     end
+    def build_nodes_list
+      write_to_file_for(RemoteInstance.node_list_name) do
+        "#{cloud_ips.join("\n")}"
+      end
+    end
     # Build the basic auth file for the heartbeat
     def build_and_copy_heartbeat_authkeys_file
       write_to_file_for("authkeys") do

data/lib/poolparty/provider.rb

@@ -2,13 +2,12 @@ module PoolParty
   class Provider
     include Sprinkle
         
-    def install_poolparty
+    def install_poolparty(testing=false)
       PoolParty.message "Installing required poolparty paraphernalia"
       load_packages
       user_packages.map {|blk| blk.call if blk }
 
       policy :poolparty, :roles => :app do
-        requires :git
         requires :ruby
         requires :heartbeat
         requires :haproxy
@@ -17,17 +16,16 @@ module PoolParty
         requires :required_gems
         
         PoolParty::Provider.user_install_packages.each do |req|
-          requires req.to_sym
+          self.send :requires, req.to_sym
         end
       end
       
-      set_start_with_sprinkle
-      @deployment.process if @deployment
+      testing ? show_process : process
     end
         
     def self.define_custom_package name=:userpackages, &block
       (user_install_packages << name).uniq!
-      user_packages << block
+      user_packages << yield if block_given?
     end
     
     def user_packages
@@ -66,16 +64,36 @@ module PoolParty
           prefix   '/usr/local'
           archives '/root/sources'
           builds   '/root/builds'
-        end    
+        end
       end
       
     end
+    
+    def process
+      set_start_with_sprinkle
+      @deployment.process if @deployment
+    end
+    
+    def show_process
+      Sprinkle::OPTIONS[:testing] = true
+      Sprinkle::OPTIONS[:verbose] = true      
+      Object.logger.level = ActiveSupport::BufferedLogger::Severity::DEBUG
+      deployment do
+        delivery :vlad do
+        end
+        source do
+          prefix   '/usr/local'
+          archives '/root/sources'
+          builds   '/root/builds'
+        end
+      end.process
+    end
             
     class << self
       require "sprinkle"
             
-      def install_poolparty
-        singleton.install_poolparty
+      def install_poolparty(testing=false)
+        singleton.install_poolparty(testing)
       end
       def singleton
         @singleton ||= new

data/lib/poolparty/provider/git.rb

@@ -1,4 +1,8 @@
 package :git do
   description "Git SCM"
   apt %w( zlib1g-dev git-core )
+  
+  verify do
+    has_executable 'git'
+  end
 end

data/lib/poolparty/provider/haproxy.rb

@@ -2,4 +2,8 @@
 package :haproxy, :provides => :proxy do
   description 'Haproxy proxy'
   apt %w( haproxy )  
+  
+  verify do
+    has_executable 'haproxy'
+  end  
 end

data/lib/poolparty/provider/heartbeat.rb

@@ -1,4 +1,6 @@
 package :heartbeat, :provides => :failover do
   description "Heartbeat Linux HA project"
-  apt %w( heartbeat-2 )
+  apt %w( heartbeat )
+  
+  has_executable 'heartbeat'
 end

data/lib/poolparty/provider/rsync.rb

@@ -1,4 +1,8 @@
 package :rsync do
   description "Rsync"
   apt %w( rsync )
+  
+  verify do
+    has_executable 'rsync'
+  end
 end

data/lib/poolparty/provider/ruby.rb

@@ -1,9 +1,11 @@
 package :ruby do
   description 'Ruby Virtual Machine'
-  # version '1.8.6'
-  # source "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-#{version}-p111.tar.gz" # implicit :style => :gnu
   apt %w( ruby ruby1.8-dev )
   requires :ruby_dependencies
+  
+  verify do
+    has_executable 'ruby'
+  end
 end
 
 package :ruby_dependencies do
@@ -13,16 +15,51 @@ end
 
 package :rubygems do
   description 'Ruby Gems Package Management System'
-  # version '1.0.1'
-  # source "http://rubyforge.org/frs/download.php/29548/rubygems-#{version}.tgz" do
-  #   custom_install 'ruby setup.rb'
-  # end
-  apt %w( rubygems )
+  version '1.2.0'
+  source "http://rubyforge.org/frs/download.php/38646/rubygems-#{version}.tgz" do
+    custom_install 'ruby setup.rb'
+  end
+  
   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
+  
+  verify do
+    has_executable 'gem'
+  end
 end
 
 package :required_gems do
-  description "Pool party gem"
-  gems %w( SQS aws-s3 amazon-ec2 auser-aska rake rcov auser-poolparty vlad --no-ri --no-rdoc)
+  description "Poolparty required gem"
+  gem 'auser-poolparty'
+  requires :s3
+  requires :ec2
+  requires :aska
+  
+  has_gem 'auser-poolparty'
+end
+
+package :s3 do
+  description "Amazon s3"
+  gem 'aws-s3'
+  
+  has_gem 'aws-s3'
+end
+package :ec2 do
+  description "Amazon EC2"
+  gem 'amazon-ec2'
+  
+  has_gem 'amazon-ec2'
+end
+package :aska do
+  description "Aska - Expert System"
+  gem 'auser-aska'
+  
+  has_gem 'auser-aska'
+end
+package :rake do
+  description "Rake"
+  gem 'rake'
+  
+  has_gem 'rake'
 end

data/lib/poolparty/provider/s3fuse.rb

@@ -6,6 +6,10 @@ package :s3fs do
     
     post :install, "mv s3fs /usr/bin"
   end
+  
+  verify do
+    has_executable 's3fs'
+  end  
     
   requires :s3fs_deps
 end

data/lib/poolparty/remote_instance.rb

@@ -79,7 +79,8 @@ module PoolParty
         :configure_resource_d => configure_resource_d,
         :configure_haproxy => setup_haproxy,
         :configure_heartbeat => configure_heartbeat,
-        :user_tasks => user_tasks
+        :user_tasks => user_tasks,
+        :node_list => move_node_list
       }#.map {|k,v| {k.to_sym => v.nice_runnable(quiet)} }.inject({}) {|a,s| s.merge(a) }
     end
     def user_tasks
@@ -166,7 +167,18 @@ module PoolParty
           mkdir -p /data && /usr/bin/s3fs #{Application.shared_bucket} -o accessKeyId=#{Application.access_key} -o secretAccessKey=#{Application.secret_access_key} -o nonempty /data
         EOC
       end
-    end        
+    end
+    def move_node_list
+      <<-EOC
+        #{if_exists node_list_name, "mv #{remote_base_tmp_dir}/nodes.lst ~/.#{node_list_name}"}
+      EOC
+    end
+    def node_list_name
+      self.class.node_list_name
+    end
+    def self.node_list_name
+      "nodes.lst"
+    end
     # Installs with one commandline and an scp, rather than 10
     def install
     end

data/lib/poolparty/tasks/development.rake

@@ -1,7 +1,7 @@
 namespace(:dev) do
   task :initialize do
     setup_application
-    run "mkdir ~/.ec2 >/dev/null 2>/dev/null" unless File.directory?("~/.ec2")      
+    run "mkdir $HOME/.ec2 >/dev/null 2>/dev/null" unless File.directory?("$HOME/.ec2")
   end
   # Setup a basic development environment for the user 
   desc "Setup development environment specify the config_file"
@@ -29,27 +29,26 @@ exiting...
     puts <<-EOM
 To work on this cloud, source the file like: 
   
-  source #{Application.ec2_dir}/#{keyfilename}
+  source $HOME/#{keyfilename}
   
     EOM
   end
   desc "Generate a new keypair"
   task :setup_keypair => [:initialize] do
-    unless File.file?(Application.keypair_path)
-      Application.keypair ||= "cloud"
-      puts "-- setting up keypair named #{Application.keypair}"
-      run <<-EOR        
-        chmod 600 #{Application.keypair_path} 2>/dev/null
-        mkdir ~/.ec2/#{Application.keypair} 2>/dev/null
-        ec2-add-keypair #{Application.keypair} > #{Application.keypair_path}
-      EOR
-    end
+    Application.keypair ||= "#{File.basename(Dir.pwd)}"    
+    run "ec2-delete-keypair #{Application.keypair}" if File.file?(Application.keypair_path)
+    puts "-- setting up keypair named #{Application.keypair} in #{Application.keypair_path}"
+    run <<-EOR        
+      chmod 600 #{Application.keypair_path} 2>/dev/null
+      mkdir $HOME/.ec2/#{Application.keypair} 2>/dev/null
+      ec2-add-keypair #{Application.keypair} > #{Application.keypair_path}
+    EOR
   end
   desc "Setup pem keys"
   task :setup_pemkeys => [:initialize] do    
     puts "Setting up stubbed pem keys in ~/.ec2/#{Application.keypair}"
     run <<-EOR
-      mkdir -p ~/.ec2/#{Application.keypair} 2>/dev/null
+      mkdir -p $HOME/.ec2/#{Application.keypair} 2>/dev/null
       echo 'UPDATE ME' > #{Application.ec2_dir}/#{Application.keypair}/cert-UPDATEME.pem
       echo 'UPDATE ME' > #{Application.ec2_dir}/#{Application.keypair}/pk-UPDATEME.pem
     EOR
@@ -62,6 +61,12 @@ To work on this cloud, source the file like:
   task :test => :initialize do
     puts "---- Testing ----"
     puts PoolParty.options(ARGV.dup)
+    puts "Using keypair at: #{Application.keypair_path}"
+  end
+  desc "Installation listing"
+  task :list_install => :initialize do
+    puts "-- packages to install --"
+    Provider.install_poolparty(true)
   end
   desc "Authorize base ports for application"
   task :authorize_ports => :initialize do