poolparty 0.2.6 → 0.2.18

data/spec/poolparty/pool/base_spec.rb

@@ -15,10 +15,10 @@ describe "Base" do
     Base.base_keypair_path.should == "~/.ec2"
   end
   it "should set the storage_directory to the tmp directory of the current working directory" do
-    Base.storage_directory.should == "#{Dir.pwd}/tmp"
+    Base.storage_directory.should =~ /tmp/
   end
   it "should set the tmp path to tmp" do
-    Base.tmp_path.should == "tmp"
+    Base.tmp_path.should =~ /\/tmp/
   end
   it "should set the remote storage path to /var/poolparty" do
     Base.remote_storage_path.should == "/var/poolparty"
@@ -104,5 +104,23 @@ describe "Base" do
         Base.store_keys_in_file
       end
     end
+    describe "allowed_commands" do
+      before(:each) do
+        @str =<<-EOE
+echo 'hello world'
+        EOE
+        @str.stub!(:read).and_return @str
+        Base.stub!(:open).and_return @str
+      end
+      it "should load the yaml file allowed_commands.yml" do
+        Base.allowed_commands.class.should == Array
+      end
+      it "should have the command echo 'hello world' in the list of allowed_commands" do
+        Base.allowed_commands.include?("echo 'hello world'").should == true
+      end
+      it "should not have the command rm -rf / in the list of allowed commands" do
+        Base.allowed_commands.include?("rm -rf /").should == false
+      end
+    end
   end
 end

data/spec/poolparty/pool/cloud_spec.rb

@@ -170,7 +170,7 @@ describe "Cloud" do
                 hello my lady
               EOE
             end
-            has_gem(:name => "poolparty")
+            has_gempackage(:name => "poolparty")
             has_package(:name => "dummy")            
           end
         end
