auser-poolparty 0.2.79 → 0.2.80

data/lib/poolparty/poolparty/pool.rb

@@ -47,6 +47,7 @@ module PoolParty
       
       def setup_defaults
         plugin_directory "#{::File.dirname(pool_specfile ? pool_specfile : Dir.pwd)}/plugins"
+        PoolParty::Extra::Deployments.include_deployments "#{Dir.pwd}/deployments"
       end
             
       # This is where the entire process starts

data/lib/poolparty/poolparty/resource.rb

@@ -225,7 +225,7 @@ module PoolParty
           :subscribe, :owner, :group, :path, :mode, :source, :notify, :subscribe, :check, :creates, :cwd, :command, :ensure,
           :require, :schedule, :range, :alias, :hour, :minute, :user, :month, :monthday, :name, :onlyif, :unless, :refreshonly,
           :refresh, :content, :template, :ip, :repeat, :provider, :key, :device, :fstype, :remounts, :options, :atboot, :before,
-          :binary, :status, :start, :stop, :restart, :pattern, :recurse
+          :binary, :status, :start, :stop, :restart, :pattern, :recurse, :home
         ]
       end
       def key

data/lib/poolparty/poolparty/resources/directory.rb

@@ -4,8 +4,8 @@ module PoolParty
     class Directory < Resource
             
       default_options({
-        :mode => 644,
-        :owner => "#{Base.user}"
+        :mode => 644
+        # :owner => "#{Base.user}"
       })
       
       def class_type_name

data/lib/poolparty/poolparty/resources/file.rb

@@ -5,8 +5,8 @@ module PoolParty
       
       default_options({
         :ensure => "file",
-        :mode => 644,
-        :owner => "#{Base.user}"
+        :mode => 644
+        # :owner => "#{Base.user}"
       })
       
       def disallowed_options

data/lib/poolparty/poolparty/resources/remote_file.rb

@@ -8,7 +8,7 @@ module PoolParty
       default_options({
         :ensure => "present",
         :mode => 644,
-        :owner => "#{Base.user}",
+        # :owner => "#{Base.user}",
         :source => nil
       })
       

data/lib/poolparty/poolparty/resources/remote_user.rb

@@ -0,0 +1,17 @@
+module PoolParty    
+  module Resources
+        
+    class RemoteUser < Resource      
+      
+      default_options({
+        :shell => "/bin/sh"
+      })
+      
+      def class_type_name
+        "user"
+      end
+      
+    end
+    
+  end
+end

data/lib/poolparty/{helpers → provisioners}/provisioner_base.rb

@@ -98,7 +98,7 @@ module PoolParty
           
           before_install(@instance)
           
-          process_clean_reconfigure_for!(@instance, testing)
+          # process_clean_reconfigure_for!(@instance, testing)
           
           vputs "Logging in and running provisioning on #{@instance.name}"
           # /bin/rm install_#{name}.sh
@@ -162,7 +162,7 @@ module PoolParty
           s << "puppetca --clean master.compute-1.internal 2>&1 > /dev/null;"
           s << "puppetca --clean master.ec2.internal 2>&1 > /dev/null"
         end
-        @cloud.run_command_on("if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; else #{str}; fi", @cloud.master)
+        @cloud.run_command_on("if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner `hostname`; else #{str}; fi", @cloud.master)
       end
       def process_reconfigure!(testing=false)
         @cloud.run_command_on(PoolParty::Remote::RemoteInstance.puppet_runner_command, @instance) unless testing
