auser-poolparty 0.2.41 → 0.2.42

data/lib/poolparty/base_packages/poolparty.rb

@@ -27,7 +27,7 @@ module PoolParty
           
           has_gempackage(:name => "rake", :download_url => "http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem")
           has_gempackage(:name => "xml-simple", :download_url => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem")
-          has_gempackage(:name => "grempe-amazon-ec2", :download_url => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem", :requires => get_gempackage("xml-simple"))
+          has_gempackage(:name => "amazon-ec2", :download_url => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem", :requires => get_gempackage("xml-simple"))
           
           has_gempackage(:name => "sexp_processor", :download_url => "http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem")
           has_gempackage(:name => "ParseTree", :download_url => "http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem", :requires => [get_gempackage("sexp_processor"), get_gempackage("ZenTest")])

data/lib/poolparty/modules/thread_pool.rb

@@ -2,7 +2,6 @@ require 'thread'
 begin
   require 'fasttread'
 rescue LoadError
-  $stderr.puts "Using the ruby-core thread implementation"
 end
 
 class ThreadPool

data/lib/poolparty/net/remote.rb

@@ -15,7 +15,7 @@ module PoolParty
           mod.send :include, PoolParty::Remote::RemoterBase
           self.class.send :include, mod
           self.extend mod
-                    
+          
           @remote_base = "#{t}".preserved_module_constant
         end
       else

data/lib/poolparty/net/remote_bases/ec2.rb

@@ -19,10 +19,10 @@ module PoolParty
         :size => "#{size || Base.size}")
       begin
         item = instance#.instancesSet.item
-        EC2ResponseObject.get_hash_from_response(item)
+        inst = EC2ResponseObject.get_hash_from_response(item)        
       rescue Exception => e
       end
-      instance
+      inst
     end
     # Terminate an instance by id
     def terminate_instance!(instance_id=nil)
@@ -52,6 +52,10 @@ module PoolParty
     def get_instances_description
       EC2ResponseObject.get_descriptions(ec2.describe_instances).sort_by {|a| a[:launching_time]}
     end
+        
+    def after_launch_master(instance=nil)      
+      ec2.associate_address(:instance_id => instance.instance_id, :public_ip => set_master_ip_to) if set_master_ip_to && instance
+    end
     
     # Help create a keypair for the cloud
     # This is a helper to create the keypair and add them to the cloud for you

data/lib/poolparty/net/remoter.rb

@@ -104,6 +104,11 @@ module PoolParty
         num.times {out << launch_new_instance!}
         out
       end
+      def request_launch_master_instance
+        after_launch_master(launch_new_instance!)
+      end
+      def after_launch_master(h={})        
+      end
       # Let's terminate an instance that is not the master instance
       def request_termination_of_non_master_instance
         inst = nonmaster_nonterminated_instances.last
@@ -142,7 +147,24 @@ module PoolParty
         if can_start_a_new_instance? && !minimum_number_of_instances_are_running?         
           list_of_pending_instances.size == 0 ? request_launch_one_instance_at_a_time : wait("5.seconds")
           reset!
-          launch_minimum_number_of_instances unless minimum_number_of_instances_are_running?
+          launch_minimum_number_of_instances
+          provision_slaves_from_n(minimum_instances.to_i)
+          after_launched
+        end
+      end
+      
+      def provision_slaves_from_n(num=1)
+        reset!
+        when_no_pending_instances do
+          wait "10.seconds" # Give some time for ssh to startup
+          @num_instances = list_of_running_instances.size
+          last_instances = nonmaster_nonterminated_instances[(@num_instances - (num))..(@num_instances)]
+          last_instances.each do |inst|
+            PoolParty::Provisioner.provision_slave(inst, self, false) unless inst.master?
+            cmd = ". /etc/profile && cloud-provision -i #{inst.name.gsub(/node/, '')} #{unix_hide_string} &"
+            Kernel.system cmd
+          end
+          PoolParty::Provisioner.reconfigure_master(self, force)          
         end
       end
       # Launch the master and let the master handle the starting of the cloud
@@ -153,7 +175,7 @@ module PoolParty
       def launch_and_configure_master!(testing=false)
         vputs "Requesting to launch new instance"
         logger.debug "Launching master"
-        request_launch_new_instances(1) if list_of_pending_instances.size.zero? && can_start_a_new_instance? && !is_master_running?
+        request_launch_master_instance if list_of_pending_instances.size.zero? && can_start_a_new_instance? && !is_master_running?
         
         vputs "Waiting for there to be no pending instances..."
         when_no_pending_instances do
@@ -189,18 +211,8 @@ module PoolParty
           @num = 1
           request_launch_new_instances(@num)
           
-          reset!
-          when_no_pending_instances do
-            reset!
-            wait "20.seconds" # Give some time for ssh to startup
-            @num_instances = nonmaster_nonterminated_instances.size
-            last_instances = nonmaster_nonterminated_instances[(@num_instances - (@num + 1))..(@num_instances)]
-            last_instances.each do |inst|
-              PoolParty::Provisioner.provision_slave(inst, self, false)
-            end
-            PoolParty::Provisioner.reconfigure_master(self, force)
-            after_launched
-          end
+          vputs "request_launch_new_instances: #{@num}"
+          provision_slaves_from_n(@num)
         end
       end
       # Contract the cloud

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 41
+    TINY  = 42
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.41
+  version: 0.2.42
 platform: ruby
 authors: 
 - Ari Lerner

data/spec/poolparty/net/remoter_spec.rb

@@ -80,7 +80,7 @@ describe "Remoter" do
       @tc.should_receive(:is_master_running?).and_return false
     end
     it "should ask to request_launch_new_instances when the master is not running and we can start a new instance" do
-      @tc.should_receive(:request_launch_new_instances).with(1)
+      @tc.should_receive(:request_launch_master_instance)
       @tc.stub!(:can_start_a_new_instance?).and_return true
       @tc.stub!(:is_master_running?).and_return false
     end

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.40</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.42</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.41
+  version: 0.2.42
 platform: ruby
 authors: 
 - Ari Lerner