auser-poolparty 0.2.21 → 0.2.22

data/Manifest.txt

@@ -140,10 +140,12 @@ lib/poolparty/base_packages/poolparty.rb
 lib/poolparty/base_packages/ruby.rb
 lib/poolparty/config/allowed_commands.yml
 lib/poolparty/core/array.rb
+lib/poolparty/core/class.rb
 lib/poolparty/core/exception.rb
 lib/poolparty/core/float.rb
 lib/poolparty/core/hash.rb
 lib/poolparty/core/kernel.rb
+lib/poolparty/core/metaid.rb
 lib/poolparty/core/module.rb
 lib/poolparty/core/my_open_struct.rb
 lib/poolparty/core/object.rb
@@ -153,6 +155,7 @@ lib/poolparty/core/symbol.rb
 lib/poolparty/core/time.rb
 lib/poolparty/dependency_resolutions/base.rb
 lib/poolparty/dependency_resolutions/puppet.rb
+lib/poolparty/exceptions/MasterException.rb
 lib/poolparty/exceptions/RemoteException.rb
 lib/poolparty/exceptions/ResourceException.rb
 lib/poolparty/exceptions/RuntimeException.rb

data/PostInstall.txt

@@ -11,8 +11,7 @@ Tutorials are at http://poolpartyrb.com
 
 Don't forget to check out the plugin tutorial @ http://poolpartyrb.com to extend PoolParty for your needs!
 
-For more information, check http://PoolPartyrb.com
-On IRC: 
+For more information, check http://PoolPartyrb.com or visit us on IRC at:
   irc.freenode.net
   #poolpartyrb
   

data/Rakefile

@@ -25,7 +25,7 @@ task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :local_deploy, :clean
 end
 
 desc "Generate gemspec for github"
-task :githubspec => [:gemspec] do
+task :gh => [:gemspec] do
   filepath = ::File.join(::File.dirname(__FILE__), "poolparty.gemspec")
   data = open(filepath).read
   spec = eval("$SAFE = 3\n#{data}")

data/bin/cloud-start

@@ -17,7 +17,7 @@ load_pool(o.spec || Binary.get_existing_spec_location)
   with_cloud(cloud, {:testing => @testing}) do
     puts header("Starting cloud")
     puts "#{list_of_running_instances.size} running instances (#{minimum_instances} - #{maximum_instances})"
-    if (minimum_instances - list_of_running_instances.size) > 0
+    if list_of_running_instances.size != 1
       puts "Starting the master instance"    
       if testing
         puts("\tNot launching while in testing mode")

data/config/hoe.rb

@@ -12,7 +12,6 @@ HOMEPATH = "http://#{GEM_NAME}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
  ['activesupport'],
- ['open4'],
  ['logging'],
  ["ruby2ruby"]
 ]    # An array of rubygem dependencies [name, version]

data/lib/poolparty.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 
 # Load required gems
-%w(activesupport open4 ftools logging ruby2ruby).each do |lib|
+%w(activesupport ftools logging ruby2ruby).each do |lib|
   begin
     require lib
   rescue Exception => e

data/lib/poolparty/base_packages/poolparty.rb

@@ -7,22 +7,20 @@ module PoolParty
         has_package(:name => "erlang-dev")
         has_package(:name => "erlang-src")
         
-        has_package(:name => "rubygems") do
+        has_package(:name => "rubygems") do |g|
           # These should be installed automagically by poolparty, but just in case
           # TODO: Fix the requires method with a helper          
-          has_gempackage(:name => "logging")
-          has_gempackage(:name => "xml-simple", :source => "/var/poolparty/xml-simple.gem") do
-            has_gempackage(:name => "grempe-amazon-ec2", :source => "http://gems.github.com")
+          g.has_gempackage(:name => "logging")
+          g.has_gempackage(:name => "xml-simple") do |x|
+            x.has_gempackage(:name => "grempe-amazon-ec2", :source => "http://gems.github.com")
           end
           
