auser-poolparty 0.2.44 → 0.2.45

data/lib/poolparty/net/remoter.rb

@@ -174,15 +174,19 @@ module PoolParty
       end
       
       def provision_slaves_from_n(num=1)
+        vputs "In provision_slaves_from_n: #{num}"
         reset!
         when_no_pending_instances do
+          vputs "Waiting for 10 seconds"
           wait "10.seconds" # Give some time for ssh to startup
           @num_instances = list_of_running_instances.size
           vputs "(@num_instances - (num))..(@num_instances): #{(@num_instances - (num))..(@num_instances)}"
           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?
+            vputs "Provision slave: #{inst}"
+            PoolParty::Provisioner.provision_slave(inst, self, false) unless inst.master? rescue vputs "Error"
             cmd = ". /etc/profile && cloud-provision -i #{inst.name.gsub(/node/, '')} #{unix_hide_string} &"
+            vputs "Provision slave with command #{cmd}"
             Kernel.system cmd
           end
           PoolParty::Provisioner.reconfigure_master(self)
@@ -215,11 +219,11 @@ module PoolParty
       end
       # Stub method for the time being to handle expansion of the cloud
       def should_expand_cloud?(force=false)
-        valid_rules?(:expansions) || force || false
+        valid_rules?(:expand_when) || force || false
       end
       # Stub method for the time being to handle the contraction of the cloud
       def should_contract_cloud?(force=false)
-        valid_rules?(:contractions) || force || false
+        valid_rules?(:contract_when) || force || false
       end
       # Expand the cloud
       # If we can start a new instance and the load requires us to expand
@@ -229,7 +233,7 @@ module PoolParty
       # get go
       def expand_cloud_if_necessary(force=false)
         if can_start_a_new_instance? && should_expand_cloud?(force)
-          logger.debug "Expanding the cloud based on load"
+          vputs "Expanding the cloud based on load"
           @num = 1
           request_launch_new_instances(@num)
           

data/lib/poolparty/plugins/git.rb

@@ -9,7 +9,6 @@ module PoolParty
             
       def has_git_repos
         has_package(:name => "git-core")
-        has_directory(:name => "#{cwd}")
         
         has_exec({:name => "git-#{name}", :requires => get_package("git-core"), :requires => [get_directory("#{cwd}"), get_package("git-core")]}) do          
           command parent.user ? "git clone #{parent.user}@#{parent.source} #{parent.path}" : "git clone #{parent.source} #{parent.to ? parent.to : ""}"
@@ -22,6 +21,11 @@ module PoolParty
         end
       end
       
+      def at(dir)
+        cwd dir
+        has_directory(:name => "#{dir}", :requires => "#{::File.dirname(dir)}")
+      end
+      
       # Since git is not a native type, we have to say which core resource
       # it is using to be able to require it
       def class_type_name

data/lib/poolparty/pool/base.rb

@@ -39,7 +39,7 @@ module PoolParty
         ENV["AWS_ACCESS_KEY_ID"] ? ENV["AWS_ACCESS_KEY_ID"] : load_keys_from_file[:access_key]
       end
       def secret_access_key
-        ENV["AWS_SECRET_ACCESS_ID"] ? ENV["AWS_SECRET_ACCESS_ID"] : load_keys_from_file[:secret_access_key]
+        ENV["AWS_SECRET_ACCESS_KEY"] ? ENV["AWS_SECRET_ACCESS_KEY"] : load_keys_from_file[:secret_access_key]
       end
       def read_keyfile
         open(get_working_key_file_locations).read

data/lib/poolparty/pool/cloud.rb

@@ -12,7 +12,8 @@ module PoolParty
     end
     
     def with_cloud(cl, opts={}, &block)
-      cl.options.merge!(opts)
+      raise CloudNotFoundException.new("Cloud not found") unless cl
+      cl.options.merge!(opts) if opts
       cl.instance_eval &block if block
     end
     
@@ -27,6 +28,7 @@ module PoolParty
       # Net methods
       include PoolParty::Remote::RemoterBase
       include Remote
