auser-poolparty 0.2.60 → 0.2.61

data/lib/poolparty/pool/resource.rb

@@ -108,10 +108,13 @@ module PoolParty
         # Take the options of the parents
         set_vars_from_options(opts) unless opts.empty?
         set_resource_parent(parent)
-        self.run_in_context &block if block
+        
+        run_setup(parent, false, &block) if block
+        # self.run_in_context &block if block
         loaded(opts, @parent)
       end
       
+      # Helper to set the containing parent on the resource
       def set_resource_parent(parent=nil)
         if parent && parent != self
           @parent = parent
@@ -149,15 +152,7 @@ module PoolParty
       def custom_function(str)
         self.class.custom_functions << str
       end
-      
-      def cloud
-        @p = parent
-        while !@p.is_a?(PoolParty::Cloud)
-          @p = @p.parent
-        end
-        @p
-      end
-      
+            
       def self.custom_functions_to_string(pre="")
         returning Array.new do |output|
           PoolParty::Resources.available_custom_resources.each do |resource|

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

@@ -4,7 +4,7 @@ module PoolParty
     # Wrap all the resources into a class package from 
     def classpackage_with_self(parent=self, &block)
       @cp = PoolParty::Resources::Classpackage.new(parent.options, parent, &block)
-      @cp.instance_eval {@resources = parent.resources}
+      @cp.run_in_context {@resources = parent.resources}
       # parent.instance_eval {@resources = nil}
       @cp
     end
@@ -17,9 +17,11 @@ module PoolParty
       
       def initialize(opts={}, parent=self, &block)
         # Take the options of the parents
-        set_parent(parent, false) if parent
+        # set_parent(parent, false) if parent
         set_vars_from_options(opts) unless opts.empty?
-        self.instance_eval &block if block
+        # self.instance_eval &block if block
+        run_setup(parent, &block) if block
+        # self.run_in_context &block if block
         # store_block(&block)        
         loaded
       end
@@ -38,7 +40,7 @@ module PoolParty
       end
       
       def name(*args)
-        args.empty? ? (@name || parent.name || "custom_#{Time.now.to_i}") : @name ||= args.first
+        args.empty? ? (@name || (!parent.nil? && parent.name) || "custom_#{Time.now.to_i}") : @name ||= args.first
       end
       def printable?
         false

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

@@ -12,10 +12,9 @@ module PoolParty
     def execute_if(attr_s="$hostname", comparison="==", str="", cust_opts={}, parent=self, &block)
       # parent = parent.is_a?(PoolParty::Cloud::Cloud) ? parent : parent.parent
       opts = {:attribute => attr_s, :equal => str, :comparison => comparison}.merge(cust_opts)
-      options = parent.respond_to?(:options) ? parent.options.merge!(opts) : opts
+      options = (parent.respond_to?(:options) && parent) ? parent.options.merge!(opts) : opts
       # @c = PoolParty::Resources::Conditional.new(options, parent, &block)
-      parent.add_resource(:conditional, options, parent, &block)
-      # @c
+      conditional(options, parent, &block)
     end
     
     class Conditional < Resource

data/lib/poolparty/templates/puppetrerun

@@ -1,16 +1,4 @@
 #!/usr/bin/env bash
 
 . /etc/profile
-if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ];
-  then
-  echo '';
-  else
-  ps aux | grep puppetmaster | awk '{print $2}' | xargs kill; /etc/init.d/puppetmaster stop; rm -rf /etc/puppet/ssl; /etc/init.d/puppetmaster start
-  if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ];
-    then
-    echo '';
-    else
-    # Try again
-    /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1 
-  fi
-fi
+/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master

data/lib/poolparty/templates/puppetrunner

@@ -1,15 +1,4 @@
 #!/usr/bin/env bash
 
 . /etc/profile
