poolparty 0.2.18 → 0.2.69

data/spec/poolparty/net/remote_spec.rb

@@ -12,16 +12,21 @@ module Hype
 end
 class TestClass
   include Remote
+  include RemoterBase
   
   def keypair
     "fake_keypair"
   end
+  def verbose
+    false
+  end
 end
 
 describe "Remote" do
   before(:each) do
     @tc = TestClass.new
-    
+    @tc.stub!(:verbose).and_return false
+    setup
   end
   it "should have the method 'using'" do
     @tc.respond_to?(:using).should == true
@@ -130,7 +135,7 @@ describe "Remote" do
     end
     describe "can_start_a_new_instance?" do
       it "should be true because the maximum instances are not running" do
-        @tc.can_start_a_new_instance?.should == true
+        @tc.can_start_a_new_instance?.should == false
       end
       it "should say that we cannot start a new instance because we are at the maximum instances" do
         add_stub_instance_to(@tc, 7)
@@ -192,20 +197,30 @@ describe "Remote" do
     end
     describe "expansions" do
       before(:each) do
+        setup
         @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 response_list_of_instances
+        @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
+          setup
           stub_list_from_remote_for(@tc)
-          @tc.stub!(:request_launch_new_instances).and_return true
+          @tc.stub!(:request_launch_new_instances).and_return PoolParty::Remote::RemoteInstance.new(:ip => "127.0.0.1", :num => 1)
           @tc.stub!(:can_start_a_new_instance).and_return true
           @tc.stub!(:list_of_pending_instances).and_return []
-          @tc.stub!(:prepare_to_configuration).and_return true
+          @tc.stub!(:prepare_for_configuration).and_return true
           @tc.stub!(:build_and_store_new_config_file).and_return true          
-          PoolParty::Provisioner.stub!(:provision_slaves).and_return true        
+          PoolParty::Provisioner.stub!(:provision_slaves).and_return true
+          Kernel.stub!(:system).and_return true
         end
         it "should receive can_start_a_new_instance?" do
           @tc.should_receive(:can_start_a_new_instance?).once
@@ -215,11 +230,16 @@ describe "Remote" do
         end
         it "should call request_launch_new_instances if we should_expand_cloud?" do
           @tc.should_receive(:should_expand_cloud?).once.and_return true
-          @tc.should_receive(:request_launch_new_instances).once.and_return [{:ip => "127.0.0.5", :name => "node2"}]
+          @tc.should_receive(:request_launch_one_instance_at_a_time).once.and_return [{:ip => "127.0.0.5", :name => "node2"}]
         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).at_least(1)
+          # Kernel.should_receive(:system).with(". /etc/profile && cloud-provision -i 5 2>&1 > /dev/null &").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
@@ -230,6 +250,7 @@ describe "Remote" do
           @tc.stub!(:request_termination_of_non_master_instance).and_return true
           @tc.stub!(:can_shutdown_an_instance?).and_return true
           @tc.stub!(:wait).and_return true
+          @tc.stub!(:valid_rules?).and_return false
         end
         it "should receive can_shutdown_an_instance?" do
           @tc.should_receive(:can_shutdown_an_instance?).once
@@ -271,6 +292,7 @@ describe "Remote" do
         before(:each) do
           @tc.stub!(:keypair).and_return "fake_keypair"
           @tc.stub!(:keypair_path).and_return "~/.ec2/fake_keypair"
+          @obj.stub!(:name).and_return "pop"
         end
         it "should call system on the kernel" do
           ::File.stub!(:exists?).with("#{File.expand_path(Base.base_keypair_path)}/id_rsa-funky").and_return true

data/spec/poolparty/net/remoter_base_spec.rb

@@ -7,9 +7,12 @@ class TestRemoter
 end
 
 describe "RemoterBase" do
+  before(:each) do
+    setup
+  end
   describe "methods" do
     before(:each) do
-      @tr = TestRemoter.new
+      @tr = TestRemoter.new      
     end
     %w(launch_new_instance! terminate_instance describe_instance instances_list).each do |method|
       eval <<-EOE

data/spec/poolparty/net/remoter_spec.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 include PoolParty::Remote
 
+def valid_rules?(*args)
+  false
+end
+
 class TestClass
   include CloudResourcer
   include Remote
@@ -14,6 +18,7 @@ class TestClass
 end
 describe "Remoter" do
   before(:each) do
