right_chimp 2.1.28 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4500754260b1df0b21af07eed9bd20591e227d3
-  data.tar.gz: ae09d843fb8c1323b04662ea20b46ab5aee756fc
+  metadata.gz: deb10edd310b0e400ce12bafcc0592b52928cdb6
+  data.tar.gz: d9a8ede4dfd0778475dbfcc26a38cacf55ada64b
 SHA512:
-  metadata.gz: 3912f54d07ee75639188a9280400f64ed7810404972978e0db0af023943631d76133abbba2d78db20e229f9e5fef48e66606b98477b66f81c4401df27d3be48c
-  data.tar.gz: 6e7c5de7246ce757b170933c986d4c1500a515918af04dd5a56a07d377a21d68a82112170bebd9d5cecaa7515b430c1e4dd310aa2cc0c1bb64c4c4b0cb2ce0e7
+  metadata.gz: 8d74afffc79fc7acc94041edd181e8b8f2f2cc60b7747e00004d6814b0edb556d0acd01c6613457c2efc917eccac03107171b3a0bbb7d721b33d9862784193ff
+  data.tar.gz: 1c2d8eeb42cb8e14245d767500cbd4dbff06b88e3a84e798ec84a3861d97639375fa6e08e838ac6086169f1a049601f3d6a1508aad014a9dade01e31be41e829

data/CHANGES

@@ -1,3 +1,7 @@
+Version 2.2
+--------------
+* Feature: Starting to add proper specs that do not rely on actual-real executions.
+
 Version 2.1.28
 --------------
 * Bugfix: Do not attempt to decrease the processing counter when handling a retry.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.28)
+    right_chimp (2.2)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)
@@ -15,7 +15,7 @@ GEM
       debug_inspector (>= 0.0.1)
     coderay (1.1.1)
     debug_inspector (0.0.2)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     domain_name (0.5.20160826)
       unf (>= 0.0.5, < 1.0.0)
     highline (1.7.8)
@@ -45,14 +45,19 @@ GEM
       json (~> 1.0)
       mime-types (~> 1.0)
       rest-client (~> 1.6)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     slop (3.6.0)
     unf (0.1.4)
       unf_ext
@@ -65,7 +70,7 @@ DEPENDENCIES
   pry
   pry-stack_explorer
   right_chimp!
-  rspec (~> 2.6.0)
+  rspec
 
 BUNDLED WITH
    1.13.2

data/chimp.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'right_api_client', '> 1.5'
   s.add_dependency 'highline', '~> 1.7.2'
 
-  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'rspec'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-stack_explorer'
 

data/lib/right_chimp/Chimp.rb

@@ -128,13 +128,13 @@ module Chimp
       # Send the command to chimpd for execution
       #
       if @use_chimpd
-        timestamp=Time.now.to_i
-        length=6
-        self.job_uuid = (36**(length-1) + rand(36**length - 36**(length-1))).to_s(36)
-        ChimpDaemonClient.submit(@chimpd_host, @chimpd_port, self,self.job_uuid)
+        timestamp = Time.now.to_i
+        length = 6
+        self.job_uuid = (36**(length - 1) + rand(36**length - 36**(length - 1))).to_s(36)
+        ChimpDaemonClient.submit(@chimpd_host, @chimpd_port, self, job_uuid)
         exit
       else
-        #Connect to the Api
+        # Connect to the Api
         Connection.instance
         if @interactive
           Connection.connect

data/lib/right_chimp/daemon/{ChimpDaemon.rb → chimp_daemon.rb}

@@ -9,7 +9,7 @@ module Chimp
 
     attr_accessor :verbose, :debug, :port, :concurrency, :delay, :retry_count,
                   :dry_run, :logfile, :chimp_queue, :proc_counter, :semaphore,
-                  :bind_address
+                  :bind_address, :server
     attr_reader :queue, :running
 
     include Singleton
