auser-poolparty 0.0.9 → 0.1.0

data/spec/monitors/cpu_monitor_spec.rb

@@ -21,7 +21,7 @@ describe "monitors" do
         )
       end
       it "should try to collect the cpu for the entire set of remote instances when calling cpu" do
-        @master.nodes.should_receive(:inject).once.and_return 0.0
+        @master.nodes.should_receive(:inject).once.with(0).and_return 0.0
         @master.cpu
       end
     end

data/spec/plugin_manager_spec.rb

@@ -4,28 +4,20 @@ describe "Plugin manager" do
   before(:each) do
     FileUtils.stub!(:mkdir_p).and_return true
     Dir["./spec/../lib/../vendor/*"].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/poolparty/pool/vendor/poolparty").and_return true
-    PluginManager.install_plugin "git@github.com:auser/PoolParty.git"
+    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
+    PluginManager.install_plugin "git@github.com:auser/poolparty.git"
   end
-  it "should keep a list of the installed plugin locations" do
+  it "should keep a list of the installed plugin locations" do    
+    PluginManager.should_receive(:install_plugin).and_return true
     PluginManager.install_plugin "git@github.com:auser/poolparty-plugins.git"
     PoolParty.installed_plugins.should == ["git@github.com:auser/poolparty-plugins.git"]
   end
-  it "should be able to rescan the plugin directory and tell which plugins are installed" do
-    PluginManager.install_plugin "git@github.com:auser/poolparty-plugins.git"
-    PluginManager.scan.should == %w(poolparty-plugins)
-  end
-  it "should be able to remove a plugin based on the name" do
-    PluginManager.install_plugin "git@github.com:auser/poolparty-plugins.git"
-    PluginManager.remove_plugin "poolparty-plugins"
-    PluginManager.scan.should == %w()
-  end
-  it "should be able to extract the git repos from the .git/config file" do
-    PluginManager.install_plugin "git@github.com:auser/poolparty-plugins.git"
-    PoolParty.reset!
-    PoolParty.installed_plugins.should == ["git@github.com:auser/poolparty-plugins.git"]
-  end
+  it "should be able to rescan the plugin directory and tell which plugins are installed"
+  it "should be able to remove a plugin based on the name"
+  it "should be able to extract the git repos from the .git/config file"
 end

data/spec/plugin_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 class TestPlugin < PoolParty::Plugin
   after_define_tasks :takss
-  after_install :echo_hosts, :email_updates
+  after_install :email_updates, :echo_hosts
   before_configure_cloud :echo_hosts  
   after_start :echo_start
   
@@ -10,14 +10,16 @@ class TestPlugin < PoolParty::Plugin
     "start"
   end
   def echo_hosts(caller)
-    "hosts"
+    write_out "hosts"
   end
   def email_updates(caller)
-    "email"
+    write_out "email_updates"
   end
   def takss(tasks)
     "tasks"
   end
+  def write_out(msg="")    
+  end
 end
 
 describe "Plugin" do
@@ -33,46 +35,44 @@ describe "Plugin" do
   describe "usage" do
     before(:each) do
       stub_option_load
-      @instance = RemoteInstance.new
-      @master = Master.new
-      
-      @test = TestPlugin.new
-      @test.stub!(:echo_hosts).and_return("true")
-      @test.stub!(:email_updates).and_return("true")
-      @test.stub!(:echo_start).and_return("true")
-      TestPlugin.stub!(:new).and_return(@test)
-      Kernel.stub!(:wait).and_return true
-      
-      @master.stub!(:launch_minimum_instances).and_return true
-      @master.stub!(:number_of_pending_instances).and_return 0
-      @master.stub!(:get_node).with(0).and_return @instance
-      
-      @instance.stub!(:ssh).and_return "true"
-      @instance.stub!(:scp).and_return "true"
-      Kernel.stub!(:system).and_return "true"
+      @num = 2
+      @test, @master, @instances = PoolParty::PluginSpecHelper.define_stubs(TestPlugin, @num)
+      @instance = @instances.first
     end
-    it "should should call echo_hosts after calling configure" do      
-      @test.should_receive(:echo_hosts).at_least(1)
-      # @instance.stub!(:)
+    it "should should call echo_hosts after calling configure" do
+      @test.should_receive_at_least_once(:write_out).with("email_updates")
       @instance.install
     end