-# rm -rf /etc/puppet/ssl
-if [ $(hostname) -eq "master"];
-  then
-  /bin/sh puppetrerun
-  else
-  if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ];
-    then
-    echo '';
-    else
-    /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
-  fi
-fi
+/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 60
+    TINY  = 61
 
     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.60
+  version: 0.2.61
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-14 00:00:00 -08:00
+date: 2008-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ executables:
 - server-list-active
 - server-list-responding
 - server-rerun
+- server-send-command
 - server-show-stats
 - server-start-client
 - server-start-master
@@ -94,6 +95,7 @@ executables:
 - server-stop-client
 - server-stop-master
 - server-stop-node
+- server-update-hosts
 extensions: []
 
 extra_rdoc_files: 
@@ -143,6 +145,7 @@ files:
 - bin/server-list-active
 - bin/server-list-responding
 - bin/server-rerun
+- bin/server-send-command
 - bin/server-show-stats
 - bin/server-start-client
 - bin/server-start-master
@@ -150,6 +153,7 @@ files:
 - bin/server-stop-client
 - bin/server-stop-master
 - bin/server-stop-node
+- bin/server-update-hosts
 - config/hoe.rb
 - config/requirements.rb
 - examples/basic.rb

data/spec/poolparty/aska/aska_spec.rb

@@ -13,14 +13,6 @@ describe "Rules" do
     @car = Car.new
   end
   describe "malformed rules" do