@@ -18,7 +18,7 @@ module Chimp
       @verbose     = false
       @debug       = false
       @port        = 9055
-      @bind_address = "localhost"
+      @bind_address = 'localhost'
       @concurrency = 50
       @delay       = 0
       @retry_count = 0
@@ -28,9 +28,9 @@ module Chimp
       @chimp_queue = Queue.new
       @semaphore   = Mutex.new
 
-      @proc_counter= 0
+      @proc_counter = 0
 
-      #Connect to the API
+      # Connect to the API
       Connection.instance
     end
 
@@ -41,8 +41,8 @@ module Chimp
       install_signal_handlers
       parse_command_line
 
-      #puts "chimpd #{VERSION} launching with #{@concurrency} workers"
-      puts "Loading... please wait"
+      # puts "chimpd #{VERSION} launching with #{@concurrency} workers"
+      Log.info 'Loading... please wait'
       spawn_queue_runner
       spawn_webserver
       spawn_chimpd_submission_processor
@@ -389,7 +389,6 @@ module Chimp
 
         if filter == 'create'
           ChimpQueue.instance.create_group(group_name, payload['type'], payload['concurrency'])
-
         elsif filter == 'retry'
           group = ChimpQueue[group_name.to_sym]
           raise WEBrick::HTTPStatus::NotFound, "Group not found" unless group

data/lib/right_chimp/exec/{ExecArray.rb → exec_array.rb}

@@ -5,11 +5,10 @@ module Chimp
   class ExecArray < Executor
     def run
       run_with_retry do
-        audit_entry = []
         options = @inputs
 
         if @timeout < 300
-          Log.error "timeout was less than 5 minutes! resetting to 5 minutes"
+          Log.error 'timeout was less than 5 minutes! resetting to 5 minutes'
           @timeout = 300
         end
 
@@ -17,7 +16,7 @@ module Chimp
 
         if audit_entry
           audit_entry.each do |a|
-            a.wait_for_completed("no audit link available",@timeout)
+            a.wait_for_completed('no audit link available', @timeout)
           end
         else
           Log.warn "No audit entries returned for job_id=#{@job_id}"
@@ -26,16 +25,15 @@ module Chimp
     end
 
     def describe_work
-      return "ExecArray job_id=#{@job_id} script=\"#{@exec['right_script']['name']}\" server=\"#{@server['nickname']}\""
+      "ExecArray job_id=#{@job_id} script=\"#{@exec['right_script']['name']}\" server=\"#{@server['nickname']}\""
     end
 
     def info
-      return @exec['right_script']['name']
+      @exec['right_script']['name']
     end
 
     def target
-      return @server['nickname']
+      @server['nickname']
     end
-
   end
 end

data/lib/right_chimp/exec/{ExecCallback.rb → exec_callback.rb}

@@ -5,7 +5,7 @@ module Chimp
   class ExecCallback < Executor
     def run
       response = RestClient.get @uri
-      if response.code > 199 and response.code < 300
+      if response.code > 199 && response.code < 300
         return true
       else
         return false

data/lib/right_chimp/exec/{ExecRightScript.rb → exec_rightscript.rb}

@@ -2,8 +2,8 @@
 # Run a RightScript
 #
 module Chimp
+  # Class that describes the execution for a rightscript
   class ExecRightScript < Executor
-
     attr_accessor :audit_entry_data, :audit_entry_url
 
     def run
@@ -15,7 +15,7 @@ module Chimp
       end
 
       run_with_retry do
-        task=Task.new
+        task = Task.new
         task.tasker = @server.run_executable(@exec, options)
         @audit_entry_url = task.friendly_url
         task.wait_for_state('completed', @timeout)
@@ -36,6 +36,5 @@ module Chimp
     def target
       @server.nickname
     end
-
   end
 end

data/lib/right_chimp/resources/Executable.rb

