auser-poolparty 1.2.7 → 1.2.8

data/spec/poolparty/core/object_spec.rb

@@ -4,28 +4,4 @@ describe "Object" do
   it "should respond to to_os" do
     Object.new.respond_to?(:to_os).should == true
   end
-
-  describe "with_options" do
-    before(:each) do
-      class TestObjClass
-        include Dslify
-        dsl_methods :b
-        
-        def initialize(o={})
-          set_vars_from_options o
-        end
-      end
-      @obj = TestObjClass.new
-    end
-    
-    describe "contextual running" do
-      before(:each) do
-        @obj.stub!(:default_options).and_return {}
-        @a = @obj.instance_eval { @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/fixtures/fake_key.pub

@@ -0,0 +1 @@
+ssh-rsa totally_aPublicKey auser@my.laptop.local

data/spec/poolparty/modules/searchable_paths_spec.rb

@@ -63,11 +63,18 @@ describe "FileWriter" do
     it "should find things in the right order" do
       @cloud.find_file("clouds.rb").should == PATH_ONE/'clouds.rb'
     end
-
-
-
-
-
+  end
+  
+  describe "#search_in_known_locations" do
+    before(:each) do
+      # create path one
+      FileUtils.mkdir_p(PATH_ONE/'extra')
+      File.write_to_file(PATH_ONE/'extra'/'clouds.rb')
+    end
+    
+    it "should look in the additional search paths first" do
+      @cloud.find_file("clouds.rb", [PATH_ONE/'extra']).should == PATH_ONE/'extra'/'clouds.rb'
+    end    
   end
 
   after(:each) do

data/spec/poolparty/net/remoter_bases/ec2_spec.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/ec2_mocks_and_stubs.rb'
 describe "ec2 remote base" do
   before(:each) do
     @cloud = TestCloud.new :test_remoter_base_cloud
-    @tr = TestEC2Class.new(@cloud.dsl_options)
+    @tr = TestEC2Class.new( TestCloud.default_options )
     stub_remoter_for(@tr)
     # @tr.stub!(:get_instances_description).and_return response_list_of_instances
   end

data/spec/poolparty/plugins/authorized_key_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Remote Instance" do
+  before(:each) do
+    @tc = TestBaseClass.new do
+    end
+  end
+  it "should have the method has_line_in_file available on the class" do
+    @tc.respond_to?(:has_line_in_file).should == true
+  end
+  describe "call" do
+    before(:each) do
+      @tc.run_in_context do
+        has_authorized_key({:for_user => 'alerner', 
+                            :public_key_file => "#{::File.dirname(__FILE__)}/../fixtures/fake_key.pub"})
+      end
+      @compiled = ChefResolver.new(@tc.to_properties_hash).compile
+    end
+    it "should have the line in the file from ChefResolver" do
+      @compiled.should match(/~alerner\/\.ssh/)
+    end
+  end
+end

data/spec/poolparty/poolparty/cloud_spec.rb

@@ -198,7 +198,7 @@ describe "Cloud" do
             @cloud.add_optional_enabled_services
           end
           it "should have at least 3 resources" do            
-            @cloud.add_poolparty_base_requirements
+            @cloud.send :add_poolparty_base_requirements
             @cloud.ordered_resources.size.should > 2
           end
           it "should receive add_poolparty_base_requirements before building the manifest" do
@@ -220,13 +220,13 @@ describe "Cloud" do
               @hb = PoolpartyBaseHeartbeatClass.new
               PoolpartyBaseHeartbeatClass.stub!(:new).and_return @hb
               
-              @cloud.add_poolparty_base_requirements
+              @cloud.send :add_poolparty_base_requirements
               @cloud.poolparty_base_heartbeat.should == @hb
             end
             describe "after adding" do
               before(:each) do
                 stub_list_from_remote_for(@cloud)
-                @cloud.add_poolparty_base_requirements
+                @cloud.send :add_poolparty_base_requirements
               end
               describe "resources" do
                 before(:each) do

data/test/poolparty/dependency_resolver/puppet_resolver_test.rb

@@ -57,7 +57,7 @@ class TestPuppetResolver < Test::Unit::TestCase
         has_directory :name => "/var/www"
         has_file :name => "/var/www/index.html", :content => "profile info", :requires => get_directory("/var/www")
 
-        set_dependency_resolver "puppet"
+        dependency_resolver "puppet"
         # has_package :name => "bash"        
         # parent == cloud
         apache do

data/test/poolparty/net/remoter_bases/metavirt/metavirt_test.rb

@@ -16,7 +16,7 @@ class TestMetavirt < Test::Unit::TestCase
       end
     end
     should "be registered as a remote_base" do
-      @cloud.available_bases.include?(:vmrun).should == true
+      PoolParty::Remote::RemoterBase.available_bases.include?(:vmrun).should == true
     end
     should "be setting the type of remote_base" do
       assert_equal PoolParty::Remote::Vmrun, @cloud.remote_base.remote_base.class
@@ -26,11 +26,8 @@ class TestMetavirt < Test::Unit::TestCase
       @cloud.metavirt.should == @cloud.remote_base
     end
     should "have a keypair" do
-      # assert_equal Key, @cloud.keypair.class
       assert_equal 'test_key', @cloud.keypair.basename
       assert_equal 'test_key', @cloud.keypair_name
-      # puts "----- #{@cloud.remote_base.dsl_options.inspect}"
-      assert_equal 'test_key', @cloud.remote_base.keypair_name
     end
     should "be able to initialize without a cloud" do
       assert_nothing_raised  do PoolParty::Remote::Metavirt.new end

data/test/poolparty/poolparty/cloud_test.rb

@@ -0,0 +1,40 @@
+require "#{::File.dirname(__FILE__)}/../../test_helper"
+
+class CloudTest < Test::Unit::TestCase
+  context "callbacks" do
+    setup do
+    reset!
+      cloud :apple do
+        user "bob"
+        minimum_instances 100
+        access_key "pool_access_key"
+        secret_access_key "cloud_access_key"
+        
+        after :bootstrap do |cld|
+          cld.class.send :attr_reader, :after_bootstrap_message          
+          @after_bootstrap_message = "After me!"
+        end
+      end
+    end
+    
+    should "call have callbacks for after :bootstrap (defined inside the cloud)" do
+      cblks = clouds[:apple].send :after_blocks
+      assert_equal [:bootstrap], cblks.keys
+      assert cblks[:bootstrap].is_a?(Array)
+    end
+    should "not have callbacks on configure (not defined inside the clouds.rb)" do
+      cblks = clouds[:apple].send :before_blocks
+      assert_equal [], cblks.keys
+    end
+    should "call the after bootstrap block when calling call_after_boostrap_callbacks on cloud" do
+      apple = clouds[:apple]
+      apple.call_after_bootstrap_callbacks
+      assert_equal apple.after_bootstrap_message, "After me!"
+    end
+    should "not call after_configure blocks when calling call_after_configure_callbacks" do
+      apple = clouds[:apple]
+      apple.call_after_configure_callbacks
+      assert_not_equal apple.after_bootstrap_message, "After me!"
+    end
+  end
+end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require "test/unit"
 require "matchy"
 require "shoulda"
 # require "mocha"
-require 'ruby-debug'
+# require 'ruby-debug'
 
 require File.dirname(__FILE__) + '/../lib/poolparty'
 require 'git-style-binary/command'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,7 +107,8 @@ files:
 - examples/metavirt_cloud.rb
 - examples/paparazzi.conf.erb
 - examples/plugin_without_plugin_directory.rb
-- examples/poolparty.rb
+- examples/simple.rb
+- examples/vmrun_cloud.rb
 - lib/poolparty
 - lib/poolparty/aska.rb
 - lib/poolparty/base_packages
@@ -123,8 +124,6 @@ files:
 - 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/nil.rb
 - lib/poolparty/core/object.rb
@@ -158,7 +157,6 @@ files:
 - lib/poolparty/helpers
 - lib/poolparty/helpers/binary.rb
 - lib/poolparty/helpers/console.rb
-- lib/poolparty/helpers/display.rb
 - lib/poolparty/helpers/hash_printer.rb
 - lib/poolparty/helpers/loading.rb
 - lib/poolparty/helpers/nice_printer.rb
@@ -197,7 +195,6 @@ files:
 - lib/poolparty/monitors/monitors/stats_monitor.rb
 - lib/poolparty/net
 - lib/poolparty/net/init.rb
-- lib/poolparty/net/remote_bases.rb
 - lib/poolparty/net/remote_instance.rb
 - lib/poolparty/net/remoter
 - lib/poolparty/net/remoter/cloud_control.rb
@@ -222,6 +219,7 @@ files:
 - lib/poolparty/plugins
 - lib/poolparty/plugins/apache2
 - lib/poolparty/plugins/apache2/apache.rb
+- lib/poolparty/plugins/authorized_key.rb
 - lib/poolparty/plugins/bind.rb
 - lib/poolparty/plugins/chef.rb
 - lib/poolparty/plugins/chef_deploy.rb
@@ -342,7 +340,6 @@ files:
 - spec/poolparty/core/float.rb
 - spec/poolparty/core/hash_spec.rb
 - spec/poolparty/core/kernel_spec.rb
-- spec/poolparty/core/module_spec.rb
 - spec/poolparty/core/object_spec.rb
 - spec/poolparty/core/ordered_hash_spec.rb
 - spec/poolparty/core/string_spec.rb
@@ -357,13 +354,12 @@ files:
 - spec/poolparty/extra/deployments_spec.rb
 - spec/poolparty/fixtures
 - spec/poolparty/fixtures/clouds.json
+- spec/poolparty/fixtures/fake_key.pub
 - spec/poolparty/fixtures/test_template.erb
 - spec/poolparty/helpers
 - spec/poolparty/helpers/binary_spec.rb
-- spec/poolparty/helpers/display_spec.rb
 - spec/poolparty/helpers/hash_printer_spec.rb
 - spec/poolparty/helpers/optioner_spec.rb
-- spec/poolparty/id_rsa
 - spec/poolparty/modules
 - spec/poolparty/modules/cloud_resourcer_spec.rb
 - spec/poolparty/modules/definable_resource.rb
@@ -385,6 +381,7 @@ files:
 - spec/poolparty/net/remoter_bases/ec2_spec.rb
 - spec/poolparty/net/remoter_spec.rb
 - spec/poolparty/plugins
+- spec/poolparty/plugins/authorized_key_spec.rb
 - spec/poolparty/plugins/chef_spec.rb
 - spec/poolparty/plugins/deploydirectory_spec.rb
 - spec/poolparty/plugins/git_spec.rb
@@ -455,6 +452,7 @@ files:
 - test/poolparty/plugins/chef_deploy_test.rb
 - test/poolparty/plugins/rails_deploy_test.rb
 - test/poolparty/poolparty
+- test/poolparty/poolparty/cloud_test.rb
 - test/poolparty/poolparty/neighborhood_test.rb
 - test/poolparty/poolparty/plugin_test.rb
 - test/poolparty/poolparty/poolparty_base_class_test.rb

data/lib/poolparty/core/metaid.rb

@@ -1,15 +0,0 @@
-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/module.rb

@@ -1,40 +0,0 @@
-# Module overloads
-class Module
-  # Gives us alias_method_chain from rails
-  def alias_method_chain(target, feature)
-    aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
-    yield(aliased_target, punctuation) if block_given?
-
-    with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
-
-    alias_method without_method, target
-    alias_method target, with_method
-
-    case
-      when public_method_defined?(without_method)
-        public target
-      when protected_method_defined?(without_method)
-        protected target
-      when private_method_defined?(without_method)
-        private target
-    end
-  end
-  def attr_accessor_with_default( *syms, &block )
-    raise 'Default value in block required' unless block
-    syms.each do | sym |
-      module_eval do
-        attr_writer( sym )
-        define_method( sym ) do | |
-          class << self; self; end.class_eval do
-            attr_reader( sym )
-          end
-          instance_variables.include?("@#{sym}") ? instance_variable_get( "@#{sym}" ) : instance_variable_set( "@#{sym}", block.call )
-        end
-      end
-    end
-    nil
-  end
-  def instance_variables_from_hash(h={})
-    h.each {|k,v| instance_eval "@#{k} = #{v}"}
-  end
-end

data/lib/poolparty/helpers/display.rb

@@ -1,30 +0,0 @@
-module PoolParty
-  module Display
-    
-    def pool_describe(options={})
-      if pools.size > 0
-        pools.each do |k,v|
-          print v.pretty_print
-        end
-      else
-        pre = "\t"
-        clouds.each do |name, cl|
-          puts cl.pretty_name(pre*2, cl)
-          puts cl.pretty_options(pre*2, cl) #cl.pretty_print("#{pre}\t")
-        end
-      end
-
-      puts ""
-      pools.size
-    end
-        
-    def header(str="")
-      "*** #{str}"
-    end
-    
-    def subheader(str="")
-      "****** #{str}"
-    end
-    
-  end
-end

data/lib/poolparty/net/remote_bases.rb

@@ -1,22 +0,0 @@
-require File.dirname(__FILE__) + "/remoter_base"
-
-class Object
-  def remote_bases
-    $remote_bases ||= []
-  end
-  
-  #TODO: deprecate, this is taken care of with inherited hook
-  # Register the remoter base in the remote_bases global store
-  def register_remote_base(*args)
-    args.each do |arg|
-      base_name = "#{arg}".downcase.to_sym
-      (remote_bases << base_name) unless remote_bases.include?(base_name)
-    end
-  end
-  alias :available_bases :remote_bases
-end
-
-Dir["#{File.dirname(__FILE__)}/remote_bases/*.rb"].each do |base| 
-  name = ::File.basename(base, ::File.extname(base))
-  require base
-end

data/spec/poolparty/core/module_spec.rb

@@ -1,15 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "Module" do
-  before(:each) do
-    @mod = Module.new do
-      attr_accessor_with_default :a do
-        Hash.new
-      end
-    end
-    @klass = Class.new.extend(@mod)
-  end
-  it "should be able to set method accessors" do
-    @klass.a.should == {}
-  end
-end

data/spec/poolparty/helpers/display_spec.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require File.dirname(__FILE__) + '/../../../lib/poolparty/helpers/display'
-
-include Display
-
-describe "Display" do
-  it "should respond to pool_describe" do
-    self.respond_to?(:pool_describe).should == true
-  end
-  it "should be able to get the list of remote bases" do
-    self.respond_to?(:available_bases).should == true
-  end
-end

data/spec/poolparty/id_rsa

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEoQIBAAKCAQEAsZYv/Ia+TxtyzH0sXMeHXjs9FgAkuGV3qiOGQOAUUlpdkhnl
-tF+BFueMOYsQOXyAE+dNKdbMO+cBvYpnEgm6Cewf7IE46AVdFnSqkGmxgmGEbH2b
-fmbbikeNf9H1MDTsUxjL2CmfUcBZce48Y7w3YN7ootrHkuKDDwH67zk7K+idPGXm
-1qnUFSlS+lDnUQ00epZnUz5NjVuVSHNiTtzmgmTdLmu22LfTe+/Kend1ZJp0zjUt
-TAIY0gYhKRDWDgEQSlNwGJxrqKhu819KN0Fg2KF57bFVAxKrr632Af+kZBvIxg6C
-gzPXKqfJfgedxJFccSKfWfTTqPYFLGzWf8xT3QIBIwKCAQBbVI21Ehi6+CxpKm6W
-HXjRYEtNJKUroeXFNtdUkH96z2NSc7f2XQCPb8R1XXYO75JTYQMc1N4QLakfpkOi
-4G5OPuvYt3xaEWMS3OoBIGnrSBg3y5HL+mJHHXv4l90uvCHEVeUtVzv+KGiDvFmS
-YMwF7vtMcIPlJAjjJZb+r7gH8x2BQeF0tNgtV7FO+p28gX6F6aQL1xlDXY6KMQV7
-WzhORxUs3JjvhO1mxC6WXDMl7DjnADpxiL5jeJ0WR90r6MkEK7XSRT8kcJPZkmud
-T+eopujJkaG4pO6eEDSAl72dpwufLM0gS/HHCxcf+Lh+aZlWAu+rgon4XgiRXJEl
-kWZLAoGBAOA2gbZyQVWTwxKY2ZuhhFXSYXh7IygqDRPaorub3DGxwyF3JY+B/0tv
-R2uw8bqzlcj+LOwS++zqiUIKb2fhPNIksuLnWGGy4Z4tFG71Hz30/NBMTvNG9V7Q
-t9J3XOJVJCLTmNr67ZqHlaAmb+CzPseekgWJh2HeJPG4c/vaR0wVAoGBAMrDck9W
-z/abAtlkVxj54mij0i/dhx7uil4LxqpDJKrjF4RR0hpoi2UaKufBmZAgKyC5h8+V
-JvKX2XTIo+rJKkWBEqumoPK9JM27riZzzeBxCsiLOPycMe6rnb10Jl+VT0g889/J
-ea2gCtG13sgbhUAAp1YC755n4Vggb4eHIzKpAoGAGZ/UT12Dz0QWS0SrJ7qwCc7m
-kW0oluA8AkTfZeXtR4IHrA2d5IPiqYkPegWX+BSGJZlkODyvE8MIX1GmVQPMb8mu
-C02js2TmlbwCVdLe/8Q6Jm8e9ztPPgk5lGVps3dx2BguufDKspMnCv0UGa4Vzau4
-6rChwgrCZMSfin9YmvsCgYBLT+ihID6dbMaLQobAIkzHx9G6AdMaHhYi7m5cf1bD
-ISX98oE9AkJnYX2mibyx4BAE1zJxrG2NTlgVbxhP5FGHh7Z6RTR3atMn1/7bFRH0
-Rz6FAILhe9gIMR1U/0Fz9aEa1M+cQ4T3WLOPuJSTd++qDt8RUYwzhat4gRN7e1Y3
-YwKBgQCEa22ta9MEOtGcX1K2Im9X747mXhYQlactT7KbsTBaVF6JUUaUHCu3uZt2
-kynbB3SMCuy5D3sPw9NREt0WXu8ChlF5XaFc2NI9Pt/lKDg1RzG5c9K111REZi01
-A93KaESBdS3veq++b553PIYUlz01Fxw/6sRB1CPTGVL50loloA==
------END RSA PRIVATE KEY-----