-    it "should not put a malformed rule in the rules" do
-      lambda {
-        @plaster = Class.new do
-          include Aska
-          rules :names, "x runs b"
-        end
-      }.should raise_error()
-    end
     [
       "k > 10",
       "x == 2",

data/spec/poolparty/helpers/provisioner_base_spec.rb

@@ -100,6 +100,8 @@ describe "ProvisionerBase" do
         stub_list_from_remote_for(@cloud)
         @cloud.stub!(:keypair).and_return "fake_keypair"
         @cloud.stub!(:keypair_path).and_return "~/.ec2/fake_keypair"
+        @cloud.stub!(:other_clouds).and_return []
+        @cloud.stub!(:expand_when).and_return "cpu > 10"
         Provisioner::Master.stub!(:new).and_return @provisioner
         @cloud.stub!(:copy_file_to_storage_directory).and_return true
         @cloud.stub!(:rsync_storage_files_to).and_return true

data/spec/poolparty/modules/cloud_resourcer_spec.rb

@@ -98,12 +98,12 @@ describe "CloudResourcer" do
         @tc.should_receive(:configure).with(@testparent.options)      
       end
       after do
-        @tc.set_parent(@testparent)
+        @tc.run_setup(@testparent)
       end      
     end
     describe "parent's services" do
       before(:each) do        
-        @tc.set_parent(@testparent)        
+        @tc.run_setup(@testparent)        
       end
       it "should set the parent" do
         @tc.parent.should == @testparent

data/spec/poolparty/net/remoter_spec.rb

@@ -91,111 +91,5 @@ describe "Remoter" do
       @tc.launch_and_configure_master!
     end
   end
-  describe "listing" do
-    before(:each) do
-      @loc = Base.storage_directory + "/tc-instances.list"
-      @locations = [@loc]
-      @tc.stub!(:local_instances_list_file_locations).and_return @locations
-    end
-    it "should have the method list_from_local available" do
-      TestClass.respond_to?(:list_from_local).should == true
-    end
-    it "should have the method list_from_remote available" do
-      TestClass.respond_to?(:list_from_remote).should == true
-    end
-    describe "remote" do
-      before(:each) do
-        @tc.stub!(:list_of_instances).and_return @sample_instances_list
-        @tc.stub!(:local_instances_list_file_locations).and_return [
-          "#{Base.storage_directory}/tc-instances.list"
-        ]
-      end
-      it "should call list_of_instances when trying to list from remote" do
-        TestClass.should_receive(:list_of_instances).once.and_return @sample_instances_list
-        TestClass.list_from_remote
-      end
-      it "should create a new RemoteInstance for each hashed instance" do
-        PoolParty::Remote::RemoteInstance.should_receive(:new).exactly(2).and_return @ri
-        @tc.list_from_remote
-      end
-      it "should return a string" do
-        @tc.list_from_remote.class.should == Array
-      end
-      it "should contain the master in the listing" do
-        @tc.list_from_remote.first.name.should == "master"
-        @tc.list_from_remote.first.master?.should == true
-      end
-      it "should write to the first (preferred) local instances list file location for next time" do
-        @tc.list_from_remote(:cache => true)
-        ::File.file?(@tc.local_instances_list_file_locations.first).should == true
-      end
-      after(:all) do
-        # Cleanup after ourselves
-        # FileUtils.rm @loc if ::File.file?(@loc)
-      end
-    end
-    describe "local" do
-      describe "listing" do
-        before(:each) do
-          stub_list_from_remote_for(@tc)
-          @tc.stub!(:list_of_instances).and_return([@ri])
-        end
-        it "should call local_instances_list_file_locations" do
-          @tc.should_receive(:local_instances_list_file_locations).at_least(1).and_return [@loc]
-        end
-        it "should call File.file? on the local_instances_list_file_locations locations" do        
-          File.should_receive(:file?).with(@loc).at_least(1).and_return false
-        end
-        it "should call get_working_listing_file to get the working local instance file" do
-          @tc.should_receive(:get_working_listing_file).at_least(1).and_return nil
-        end
-        after(:each) do
-          @tc.list_from_local
-        end
-      end
-      describe "with listing" do
-        before(:each) do
-          str = "master 192.168.0.1
-          node1 192.168.0.2"
-          @loc.stub!(:read).and_return str
-          TestClass.stub!(:open).and_return @loc
-          TestClass.stub!(:get_working_listing_file).and_return @loc
-          @ri = PoolParty::Remote::RemoteInstance.new({:ip => "192.168.0.1", :name => "master"})
-          PoolParty::Remote::RemoteInstance.stub!(:new).and_return @ri          
-          stub_list_from_remote_for(@tc)          
-        end
-        it "should call open on the get_working_listing_file" do
-          @tc.should_receive(:open).with(@loc).at_least(1).and_return @loc
-          @tc.list_from_local
-        end
-        it "should create a new RemoteInstance for each line in the file" do
-          PoolParty::Remote::RemoteInstance.should_receive(:new).at_least(2)
-          @tc.list_from_local
-        end
-        it "should return a string" do
-          @tc.list_from_local.class.should == Array
-        end
-        it "should have the name of the master and the ip in the list_from_local" do
-          @tc.list_from_local[0].name.should == "master"
-        end
-        it "should have name in the listing" do
-          @ri.should_receive(:name).at_least(1).and_return "node0"
-          @ri.to_s
-        end
-        it "should have the ip in the listing" do
-          @ri.should_receive(:ip).at_least(1).and_return "127.0.0.1"
-          @ri.to_s
-        end
-        it "should call to_s on the RemoteInstance instances" do          
-          PoolParty::Remote::RemoteInstance.should_receive(:new).at_least(2).and_return @ri
-          @ri.should_receive(:to_s).at_least(1)
-          @ri.to_s
-        end
-      end
-      after(:each) do
-        @tc.list_from_local
-      end
-    end
-  end
 
 end

data/spec/poolparty/pool/base_spec.rb

@@ -5,9 +5,6 @@ describe "Base" do
     ENV.stub!(:[]).with("AWS_ACCESS_KEY_ID").and_return "KEY"
     ENV.stub!(:[]).with("AWS_SECRET_ACCESS_KEY").and_return "SECRET"
   end
-  it "should set the environment, if not set to production" do
-    Base.environment.should == "production"
-  end
   it "should set the user to root" do
     Base.user.should == "root"
   end

data/spec/poolparty/pool/cloud_spec.rb

@@ -185,6 +185,10 @@ describe "Cloud" do
           it "should it should have the method build_manifest" do
             @cloud.respond_to?(:build_manifest).should == true
           end
+          it "should make a new 'haproxy' class" do
+            PoolPartyHaproxyClass.should_receive(:new).once
+            @cloud.add_poolparty_base_requirements
+          end
           it "should have 3 resources" do
             @cloud.add_poolparty_base_requirements
             @cloud.number_of_resources.should > 2
@@ -223,7 +227,7 @@ describe "Cloud" do
             describe "after adding" do
               before(:each) do
                 stub_list_from_remote_for(@cloud)
-                @cloud.add_poolparty_base_requirements              
+                @cloud.add_poolparty_base_requirements
               end
               it "should add resources onto the heartbeat class inside the cloud" do
                 @cloud.services.size.should > 0
@@ -260,7 +264,9 @@ describe "Cloud" do
               node1 192.168.0.2"
               @sample_instances_list = [{:ip => "192.168.0.1", :name => "master"}, {:ip => "192.168.0.2", :name => "node1"}]
               @ris = @sample_instances_list.map {|h| PoolParty::Remote::RemoteInstance.new(h, @cloud) }
-
+              
+              stub_remoter_for(@cloud)
+              
               @manifest = @cloud.build_manifest
             end
             it "should return a string when calling build_manifest" do
@@ -272,8 +278,8 @@ describe "Cloud" do
             it "should have the comment of a package in the manifest" do
               @manifest.should =~ /package \{/
             end
-            it "should have the comment for heartbeat in the manifest" do
-              @manifest.should =~ /class heartbeat/            
+            it "should have the comment for haproxy in the manifest" do
+              @manifest.should =~ /haproxy/            
             end
             it "should include the poolparty gem" do
               @manifest.should =~ /package \{/
@@ -317,21 +323,6 @@ describe "Cloud" do
           @cloud3.master.should_not be_nil
         end
       end
-
-      describe "provisioning" do
-        it "should be able to tell that it is provisioning when setting the provisioning flag" do
-          @cloud.provisioning?.should == false
-        end
-        it "should be able to set it as provisioning" do
-          @cloud.provisioning_in_progress
-          @cloud.provisioning?.should == true
-        end
-        it "should be able to unset itself as provisioning" do
-          @cloud.provisioning_in_progress
-          @cloud.provisioning_complete
-          @cloud.provisioning?.should == false
-        end
-      end
     end
   end
 end

data/spec/poolparty/pool/plugin_spec.rb

@@ -28,8 +28,8 @@ describe "Plugin" do
       @c.parent.should == @p
     end
     describe "instance" do
-      before(:each) do
-        @plugin = "apache".class_constant.new(@c)
+      before(:each) do        
+        @plugin = @c.apache
       end
       it "should not be empty" do
         @plugin.class.should == PoolPartyApacheClass

data/spec/poolparty/pool/pool_spec.rb

@@ -78,6 +78,21 @@ describe "Pool" do
           @pool.maximum_instances.should == 5
         end
       end
-    end    
+    end  
+    describe "with clouds" do
+      before(:each) do
+        reset!
+        @pool = Pool.new :test do
+          cloud :app
+          cloud :db
+        end
+      end
+      it "should have 2 clouds in the pool when there are 2 described" do
+        @pool.clouds.size.should == 2
+      end
+      it "should be able to tel the other clouds from within one cloud" do
+        cloud(:app).other_clouds.should == [cloud(:db)]
+      end
+    end  
   end
 end

data/spec/poolparty/pool/resource_spec.rb

@@ -225,7 +225,7 @@ describe "Resource" do
       end
       describe "parent" do
         before(:each) do
-          @cloud = cloud :app do
+          @cloud = cloud :orange do
             tangerine "orange"
             file(:name => "file.txt")
           end