-          has_gempackage(:name => "open4")
-          
-          has_gempackage(:name => "ParseTree", :version => "2.2.0") do
-            has_gempackage(:name => "ruby2ruby")
-            has_gempackage(:name => "activesupport") do
-              has_gempackage(:name => "auser-poolparty", :source => "http://gems.github.com") do
-                has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger") do
-                  has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node")
+          has_gempackage(:name => "ParseTree", :version => "3.0.1") do |pt|
+            pt.has_gempackage(:name => "ruby2ruby")
+            pt.has_gempackage(:name => "activesupport") do |a|
+              a.has_gempackage(:name => "auser-poolparty", :source => "http://gems.github.com") do |pool|
+                pool.has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger") do |mess|
+                  mess.has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node")
                 end                
               end
             end

data/lib/poolparty/core/class.rb

@@ -0,0 +1,2 @@
+class Class
+end

data/lib/poolparty/core/exception.rb

@@ -2,8 +2,9 @@
   Exception overloads
 =end
 class Exception
+  alias nice_message to_str
   # Gives us a nice_message for exceptions
   def nice_message(padding="")
-    "#{padding}#{message}\n#{padding}" + backtrace.join("\n#{padding}")
+    "#{padding}#{message}\n#{padding}"# + backtrace.join("\n#{padding}")
   end
 end

data/lib/poolparty/core/kernel.rb

@@ -33,5 +33,5 @@ module Kernel
       STDOUT.flush
       STDOUT.reopen(old_stdout)
     end
-  end  
+  end
 end

data/lib/poolparty/core/metaid.rb

@@ -0,0 +1,15 @@
+class Object
+  # The hidden singleton lurks behind everyone
+  def metaclass; class << self; self; end; end
+  def meta_eval &blk; metaclass.instance_eval &blk; end
+
+  # Adds methods to a metaclass
+  def meta_def name, &blk
+    meta_eval { define_method name, &blk }
+  end
+
+  # Defines an instance method within a class
+  def class_def name, &blk
+    class_eval { define_method name, &blk }
+  end
+end

data/lib/poolparty/core/object.rb

@@ -57,6 +57,16 @@ class Object
     block_method.bind(self).call(*args)
   end
   def meta_def name, &blk
-    (class << self; self; end).instance_eval { define_method name, &blk }
+    meta_eval { define_method name, &blk }
+  end
+  def meta_undef name
+    meta_eval { remove_method name }
+  end
+  def run_in_context(&block)
+    name="temp_#{self.class}_#{parent.to_s}".to_sym
+    meta_def name, &block
+    self.send name, self
+    # self.instance_eval &block if block
+    meta_undef name
   end
 end

data/lib/poolparty/exceptions/MasterException.rb

@@ -0,0 +1,10 @@
+class MasterException < Exception
+  EXCEPTION_MESSAGES = {
+    :no_ip => "Master does not have an ip or has not been launched"
+  }
+  attr_reader :message
+  
+  def initialize(type=:no_ip, note="")
+    @message = "Master Exception: #{EXCEPTION_MESSAGES[type]} #{note}"
+  end
+end

data/lib/poolparty/helpers/provisioner_base.rb

@@ -15,6 +15,10 @@ module PoolParty
     def self.configure_master(cloud, testing=false)
       Provisioner::Master.new(cloud).process_configure!(testing)
     end
+    
+    def self.reconfigure_master(cloud, testing=false)
+      Provisioner::Master.new(cloud).process_reconfigure!(testing)
+    end
 
     def self.provision_slaves(cloud, testing=false)
       cloud.nonmaster_nonterminated_instances.each do |sl|        
@@ -46,7 +50,7 @@ module PoolParty
         @cloud = cloud
         
         options(cloud.options) if cloud && cloud.respond_to?(:options)