@@ -211,6 +211,7 @@ module PoolParty
       def default_install_tasks
         [
           "#!/usr/bin/env sh",
+          first_install_tasks,
           upgrade_system,
           install_rubygems,
           make_logger_directory,
@@ -231,6 +232,11 @@ module PoolParty
       def install_tasks(a=[])
         @install_task ||= a
       end
+      # Set the first tasks to be called on the instance
+      # before any other tasks are run
+      def first_install_tasks
+        @cloud.first_install_tasks_for(@instances) || []
+      end
       def configure_tasks(a=[])
         @configure_tasks ||= a
       end
@@ -357,8 +363,8 @@ fi
           cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrerun /usr/bin/puppetrerun
           chmod +x /usr/bin/puppetrerun
           
-          cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetcleaner /usr/bin/puppetcleaner
-          chmod +x /usr/bin/puppetcleaner
+          mv #{Base.remote_storage_path}/cookie ~/.erlang.cookie
+          chmod 400 ~/.erlang.cookie
         EOS
       end
     end

data/lib/poolparty/{helpers → provisioners}/provisioners/master.rb

@@ -15,10 +15,15 @@ module PoolParty
       def error
         raise RemoteException.new(:could_not_install, "Your cloud does not have a master")
       end
+      
+      def first_install_tasks
+        [
+          create_local_hosts_entry
+        ]
+      end
 
       def install_tasks
-        [
-          create_local_hosts_entry,
+        [          
           setup_basic_structure,
           setup_configs,        
           setup_fileserver,
@@ -128,14 +133,13 @@ wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=tru
         EOE
       end
       
-      # ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
       # /etc/init.d/puppetmaster stop; rm -rf /etc/puppet/ssl; /etc/init.d/puppetmaster start
+      # ps aux | grep puppetmaster | grep -v grep | awk '{print $2}' | xargs kill;
       def restart_puppetmaster
         <<-EOS
 echo "(Re)starting poolparty"
 . /etc/profile
-# /etc/init.d/puppetmaster stop #{unix_hide_string}
-ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/poolparty/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start
+/etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start
         EOS
       end
       
@@ -181,10 +185,10 @@ cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolpa
             
       def restart_puppetd
         # /usr/bin/puppetrerun
+        # /usr/bin/puppetcleaner master
         <<-EOS
 echo "Running puppet manifest"
-/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
-/usr/bin/puppetcleaner master
+/usr/bin/puppetrerun
         EOS
       end
     end

data/lib/poolparty/templates/puppetrerun

@@ -11,7 +11,8 @@ if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server mast
       if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ]; then
         echo "Run successfully" && exit 0
         else
-        /etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;/etc/init.d/puppetmaster start
+        # /etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;/etc/init.d/puppetmaster start
+        rm /etc/poolparty/ssl/$HN*
         /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
       fi
     else

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 79
+    TINY  = 81
 
     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.79
+  version: 0.2.80
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-06 00:00:00 -08:00
+date: 2008-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ executables:
 - cloud-refresh
 - cloud-rsync
 - cloud-run
+- cloud-spec
 - cloud-ssh
 - cloud-start
 - cloud-stats
@@ -130,6 +131,7 @@ files:
 - bin/cloud-refresh
 - bin/cloud-rsync
 - bin/cloud-run
+- bin/cloud-spec
 - bin/cloud-ssh
 - bin/cloud-start
 - bin/cloud-stats
@@ -264,7 +266,6 @@ files:
 - lib/erlang/messenger/src/master_app.erl
 - lib/erlang/messenger/src/node_app.erl
 - lib/erlang/messenger/src/pm_client.erl
-- lib/erlang/messenger/src/pm_client_old.erl
 - lib/erlang/messenger/src/pm_client_supervisor.erl
 - lib/erlang/messenger/src/pm_cluster.erl
 - lib/erlang/messenger/src/pm_event_manager.erl
@@ -311,14 +312,12 @@ files:
 - lib/poolparty/exceptions/SpecException.rb
 - lib/poolparty/exceptions/TemplateNotFound.rb
 - lib/poolparty/exceptions/UnacceptableCommand.rb
+- lib/poolparty/extra/deployments.rb
 - lib/poolparty/helpers/binary.rb
 - lib/poolparty/helpers/console.rb
 - lib/poolparty/helpers/display.rb
 - lib/poolparty/helpers/nice_printer.rb
 - lib/poolparty/helpers/optioner.rb
-- lib/poolparty/helpers/provisioner_base.rb
-- lib/poolparty/helpers/provisioners/master.rb
-- lib/poolparty/helpers/provisioners/slave.rb
 - lib/poolparty/helpers/ruberl.rb
 - lib/poolparty/modules/cloud_dsl.rb
 - lib/poolparty/modules/cloud_resourcer.rb
@@ -369,11 +368,15 @@ files:
 - lib/poolparty/poolparty/resources/mount.rb
 - lib/poolparty/poolparty/resources/package.rb
 - lib/poolparty/poolparty/resources/remote_file.rb
+- lib/poolparty/poolparty/resources/remote_user.rb
 - lib/poolparty/poolparty/resources/service.rb
 - lib/poolparty/poolparty/resources/sshkey.rb
 - lib/poolparty/poolparty/resources/symlink.rb
 - lib/poolparty/poolparty/resources/variable.rb
 - lib/poolparty/poolparty/script.rb
+- lib/poolparty/provisioners/provisioner_base.rb
+- lib/poolparty/provisioners/provisioners/master.rb
+- lib/poolparty/provisioners/provisioners/slave.rb
 - lib/poolparty/spec/core/string.rb
 - lib/poolparty/spec/matchers/a_spec_extensions_base.rb
 - lib/poolparty/spec/matchers/have_cron.rb
@@ -437,6 +440,7 @@ files:
 - spec/poolparty/core/string_spec.rb
 - spec/poolparty/core/time_spec.rb
 - spec/poolparty/dependency_resolutions/base_spec.rb
+- spec/poolparty/extra/deployments_spec.rb
 - spec/poolparty/helpers/binary_spec.rb
 - spec/poolparty/helpers/display_spec.rb
 - spec/poolparty/helpers/optioner_spec.rb
@@ -461,35 +465,36 @@ files:
 - spec/poolparty/plugins/git_spec.rb
 - spec/poolparty/plugins/line_spec.rb
 - spec/poolparty/plugins/svn_spec.rb
-- spec/poolparty/pool/base_spec.rb
-- spec/poolparty/pool/cloud_spec.rb
-- spec/poolparty/pool/configurers/files/ruby_basic.rb
-- spec/poolparty/pool/configurers/files/ruby_plugins.rb
-- spec/poolparty/pool/configurers/ruby_spec.rb
-- spec/poolparty/pool/custom_resource_spec.rb
-- spec/poolparty/pool/example_spec.rb
-- spec/poolparty/pool/plugin_model_spec.rb
-- spec/poolparty/pool/plugin_spec.rb
-- spec/poolparty/pool/pool_spec.rb
-- spec/poolparty/pool/resource_spec.rb
-- spec/poolparty/pool/resources/class_package_spec.rb
-- spec/poolparty/pool/resources/conditional_spec.rb
-- spec/poolparty/pool/resources/cron_spec.rb
-- spec/poolparty/pool/resources/directory_spec.rb
-- spec/poolparty/pool/resources/exec_spec.rb
-- spec/poolparty/pool/resources/file_spec.rb
-- spec/poolparty/pool/resources/gem_spec.rb
-- spec/poolparty/pool/resources/host_spec.rb
-- spec/poolparty/pool/resources/package_spec.rb
-- spec/poolparty/pool/resources/remote_file_spec.rb
-- spec/poolparty/pool/resources/service_spec.rb
-- spec/poolparty/pool/resources/sshkey_spec.rb
-- spec/poolparty/pool/resources/symlink_spec.rb
-- spec/poolparty/pool/resources/variable_spec.rb
-- spec/poolparty/pool/script_spec.rb
-- spec/poolparty/pool/test_plugins/sshkey_test
-- spec/poolparty/pool/test_plugins/virtual_host_template.erb
-- spec/poolparty/pool/test_plugins/webserver.rb
+- spec/poolparty/poolparty/base_spec.rb
+- spec/poolparty/poolparty/cloud_spec.rb
+- spec/poolparty/poolparty/configurers/files/ruby_basic.rb
+- spec/poolparty/poolparty/configurers/files/ruby_plugins.rb
+- spec/poolparty/poolparty/configurers/ruby_spec.rb
+- spec/poolparty/poolparty/custom_resource_spec.rb
+- spec/poolparty/poolparty/example_spec.rb
+- spec/poolparty/poolparty/plugin_model_spec.rb
+- spec/poolparty/poolparty/plugin_spec.rb
+- spec/poolparty/poolparty/pool_spec.rb
+- spec/poolparty/poolparty/resource_spec.rb
+- spec/poolparty/poolparty/resources/class_package_spec.rb
+- spec/poolparty/poolparty/resources/conditional_spec.rb
+- spec/poolparty/poolparty/resources/cron_spec.rb
+- spec/poolparty/poolparty/resources/directory_spec.rb
+- spec/poolparty/poolparty/resources/exec_spec.rb
+- spec/poolparty/poolparty/resources/file_spec.rb
+- spec/poolparty/poolparty/resources/gem_spec.rb
+- spec/poolparty/poolparty/resources/host_spec.rb
+- spec/poolparty/poolparty/resources/package_spec.rb
+- spec/poolparty/poolparty/resources/remote_file_spec.rb
+- spec/poolparty/poolparty/resources/service_spec.rb
+- spec/poolparty/poolparty/resources/sshkey_spec.rb
+- spec/poolparty/poolparty/resources/symlink_spec.rb
+- spec/poolparty/poolparty/resources/user_spec.rb
+- spec/poolparty/poolparty/resources/variable_spec.rb
+- spec/poolparty/poolparty/script_spec.rb
+- spec/poolparty/poolparty/test_plugins/sshkey_test
+- spec/poolparty/poolparty/test_plugins/virtual_host_template.erb
+- spec/poolparty/poolparty/test_plugins/webserver.rb
 - spec/poolparty/poolparty_spec.rb
 - spec/poolparty/spec/core/string_spec.rb
 - spec/poolparty/spec_helper.rb
@@ -506,6 +511,7 @@ files:
 - test/test_helper.rb
 - test/test_pool_spec_generator.rb
 - test/test_poolparty.rb
+- website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/code.css
@@ -514,7 +520,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:46 12/06/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 15:39 12/09/08)
   
   To get started, run the generator:
   

data/spec/poolparty/extra/deployments_spec.rb

@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "deployments" do
+  describe "class" do
+    before(:each) do
+      @klass = PoolParty::Extra::Deployments
+      @file = "hanky_danky_ranky.pool"
+      ::File.stub!(:file?).with(@file).and_return false
+    end
+    it "should have the singleton method include_deployment" do
+      @klass.respond_to?(:include_deployment).should == true
+    end
+    it "should return nil if the file doesn't exist" do
+      @klass.include_deployment(@file).should == nil
+    end
+    describe "existing file" do
+      before(:each) do
+        ::File.stub!(:file?).and_return true
+        @contents = "'hello goober'"
+        @klass.stub!(:open).with(@file).and_return @file
+        @file.stub!(:read).and_return @contents
+      end
+      it "should not be nil if the file does exist" do        
+        @klass.include_deployment(@file).should_not == nil
+      end
+      it "should create a class called PoolPartyHankyDankyRankyClass" do
+        @klass.include_deployment(@file).should_not == nil
+        Object.const_defined?(:PoolPartyHankyDankyRankyClass).should == true
+      end
+      it "should create a method on the class called enable" do
+        PoolPartyHankyDankyRankyClass.new.respond_to?(:enable).should == true
+      end
+      it "should add the contents of the file to be eval'd on the method" do
+        PoolPartyHankyDankyRankyClass.new.enable.should == "hello goober"
+      end
+    end
+    describe "include_deployments" do
+      before(:each) do
+        ::File.stub!(:directory?).and_return false
+        @dir = "/deployments"
+      end
+      it "should have the method include_deployments" do
+        @klass.respond_to?(:include_deployments).should == true
+      end
+      it "should return nil if the directory does not exist" do
+        @klass.include_deployments(@dir).should == nil
+      end
+      describe "existing directory" do
+        before(:each) do          
+          ::File.stub!(:directory?).and_return true
+          @contents = []
+          Dir.stub!(:[]).and_return @contents
+        end
+        it "should not be nil if the directory exists" do
+          @klass.include_deployments(@dir).should_not == nil
+        end
+        it "should call Dir.[] on the directory" do
+          Dir.should_receive(:[]).with("#{@dir}/*").and_return []
+          @klass.include_deployments(@dir)
+        end
+      end
+    end
+  end
+end

data/spec/poolparty/helpers/provisioner_base_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require File.dirname(__FILE__) + '/../../../lib/poolparty/helpers/provisioner_base'
 
 include Provisioner
 

data/spec/poolparty/helpers/provisioners/master_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../../../lib/poolparty/helpers/provisioner_base'
 
 include Provisioner
 

data/spec/poolparty/helpers/provisioners/slave_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../../../lib/poolparty/helpers/provisioner_base'
 
 include Provisioner
 

data/spec/poolparty/{pool → poolparty}/cloud_spec.rb

@@ -316,6 +316,9 @@ describe "Cloud" do
             it "should call before_configuration_tasks callback" do
               @cloud.should_receive(:before_configuration_tasks).once
             end
+            it "should call call write_unique_cookie" do
+              @cloud.should_receive(:write_unique_cookie).once
+            end
             describe "copy_custom_monitors" do
               before(:each) do                
                 Base.stub!(:custom_monitor_directories).and_return ["/tmp/monitors/custom_monitor.rb"]
@@ -364,6 +367,40 @@ describe "Cloud" do
             end
           end
         end
+        describe "minimum_runnable_options" do
+          it "should be an array on the cloud" do
+            @cloud.minimum_runnable_options.class.should == Array
+          end
+          ["keypair","minimum_instances","maximum_instances",
+            "expand_when","contract_when","set_master_ip_to"].each do |k|
+            eval <<-EOE
+              it "should have #{k} in the minimum_runnable_options" do
+                @cloud.minimum_runnable_options.include?(:#{k}).should == true
+              end
+            EOE
+          end
+          it "should include the custom_minimum_runnable_options" do
+            @cloud.stub!(:custom_minimum_runnable_options).and_return [:blank]
+            @cloud.minimum_runnable_options.include?(:blank).should == true
+          end
+        end
+        describe "unique_cookie" do
+          it "should have the method generate generate_unique_cookie_string" do
+            @cloud.respond_to?(:generate_unique_cookie_string).should == true
+          end
+          it "should call hexdigest to digest/sha" do
+            Digest::SHA256.should_receive(:hexdigest).with("#{@cloud.full_keypair_name}#{@cloud.name}")
+            @cloud.generate_unique_cookie_string
+          end
+          it "should generate the same cookie string every time" do
+            older = @cloud.generate_unique_cookie_string
+            old = @cloud.generate_unique_cookie_string
+            new_one = @cloud.generate_unique_cookie_string
+            older.should == old
+            old.should == new_one
+            new_one.should == older
+          end
+        end
       end
 
       describe "instances" do