+    setup
     @cloud = cloud :app do;end
     @tc = TestClass.new
     @tc.parent = @cloud
@@ -45,7 +50,7 @@ describe "Remoter" do
       @ri.stub!(:ip).and_return "192.168.0.22"
     end
     it "should have rsync in the rsync_command" do
-      @tc.rsync_command.should == "rsync --delete -azP --exclude cache -e '#{@tc.ssh_string}'"
+      @tc.rsync_command.should == "rsync -azP --exclude cache -e '#{@tc.ssh_string}'"
     end
     it "should be able to rsync storage commands" do
       @tc.rsync_storage_files_to_command(@ri).should == "#{@tc.rsync_command} #{Base.storage_directory}/ 192.168.0.22:/var/poolparty"
@@ -59,7 +64,11 @@ describe "Remoter" do
       @tc.stub!(:list_of_pending_instances).and_return []
       @tc.stub!(:list_of_running_instances).and_return []
       @tc.stub!(:master).and_return ris.first
+      @tc.stub!(:after_launched).and_return true
+      @tc.stub!(:verbose).and_return false
       Provisioner.stub!(:provision_master).and_return true
+      Provisioner.stub!(:reconfigure_master).and_return true
+      Provisioner.stub!(:clear_master_ssl_certs).and_return true
     end
     it "should have the method launch_master!" do
       @tc.respond_to?(:launch_and_configure_master!).should == true
