auser-poolparty 0.2.16 → 0.2.20

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

@@ -4,81 +4,86 @@ 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
+        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
+      end
   end
 end

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

@@ -4,35 +4,39 @@ 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'"
+    reset_resources!
   end
-  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.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 have a case statement for the hostname" do
-      @string.should =~ /case \$hostname/
+    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 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_resource(: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 "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
     end
   end
 end

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/
+    @cloud.get_resource(:gempackage, "activesupport").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/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,59 @@
 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!
   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 :appdotcom do
+            keypair "snoodle"
+            cloud :app do
+              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
-        @saved = Script.save!(false)
-      end
-      it "should save the keypair" do
-        @saved.should =~ /keypair "snoodle"/
       end
     end
   end

data/spec/poolparty/spec_helper.rb

@@ -17,6 +17,10 @@ extend PoolParty
 Base.environment = "test"
 Base.verbose = false
 
+def setup_cl
+  require 'poolpartycl'
+end
+
 def stub_option_load
     @str=<<-EOS
 :access_key:    

data/tasks/cloud.rake

@@ -1,57 +1,3 @@
 # Cloud tasks
 namespace(:cloud) do
-  # Setup
-  task :init do
-    setup_application
-    raise Exception.new("You must specify your access_key and secret_access_key") unless Base.access_key && Base.secret_access_key
-  end
-  # Install the stack on all of the nodes
-  desc "Prepare all servers"
-  task :prepare => :init do
-    PoolParty::Master.new.nodes.each do |node|
-      node.install
-    end
-  end
-  # Start the cloud
-  desc "Start the cloud"
-  task :start => :init do
-    PoolParty::Master.new.start_cloud!
-  end
-  # Reload the cloud with the new updated data
-  desc "Reload all instances with updated data"
-  task :reload => :init do
-    PoolParty::Master.new.nodes.each do |node|
-      node.configure
-      node.restart_with_monit
-    end
-  end
-  # List the cloud
-  desc "List cloud"
-  task :list => :init do
-    puts PoolParty::Master.new.list
-  end
-  # Shutdown the cloud
-  desc "Shutdown the entire cloud"
-  task :shutdown => :init do
-    PoolParty::Master.new.request_termination_of_all_instances
-  end
-  # Watch the cloud and scale it if necessary
-  desc "Watch the cloud and maintain it"
-  task :scale => :init do
-    begin
-      PoolParty::Master.new.scale_cloud!
-    rescue Exception => e
-      puts "There was an error scaling the cloud: #{e}"
-    end
-    
-  end
-  # Maintain the cloud in a background process
-  desc "Maintain the cloud (run on the master)"
-  task :maintain => :init do
-    begin
-      PoolParty::Master.new.start_monitor!
-    rescue Exception => e
-      puts "There was an error starting the monitor: #{e}"
-    end
-  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"
@@ -56,18 +55,6 @@ To work on this cloud, source the file like:
   end
   desc "initialize setup"
   task :init => [:setup_pemkeys]
-  
-  desc "Just an argv test"
-  task :test => :initialize do
-    puts "---- Testing ----"
-    puts PoolParty.options(ARGV.dup)
-    puts "Using keypair at: #{Base.keypair_path}"
-  end
-  desc "Installation listing"
-  task :list_install => :initialize do
-    puts "-- packages to install --"
-    Provider.install_PoolParty(true)
-  end
   desc "Authorize base ports for application"
   task :authorize_ports => :initialize do
     run <<-EOR
@@ -75,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,20 +1,13 @@
-namespace(:ec2) do        
+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]
-  end
-  # Start a new instance in the cloud
-  desc "Add and start an instance to the pool"
-  task :start_new_instance => [:init] do
-    puts PoolParty::Remoting.new.launch_new_instance!
-  end
-  # Stop all the instances via command-line
-  desc "Stop all running instances"
-  task :stop_running_instances => [:init] do
-    Thread.new {`ec2-describe-instances | grep INSTANCE | grep running | awk '{print $2}' | xargs ec2-terminate-instances`}
-  end
-  # Reboot the instances via commandline
-  desc "Restart all running instances"
-  task :restart_running_instances => [:init] do
-    Thread.new {`ec2-describe-instances | grep INSTANCE | grep running | awk '{print $2}' | xargs ec2-reboot-instances`}
+    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/tasks/instance.rake

@@ -1,63 +1,2 @@
 namespace(:instance) do
-  # Find the instance we want to deal with
-  # interface can be: num=0, i=0, inst=0, 0
-  # defaults to the master instance (0)
-  task :init do
-    num = (ENV['num'] || ENV["i"] || ENV["inst"] || ARGV.shift || 0).to_i
-    raise Exception.new("Please set the number of the instance (i.e. num=1, i=1, or as an argument)") unless num
-    @node = PoolParty::Master.new.get_node(num)
-  end
-  # Ssh into the node
-  desc "Remotely login to the remote instance"
-  task :ssh => [:init] do
-    @node.ssh
-  end
-  desc "Send a file to the remote instance"
-  task :exec => :init do
-    @node.ssh ENV['cmd']
-  end
-  # Send a file to the remote instance
-  # as designated by src='' and dest=''
-  desc "Send a file to the remote instance"
-  task :scp => :init do
-    @node.scp ENV['src'], ENV['dest']
-  end
-  # Execute a command on the remote instance as designated
-  # by cmd=''
-  desc "Execute cmd on a remote instance"
-  task :exec => [:init] do
-    cmd = ENV['cmd'] || "ls -l"
-    puts @node.ssh(cmd.runnable)
-  end
-  # Restart all the services monitored by monit
-  desc "Restart all the services"
-  task :reload => [:init] do
-    @node.restart_with_monit
-  end
-  # Start all the services monitored by monit
-  desc "Start all services"
-  task :load => [:init] do
-    @node.start_with_monit
-  end
-  # Stop the services monitored by monit
-  desc "Stop all services"
-  task :stop => [:init] do
-    @node.stop_with_monit
-  end
-  # Install the required services on this node
-  desc "Install stack on this node"
-  task :install => :init do          
-    @node.install
-  end
-  # Turnoff this instance
-  desc "Teardown instance"
-  task :shutdown => :init do
-    `ec2-terminate-instances #{@node.instance_id}`
-  end
-  # Configure this node and start the services
-  desc "Configure the stack on this node"
-  task :configure => :init do
-    @node.configure
-    @node.restart_with_monit
-  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.16</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.20</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>