auser-poolparty 0.1.0 → 0.1.1

data/spec/{file_writer_spec.rb → lib/file_writer_spec.rb}

@@ -1,11 +1,11 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 class TestClass
   include FileWriter
 end
 describe "FileWriter" do  
   before(:each) do
-    Application.reset!
+    # Application.reset!
     @instance = RemoteInstance.new
     @instance.stub!(:name).and_return "node0"
     @instance.stub!(:ip).and_return "127.0.0.1"

data/spec/{kernel_spec.rb → lib/kernel_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Kernel extensions" do
   before(:each) do

data/spec/{master_spec.rb → lib/master_spec.rb}

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/helpers/ec2_mock'
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../helpers/ec2_mock'
 
 describe "Master" do
   before(:each) do
@@ -8,8 +8,10 @@ describe "Master" do
     Kernel.stub!(:exec).and_return true
     Kernel.stub!(:sleep).and_return true # WHy wait?, just do it
     
+    Application.options
+    
     Application.options.stub!(:contract_when).and_return("web > 30.0\n cpu < 0.10")
-    Application.options.stub!(:expand_when).and_return("web < 3.0\n cpu > 0.80")
+    Application.options.stub!(:expand_when).and_return("web < 3.0\n cpu > 0.80")    
     @master = Master.new
   end  
   after(:all) do
@@ -111,10 +113,10 @@ describe "Master" do
     it "should be able to return the size of the cloud" do
       @master.nodes.size.should == 3
     end
-    it "should be able to restart the running instances' services" do
-      @master.nodes.each {|a| a.should_receive(:restart_with_monit).and_return true }
-      @master.restart_running_instances_services
-    end
+    # it "should be able to restart the running instances' services" do
+    #   @master.nodes.each {|a| a.should_receive(:restart_with_monit).and_return true }
+    #   @master.restart_running_instances_services
+    # end
     it "should be able to build a heartbeat auth file" do
       open(@master.build_and_copy_heartbeat_authkeys_file.path).read.should =~ /1 md5/
     end
@@ -157,7 +159,7 @@ describe "Master" do
         end
         describe "rsync'ing the files to the instances" do
           it "should cleanup the tmp directory before sending configuration to the nodes" do
-            @master.should_receive(:cleanup_tmp_directory).once
+            @master.should_receive(:cleanup_tmp_directory).at_least(1)
             @master.build_and_send_config_files_in_temp_directory
           end
           it "should receive send_config_files_to_nodes after it builds the config files in the temp directory" do
@@ -199,13 +201,16 @@ describe "Master" do
         before(:each) do
           Application.stub!(:install_on_load?).and_return true
           Sprinkle::Script.stub!(:sprinkle).and_return true
+          Provider.stub!(:install_poolparty).and_return true
           @master.stub!(:ssh).and_return true
           @master.nodes.each do |node|
             node.stub!(:run_now).and_return true
           end
         end
-        it "should install on the instances if the application says it should" do        
-          Provider.stub!(:install_userpackages)
+        after(:all) do
+          Kernel.system("ssh-add -d #{Application.keypair_path} >/dev/null 2>/dev/null")
+        end
+        it "should install on the instances if the application says it should" do
           Provider.should_receive(:install_poolparty)
           @master.install_cloud
         end
@@ -213,18 +218,24 @@ describe "Master" do
           @master.should_receive(:ssh).and_return true
           @master.install_cloud
         end
+        it "should store the ssh keypair before install" do
+          Kernel.should_receive(:system).with("ssh-add #{Application.keypair_path} >/dev/null 2>/dev/null").at_least(1).and_return true
+          @master.install_cloud
+        end
+        it "should delete the ssh keypair after configure_cloud" do
+          Kernel.should_receive_at_least_once(:system).with("ssh-add -d #{Application.keypair_name} >/dev/null 2>/dev/null").and_return true
+          @master.configure_cloud
+        end
         describe "stubbing installation" do
           before(:each) do
             @master.stub!(:execute_tasks).and_return true          
           end
           it "should install poolparty" do
             Provider.should_receive(:install_poolparty).and_return true
-            Provider.should_receive(:install_userpackages).and_return true
             @master.install_cloud
           end
           it "should install the user packages" do
             Provider.should_receive(:install_poolparty).and_return true
-            Provider.should_receive(:install_userpackages).and_return true
             @master.install_cloud
           end
         end
@@ -333,8 +344,7 @@ describe "Master" do
           File.directory?(@master.base_tmp_dir).should == true
         end
         it "should copy the cloud_master_takeover script to the tmp directory" do
-          @master.should_receive(:get_config_file_for).at_least(1).and_return "true"
-          File.should_receive(:copy).exactly(3).and_return true
+          @master.should_not_receive(:get_config_file_for)
           @master.build_and_send_config_files_in_temp_directory
         end
         it "should tar the plugin_dir into the tmp directory" do
@@ -343,6 +353,18 @@ describe "Master" do
           Kernel.should_receive(:system).with("tar -czf #{@master.base_tmp_dir}/plugins.tar.gz #{File.basename(Application.plugin_dir)}").and_return true
           @master.build_and_send_config_files_in_temp_directory
         end
+        it "should try to copy the pem files" do
+          @master.should_receive(:copy_pem_files_to_tmp_dir).and_return true
+          @master.build_and_send_config_files_in_temp_directory
+        end
+        it "should try to copy the cert file" do
+          File.should_receive(:copy).with("/Users/auser/.ec2/current/cert-56EMRIBSJ56JJ5P6QEGXICFOO6DDVVDD.pem", "/Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/pool/tmp/cert-56EMRIBSJ56JJ5P6QEGXICFOO6DDVVDD.pem")                     
+          @master.copy_pem_files_to_tmp_dir
+        end
+        it "should try the copy the pk file" do
+          File.should_receive(:copy).with("/Users/auser/.ec2/current/pk-56EMRIBSJ56JJ5P6QEGXICFOO6DDVVDD.pem", "/Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/pool/tmp/pk-56EMRIBSJ56JJ5P6QEGXICFOO6DDVVDD.pem")
+          @master.copy_pem_files_to_tmp_dir
+        end
         describe "get configs" do
           before(:each) do
             @master.stub!(:user_dir).and_return("user")
@@ -360,7 +382,7 @@ describe "Master" do
         it "should copy the config file if it exists" do
           Application.stub!(:config_file).and_return "config.yml"
           File.stub!(:exists?).and_return true        
-          File.should_receive(:copy).exactly(5).times.and_return true
+          File.should_receive(:copy).at_least(2).times.and_return true
           @master.build_and_send_config_files_in_temp_directory
         end
         describe "with copy_config_files_in_directory_to_tmp_dir method" do
@@ -387,7 +409,7 @@ describe "Master" do
           end
           it "should copy all the resource.d files from the monit directory to the tmp directory" do
             @master.stub!(:copy_config_files_in_directory_to_tmp_dir).with("config/resource.d").and_return true
-            @master.should_receive(:copy_config_files_in_directory_to_tmp_dir).at_least(1).with("config/monit.d").and_return true
+            # @master.should_receive(:copy_config_files_in_directory_to_tmp_dir).at_least(1).with("config/monit.d").and_return true
             @master.build_and_send_config_files_in_temp_directory
           end
           it "should build the authkeys file for haproxy" do

data/spec/{optioner_spec.rb → lib/optioner_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Optioner with options" do
   it "should be able to pull out the lonely arguments without any switches" do

data/spec/{plugin_manager_spec.rb → lib/plugin_manager_spec.rb}

@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Plugin manager" do
   before(:each) do
     FileUtils.stub!(:mkdir_p).and_return true
-    Dir["./spec/../lib/../vendor/*"].each {|a| FileUtils.rm_rf a}
+    Dir["./spec/../lib/../plugin/*"].each {|a| FileUtils.rm_rf a}
     Git.stub!(:clone).and_return true
     PluginManager.stub!(:extract_git_repos_from_plugin_dirs).and_return %w(git@github.com:auser/poolparty-plugins.git)
   end
   it "should git clone the directory when it is installing a plugin" do
     File.stub!(:directory?).and_return false
-    Git.should_receive(:clone).with("git@github.com:auser/poolparty.git", "/Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/pool/vendor/poolparty").and_return true
+    Git.should_receive(:clone).with("git@github.com:auser/poolparty.git", "/Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/pool/plugin/poolparty").and_return true
     PluginManager.install_plugin "git@github.com:auser/poolparty.git"
   end
   it "should keep a list of the installed plugin locations" do    

data/spec/{plugin_spec.rb → lib/plugin_spec.rb}

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + "/../helpers/ec2_mock"
 
 class TestPlugin < PoolParty::Plugin
   after_define_tasks :takss
@@ -73,6 +74,16 @@ describe "Plugin" do
       @test.should_not_receive(:email_updates)
       @master.configure_cloud
     end
+    describe "user-data" do
+      it "should be able to add to the user-data with a string" do
+        @test.add_user_data("hollow")
+        Application.launching_user_data.should =~ /:user_data: hollow/
+      end
+      it "should be able to add a hash to the user-data with a hash" do
+        @test.add_user_data(:box => "box")
+        Application.launching_user_data.should =~ /:box: box/
+      end
+    end
     describe "instance methods" do
       before(:each) do
         @str = "filename"

data/spec/{pool_binary_spec.rb → lib/pool_binary_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Pool binary" do
   describe "running" do

data/spec/{poolparty_spec.rb → lib/poolparty_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 module TestMonitor
   module Master      
@@ -12,7 +12,7 @@ describe "Application options" do
     stub_option_load
   end
   it "should be able to say that the plugin directory is the current directory" do
-    File.basename(PoolParty.plugin_dir).should == "vendor"
+    File.basename(PoolParty.plugin_dir).should == "plugins"
   end
   it "should not load plugins if the directory doesn't exist" do
     File.stub!(:directory?).with(plugin_dir).and_return false
@@ -44,17 +44,17 @@ describe "Application options" do
     it "should try to load from the user directory before the root lib directory" do
       File.should_receive_at_least_once(:directory?).with("#{user_dir}/monitors").and_return true
       Dir.should_receive(:[]).with("#{user_dir}/monitors/*").and_return([])
-      PoolParty.load
+      PoolParty.load_app
     end
     it "should try to load from the root directory if the user directory monitors don't exist" do
       File.should_receive_at_least_once(:directory?).with("#{user_dir}/monitors").and_return false
       Dir.should_receive(:[]).with("#{Application.root_dir}/lib/poolparty/monitors/*").and_return([])
-      PoolParty.load
+      PoolParty.load_app
     end
     it "should load the monitors and the plugins" do
       PoolParty.should_receive(:load_plugins)
       PoolParty.should_receive(:load_monitors)
-      PoolParty.load
+      PoolParty.load_app
     end
   end
 end

data/spec/lib/provider_spec.rb

@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + "/../helpers/ec2_mock"
+
+describe "Provider" do
+  before(:each) do
+    stub_option_load
+    Sprinkle::Script.stub!(:sprinkle).and_return true
+    @ips = ["127.0.0.1"]
+    Master.stub!(:cloud_ips).and_return @ips
+  end
+  it "should load the packages in the package directory" do
+    Dir.should_receive(:[]).and_return []
+    Provider.new.load_packages
+  end
+  it "should load the packages defined in the user directory" 
+  describe "running" do
+    describe "server packages" do
+      before(:each) do
+        @provider = Provider.new
+        @str = "new"
+        @str.stub!(:process).and_return true
+        @provider.stub!(:set_start_with_sprinkle).and_return @str
+        Provider.stub!(:new).and_return @provider
+        Master.stub!(:cloud_ips).and_return ["127.0.0.1"]
+      end
+      it "should use the loaded packages to install" do
+        @provider.should_receive(:load_packages).and_return []
+        @provider.install_poolparty
+      end
+      it "should load the install script when installing" do
+        @provider.should_receive(:set_start_with_sprinkle).and_return true
+        @provider.install_poolparty
+      end
+    end
+    describe "user packages" do
+      describe "defining" do
+        before(:each) do
+          Provider.define_custom_package(:sprinkle) do
+            package :sprinkle, :provides => :package do
+              description 'Sprinkle'
+              apt %w( sprinkle )
+            end
+          end
+        end
+        it "should be able to define user packages with blocks and pass those into the user_packages" do
+          Provider.user_packages.size.should == 1
+        end
+        it "should define the user packages as strings" do
+          Provider.user_packages.first.class.should == Proc
+        end
+      end
+      describe "defining custom packages" do
+        before(:each) do
+          Provider.reset!
+          Provider.define_custom_package(:custom) do
+            <<-EOE
+              package :custom do
+                description 'custom packages'
+              end
+            EOE
+          end
+        end
+        it "should be able to define a custom package with a name" do
+          Provider.user_packages.size.should > 1
+        end
+        it "should have the name of the custom package built in" do
+          Provider.user_install_packages.sort {|a,b| a.to_s <=> b.to_s }.should == [:custom, :sprinkle]
+        end
+      end
+    end
+  end
+end

data/spec/{remote_instance_spec.rb → lib/remote_instance_spec.rb}

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + "/../helpers/ec2_mock"
 
 class RemoteInstance
   def scp(src="", dest="", opts={})
@@ -19,12 +20,7 @@ describe "remote instance" do
     
     @master = Master.new
   end
-  
-  describe "scping" do
-  end
-  describe "ssh'ing" do
-  end
-  
+    
   describe "in general" do
     it "should set the ip upon creation" do
       @instance.ip.should == "127.0.0.1"
@@ -61,6 +57,52 @@ describe "remote instance" do
         Kernel.stub!(:system).and_return true
         stub_option_load
       end
+      describe "configure tasks" do
+        it "should move_hostfile" do
+          @instance.should_receive(:change_hostname).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should configure_master" do
+          @instance.should_receive(:configure_master).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should move_config_file" do
+          @instance.should_receive(:move_config_file).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should mount_s3_drive" do
+          @instance.should_receive(:mount_s3_drive).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should update_plugin_string" do
+          @instance.should_receive(:update_plugin_string).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should setup_pems" do
+          @instance.should_receive(:setup_pems).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should configure_authkeys" do
+          @instance.should_receive(:configure_authkeys).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should configure_resource_d" do
+          @instance.should_receive(:configure_resource_d).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should setup_haproxy" do
+          @instance.should_receive(:setup_haproxy).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should configure_heartbeat" do
+          @instance.should_receive(:configure_heartbeat).once.and_return ""
+          @instance.configure_tasks
+        end
+        it "should run user_tasks" do
+          @instance.should_receive(:user_tasks).once.and_return ""
+          @instance.configure_tasks
+        end
+      end      
       describe "with a public ip" do
         before(:each) do
           Application.stub!(:public_ip).and_return "127.0.0.1"
@@ -82,7 +124,7 @@ describe "remote instance" do
         end
         it "should untar and move plugin directories around" do
           dir = File.basename Application.plugin_dir
-          @instance.update_plugin_string.should == "mkdir -p #{dir} && tar -zxf plugins.tar.gz -C #{dir}"
+          @instance.update_plugin_string.should == "if [ -f ~/tmp/plugins.tar.gz ]; then mkdir -p plugins && tar -zxf ~/tmp/plugins.tar.gz -C plugins; fi"          
         end
     end
   end  
@@ -121,7 +163,7 @@ describe "remote instance" do
     
     describe "when installing the poolparty software" do
       before(:each) do
-        @instance.stub!(:run_now).and_return ""
+        @instance.stub!(:run).and_return false
       end
       it "should be able to detect if the stack_installed? == false" do
         @instance.stack_installed?.should == false

data/spec/{remoter_spec.rb → lib/remoter_spec.rb}

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + "/../helpers/ec2_mock"
 
 class TestRemote
   include Remoter
@@ -20,9 +21,13 @@ describe "Remoter" do
     Application.stub!(:ec2_dir).and_return "/Users"
     Application.stub!(:keypair).and_return "app"
     Application.stub!(:username).and_return "root"
+    Application.stub!(:keypair_path).and_return "/Users/id_rsa-app"
   end
   it "should have an ssh method that corresponds to ssm with the keypair" do
-    RemoteInstance.ssh_string.should == "ssh -i /Users/id_rsa-app -o StrictHostKeyChecking=no -l root"
+    RemoteInstance.ssh_string.should =~ /ssh -o StrictHostKeyChecking=no -l 'root' -i/
+  end
+  it "should an ssh array that just contains the ssh commands" do
+    RemoteInstance.ssh_array.should == ["-o StrictHostKeyChecking=no","-l 'root'","-i '/Users/id_rsa-app'"]
   end
   it "should have a list of ssh_tasks" do
     @remoter.ssh_tasks.should == []

data/spec/{remoting_spec.rb → lib/remoting_spec.rb}

@@ -1,9 +1,10 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/helpers/ec2_mock"
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + "/../helpers/ec2_mock"
 
 describe "Master remoting: " do
   before(:each) do
     stub_option_load
+    
     Kernel.stub!(:system).and_return true
     Application.stub!(:environment).and_return("test") # So it doesn't daemonize
     Application.stub!(:minimum_instances).and_return(2)
@@ -12,11 +13,63 @@ describe "Master remoting: " do
     Application.stub!(:verbose).and_return(false) # Turn off messaging
     
     @master = Master.new
-    @master.launch_new_instance!    
+    @master.launch_new_instance!
+  end
+  describe "listing" do
+    before(:each) do
+      Application.stub!(:keypair).and_return("alist")
+      @a1={:instance_id => "i-a1", :ip => "127.0.0.1", :status => "running", :launching_time => 10.minutes.ago, :keypair => "alist"}
+      @a2={:instance_id => "i-a2", :ip => "127.0.0.3", :status => "running", :launching_time => 2.hours.ago, :keypair => "alist"}
+      @a3={:instance_id => "i-a3", :ip => "127.0.0.3", :status => "terminated", :launching_time => 2.hours.ago, :keypair => "alist"}
+      @a4={:instance_id => "i-a4", :ip => "127.0.0.4", :status => "pending", :launching_time => 2.hours.ago, :keypair => "alist"}
+      
+      @b1={:instance_id => "i-b1", :ip => "127.0.0.2", :status => "terminated", :launching_time => 55.minutes.ago, :keypair => "blist"}
+      @c1={:instance_id => "i-c1", :ip => "127.0.0.4", :status => "pending", :launching_time => 2.days.ago, :keypair => "clist"}
+      @master.stub!(:get_instances_description).and_return [@a1, @a2, @a3, @a4, @b1, @c1]
+    end
+    it "should pull out the list those instances with the keypair requested" do      
+      @master.list_of_instances.collect {|a| a[:instance_id]}.should == ["i-a1", "i-a2", "i-a3", "i-a4"]
+    end
+    it "should pull out the list with the blist keypair" do
+      Application.stub!(:keypair).and_return("blist")
+      @master.list_of_instances.collect {|a| a[:instance_id]}.should == ["i-b1"]
+    end
+    it "should be able to pull out the list_of_nonterminated_instances" do
+      @master.list_of_nonterminated_instances.should == [@a1, @a2, @a4]
+    end
+    it "should be able to pull the list of list_of_pending_instances" do
+      @master.list_of_pending_instances.should == [@a4]
+    end
+    it "should be able to pull the list of list_of_running_instances" do
+      @master.list_of_running_instances.should == [@a1, @a2]
+    end
+    it "should be able to get the number_of_pending_instances" do
+      @master.number_of_pending_instances.should == 1
+    end
+    it "should be able to grab the number_of_running_instances" do
+      @master.number_of_running_instances.should == 2
+    end
+    it "should be able to grab the entire list of instances" do
+      @master.list_of_all_instances.should == [@a1, @a2, @a3, @a4, @b1, @c1]
+    end
+    it "should be able to grab the entire list sorted by keypair" do
+      @master.cloud_keypairs.should == ["alist", "blist", "clist"]
+    end
   end
   describe "starting" do
     before(:each) do
       @master.start_cloud!
+      
+      @a1={:instance_id => "i-a1", :ip => "127.0.0.1", :status => "running", :launching_time => 10.minutes.ago, :keypair => "alist"}
+      @a2={:instance_id => "i-a2", :ip => "127.0.0.3", :status => "running", :launching_time => 2.hours.ago, :keypair => "alist"}
+      @a3={:instance_id => "i-a3", :ip => "127.0.0.3", :status => "terminated", :launching_time => 2.hours.ago, :keypair => "alist"}
+      @a4={:instance_id => "i-a4", :ip => "127.0.0.4", :status => "pending", :launching_time => 2.hours.ago, :keypair => "alist"}
+      
+      @b1={:instance_id => "i-b1", :ip => "127.0.0.2", :status => "terminated", :launching_time => 55.minutes.ago, :keypair => "blist"}
+      @c1={:instance_id => "i-c1", :ip => "127.0.0.4", :status => "pending", :launching_time => 2.days.ago, :keypair => "clist"}
+      @master.stub!(:get_instances_description).and_return [@a1, @a2, @a3, @a4, @b1, @c1]
+      
+      Application.stub!(:keypair).and_return "alist"
     end
     it "should start the cloud with instances" do
       @master.list_of_instances.should_not be_empty
@@ -30,6 +83,9 @@ describe "Master remoting: " do
     end
   end
   describe "maintaining" do
+    before(:each) do
+      Application.stub!(:keypair).and_return "alist"
+    end
     it "should maintain the minimum_instances if one goes down" do
       @master.start_cloud!
       wait 0.2 # Give the two instances time to boot up
@@ -46,7 +102,7 @@ describe "Master remoting: " do
     it "should launch a new instance when the load gets too heavy set in the configs" do
       @master.stub!(:expand?).and_return true
       @master.start_cloud!
-      wait 0.2 # Give the two instances time to boot up
+      wait 0.5 # Give the two instances time to boot up
       (Application.minimum_instances - @master.number_of_pending_and_running_instances).should == 0
       @master.scale_cloud!
       @master.nodes.size.should == Application.minimum_instances + 1

data/spec/{scheduler_spec.rb → lib/scheduler_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 class TestSched  
   include Scheduler

data/spec/{string_spec.rb → lib/string_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "String" do
   before(:each) do

data/spec/monitors/cpu_monitor_spec.rb

@@ -27,11 +27,11 @@ describe "monitors" do
     end
     describe "remote instance" do
       it "should try to ssh into the remote instance" do
-        @instance.should_receive(:ssh).once.with("uptime")
+        @instance.should_receive(:run).once.with("uptime")
         @instance.cpu
       end
       it "should be able to find the exact amount of time the processor has been up" do
-        @instance.stub!(:ssh).once.with("uptime").and_return("18:55:31 up 5 min,  1 user,  load average: 0.32, 0.03, 0.00")
+        @instance.stub!(:run).once.with("uptime").and_return("18:55:31 up 5 min,  1 user,  load average: 0.32, 0.03, 0.00")
         @instance.cpu.should == 0.32
       end
     end

data/spec/monitors/memory_spec.rb

@@ -26,12 +26,12 @@ describe "monitors" do
       end
     end
     describe "remote instance" do
-      it "should try to ssh into the remote instance" do
-        @instance.should_receive(:ssh).once.with("free -m | grep -i mem")
+      it "should try to run into the remote instance" do
+        @instance.should_receive(:run).once.with("free -m | grep -i mem")
         @instance.memory
       end
       it "should be able to find the exact amount of time the processor has been up" do
-        @instance.stub!(:ssh).once.with("free -m | grep -i mem").and_return("Mem:          1700         546       1644          0          2         18")
+        @instance.stub!(:run).once.with("free -m | grep -i mem").and_return("Mem:          1700         546       1644          0          2         18")
         @instance.memory.round_to(2).should == 0.32
       end
     end

data/spec/monitors/misc_monitor_spec.rb

@@ -40,7 +40,7 @@ describe "monitors (random, to spec the inclusion)" do
       end
     end
     describe "remote instance" do
-      it "should try to ssh into the remote instance" do
+      it "should try to run into the remote instance" do
         @instance.db.should == 5.0
       end
       it "should be able to find the exact amount of time the processor has been up" do

data/spec/monitors/web_spec.rb

@@ -27,12 +27,12 @@ describe "monitors" do
       end
     end
     describe "remote instance" do
-      it "should try to ssh into the remote instance" do
-        @instance.should_receive(:ssh).once.with("httperf --server localhost --port #{Application.client_port} --num-conn 3 --timeout 5 | grep 'Request rate'")
+      it "should try to run into the remote instance" do
+        @instance.should_receive(:run).once.with("httperf --server localhost --port #{Application.client_port} --num-conn 3 --timeout 5 | grep 'Request rate'")
         @instance.web
       end
       it "should be able to find the exact amount of time the processor has been up" do
-        @instance.stub!(:ssh).once.and_return("Request rate: 1.5 req/s (649.9 ms/req)")
+        @instance.stub!(:run).once.and_return("Request rate: 1.5 req/s (649.9 ms/req)")
         @instance.web.round_to(2).should == 1.5
       end
     end