@@ -71,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
@@ -82,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/plugins/deploydirectory_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+include PoolParty::Resources
+
+class TestClass
+  include PoolParty::Resources
+end
+describe "Remote Instance" do
+  before(:each) do
+    reset_resources!
+  end
+  describe "wrapped" do
+    before(:each) do
+      @tc = TestClass.new      
+      @cloud = MyOpenStruct.new(:keypair => "keys", :remote_keypair_path => "/keypair_path", :name => "cloudcloud")
+      @cloud.stub!(:is_a?).with(PoolParty::Cloud::Cloud).and_return true
+      @tc.stub!(:parent).and_return @cloud
+      
+      @options = {:name => "deploydirectory", :from => ::File.dirname(__FILE__), :to => "/var/www/deploydirectory", :testing => false}
+    end
+    it "should be a string" do
+      @tc.has_deploydirectory(@options).to_string.should =~ /exec \{/
+    end
+    it "should included the flushed out options" do
+      @tc.has_deploydirectory(@options).to_string.should =~ /command/
+    end
+    describe "in resource" do
+      before(:each) do
+        @tc.instance_eval do
+          has_deploydirectory do
+            name "deploydirectory"
+            from ::File.dirname(__FILE__)
+            to "/var/www/deploydirectory"
+          end
+        end
+      end
+      it "should have the path set within the resource" do
+        @tc.resource(:deploydirectory).first.to_string.should =~ /exec \{/
+      end
+      it "should not have the from in the to_string" do
+        @tc.resource(:deploydirectory).first.to_string.should_not =~ /from /
+      end
+      it "should not have the to in the to_string" do
+        @tc.resource(:deploydirectory).first.to_string.should_not =~ /to /
+      end
+      it "should have onlyif in the to_string" do
+        @tc.resource(:deploydirectory).first.to_string.should =~ /onlyif/
+      end
+    end
+  end
+end

data/spec/poolparty/pool/base_spec.rb

@@ -2,23 +2,24 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Base" do
   before(:each) do
-    ENV.stub!(:[]).with("AWS_ACCESS_KEY_ID").and_return "KEY"
-    ENV.stub!(:[]).with("AWS_SECRET_ACCESS_ID").and_return "SECRET"
-  end
-  it "should set the environment, if not set to production" do
-    Base.environment.should == "production"
+    # To clear out the instance variables just in case
+    Base.instance_eval do
+      @access_key = @secret_access_key = nil
+    end
+    ENV.stub!(:[]).with("AWS_ACCESS_KEY").and_return "KEY"
+    ENV.stub!(:[]).with("AWS_SECRET_ACCESS_KEY").and_return "SECRET"
   end
   it "should set the user to root" do
     Base.user.should == "root"
   end
-  it "should set the base keypair path to ~/.ec2" do
-    Base.base_keypair_path.should == "~/.ec2"
+  it "should set the base keypair path to $HOME/.ec2" do
+    Base.base_keypair_path.should =~ /\.ec2/
   end
   it "should set the storage_directory to the tmp directory of the current working directory" do
     Base.storage_directory.should =~ /tmp/
   end
   it "should set the tmp path to tmp" do
-    Base.tmp_path.should =~ /\/tmp/
+    Base.tmp_path.should == "/tmp/poolparty"
   end
   it "should set the remote storage path to /var/poolparty" do
     Base.remote_storage_path.should == "/var/poolparty"
@@ -41,6 +42,13 @@ describe "Base" do
       ::File.stub!(:file?).with("ppkeys").and_return true
       Base.get_working_key_file_locations.should == "ppkeys"
     end
+    it "should call get_working_key_file_locations" do
+      @str = "foo"
+      @str.stub!(:read).and_return true
+      Base.stub!(:open).and_return @str
+      Base.should_receive(:get_working_key_file_locations)
+      Base.read_keyfile
+    end
     describe "with keyfile" do
       before(:each) do
         @keyfile = "ppkeys"
@@ -49,7 +57,9 @@ describe "Base" do
         :secret_access_key: SECRET"
         @keyfile.stub!(:read).and_return @str
         Base.stub!(:get_working_key_file_locations).and_return @keyfile
-        Base.stub!(:open).with(@keyfile).and_return @keyfile
+        Base.stub!(:read_keyfile).and_return @str
+        Base.stub!(:open).and_return @str
+        Base.reset!
       end
       it "should call YAML::load on the working key file" do
         YAML.should_receive(:load).with(@str)
@@ -67,8 +77,11 @@ describe "Base" do
       describe "without keyfile" do
         before(:each) do
           Base.stub!(:get_working_key_file_locations).and_return nil
-          ENV.stub!(:[]).with("AWS_ACCESS_KEY_ID").and_return nil
-          ENV.stub!(:[]).with("AWS_SECRET_ACCESS_ID").and_return nil
+          Base.instance_eval do
+            @access_key = @secret_access_key = nil
+          end
+          ENV.stub!(:[]).with("AWS_ACCESS_KEY").and_return nil
+          ENV.stub!(:[]).with("AWS_SECRET_ACCESS_KEY").and_return nil
           Base.reset!
         end
         it "should render the access_key nil" do
@@ -78,6 +91,22 @@ describe "Base" do
           Base.secret_access_key.should == nil
         end
       end
+      describe "store_keys_in_file_for" do
+        before(:each) do
+          @obj = Class.new
+          @obj.stub!(:access_key).and_return "MYACCESSKEY"
+          @obj.stub!(:secret_access_key).and_return "MYSECRETACCESSKEY"
+          Base.stub!(:store_keys_in_file).and_return true
+          
+          Base.store_keys_in_file_for(@obj)
+        end
+        it "should take the access key from the object" do          
+          Base.access_key.should == "MYACCESSKEY"
+        end
+        it "should take the secret_access_key from the object" do
+          Base.secret_access_key.should == "MYSECRETACCESSKEY"
+        end
+      end
     end
     describe "storing keyfile" do
       before(:each) do
@@ -90,10 +119,9 @@ describe "Base" do
         Base.stub!(:write_to_file).and_return true
         Base.stub!(:key_file_locations).and_return ["ppkey"]
       end
-      it "should call access_key.nil?" do
-        @ak.should_receive(:nil?).and_return false
-        @pk.should_receive(:nil?).and_return true        
-      end
+      # it "should call access_key.nil?" do
+      #   @ak.should_receive(:nil?).once.and_return true
+      # end
       it "should call YAML::dump" do
         YAML.should_receive(:dump).and_return @str
       end
@@ -104,23 +132,5 @@ describe "Base" do
         Base.store_keys_in_file
       end
     end
-    describe "allowed_commands" do
-      before(:each) do
-        @str =<<-EOE
-echo 'hello world'
-        EOE
-        @str.stub!(:read).and_return @str
-        Base.stub!(:open).and_return @str
-      end
-      it "should load the yaml file allowed_commands.yml" do
-        Base.allowed_commands.class.should == Array
-      end
-      it "should have the command echo 'hello world' in the list of allowed_commands" do
-        Base.allowed_commands.include?("echo 'hello world'").should == true
-      end
-      it "should not have the command rm -rf / in the list of allowed commands" do
-        Base.allowed_commands.include?("rm -rf /").should == false
-      end
-    end
   end
 end