poolparty 0.2.18 → 0.2.69

data/spec/poolparty/pool/resources/class_package_spec.rb

@@ -4,81 +4,117 @@ include PoolParty::Resources
 
 describe "File" do
   before(:each) do
-    reset!
-    @class = PoolParty::Resources::Classpackage.new({:name => "rockstar"})
+    reset_resources!  
   end
-  it "should have a method resources" do
-    @class.respond_to?(:resources).should == true
-  end
-  it "should store the resources in an array" do
-    @class.resources.class.should == Hash
-  end
-  describe "with resources" do
-    before(:each) do
-      cloud :application_cloud do
-        classpackage do
-          file({:name => "red"})
+  describe "wrapped" do
+      before(:each) do
+        reset!
+        @class = PoolParty::Resources::Classpackage.new({:name => "rockstar"})
+      end
+      it "should have a method resources" do
+        @class.respond_to?(:resources).should == true
+      end
+      it "should store the resources in an array" do
+        @class.resources.class.should == Hash
+      end
+      describe "with resources" do
+        before(:each) do
+          cloud :application_cloud do
+            classpackage do
+              file({:name => "red"})
+            end
+          end
+          @class = cloud(:application_cloud).resource(:classpackage).first
+        end
+        it "should store a resource in the resources array" do
+          @class.resources.size.should == 1
+        end
+        it "should have a file resource in the cloud" do
+          @class.resource(:file).should_not == nil
+        end
+        describe "to_s" do
+          before(:each) do
+            @class.instance_eval do
+              name "rockstar"
+              file({:name => "red"}) do; end
+            end
+          end
+          it "should output the class with the name as class [name]" do
+            @class.to_string.should =~ /class rockstar/
+          end
+          after do
+            @class.to_string
+          end
         end
       end
-      @class = cloud(:application_cloud).resource(:classpackage).first
-    end
-    it "should store a resource in the resources array" do
-      @class.resources.size.should == 1
     end
-    it "should have a file resource in the cloud" do
-      @class.resource(:file).should_not == nil
-    end
-    describe "to_s" do
+    describe "setting with a block" do
       before(:each) do
-        @class.instance_eval do
-          name "rockstar"
-          file({:name => "red"}) do; end
+        @class1 = classpackage do
+          name "my_class"
+          file({:name => "frank"})
         end
       end
-      it "should output the class with the name as class [name]" do
-        @class.to_string.should =~ /class rockstar/
+      it "should set the name when set" do
+        @class1.name.should == "my_class"
       end
-      after do
-        @class.to_string
+      it "should have the file resource in the resources class" do
+        @class1.resources.size.should_not be_zero
+      end
+      it "should have the file resource in the resources array" do
+        @class1.resource(:file).class.should == Array
+      end
+      it "should store the file in the resources array" do
+        @class1.resource(:file).get_named("frank").first.name.should == "frank"
       end
     end