-        set_vars_from_options(instance.options) unless instance.nil? || instance.options.empty?
+        set_vars_from_options(instance.options) unless instance.nil? || !instance.options.empty?
         options(instance.options) if instance.respond_to?(:options)
         
         @os = os.to_s.downcase.to_sym
@@ -65,6 +69,9 @@ module PoolParty
         provisioner_file = ::File.join(Base.storage_directory, "install_#{name}.sh")
         ::File.open(provisioner_file, "w+") {|f| f << install }
       end
+      def name
+        @instance.name
+      end
       def process_install!(testing=false)
         error unless valid?
         write_install_file
@@ -102,6 +109,9 @@ module PoolParty
           @cloud.run_command_on(cmd, @instance)
         end
       end
+      def process_reconfigure!(testing=false)
+        @cloud.run_command_on("puppetd --test  2>&1 &", @instance) unless testing
+      end
       def setup_runner(cloud)
         cloud.prepare_to_configuration
         cloud.build_and_store_new_config_file
@@ -231,8 +241,8 @@ module PoolParty
           "          
 touch /etc/apt/sources.list
 echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
-# aptitude update -y 2>&1
-# aptitude autoclean 2>&1 &
+aptitude update -y 2>&1
+aptitude autoclean 2>&1
           "
         else
           "# No system upgrade needed"

data/lib/poolparty/helpers/provisioners/master.rb

@@ -3,6 +3,7 @@ module PoolParty
     class Master < ProvisionerBase
       
       def initialize(cloud=self, os=:ubuntu)
+        raise MasterException.new(:no_ip) unless cloud.master && cloud.master.ip
         super(cloud.master, cloud, os)
         @master_ip = cloud.master.ip
       end

data/lib/poolparty/helpers/provisioners/slave.rb

@@ -4,13 +4,13 @@ module PoolParty
 
       def install_tasks
         [ 
-          setup_puppet
+          setup_puppet,
+          setup_configs
         ] << configure_tasks
       end
 
       def configure_tasks