+      include PoolParty::CloudDsl
       
       default_options({
         :minimum_instances => 2,
@@ -156,7 +158,10 @@ module PoolParty
       # they need a few options to run, these are the required options
       # to be saved on the remote "master" machine
       def minimum_runnable_options
-        [:keypair, :minimum_instances, :maximum_instances, :ami, :expand_when, :contract_when]
+        [
+          :keypair, :minimum_instances, :maximum_instances, :ami, 
+          :expand_when, :contract_when, :set_master_ip_to
+        ]
       end
       
       # Add all the poolparty requirements here

data/lib/poolparty/pool/resource.rb

@@ -167,7 +167,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
+          :refresh, :content, :template, :ip, :repeat, :provider, :key, :device, :fstype, :remounts, :options, :atboot
         ]
       end
       def key

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

@@ -0,0 +1,22 @@
+module PoolParty    
+  module Resources
+        
+    class Mount < Resource      
+      
+      default_options({
+        :name => "/data",
+        :remounts => "true",
+        :options => "rw,nosuid,noquota",
+        :fstype => "xfs",
+        :atboot => "yes"
+      })
+      
+      def disallowed_options
+        [:name]
+      end
+            
+      
+    end
+    
+  end
+end

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 44
+    TINY  = 45
 
     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.44
+  version: 0.2.45
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-04 00:00:00 -08:00
+date: 2008-11-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,6 @@ executables:
 - pool-console
 - pool-describe
 - pool-list
-- pool-provision
 - pool-spec
 - pool-start
 - server-build-messenger
@@ -128,7 +127,6 @@ files:
 - bin/pool-console
 - bin/pool-describe
 - bin/pool-list
-- bin/pool-provision
 - bin/pool-spec
 - bin/pool-start
 - bin/server-build-messenger
@@ -414,6 +412,7 @@ files:
 - lib/poolparty/core/time.rb
 - lib/poolparty/dependency_resolutions/base.rb
 - lib/poolparty/dependency_resolutions/puppet.rb
+- lib/poolparty/exceptions/CloudNotFoundException.rb
 - lib/poolparty/exceptions/LoadRulesException.rb
 - lib/poolparty/exceptions/MasterException.rb
 - lib/poolparty/exceptions/RemoteException.rb
@@ -429,6 +428,7 @@ files:
 - lib/poolparty/helpers/provisioner_base.rb
 - lib/poolparty/helpers/provisioners/master.rb
 - lib/poolparty/helpers/provisioners/slave.rb
+- lib/poolparty/modules/cloud_dsl.rb
 - lib/poolparty/modules/cloud_resourcer.rb
 - lib/poolparty/modules/configurable.rb
 - lib/poolparty/modules/definable_resource.rb
@@ -468,6 +468,7 @@ files:
 - lib/poolparty/pool/resources/file.rb
 - lib/poolparty/pool/resources/gem_package.rb
 - lib/poolparty/pool/resources/host.rb
+- lib/poolparty/pool/resources/mount.rb
 - lib/poolparty/pool/resources/package.rb
 - lib/poolparty/pool/resources/remote_file.rb
 - lib/poolparty/pool/resources/service.rb

data/spec/poolparty/modules/configurable_spec.rb

@@ -9,7 +9,6 @@ describe "configurable" do
     @tc = TestClass.new
   end
   it "should set the name as frank" do
-    @tc.name.should == nil
     @tc.configure({:name => "frank"})
     @tc.name.should == "frank"
   end
@@ -23,4 +22,8 @@ describe "configurable" do
     @tc.reconfigure(:name => "dewey")
     @tc.name.should == "dewey"
   end
+  it "should send an array if two arguments are given" do
+    @tc.configure({:name => ["array", "ishere"]})
+    @tc.name.should == ["array", "ishere"]
+  end
 end

data/spec/poolparty/pool/base_spec.rb

@@ -3,7 +3,7 @@ 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"
+    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"
@@ -77,7 +77,7 @@ describe "Base" 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
+          ENV.stub!(:[]).with("AWS_SECRET_ACCESS_KEY").and_return nil
           Base.reset!
         end
         it "should render the access_key nil" do

data/spec/poolparty/pool/plugin_model_spec.rb

@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/test_plugins/webserver'
 
 describe "Plugin" do
   before(:each) do
-    setup
     @p = pool :poolpartyrb do
       cloud :app do
         apache do                
@@ -56,8 +55,8 @@ describe "Plugin" do
         @plugin.respond_to?(:site).should == true
       end
       it "should be able to call the plugin method site" do
-        @plugin.should_receive(:virtual_host).once
-        @plugin.site("hi", {:document_root => "/root"})
+        @plugin.should_receive(:virtual_host).with("hop", {:document_root => "/root"})
+        @plugin.virtual_host("hop", {:document_root => "/root"})
       end
     end
   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.44</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.45</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.44
+  version: 0.2.45
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-04 00:00:00 -08:00
+date: 2008-11-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,6 @@ executables:
 - pool-console
 - pool-describe
 - pool-list
-- pool-provision
 - pool-spec
 - pool-start
 - server-build-messenger
@@ -128,7 +127,6 @@ files:
 - bin/pool-console
 - bin/pool-describe
 - bin/pool-list
-- bin/pool-provision
 - bin/pool-spec
 - bin/pool-start
 - bin/server-build-messenger
@@ -414,6 +412,7 @@ files:
 - lib/poolparty/core/time.rb
 - lib/poolparty/dependency_resolutions/base.rb
 - lib/poolparty/dependency_resolutions/puppet.rb
+- lib/poolparty/exceptions/CloudNotFoundException.rb
 - lib/poolparty/exceptions/LoadRulesException.rb
 - lib/poolparty/exceptions/MasterException.rb
 - lib/poolparty/exceptions/RemoteException.rb
@@ -429,6 +428,7 @@ files:
 - lib/poolparty/helpers/provisioner_base.rb
 - lib/poolparty/helpers/provisioners/master.rb
 - lib/poolparty/helpers/provisioners/slave.rb
+- lib/poolparty/modules/cloud_dsl.rb
 - lib/poolparty/modules/cloud_resourcer.rb
 - lib/poolparty/modules/configurable.rb
 - lib/poolparty/modules/definable_resource.rb
@@ -468,6 +468,7 @@ files:
 - lib/poolparty/pool/resources/file.rb
 - lib/poolparty/pool/resources/gem_package.rb
 - lib/poolparty/pool/resources/host.rb
+- lib/poolparty/pool/resources/mount.rb
 - lib/poolparty/pool/resources/package.rb
 - lib/poolparty/pool/resources/remote_file.rb
 - lib/poolparty/pool/resources/service.rb

data/bin/pool-provision

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-# require "poolparty"
-# require "poolpartycl"
-# 
-# o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-#   opts.on('-t', '--type [master|slave|all]', 'Provision these instances (default: all)')    { |o| optioner.class_type o }
-#   opts.on('-a', '--all', 'Provision all the instances')    { |o| optioner.all true }
-#   opts.on('-n [name]', '--name [name]', 'Pool to provision (required)') {|o| optioner.cloud_name o }
-# end
-# load_pool(o.spec || Binary.get_existing_spec_location)
-# 
-# if o.cloud_name
-#   @c = cloud(o.cloud_name.downcase.to_sym)
-# else
-#   puts "Cloud name required. Please specify it with -c [name]"
-#   exit(0)
-# end
-# 
-# if o.class_type && o.class_type != "all" && !o.all  
-#   case o.class_type
-#   when "master","m"
-#     puts header("Provisioning the master instances")    
-#   when "slave", "s"
-#     puts header("Provisioning the slave instances")
-#   end
-# else
-#   # Provision all the instances
-#   puts header("Provisioning all the instances")
-#   provisioner_file = ::File.join(Base.storage_directory, "install.sh")
-#   File.open(provisioner_file, "w+") do |file|
-#     file << Provisioner::Master.install(@c)
-#   end  
-# end