-  end
-end
-describe "setting with a block" do
-  before(:each) do
-    @class1 = classpackage do
-      name "my_class"
-      file({:name => "frank"})
-    end
-  end
-  it "should set the name when set" do
-    @class1.name.should == "my_class"
-  end
-  it "should have the file resource in the resources class" do
-    @class1.resources.size.should_not be_zero
-  end
-  it "should have the file resource in the resources array" do
-    @class1.resource(:file).class.should == Array
-  end
-  it "should store the file in the resources array" do
-    @class1.resource(:file).get_named("frank").first.name.should == "frank"
-  end
-end
-describe "from a collection of resources to another" do
-  before(:each) do
-    self.stub!(:options).and_return({:name => "cook"})
-    file(:name => "franksfile")
-    exec(:name => "get file", :command => "kill frank for file")
-  end
-  it "should have the method classpackage_with_self" do
-    self.respond_to?(:classpackage_with_self).should == true
-  end
-  it "should transfer the resources to the class" do
-    @class2 = classpackage_with_self(self)
-    @class2.resources.should_not be_empty
-  end
-  it "should leave zero resources on the parent" do
-    @class2 = classpackage_with_self(self)
-    resources.should be_empty
+    describe "from a collection of resources to another" do
+      before(:each) do 
+        reset_resources!       
+        cloud :bunkers do
+          file(:name => "franksfile")
+          exec(:name => "get file", :command => "kill frank for file")
+        end
+        @cloud = cloud(:bunkers)
+        @class2 = classpackage_with_self(@cloud)
+      end
+      it "should have the method classpackage_with_self" do
+        self.respond_to?(:classpackage_with_self).should == true
+      end
+      it "should transfer the resources to the class" do
+        @class2.resources.size.should == 2
+      end
+      it "should have the file resource in the classpackage" do
+        @class2.resource(:file).first.name.should == "franksfile"
+      end
+      it "should have the exec resource in the classpackage" do
+        @class2.resource(:exec).first.name.should == "get file"
+      end
+      it "should have the resources on the new classpackage" do
+        @cloud.resources.size.should == 1
+      end
+      it "should have the conditional classpackage on the resources" do
+        @cloud.resource(:classpackage).first.should == @class2
+      end
+      describe "to_string" do
+        before(:each) do
+          @output = @class2.to_string
+        end
+        it "should have the file in the string" do
+          @output.should =~ /franksfile/
+        end
+        it "should contain just the two resources in the string" do
+          @output.match(/(\w+) \{/).size.should == 2
+        end
+        describe "from within the cloud" do
+          before(:each) do
+            reset_resources!
+            @output = @cloud.build_short_manifest
+          end
+          it "should have one class" do
+            @output.match(/class (\w+) \{/).size.should == 2
+          end
+        end
+      end
   end
 end

data/spec/poolparty/pool/resources/conditional_spec.rb

@@ -4,35 +4,74 @@ include PoolParty::Resources
 
 describe "Conditional" do
   before(:each) do
-    @cloud = cloud :app do; end
-    @cloud.instance_eval do
-      execute_if("$hostname", "'master'", self) do
-        file({:name => "/etc/apache2/puppetmaster.conf"})
-      end
-    end
-    @cond = @cloud.resource(:conditional).first
-  end
-  it "should add the block of resources on the parent" do
-    @cloud.resources.size.should == 1
-  end
-  it "should have a conditional in the resources" do
-    @cloud.resource(:conditional).first.name.should == "$hostname == 'master'"
-  end
-  it "should push the resources onto the conditional resource" do
-    @cond.resources.size.should == 1
+    reset_resources!
   end
-  it "should have a file resource on the conditional" do
-    @cond.resource(:file).first.name.should == "/etc/apache2/puppetmaster.conf"
-  end
-  it "should have the parent as the cloud" do
-    @cond.parent.should == @cloud
-  end
-  describe "to_string" do
+  describe "wrapped" do
     before(:each) do
-      @string = @cond.to_string
+      @cloud = cloud :conditional_cloud_spec do
+          execute_if("$hostname","'master'", {}, self) do
+            has_file({:name => "/etc/apache2/puppetmaster2.conf"})
+          end
+      end
+      @cond = @cloud.get_resource(:conditional, "$hostname 'master'")
+    end
+    it "should add the block of resources on the parent" do
+      @cloud.resources.size.should == 1
+    end
+    it "should have a conditional in the resources" do
+      @cond.name.should == "$hostname 'master'"
     end
-    it "should have a case statement for the hostname" do
-      @string.should =~ /case \$hostname/
+    it "should push the resources onto the conditional resource" do
+      @cond.resources.size.should == 1
+    end
+    it "should have a file resource on the conditional" do
+      @cond.get_file("/etc/apache2/puppetmaster2.conf").name.should == "/etc/apache2/puppetmaster2.conf"
+    end
+    it "should have the parent as the cloud" do
+      @cond.parent.should == @cloud
+    end
+    describe "helpers" do
+      it "should have execute_on_master with the string $hostname == 'master'" do
+        str = execute_on_master do
+          has_file(:name => "/etc/vars")
+        end.to_string.should =~ /\$hostnamemaster/
+      end
+      it "should have execute_on_node with the string $hostname != 'master'" do
+        str = execute_on_node do
+          has_file(:name => "/etc/vars")
+        end.to_string.should =~ /\$hostnamemaster/
+      end
+    end
+    describe "to_string" do
+      before(:each) do
+        @string = @cond.to_string
+      end
+      it "should have a case statement for the hostname" do
+        @string.should =~ /case \$hostname/
+      end
+      describe "multiple" do
+        before(:each) do
+          reset!
+          @cloud = cloud :multiple_conditionals do
+            execute_on_master do
+              has_file(:name => "/etc/frank.txt")
+            end
+            execute_on_master do
+              has_exec(:name => "feed frank")
+            end
+          end
+        end
+        it "should have two conditional resources" do
+          @cloud.resource(:conditional).size.should == 2
+        end
+      end
+      describe "execute on node" do
+        it "should place the node in the default section" do
+          str = execute_on_node do
+            has_file(:name => "/etc/vars")
+          end.to_string.should =~ /default : \{/
+        end
+      end
     end
   end
 end

data/spec/poolparty/pool/resources/cron_spec.rb

@@ -19,17 +19,18 @@ describe "Cron" do
     end
     describe "as included" do            
       before(:each) do
+        reset_resources!
         @cron = cron({:rent => "low"}) do
           name "/www/conf/httpd.conf"
           hour 23
           minute 5
-          weekday 1
+          weekday 1          
         end
       end
       it "should use default values" do
         @cron.name.should == "/www/conf/httpd.conf"
       end
-      it "should keep the default values for the file" do
+      it "should keep the default values for the cron" do
         @cron.user.should == "root"
       end
       it "should also set options through a hash" do

data/spec/poolparty/pool/resources/exec_spec.rb

@@ -8,7 +8,7 @@ describe "Exec" do
   end
   describe "instances" do
     it "should turn the one hash instance into a string" do
-      @exec.to_string.should =~ /exec \{\n"\/usr\/bin\/ifconfig"/
+      @exec.to_string.should =~ /exec \{ "\/usr\/bin\/ifconfig"/
     end
     it "should turn the two hash instance into a string" do
       @exec = exec({:name => "/usr/bin/ping 127.0.0.1"})

data/spec/poolparty/pool/resources/gem_spec.rb

@@ -10,7 +10,7 @@ describe "Gem" do
         has_gempackage(:name => "rails")
       end
     end
-    @gem = @cloud.resource(:gempackage).first
+    @gem = @cloud.get_resource(:gempackage, "activesupport")
   end
   it "should have a package" do
     @cloud.resource(:gempackage).should_not be_empty
@@ -19,24 +19,28 @@ describe "Gem" do
     @gem.name.should == "activesupport"
   end
   it "should have the 'rails' gem in the packages" do
-    @cloud.resource(:gempackage).first.to_string.should =~ /rails/
+    @gem.to_string.should =~ /activesupport/
   end
   describe "with parent options" do
     before(:each) do
-      reset_all!
-      @cloud1 = cloud :gem_version_cloud do
-        has_gempackage(:name => "ParseTree", :version => "2.2.0") do
-          has_gempackage(:name => "edge-rails")
+      reset_resources!
+    end
+    describe "reset" do
+      before(:each) do      
+        @cloud1 = cloud :gem_version_cloud do
+          has_gempackage(:name => "ParseTree", :version => "2.2.0") do
+            has_gempackage(:name => "edge-rails")
+          end
         end
+        @gem = @cloud1.resource(:gempackage).first
+        @gem2 = @gem.resource(:gempackage).first
+      end
+      it "should have the version set on the parent" do
+        @gem.version.should == "2.2.0"
+      end
+      it "should not take the version of the parent on the child" do
+        @gem.resource(:gempackage).first.version.should == nil
       end
-      @gem = @cloud1.resource(:gempackage).first
-      @gem2 = @gem.resource(:gempackage).first
-    end
-    it "should have the version set on the parent" do
-      @gem.version.should == "2.2.0"
-    end
-    it "should not take the version of the parent on the child" do
-      @gem2.version.should == nil
     end
   end
 end

data/spec/poolparty/pool/resources/remote_file_spec.rb

@@ -24,7 +24,7 @@ describe "Remote file" do
         end
       end
       it "should have the source set to puppet" do
-        @file.source.should == "puppet:///files/httpd.conf"
+        @file.source.should == "puppet://master/files/httpd.conf"
       end
       it "should use default values" do
         @file.name.should == "/www/conf/httpd.conf"

data/spec/poolparty/pool/resources/variable_spec.rb

@@ -4,7 +4,7 @@ include PoolParty::Resources
 
 describe "Variable" do
   before(:each) do
-    reset!
+    reset_resources!
     @variable = variable(:name => "name", :value => "ari Lerner")
   end
   it "should have a package" do

data/spec/poolparty/pool/script_spec.rb

@@ -1,50 +1,71 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
+include PoolParty::Resources
+
 describe "Script" do
-  it "should have inflate as a class method" do
-    Script.respond_to?(:inflate).should == true
-  end
-  it "should have inflate_file as an instance method" do
-    Script.respond_to?(:inflate_file).should == true
+  before(:each) do
+    reset_resources!
+    setup
   end
-  it "should have inflate as an instance method" do
-    Script.new.respond_to?(:inflate).should == true
-  end
-  
-  describe "with a script" do
-    before(:each) do
-      @script = 'script'
-      @filename = 'filename'
-
-      @pool = Script.new
-      Script.stub!(:new).and_return(@pool)
-      @pool.stub!(:inflate).and_return true
+  describe "wrapped" do
+    it "should have inflate as a class method" do
+      Script.respond_to?(:inflate).should == true
     end
-    
-    it "should create a new Script when calling on the class method" do
-      Script.should_receive(:new).and_return @pool      
-    end    
-    it "should instance eval the script" do
-      @pool.should_receive(:instance_eval).with(@script, @filename).and_return true
+    it "should have inflate_file as an instance method" do
+      Script.respond_to?(:inflate_file).should == true
     end
-    it "should call inflate on itself" do
-      @pool.should_receive(:inflate).and_return true
+    it "should have inflate as an instance method" do
+      Script.new.respond_to?(:inflate).should == true
     end
-    after do
-      Script.inflate(@script, @filename)
-    end
-    describe "save!" do
+
+    describe "with a script" do
       before(:each) do
-        pool :appdotcom do
-          keypair "snoodle"
-          cloud :app do
-            has_file :name => "/etc/httpd/httpd.conf"
+        @script = 'script'
+        @filename = 'filename'
+
+        @pool = Script.new
+        Script.stub!(:new).and_return(@pool)
+        @pool.stub!(:inflate).and_return true
+      end
+
+      it "should create a new Script when calling on the class method" do
+        Script.should_receive(:new).and_return @pool      
+      end    
+      it "should instance eval the script" do
+        @pool.should_receive(:instance_eval).with(@script, @filename).and_return true
+      end
+      it "should call inflate on itself" do
+        @pool.should_receive(:inflate).and_return true
+      end
+      after do
+        Script.inflate(@script, @filename)
+      end
+      describe "save!" do
+        before(:each) do
+          reset!
+          reset_resources!
+          pool :appdotcomcoo do
+            keypair "snoodle"
+            ami "ami-123456"
+            
+            cloud :app do
+              expand_when "cpu > 90", "memory > 80"
+              contract_when "cpu < 10", "memory < 10"
+              
+              has_file :name => "/etc/httpd/httpd.conf"
+            end
           end
+          @saved = Script.save!(false)
+        end
+        it "should save the keypair" do
+          @saved.should =~ /keypair 'snoodle'/
+        end
+        it "should save the ami" do
+          @saved.should =~ /ami 'ami-123456'/
+        end
+        it "should save the expansions" do
+          @saved.should =~ /expand_when 'cpu>90', 'memory>80'/
         end
-        @saved = Script.save!(false)
-      end
-      it "should save the keypair" do
-        @saved.should =~ /keypair "snoodle"/
       end
     end
   end

data/spec/poolparty/pool/test_plugins/webserver.rb

@@ -1,5 +1,6 @@
 class WebServers
   plugin :apache do
+    include PoolParty::Resources
     
     attr_accessor :php
     

data/spec/poolparty/spec_helper.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'poolparty'
 
-%w(test/spec).each do |library|
+%w(spec).each do |library|
   begin
     require library
   rescue
@@ -11,11 +11,14 @@ end
 
 # Dir["#{File.dirname(__FILE__)}/helpers/**"].each {|a| require a}
 
+ENV["POOL_SPEC"] = nil
+
 include PoolParty
 extend PoolParty
 
-Base.environment = "test"
-Base.verbose = false
+def setup
+  PoolParty::Messenger.stub!(:messenger_send!).and_return false
+end
 
 def setup_cl
   require 'poolpartycl'
@@ -62,7 +65,7 @@ def stub_list_from_local_for(o)
   @ris = @list.split(/\n/).map {|line| PoolParty::Remote::RemoteInstance.new(line) }
 end
 def stub_remoter_for(o)
-  o.stub!(:ec2).and_return EC2::Base.new( :access_key_id => "not a key",  :secret_access_key => "even more not a key")
+  o.stub!(:ec2).and_return EC2::Base.new( :access_key_id => "not a key",  :secret_access_key => "even more not a key")  
 end
 def stub_list_from_remote_for(o, launch_stub=true)
   stub_remoter_for(o)
@@ -99,6 +102,7 @@ def running_remote_instances
 end
 
 def reset_response!
+  setup
   @ris = nil
 end
 
@@ -116,10 +120,17 @@ def remove_stub_instance_from(o, num)
   # o.stub!(:remote_instances_list).once.and_return ris
 end
 def stub_instance(num=1, status="running", keypair="fake_keypair")
-  {:name => "node#{num}", :ip => "192.168.0.#{num}", :status => "#{status}", :launching_time => num.minutes.ago, :keypair => "#{keypair}"}
+  {:name => "node#{num}", :ip => "192.168.0.#{num}", :status => "#{status}", :launching_time => num.minutes.ago.to_s, :keypair => "#{keypair}"}
 end
 def drop_pending_instances_for(o)
   puts "hi"
   o.list_of_pending_instances.stub!(:size).and_return 0
   1
+end
+
+# Stub for messenger_send!
+class Object
+  def messenger_send!(*args)
+    true
+  end
 end

data/tasks/deployment.rake

@@ -7,8 +7,12 @@ task :deploy => [:check_version, :website, :release] do
   puts "Tagging release #{CHANGES}"
 end
 
-desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:website_generate, :install_gem]
+# desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
+# task :local_deploy => []
+desc "Deploy the gem locally"
+task :local_deploy => [:website_generate, :install_gem, :build_local_gem] do
+  sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri"
+end
 
 task :check_version do
   unless ENV['VERSION']
@@ -26,9 +30,21 @@ task :install_gem_no_doc => [:clean, :package] do
   sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri"
 end
 
+desc "Ensure .hoerc exists in the homedirectory. Create it if it doesn't"
+task :hoerc do
+str =<<-EOE
+---
+publish_on_announce: true
+exclude: !ruby/regexp
+  /tmp$|\.git|log$|local/.*\.rb$|Makefile|\.beam$/
+EOE
+  hoerc_path = ::File.join( ENV["HOME"], ".hoerc" )
+  ::File.open(hoerc_path, "w+") {|f| f << str } unless ::File.file?(hoerc_path)
+end
+
 namespace :manifest do
   desc 'Recreate Manifest.txt to include ALL files'
-  task :refresh do
+  task :refresh => [:hoerc] do
     `rake check_manifest | patch -p0 > Manifest.txt`
   end
 end

data/tasks/development.rake

@@ -1,7 +1,6 @@
 namespace(:dev) do
   task :initialize do
-    setup_application
-    run "mkdir ~/.ec2 >/dev/null 2>/dev/null" unless File.directory?("~/.ec2")      
+    Kernel.system"mkdir ~/.ec2 >/dev/null 2>/dev/null" unless File.directory?("~/.ec2")      
   end
   # Setup a basic development environment for the user 
   desc "Setup development environment specify the config_file"
@@ -63,4 +62,14 @@ To work on this cloud, source the file like:
       ec2-authorize -p 80 default
     EOR
   end
+  desc "Turn the gemspec into a yaml file"
+  task :gemspec_to_yaml => [:initialize, :gemspec] do
+    filepath = ::File.join(::File.dirname(__FILE__), "..", "poolparty.gemspec")
+    data = open(filepath).read
+    spec = eval("$SAFE = 3\n#{data}")
+    yml = YAML.dump spec
+    File.open(filepath, "w+") do |f|
+      f << yml
+    end
+  end
 end

data/tasks/ec2.rake

@@ -1,5 +1,13 @@
 namespace(:ec2) do
+  desc "Prepare your cloud for poolparty"
   task :init do
-    %x[ec2-authorize default -P icmp -t -1:-1 -s 0.0.0.0/0]
+    cmd =<<-EOE
+ec2-authorize default -P icmp -t -1:-1 -s 0.0.0.0/0
+ec2-authorize -p 7000-7050 default
+ec2-authorize -p 8140 default
+ec2-authorize -p 4369 default
+    EOE
+    
+    Kernel.system cmd.split(/\n/).join(" && ")
   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.18</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.68</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>
@@ -96,7 +96,7 @@ rake install_gem</pre></p>
 <h2>Contact</h2>
 <p>Comments are welcome. Send an email to <a href="mailto:ari.lerner@citrusbyte.com">Ari Lerner</a> email via the <a href="http://groups.google.com/group/PoolParty">forum</a></p>
     <p class="coda">
-      <a href="http://blog.citrusbyte.com">Ari Lerner</a> at <a href="http://citrusbyte.com">CitrusByte</a>, 15th October 2008<br>
+      <a href="http://blog.citrusbyte.com">Ari Lerner</a> at <a href="http://citrusbyte.com">CitrusByte</a>, 21st November 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>