-    it "should call email_updates after calling install" do
-      @test.should_receive(:email_updates).at_least(1)
-      @instance.install
+    describe "installation" do
+      before(:each) do
+        Application.stub!(:install_on_load?).and_return true        
+      end
+      it "should call install on each of the instances after calling install_cloud" do
+        @test.should_receive(:email_updates).exactly(@num)
+        @test.should_receive(:echo_hosts).exactly(@num)
+        @master.install_cloud
+      end
+      it "should call email_updates after calling install" do
+        @test.should_receive(:email_updates).twice
+        @master.install_cloud
+      end
+      it "should call echo_hosts before it calls configure" do
+        @test.should_receive(:echo_hosts).at_least(1).and_return "hi"
+        @master.install_cloud
+      end
     end
-    it "should call echo_hosts before it calls configure" do
-      @test.should_receive(:echo_hosts).at_least(1).and_return "hi"
-      @master.configure_cloud
+    it "should say that it started on the master" do
+      @master.stub!(:launch_minimum_instances)
+      @master.stub!(:wait_for_all_instances_to_boot)
+      @master.stub!(:setup_cloud)
+      @test.should_receive(:echo_start).at_least(1).and_return "hi"
+      @master.start
     end
     it "should not call echo_hosts after if configures" do
+      @test.stub!(:echo_hosts).and_return true
       @test.should_not_receive(:email_updates)
       @master.configure_cloud
     end
-    it "should say that it started on the master" do
-      @test.should_receive(:echo_start).at_least(1).and_return "hi"
-      @master.stub!(:install_cloud)
-      @master.start
-    end
     describe "instance methods" do
       before(:each) do
         @str = "filename"

data/spec/poolparty_spec.rb

@@ -1,8 +1,15 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
+module TestMonitor
+  module Master      
+  end
+  module Remote
+  end    
+end
+
 describe "Application options" do
   before(:each) do
-    # stub_option_load
+    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"
@@ -17,4 +24,37 @@ describe "Application options" do
     Dir.should_receive(:[]).and_return %w()
     PoolParty.load_plugins
   end
+  describe "monitors" do
+    before(:each) do
+      PoolParty.reset!
+    end
+    it "should load a monitor and store it into the registered monitor's array" do
+      PoolParty.register_monitor TestMonitor
+      PoolParty.registered_monitors.include?(TestMonitor).should == true
+    end
+    it "should be able to ask if the monitor is a registered monitor" do
+      PoolParty.register_monitor TestMonitor
+      PoolParty.registered_monitor?(TestMonitor).should == true
+    end
+    it "should not register a monitor more than once" do
+      PoolParty::Monitors.should_receive(:extend).once
+      PoolParty.register_monitor TestMonitor
+      PoolParty.register_monitor TestMonitor
+    end
+    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
+    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
+    end
+    it "should load the monitors and the plugins" do
+      PoolParty.should_receive(:load_plugins)
+      PoolParty.should_receive(:load_monitors)
+      PoolParty.load
+    end
+  end
 end

data/spec/remote_instance_spec.rb

@@ -61,22 +61,6 @@ describe "remote instance" do
         Kernel.stub!(:system).and_return true
         stub_option_load
       end
-      # it "should try to run the scp build file" do
-      #   Master.should_receive(:build_scp_instances_script_for).with(@instance).and_return @tempfile
-      #   @instance.configure
-      # end
-      # it "should try to run and build the reconfigure script for the node" do
-      #   Master.should_receive(:build_reconfigure_instances_script_for).with(@instance).and_return @tempfile
-      #   @instance.configure
-      # end
-      # it "should scp the reconfigure file to the remote instance" do
-      #   @instance.should_receive(:scp).once.and_return true
-      #   @instance.configure
-      # end
-      # it "should ssh and execute the reconfigure file on the remote instance" do
-      #   @instance.should_receive(:ssh).once.with("chmod +x /usr/local/src/reconfigure.sh && /bin/sh /usr/local/src/reconfigure.sh").and_return true
-      #   @instance.configure
-      # end
       describe "with a public ip" do
         before(:each) do
           Application.stub!(:public_ip).and_return "127.0.0.1"
@@ -88,7 +72,7 @@ describe "remote instance" do
           @master.configure_cloud
         end
         it "should run associate_address if there is a public_ip set in the Application.options" do