@@ -10,26 +10,27 @@ module Chimp
 
     def initialize
       @params = {
-        "position"=>5,
-        "right_script"=>{
-          "created_at"=>"",
-          "href"=>"dummy_href",
-          "updated_at"=>"",
-          "version"=>4,
-          "is_head_version"=>false,
-          "script"=>"",
-          "name"=>"dummy_name",
-          "description"=>"dummy_description"
-          },
-        "recipe"=>nil,
-        "apply"=>"operational"
-        }
-        @delay = 0
+        'position' => 5,
+        'right_script' => {
+          'created_at' => '',
+          'href' => 'dummy_href',
+          'updated_at' => '',
+          'version' => 4,
+          'is_head_version' => false,
+          'script' => '',
+          'name' => 'dummy_name',
+          'description' => 'dummy_description'
+        },
+        'recipe' => nil,
+        'apply' => 'operational'
+      }
+      @delay = 0
     end
 
     def href
       @params['right_script']['href']
     end
+
     def name
       @params['right_script']['name']
     end

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.28"
+  VERSION = '2.2'
 end

data/lib/right_chimp.rb

@@ -17,28 +17,29 @@ require 'right_api_client'
 require 'rest-client'
 require 'logger'
 
+# Group all the requires for Chimp
 module Chimp
   require 'right_chimp/version'
-  require 'right_chimp/Chimp'
-  require 'right_chimp/Log'
-  require 'right_chimp/IDManager'
-
-  require 'right_chimp/daemon/ChimpDaemon'
-  require 'right_chimp/daemon/ChimpDaemonClient'
-
-  require 'right_chimp/queue/ChimpQueue'
-  require 'right_chimp/queue/QueueWorker'
-  require 'right_chimp/queue/ExecutionGroup'
-
-  require 'right_chimp/exec/Executor'
-  require 'right_chimp/exec/ExecArray'
-  require 'right_chimp/exec/ExecRightScript'
-  require 'right_chimp/exec/ExecSSH'
-  require 'right_chimp/exec/ExecReport'
-  require 'right_chimp/exec/ExecNoop'
-
-  require 'right_chimp/resources/Connection'
-  require 'right_chimp/resources/Executable'
-  require 'right_chimp/resources/Server'
-  require 'right_chimp/resources/Task'
+  require 'right_chimp/chimp'
+  require 'right_chimp/log'
+  require 'right_chimp/id_manager'
+
+  require 'right_chimp/daemon/chimp_daemon'
+  require 'right_chimp/daemon/chimp_daemon_client'
+
+  require 'right_chimp/queue/chimp_queue'
+  require 'right_chimp/queue/queue_worker'
+  require 'right_chimp/queue/execution_group'
+
+  require 'right_chimp/exec/executor'
+  require 'right_chimp/exec/exec_array'
+  require 'right_chimp/exec/exec_rightscript'
+  require 'right_chimp/exec/exec_ssh'
+  require 'right_chimp/exec/exec_report'
+  require 'right_chimp/exec/exec_noop'
+
+  require 'right_chimp/resources/connection'
+  require 'right_chimp/resources/executable'
+  require 'right_chimp/resources/server'
+  require 'right_chimp/resources/task'
 end