@@ -279,6 +279,21 @@ describe "Cloud" do
             @manifest.should =~ /host \{\n\t\t"master":/
           end
         end
+        describe "building with an existing manifest" do
+          before(:each) do
+            @file = "/etc/puppet/manifests/nodes/nodes.pp"
+            @file.stub!(:read).and_return "nodes"
+            ::FileTest.stub!(:file?).with("/etc/puppet/manifests/classes/poolparty.pp").and_return true
+            @cloud.stub!(:open).with("/etc/puppet/manifests/classes/poolparty.pp").and_return @file
+          end
+          it "should not call resources_string_from_resources if the file /etc/puppet/manifests/nodes/nodes.pp exists" do
+            @cloud.should_not_receive(:add_poolparty_base_requirements)
+            @cloud.build_manifest
+          end
+          it "should build from the existing file" do
+            @cloud.build_manifest.should == "nodes"
+          end
+        end
       end
     end
     
@@ -295,5 +310,19 @@ describe "Cloud" do
       end
     end
     
+    describe "provisioning" do
+      it "should be able to tell that it is provisioning when setting the provisioning flag" do
+        @cloud.provisioning?.should == false
+      end
+      it "should be able to set it as provisioning" do
+        @cloud.provisioning_in_progress
+        @cloud.provisioning?.should == true
+      end
+      it "should be able to unset itself as provisioning" do
+        @cloud.provisioning_in_progress
+        @cloud.provisioning_complete
+        @cloud.provisioning?.should == false
+      end
+    end
   end
 end

data/spec/poolparty/pool/custom_resource_spec.rb

@@ -80,10 +80,10 @@ describe "Custom Resource" do
         end
         it "should create a new CallFunction instance when calling call_function with a string" do
           PoolParty::Resources::CallFunction.should_receive(:new).and_return "bunk"
-          add_resource(:call_function, "line")
+          add_resource(:call_function, :name => "line")
         end
         it "should create a call function in the function call array" do
-          add_resource(:call_function, @cloud, "heyyohey")
+          add_resource(:call_function, {:name => "custom_function"}, @cloud)
           resource(:call_function).size.should == 1
         end
         describe "defining" do

data/spec/poolparty/pool/plugin_spec.rb

@@ -39,7 +39,7 @@ describe "Plugin" do
       before(:each) do
         @plugin.instance_eval do
           enable_php
-          has_gem(:name => "aska")
+          has_gempackage(:name => "aska")
         end
       end
       it "should call enable_php on the class" do
@@ -49,13 +49,13 @@ describe "Plugin" do
         @plugin.resources.class.should == Hash
       end
       it "should have an array of gem resources" do
-        @plugin.resource(:package).class.should == Array
+        @plugin.resource(:gempackage).class.should == Array
       end
       it "should have 1 gem in the resources defined" do
-        @plugin.resource(:package).size.should == 1
+        @plugin.resource(:gempackage).size.should == 1
       end
       it "should have the gem named aska in the gem resource" do
-        @plugin.resource(:package).first.name.should == "aska"
+        @plugin.resource(:gempackage).first.name.should == "aska"
       end
       it "should have its resources visible to its parent" do
         @plugin.parent = @c

data/spec/poolparty/pool/pool_spec.rb

@@ -37,7 +37,7 @@ describe "Pool" do
         end
       end
       it "should call Dir when the plugin directory is set" do
-        Dir.should_receive(:[]).with("yaway/*.rb").once.and_return []        
+        Dir.should_receive(:[]).with("yaway/*/*.rb").once.and_return []        
       end
     end
     describe "configuration" do

data/spec/poolparty/pool/resource_spec.rb

@@ -131,6 +131,13 @@ describe "Resource" do
     include PoolParty::Resources
     before(:each) do
       reset_resources!
+      @cloud = cloud :command_cloud do; end
+    end
+    it "should call add_resource when creating using the command: file" do
+      @cloud.should_receive(:add_resource).with(:file, {:name => "frank"}, @cloud)
+      @cloud.instance_eval do
+        file(:name => "frank")
+      end
     end
     it "should create the new 'resource' as a resource" do
       resource(:file).class.should == Array
@@ -220,5 +227,64 @@ describe "Resource" do
         @file.parent.tangerine.should == "orange"
       end
     end
+    describe "appending to resource" do
+      before(:each) do
+        @cloud1 = cloud :apples do
+          directory(:name => "/var/www") do
+            file(:name => "/var/www/file.html")
+          end
+        end        
+        @dir = @cloud1.get_resource(:directory, "/var/www")
+        @file = @dir.get_resource(:file, "/var/www/file.html")
+      end
+      it "should say there is 1 resource because the lower-level resources should be contained on the parenting resource" do
+        @cloud1.resources.size.should == 1
+      end
+      it "should say there is one resource on the outer resource" do
+        @dir.resources.size.should == 1
+      end
+      it "should contain the file as a resource" do
+        @dir.resource(:file)[0].to_s.should == @file.to_s
+      end
+      it "should set the parent as the parenting resource" do
+        @file.parent.to_s.should == @dir.to_s
+      end
+    end
+    describe "fetching" do
+      before(:each) do
+        @file = file(:name => "pancakes")
+      end
+      it "should not create a new resource if the same resource exists" do
+        PoolParty::Resources::File.should_not_receive(:new)
+        file(:name => "pancakes")
+      end
+      it "should return the file preiously created" do
+        get_resource(:file, "pancakes").should == @file
+      end
+      it "should be able to use the helper to grab the file" do
+        PoolParty::Resources::File.should_not_receive(:new)
+        file(:name => "pancakes").should == @file
+      end
+      it "should turn the resource into a string" do
+        @file.to_s.should == "File['pancakes']"
+      end
+      describe "cancelled" do
+        it "should make a resource not cancelled by default" do
+          @file.cancelled?.should == false
+        end
+        it "should say cancelled? is true if it has been cancelled" do
+          @file.cancel
+          @file.cancelled?.should == true
+        end
+      end
+      describe "virtual_resources" do
+        before(:each) do
+          @virtual_resource = git(:name => "tank", :source => "git://github.com/auser/testgit.git")
+        end
+        it "should fetch a virtual resource the same" do
+          git(:name => "tank", :source => "git://github.com/auser/testgit.git").to_s.should == @virtual_resource.to_s
+        end
+      end
+    end
   end
 end

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

@@ -5,12 +5,38 @@ include PoolParty::Resources
 describe "Gem" do
   before(:each) do
     reset!
-    @gem = gem(:name => "rails")
+    @cloud = cloud :gem_cloud do
+      has_gempackage(:name => "activesupport") do
+        has_gempackage(:name => "rails")
+      end
+    end
+    @gem = @cloud.resource(:gempackage).first
   end
   it "should have a package" do
-    resource(:package).should_not be_empty
+    @cloud.resource(:gempackage).should_not be_empty
+  end
+  it "should have the name set as activesupport" do
+    @gem.name.should == "activesupport"
   end
   it "should have the 'rails' gem in the packages" do
-    @gem.to_string.should =~ /Package\[rubygems\]/
+    @cloud.resource(:gempackage).first.to_string.should =~ /rails/
+  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")
+        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
+      @gem2.version.should == nil
+    end
   end
 end

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

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+include PoolParty::Resources
+
+describe "Symlink" do
+  before(:each) do
+    reset_resources!
+    @cloud = cloud :symlink_test do
+      has_symlink(:name => "/etc/apache2/puppetmaster.conf", :source => "/etc/http/puppetmaster.conf")
+    end
+    @symlink = @cloud.resource(:symlink).first
+  end
+  it "should create a file" do
+    @cloud.resource(:symlink).empty?.should == false
+  end
+  it "should create a file { resource" do
+    @symlink.to_string.should =~ /file \{/
+  end
+  it "should use the from for the ensures" do
+    @symlink.ensure.should == @symlink.source
+  end
+end

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

@@ -17,4 +17,8 @@ describe "Variable" do
     v = variable(:name => "girlfriends", :value => %w(Rachel Erica Michelle))
     v.to_string.should == "$girlfriends = [ 'Rachel', 'Erica', 'Michelle' ]"
   end
+  it "should set the string to be without a string if it's a function" do
+    v = variable(:name => "girlfriends", :value => "lookup_var()")
+    v.to_string.should == "$girlfriends = lookup_var()"
+  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:    
@@ -38,6 +42,7 @@ def wait_launch(time=5)
   Process.wait(pid, 0)
 end
 def reset_all!
+  $cloud = nil
 end
 def read_file(path)
   require "open-uri"

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

@@ -56,18 +56,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

data/tasks/ec2.rake

@@ -1,20 +1,5 @@
-namespace(:ec2) do        
+namespace(:ec2) do
   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`}
-  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