-          @instance.should_receive(:associate_address_with).with(Application.public_ip, @instance.instance_id).and_return true
+          @instance.should_receive(:associate_address_with).with(Application.public_ip, @instance.instance_id).at_least(1).and_return true
           @master.configure_cloud
         end
         it "should not run associate_address_with if the public_ip is empty" do
@@ -96,7 +80,10 @@ describe "remote instance" do
           @instance.should_not_receive(:associate_address_with)
           @master.configure_cloud
         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}"
+        end
     end
   end  
   describe "in failover" do

data/spec/scheduler_spec.rb

@@ -39,10 +39,6 @@ describe "Scheduler" do
         @test.add_task {@klass.pop}        
         @stasks.tasks.size.should == 1
       end
-      it "should add each task as a thread" do
-        Thread.should_receive(:new).once
-        @stasks.push proc{puts "hi"}
-      end
     end
     describe "when running" do
       before(:each) do
@@ -56,8 +52,13 @@ describe "Scheduler" do
         @klass.should_receive(:pop)
         @test.run_thread_list
       end
-      it "should be able to add tasks and have the run_thread_list run" do
-        @test._tasker.class.should_receive(:synchronize).once        
+      it "should use the ThreadPool" do
+        p = ThreadPool.new(10)
+        ThreadPool.should_receive(:new).with(10).and_return p
+        @test.run_thread_list
+      end
+      it "should process each of the tasks" do
+        @klass.should_receive(:pop)
         @test.run_thread_list
       end
       it "should empty all the tasks after running them in the loop" do

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
-require File.join(File.dirname(__FILE__), *%w[.. lib poolparty])
+lpwd = File.dirname(__FILE__)
+$:.unshift(lpwd)
+require File.join(lpwd, *%w[.. lib poolparty])
 
-%w(test/spec).each do |library|
+%w(spec).each do |library|
   begin
     require library
   rescue
@@ -20,6 +22,8 @@ def stub_option_load
     @str=<<-EOS
 :access_key:    
   3.14159
+:secret_access_key:
+  "pi"
     EOS
     @sio = StringIO.new
     StringIO.stub!(:new).and_return @sio
@@ -27,6 +31,7 @@ def stub_option_load
     @sio.stub!(:read).and_return @str
     PoolParty.stub!(:timer).and_return Timeout
     PoolParty.timer.stub!(:timeout).and_return lambda {YAML.load(open("http://169.254.169.254/latest/user-data").read)}
+    Application.reset!
 end
 
 def wait_launch(time=5)
@@ -34,19 +39,4 @@ def wait_launch(time=5)
   wait time
   Process.kill("INT", pid)
   Process.wait(pid, 0)
-end
-
-module Test::Unit::AssertDifference
-  def assert_difference(object, method = nil, difference = 1)
-    initial_value = object.send(method)
-    yield
-    assert_equal initial_value + difference, object.send(method), "#{object}##{method}"
-  end
-
-  def assert_no_difference(object, method, &block)
-    assert_difference object, method, 0, &block
-  end
-end
-
-Test::Spec::Should.send(:include, Test::Unit::AssertDifference)
-Test::Spec::ShouldNot.send(:include, Test::Unit::AssertDifference)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ari Lerner
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2008-06-28 00:00:00 -07:00
+date: 2008-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Run your entire application off EC2, managed and auto-scaling
 email: ari.lerner@citrusbyte.com
 executables: 
@@ -92,6 +101,8 @@ extra_rdoc_files:
 - lib/core/proc.rb
 - lib/core/string.rb
 - lib/core/time.rb
+- lib/helpers
+- lib/helpers/plugin_spec_helper.rb
 - lib/modules
 - lib/modules/callback.rb
 - lib/modules/ec2_wrapper.rb
@@ -134,9 +145,9 @@ extra_rdoc_files:
 - lib/poolparty/tasks/development.rake
 - lib/poolparty/tasks/ec2.rake
 - lib/poolparty/tasks/instance.rake
-- lib/poolparty/tasks/package.rake
 - lib/poolparty/tasks/plugins.rake
 - lib/poolparty/tasks/server.rake
+- lib/poolparty/thread_pool.rb
 - lib/s3
 - lib/s3/s3_object_store_folders.rb
 files: 