data/spec/chimp_daemon_client_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Chimp::ChimpDaemonClient do
+  before(:all) do
+    @daemon = Chimp::ChimpDaemon.instance
+    @daemon.verbose = false
+    @daemon.concurrency = 3
+    @daemon.spawn_queue_runner
+    @daemon.spawn_webserver
+  end
+
+  after(:all) do
+    @daemon.server.shutdown
+  end
+
+  let(:chimp_object) do
+    c = Chimp::Chimp.new
+    c.job_uuid = '123456'
+    c
+  end
+
+  describe '#submit' do
+    it 'should be able to send a job to the daemon' do
+      expect(Chimp::ChimpDaemonClient.submit('localhost', '9055', chimp_object, '123456')).to eq(true)
+    end
+
+    it 'should increase the processing counter by 1' do
+      start_value = @daemon.proc_counter
+      Chimp::ChimpDaemonClient.submit('localhost', '9055', chimp_object, '123456')
+      difference = @daemon.proc_counter - start_value
+      expect(difference).to eq 1
+    end
+  end
+
+  # describe '#retrieve_job_info' do
+  #   it 'should correctly get a job ' do
+  #     binding.pry
+  #     Chimp::ChimpDaemonClient.retrieve_job_info('localhost', '9055')
+  #   end
+  # end
+
+  describe '#retrieve_group_info' do
+    it 'should retrieve a full group' do
+      r = Chimp::ChimpDaemonClient.retrieve_group_info('localhost', '9055', 'default', :running)
+      expect(r).to be_a(Array)
+      expect(r[0]).to be_a(Chimp::ExecRightScript)
+    end
+
+    it 'should fail if the group doesnt exist' do
+      expect {
+        Chimp::ChimpDaemonClient.retrieve_group_info('localhost', '9055', 'foobar', :running)
+      }.to raise_error(RestClient::ResourceNotFound)
+    end
+  end
+
+  # # this basically tests updating the status of a job
+  # describe '#set_job_status' do
+  #   it 'should change the status of a job' do
+  #     Chimp::ChimpDaemonClient.set_job_status('localhost', '9055', '0', :running)
+  #   end
+  #
+  #   it 'should be unable to update a job that doesnt exist' do
+  #
+  #   end
+  # end
+
+  describe '#create_group' do
+    it 'should create a parallel group' do
+      expect(Chimp::ChimpDaemonClient.create_group('localhost', '9055', 'paragroup', :parallel, '3')).to eq(false)
+      expect(@daemon.queue.group['paragroup']).to be_a(Chimp::ParallelExecutionGroup)
+      expect(@daemon.queue.group['paragroup'].concurrency).to eq('3')
+    end
+
+    it 'should create a serial group' do
+      expect(Chimp::ChimpDaemonClient.create_group('localhost', '9055', 'serialgroup', :serial, '2')).to eq(false)
+      expect(@daemon.queue.group['serialgroup']).to be_a(Chimp::SerialExecutionGroup)
+      expect(@daemon.queue.group['serialgroup'].concurrency).to eq('2')
+      # FIXME: Concurrency doesnt seem to be applied correctly, serial group should have concurrency of 1
+    end
+  end
+  # describe '#retry_group'
+end

data/spec/chimp_daemon_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Chimp::ChimpDaemon do
+  let(:daemon) do
+    Chimp::ChimpDaemon.instance
+  end
+
+  describe '#initialize' do
+    it 'is a ChimpDaemon object' do
+      expect(daemon).to be_a Chimp::ChimpDaemon
+    end
+
+    it 'has a ChimpQueue object inside @queue' do
+      expect(daemon.queue).to be_a Chimp::ChimpQueue
+    end
+  end
+
+  describe '#run' do
+    # it 'should be able to spawn a webserver'
+    # it 'should be able to run forever'
+    # it 'should spawn a queue runner'
+    # it 'should run_forever'
+  end
+
+  describe '#parse_command_line' do
+    it 'should parse all parameters' do
+      string = '--logfile=/tmp/test --verbose --concurrency=34 --port=9056'
+      ARGV = string.split(' ')
+      daemon.parse_command_line
+      expect(daemon.concurrency).to eq 34
+      expect(daemon.logfile).to eq '/tmp/test'
+      expect(daemon.verbose).to eq true
+      expect(daemon.port).to eq '9056'
+    end
+  end
+
+  describe '#spawn_webserver' do
+    it 'should spawn a webserver' do
+      daemon.spawn_webserver
+      expect(daemon.server).to be_a WEBrick::HTTPServer
+    end
+  end
+
+  describe '#run_forever' do
+  end
+
+  describe '#install_signal_handlers' do
+  end
+
+  describe '#quit' do
+  end
+
+  describe '#spawn_chimpd_submission_processor' do
+  end
+end