-        [
-          setup_configs,
+        [          
           start_puppet
         ]
       end

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

@@ -20,8 +20,9 @@ module PoolParty
       begin
         item = instance#.instancesSet.item
         EC2ResponseObject.get_hash_from_response(item)
-      rescue Exception => e          
+      rescue Exception => e
       end
+      instance
     end
     # Terminate an instance by id
     def terminate_instance!(instance_id=nil)

data/lib/poolparty/net/remoter.rb

@@ -181,8 +181,9 @@ module PoolParty
           reset!
           when_no_pending_instances do
             wait "20.seconds" # Give some time for ssh to startup
-            PoolParty::Provisioner.provision_slaves(self)
-            PoolParty::Provisioner.configure_master(self, testing)
+            last_instance = nonmaster_nonterminated_instances.last
+            PoolParty::Provisioner.provision_slave(last_instance, self)
+            PoolParty::Provisioner.reconfigure_master(self, force)
             # prepare_reconfiguration
           end
         end

data/lib/poolparty/plugins/git.rb

@@ -9,6 +9,8 @@ module PoolParty
             
       def has_git_repos
         has_package(:name => "git-core")
+        has_directory(:name => "#{cwd}")
+        
         exec({:name => "git-#{name}", :requires => package(:name => "git-core")}) do
           command parent.user ? "git clone #{parent.user}@#{parent.source} #{parent.path}" : "git clone #{parent.source} #{parent.to ? parent.to : ""}"
           cwd "#{parent.cwd if parent.cwd}"

data/lib/poolparty/pool/cloud.rb

@@ -115,25 +115,29 @@ module PoolParty
           reset_resources!
           add_poolparty_base_requirements
           
-          @build_manifest = returning Array.new do |str|            
-
-            # Refactor this into the resources method
-            # TODO
-            services.each do |service|
-              @cp = classpackage_with_self(service)
-              str << @cp.to_string
-              str << @cp.include_string
-            end
-            
-            str << resources_string_from_resources(resources)
-
-            str << "# Custom functions"
-            str << Resources::CustomResource.custom_functions_to_string
-          end.join("\n")          
+          @build_manifest = build_short_manifest
         end
         @build_manifest
       end
       
+      def build_short_manifest
+        returning Array.new do |str|            
+
+          # Refactor this into the resources method
+          # TODO
+          services.each do |service|
+            @cp = classpackage_with_self(service)
+            str << @cp.to_string
+            str << @cp.include_string
+          end
+          
+          str << resources_string_from_resources(resources)
+
+          str << "# Custom functions"
+          str << Resources::CustomResource.custom_functions_to_string
+        end.join("\n")
+      end
+      
       def build_from_existing_file
         if ::FileTest.file?("/etc/puppet/manifests/classes/poolparty.pp")
           open("/etc/puppet/manifests/classes/poolparty.pp").read

data/lib/poolparty/pool/resource.rb

@@ -108,7 +108,7 @@ module PoolParty
         # Take the options of the parents
         set_resource_parent(parent)
         set_vars_from_options(opts) unless opts.empty?
-        self.instance_eval &block if block
+        self.run_in_context &block if block
         loaded(opts, @parent)
       end
       

data/lib/poolparty/pool/resources/gem_package.rb

@@ -6,10 +6,19 @@ module PoolParty
       # When we call gempackage, we want the exec to run on the directory we suggest
       # we also only want it to run if there is NOT a local gem already installed with
       # the package details (version and name)
+      # 
+      # TODO: Add it so that it tries to pull the gem off the master fileserver first...
       def loaded(opts={}, parent=self)
+        # has_exec(:name => "unpack-#{name}-into-fileserver", :command => "gem unpack #{name} && mv #{name}* #{name}.gem", :cwd => Base.remote_storage_path) do
+        #   ifnot "test -d #{Base.remote_storage_path}/#{name}.gem"
+        # end
+        
         has_exec(opts.merge({:name => name, :cwd => "/tmp", :path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/var/lib/gems/1.8/bin"}), parent) do          
-          command "gem install -y --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name}"
+          command "gem install -y --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name} <<heredoc
+          1
+          heredoc"
           ifnot "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version}"
+          # notify get_exec("unpack-#{name}-into-fileserver")
         end
       end
       def virtual_resource?

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 21
+    TINY  = 22
 
     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.21
+  version: 0.2.22
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-25 00:00:00 -07:00
+date: 2008-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: open4
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: logging
   type: :runtime
@@ -248,10 +238,12 @@ files:
 - lib/poolparty/base_packages/ruby.rb
 - lib/poolparty/config/allowed_commands.yml
 - lib/poolparty/core/array.rb
+- lib/poolparty/core/class.rb
 - lib/poolparty/core/exception.rb
 - lib/poolparty/core/float.rb
 - lib/poolparty/core/hash.rb
 - lib/poolparty/core/kernel.rb
+- lib/poolparty/core/metaid.rb
 - lib/poolparty/core/module.rb
 - lib/poolparty/core/my_open_struct.rb
 - lib/poolparty/core/object.rb
@@ -261,6 +253,7 @@ files:
 - lib/poolparty/core/time.rb
 - lib/poolparty/dependency_resolutions/base.rb
 - lib/poolparty/dependency_resolutions/puppet.rb
+- lib/poolparty/exceptions/MasterException.rb
 - lib/poolparty/exceptions/RemoteException.rb
 - lib/poolparty/exceptions/ResourceException.rb
 - lib/poolparty/exceptions/RuntimeException.rb
@@ -443,8 +436,7 @@ post_install_message: |-
   
   Don't forget to check out the plugin tutorial @ http://poolpartyrb.com to extend PoolParty for your needs!
   
-  For more information, check http://PoolPartyrb.com
-  On IRC: 
+  For more information, check http://PoolPartyrb.com or visit us on IRC at:
     irc.freenode.net
     #poolpartyrb
     

data/spec/poolparty/core/object_spec.rb

@@ -56,5 +56,14 @@ describe "Object" do
         @b.dude.should == "totally"
       end
     end
+    describe "contextual running" do
+      before(:each) do
+        @obj.stub!(:default_options).and_return {}
+        @a = @obj.run_in_context { @a = "hello world" }
+      end
+      it "should have the method meta_eval" do
+        @obj.respond_to?(:meta_eval).should == true
+      end
+    end
   end
 end

data/spec/poolparty/net/remote_spec.rb

@@ -194,8 +194,15 @@ describe "Remote" do
       before(:each) do
         @tc.stub!(:copy_ssh_app).and_return true
         @tc.stub!(:prepare_reconfiguration).and_return "full"
-        PoolParty::Provisioner.stub!(:configure_master).and_return true
+        PoolParty::Provisioner.stub!(:reconfigure_master).and_return true
         @tc.stub!(:wait).and_return true
+        @tc.stub!(:nonmaster_nonterminated_instances).and_return true
+        @inst = stub_instance(9, "running")
+        @tc.nonmaster_nonterminated_instances.stub!(:last).and_return @inst
+        @inst.stub!(:options).and_return({:name => "red"})
+        @tc.stub!(:rsync_storage_files_to).and_return true
+        @tc.stub!(:run_command_on).and_return true
+        @tc.stub!(:full_keypair_path).and_return "true"
       end
       describe "expand_cloud_if_necessary" do
         before(:each) do
@@ -219,7 +226,11 @@ describe "Remote" do
         end
         it "should call a new slave provisioner" do
           @tc.stub!(:should_expand_cloud?).once.and_return true
-          PoolParty::Provisioner.should_receive(:provision_slaves).and_return true
+          PoolParty::Provisioner.should_receive(:provision_slave).and_return true
+        end
+        it "should call reconfigure on the master to pick up the new slave" do
+          @tc.stub!(:should_expand_cloud?).once.and_return true
+          PoolParty::Provisioner.should_receive(:reconfigure_master).once
         end
         after(:each) do
           @tc.expand_cloud_if_necessary

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.21</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.22</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.21
+  version: 0.2.22
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-25 00:00:00 -07:00
+date: 2008-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: open4
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: logging
   type: :runtime
@@ -248,10 +238,12 @@ files:
 - lib/poolparty/base_packages/ruby.rb
 - lib/poolparty/config/allowed_commands.yml
 - lib/poolparty/core/array.rb
+- lib/poolparty/core/class.rb
 - lib/poolparty/core/exception.rb
 - lib/poolparty/core/float.rb
 - lib/poolparty/core/hash.rb
 - lib/poolparty/core/kernel.rb
+- lib/poolparty/core/metaid.rb
 - lib/poolparty/core/module.rb
 - lib/poolparty/core/my_open_struct.rb
 - lib/poolparty/core/object.rb
@@ -261,6 +253,7 @@ files:
 - lib/poolparty/core/time.rb
 - lib/poolparty/dependency_resolutions/base.rb
 - lib/poolparty/dependency_resolutions/puppet.rb
+- lib/poolparty/exceptions/MasterException.rb
 - lib/poolparty/exceptions/RemoteException.rb
 - lib/poolparty/exceptions/ResourceException.rb
 - lib/poolparty/exceptions/RuntimeException.rb
@@ -443,8 +436,7 @@ post_install_message: |-
   
   Don't forget to check out the plugin tutorial @ http://poolpartyrb.com to extend PoolParty for your needs!
   
-  For more information, check http://PoolPartyrb.com
-  On IRC: 
+  For more information, check http://PoolPartyrb.com or visit us on IRC at:
     irc.freenode.net
     #poolpartyrb