@@ -177,6 +188,8 @@ files:
 - lib/core/proc.rb
 - lib/core/string.rb
 - lib/core/time.rb
+- lib/helpers
+- lib/helpers/plugin_spec_helper.rb
 - lib/modules
 - lib/modules/callback.rb
 - lib/modules/ec2_wrapper.rb
@@ -219,9 +232,9 @@ files:
 - lib/poolparty/tasks/development.rake
 - lib/poolparty/tasks/ec2.rake
 - lib/poolparty/tasks/instance.rake
-- lib/poolparty/tasks/package.rake
 - lib/poolparty/tasks/plugins.rake
 - lib/poolparty/tasks/server.rake
+- lib/poolparty/thread_pool.rb
 - lib/s3
 - lib/s3/s3_object_store_folders.rb
 - spec
@@ -257,8 +270,8 @@ files:
 - spec/string_spec.rb
 - poolparty.gemspec
 has_rdoc: true
-homepage: http://blog.citrusbyte.com
-post_install_message: "\n      \n      Get ready to jump in the pool, you just installed PoolParty! (Updated at 05:15PM, 06/28/08)\n\n      Please check out the documentation for any questions or check out the google groups at\n        http://groups.google.com/group/poolpartyrb\n\n      Don't forget to check out the plugin tutorial @ http://poolpartyrb.com for extending PoolParty!      \n\n      For more information, check http://poolpartyrb.com\n      On IRC: \n        irc.freenode.net\n        #poolpartyrb\n      *** Ari Lerner @ <ari.lerner@citrusbyte.com> ***\n    "
+homepage: http://poolpartyrb.com
+post_install_message: "\n      \n      Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:12PM, 07/02/08)\n\n      Please check out the documentation for any questions or check out the google groups at\n        http://groups.google.com/group/poolpartyrb\n\n      Don't forget to check out the plugin tutorial @ http://poolpartyrb.com for extending PoolParty!      \n\n      For more information, check http://poolpartyrb.com\n      On IRC: \n        irc.freenode.net\n        #poolpartyrb\n      *** Ari Lerner @ <ari.lerner@citrusbyte.com> ***\n    "
 rdoc_options: 
 - --line-numbers
 - --inline-source

data/lib/poolparty/tasks/package.rake

@@ -1,53 +0,0 @@
-namespace(:pkg) do
-  ## Rake task to create/update a .manifest file in your project, as well as update *.gemspec
-  desc %{Update ".manifest" with the latest list of project filenames. Respect\
-  .gitignore by excluding everything that git ignores. Update `files` and\
-  `test_files` arrays in "*.gemspec" file if it's present.}
-  task :manifest do
-    list = Dir['**/*'].sort
-    spec_file = Dir['*.gemspec'].first
-    list -= [spec_file] if spec_file
-
-    File.read('.gitignore').each_line do |glob|
-      glob = glob.chomp.sub(/^\//, '')
-      list -= Dir[glob]
-      list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob)
-      puts "excluding #{glob}"
-    end
-
-    if spec_file
-      spec = File.read spec_file
-      spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
-        assignment = $1
-        bunch = $2 ? list.grep(/^test\//) : list
-        '%s%%w(%s)' % [assignment, bunch.join(' ')]
-      end
-
-      File.open(spec_file,   'w') {|f| f << spec }
-    end
-    File.open('Manifest', 'w') {|f| f << list.join("\n") }
-  end
-  desc "Build gemspec for github"
-  task :gemspec => :manifest do
-    require "yaml"
-    `rake gem`
-    data = YAML.load(open("poolparty.gemspec").read).to_ruby
-    File.open("poolparty.gemspec", "w+") {|f| f << data }
-  end
-  desc "Update gemspec with the time"
-  task :gemspec_update => :gemspec do
-    data = open("poolparty.gemspec").read
-    str = "Updated at #{Time.now.strftime("%I:%M%p, %D")}"
-    
-    if data.scan(/Updated at/).empty?
-      data = data.gsub(/you just installed PoolParty\!/, '\0'+" (#{str})")
-    end
-    
-    File.open("poolparty.gemspec", "w+") {|f| f << data }
-  end
-  desc "Release them gem to the gem server"
-  task :release => :gemspec_update do
-    `git ci -a -m "Updated gemspec for github"`
-    `git push gem`
-  end
-end