data/spec/exec_righscript_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Chimp::ExecRightScript do
+  let(:e) do
+    e = Chimp::ExecRightScript.new
+    e.job_uuid = '123456'
+    e.time_start = Time.now
+    e.time_end = e.time_start + 2
+    # Need to setup e.exec
+    e.exec = Chimp::Executable.new
+    e.server = Chimp::Server.new
+    e
+  end
+
+  before(:all) do
+  end
+
+  describe '#run' do
+    it 'should pause' do
+      # FIXME: probably need to workout some api stub/mocking
+    end
+  end
+
+  describe '#describe_work' do
+    it 'should return the formatted output' do
+      expect(e.describe_work).to be_a(String)
+    end
+  end
+
+  describe '#info' do
+    it 'should be able to tell you the name' do
+      expect(e.info).to be_a(String)
+    end
+  end
+
+  describe '#target' do
+    it 'should return the name of the server' do
+      expect(e.target).to be_a(String)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+#
+# Test ChimpQueue
+#
+require 'right_chimp'
+require 'rspec'
+
+ENV['TEST'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.1.28
+  version: '2.2'
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -148,20 +148,20 @@ files:
 - docker/right_chimp.sh
 - lib/right_chimp.rb
 - lib/right_chimp/Chimp.rb
-- lib/right_chimp/IDManager.rb
 - lib/right_chimp/Log.rb
-- lib/right_chimp/daemon/ChimpDaemon.rb
-- lib/right_chimp/daemon/ChimpDaemonClient.rb
-- lib/right_chimp/exec/ExecArray.rb
-- lib/right_chimp/exec/ExecCallback.rb
-- lib/right_chimp/exec/ExecNoop.rb
-- lib/right_chimp/exec/ExecReport.rb
-- lib/right_chimp/exec/ExecRightScript.rb
-- lib/right_chimp/exec/ExecSSH.rb
+- lib/right_chimp/daemon/chimp_daemon.rb
+- lib/right_chimp/daemon/chimp_daemon_client.rb
 - lib/right_chimp/exec/Executor.rb
-- lib/right_chimp/queue/ChimpQueue.rb
-- lib/right_chimp/queue/ExecutionGroup.rb
-- lib/right_chimp/queue/QueueWorker.rb
+- lib/right_chimp/exec/exec_array.rb
+- lib/right_chimp/exec/exec_callback.rb
+- lib/right_chimp/exec/exec_noop.rb
+- lib/right_chimp/exec/exec_report.rb
+- lib/right_chimp/exec/exec_rightscript.rb
+- lib/right_chimp/exec/exec_ssh.rb
+- lib/right_chimp/id_manager.rb
+- lib/right_chimp/queue/chimp_queue.rb
+- lib/right_chimp/queue/execution_group.rb
+- lib/right_chimp/queue/queue_worker.rb
 - lib/right_chimp/resources/Connection.rb
 - lib/right_chimp/resources/Executable.rb
 - lib/right_chimp/resources/Server.rb
@@ -173,14 +173,10 @@ files:
 - lib/right_chimp/templates/invertedhotdogstand.css
 - lib/right_chimp/templates/styleswitcher.js
 - lib/right_chimp/version.rb
-- spec/spec_chimp.rb
-- spec/spec_chimp_commandline.rb
-- spec/spec_chimpd.rb
-- spec/spec_chimpd_client.rb
-- spec/spec_execution_group.rb
-- spec/spec_queue.rb
-- spec/spec_queue_worker.rb
-- spec/spec_selection.rb
+- spec/chimp_daemon_client_spec.rb
+- spec/chimp_daemon_spec.rb
+- spec/exec_righscript_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/rightscale/right_chimp
 licenses:
 - MIT
@@ -206,11 +202,7 @@ signing_key:
 specification_version: 4
 summary: RightScale platform command-line tool
 test_files:
-- spec/spec_chimp.rb
-- spec/spec_chimp_commandline.rb
-- spec/spec_chimpd.rb
-- spec/spec_chimpd_client.rb
-- spec/spec_execution_group.rb
-- spec/spec_queue.rb
-- spec/spec_queue_worker.rb
-- spec/spec_selection.rb
+- spec/chimp_daemon_client_spec.rb
+- spec/chimp_daemon_spec.rb
+- spec/exec_righscript_spec.rb
+- spec/spec_helper.rb

data/spec/spec_chimp.rb

@@ -1,20 +0,0 @@
-#
-# Test chimpd client
-#
-$LOAD_PATH << File.dirname(__FILE__) + "/.."
-
-require 'lib/right_chimp.rb'
-require 'rspec'
-require 'pp'
-
-include Chimp
-
-describe Chimp::ExecRightScript do
-  it "can select servers with a tag query" do
-    c = Chimp::Chimp.new
-    c.tags = ["info:deployment=moo:localring91"]
-    c.script = "SYS DNSMadeEasy Register Addresses"
-    c.dry_run = false
-    c.run
-  end
-end

data/spec/spec_chimp_commandline.rb

@@ -1,55 +0,0 @@
-#
-# Test chimpd client
-#
-$LOAD_PATH << File.dirname(__FILE__) + "/.."
-require 'lib/right_chimp.rb'
-require 'rspec'
-require 'pp'
-
-include Chimp
-
-chimp_command = "CHIMP_TEST=true bundle exec bin/chimp --noprompt"
-test_tag      = "--tag='info:deployment=moo:localring91'"
-test_script   = "--script='SYS DNSMadeEasy Register Addresses'"
-
-describe Chimp::Chimp do
-  #
-  # Selection options
-  #
-  #it "should not prompt when there is no action" do
-  #  data =`CHIMP_TEST=true bundle exec bin/chimp #{test_tag}`
-  #  $?.should == 0
-  #  data.match("No actions to perform.").should != nil 
-  #end
-
-  #
-  # RightScript execution
-  #
-  it "should run a rightscript with a tag query" do
-    system("#{chimp_command} #{test_tag} #{test_script}")
-    $?.should == 0
-  end
-  
-  it "should run scripts on an array with a concurrency of 1 and a delay of 5" do
-    system("#{chimp_command} --array='Core91' --concurrency=1 --delay=5 --script='SYS MAIL postfix configuration'")
-    $?.should == 0
-  end
-  
-  it "should run scripts on an array with a concurrency of 4 and a delay of 0" do
-    system("#{chimp_command} --array='Core94' --array='Core91' --concurrency=4 --delay=0 --script='SYS MAIL postfix configuration'")
-    $?.should == 0
-  end
-  
-  #
-  # chimpd submission
-  #
-  
-  #it "should run a rightscript with a tag query via chimpd" do
-  #  system('CHIMP_TEST=true bundle exec bin/chimpd')
-  #  system('CHIMP_TEST=true bundle exec bin/chimp --chimpd --dry-run --noprompt --tag="info:deployment=moo:localring91" --script="SYS DNSMadeEasy Register Addresses"')
-  #  $?.should == 0
-  #  system('CHIMP_TEST=true bundle exec bin/chimpd --quit')
-  #end
-end
-
-

data/spec/spec_chimpd.rb

@@ -1,33 +0,0 @@
-#
-# Test chimpd
-#
-$LOAD_PATH << File.dirname(__FILE__) + "/.."
-require 'lib/right_chimp.rb'
-require 'rspec'
-require 'pp'
-
-include Chimp
-
-uri = 
-
-describe Chimp::ChimpDaemon do
-  before :all do
-    @c = ChimpDaemon.instance
-    @c.spawn_queue_runner
-    @c.spawn_webserver
-  end
-  
-  #
-  # .spawn_queue_runner
-  #
-  it "should have 50 threads" do
-    ChimpQueue.instance.max_threads.should == 50
-  end
-
-  #
-  # .quit
-  #
-  after :all do
-    @c.quit
-  end
-end

data/spec/spec_chimpd_client.rb

@@ -1,44 +0,0 @@
-#
-# Test chimpd client
-#
-$LOAD_PATH << File.dirname(__FILE__) + "/.."
-require 'lib/right_chimp.rb'
-require 'rspec'
-require 'pp'
-
-include Chimp
-
-host = "localhost"
-port = "9055"
-
-describe Chimp::ChimpDaemonClient do
-  before :all do
-    @c = ChimpDaemon.new
-    @c.verbose = false
-    @c.concurrency = 3
-    @c.spawn_queue_runner
-    @c.spawn_webserver
-  end
-
-  after :all do
-    @c.quit if @c
-  end
-
-  #it "can quit a chimpd" do
-  #  response_code = ChimpDaemonClient.quit(host, port)
-  #  response_code.should == 200
-  #end
-  
-  #
-  # .submit
-  #
-  it "can submit work to chimpd" do
-    c = Chimp::Chimp.new
-    c.tags = ["service:auditor=true"]
-    c.script = "SYS DNSMadeEasy Register Addresses"
-    c.dry_run = false
-    ChimpDaemonClient.submit(host, port, c)
-  end
-
-end
-

data/spec/spec_execution_group.rb

@@ -1,135 +0,0 @@
-#
-# Test QueueWorker
-#
-$LOAD_PATH << File.dirname(__FILE__) + "/.."
-require 'lib/right_chimp.rb'
-require 'rspec'
-
-include Chimp
-
-describe SerialExecutionGroup do
-  before :each do
-    @eg = SerialExecutionGroup.new(:test)
-  end
-
-  #
-  # .ready?
-  #
-  it "should be ready when it has work in its queue" do
-    @eg.ready?.should == false
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.ready?.should == true
-  end
-  
-  it "should not be ready while a job is executing" do
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.push(ExecNoop.new(:job_id => 1))
-    @eg.get_job(0).status = Executor::STATUS_RUNNING    
-    @eg.ready?.should == false
-  end
-  
-  #
-  # .done?
-  #
-  it "should not be done when it has work in its queue" do
-    @eg.done?.should == true
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.done?.should == false
-  end
-  
-  #
-  # .size
-  #
-  it "should be able to report the correct number of items in its queue" do
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.push(ExecNoop.new(:job_id => 1))
-    @eg.push(ExecNoop.new(:job_id => 2))
-    @eg.push(ExecNoop.new(:job_id => 3))
-    @eg.push(ExecNoop.new(:job_id => 4))
-    
-    @eg.size.should == 5
-    
-    @eg.shift
-    @eg.size.should == 4
-    
-    @eg.shift
-    @eg.size.should == 3
-  end
-  
-  #
-  # .sort!
-  #
-  it "should be able to sort its queue by server name" do
-    @eg.push(ExecNoop.new(:job_id => 1, :server => { "nickname" => "BBB", "name" => "BBB"}))
-    @eg.push(ExecNoop.new(:job_id => 1, :server => { "nickname" => "CCC", "name" => "CCC"}))
-    @eg.push(ExecNoop.new(:job_id => 0, :server => { "nickname" => "AAA", "name" => "AAA"}))
-    @eg.sort!
-  end
-  
-  #
-  # .running?
-  #
-  it "should tell us whether it is running" do
-    @eg.running?.should == false
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.running?.should == true
-  end
-  
-  #
-  # .requeue(id)
-  #
-  it "should requeue jobs correctly" do
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.reset!
-    @eg.size.should == 0
-    @eg.requeue(0)
-    @eg.size.should == 1
-  end
-  
-  #
-  # .requeue_failed_jobs
-  #
-  it "should requeue all failed jobs" do
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.reset!
-    @eg.size.should == 0
-    
-    @eg.get_job(0).status = Executor::STATUS_ERROR
-    @eg.requeue_failed_jobs!
-    @eg.size.should == 1
-  end
-  
-  #
-  # .cancel(id)
-  #
-  it "should cancel a job" do
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.size.should == 1
-    @eg.cancel(0)
-    @eg.size.should == 0
-  end
-  
-end
-
-describe ParallelExecutionGroup do
-  before :each do
-    @eg = ParallelExecutionGroup.new(:test)
-  end
-
-  #
-  # .ready?
-  #
-  it "should be ready when it has work in its queue" do
-    @eg.ready?.should == false
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.push(ExecNoop.new(:job_id => 1))
-    @eg.ready?.should == true
-  end
-  
-  it "should be ready while a job is executing" do
-    @eg.push(ExecNoop.new(:job_id => 0))
-    @eg.push(ExecNoop.new(:job_id => 1))
-    @eg.get_job(0).status = Executor::STATUS_RUNNING    
-    @eg.ready?.should == true
-  end
-end

data/spec/spec_queue.rb

@@ -1,37 +0,0 @@
-#
-# Test ChimpQueue
-#
-
-require 'lib/right_chimp.rb'
-require 'rspec'
-
-include Chimp
-
-describe ChimpQueue do
-  before :all do
-    @queue = ChimpQueue.instance
-    @queue.max_threads = 3
-    @queue.start
-  end
-  
-  before :each do
-    @queue.reset!
-  end
-  
-  it "should accept work" do
-    @queue.push(:default, ExecNoop.new(:job_id => 0))
-    @queue.group[:default].get_job(0).status.should == Executor::STATUS_NONE
-  end
-  
-  it "should distribute work" do
-    @queue.push(:default, ExecNoop.new(:job_id => 0))
-    @queue.shift.status.should == Executor::STATUS_NONE
-  end
-  
-  it "should process the queue" do
-    @queue.push(:default, ExecNoop.new(:job_id => 0))
-    @queue.wait_until_done(:default) { }
-    @queue.group[:default].get_job(0).status.should == Executor::STATUS_DONE
-  end
-end
-

data/spec/spec_queue_worker.rb

@@ -1,30 +0,0 @@
-#
-# Test QueueWorker
-#
-$LOAD_PATH << File.dirname(__FILE__) + "/.."
-require 'lib/right_chimp.rb'
-require 'rspec'
-
-include Chimp
-
-describe QueueWorker do
-  it "should instantiate" do
-    q = QueueWorker.new
-    q.delay = 10
-    q.retry_count = 10
-    q.never_exit = false
-    
-    ChimpQueue.instance.group = {}
-
-    q.delay.should == 10
-    q.retry_count.should == 10
-    q.never_exit.should == false
-  end
-  
-  #it "should run" do
-  #  q = QueueWorker.new
-  #  q.run
-  #end
-  
-end
-

data/spec/spec_selection.rb

@@ -1,33 +0,0 @@
-#
-# Test Chimp
-#
-$LOAD_PATH << File.dirname(__FILE__) + "/.."
-require 'lib/right_chimp.rb'
-require 'rspec'
-
-describe Chimp::Chimp do
-  before :each do
-    @c = Chimp::Chimp.new
-    @c.quiet = true
-    @c.prompt = false
-    @c.progress = false
-    @c.interactive = false
-  end
-  
-  it "performs a tag query" do
-    @c.tags = ['service:dataservice=true']
-    @c.run
-    @c.servers.size.should > 0
-  end
-  
-  it "performs a deployment query" do
-    @c.deployment_names = ['moo:globalring']
-    @c.run
-    @c.servers.size.should > 0
-  end
-  
-  it "performs an array query" do
-    @c.array_names = ['Chimp Test Array']
-    @c.run
-  end
-end