robot-controller 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de685bf1713c0024ed280fa7e35555af6062efa8
-  data.tar.gz: 57aa53a3c00e41b09788530c5be01598b4eb44af
+  metadata.gz: cc1d7187fe30f51ff0aa1b33b4bc4279842bd897
+  data.tar.gz: 19747c392222005ce922fe8dcada9db9e6331261
 SHA512:
-  metadata.gz: 4815d7bbdfdf108604454f03b43fedcea8ba9cd29ac2ebe55a051df43254d4bd350d648c1d27c1762373c63c6e18b6d365751466fc75e007eae16bdb290ea2b0
-  data.tar.gz: a4be372dd98048c84fa21bdcfceace4a2a8cb32d696a4b0b766e72d70f56c3b4fa70c88d92cf204e50db0aa8fe2a7481f30c0e376d5d51b515c2f77af27e8ce9
+  metadata.gz: 47458045a08ae1eedbc2c2b06d9b57364b603e66a4f7f54ebf5b74ed5f0c0a08d8aa51cfdfe1873137796c61c38eafcd78f40c06eff677542c5041f9843b472d
+  data.tar.gz: b18cfbee4f94539cce0c34886fa242a5d2692b995218467fb4ee2fb88aa60d48f4b042490bbae4b27cd3cc95e93cb911c41813a9cdd610daec3234712dcd0e89

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-07-01 12:52:10 -0700 using RuboCop version 0.32.1.
+# on 2015-08-20 12:41:25 -0700 using RuboCop version 0.32.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -7,7 +7,7 @@
 
 # Offense count: 3
 Metrics/AbcSize:
-  Max: 87
+  Max: 92
 
 # Offense count: 1
 Metrics/BlockNesting:
@@ -15,7 +15,7 @@ Metrics/BlockNesting:
 
 # Offense count: 2
 Metrics/CyclomaticComplexity:
-  Max: 23
+  Max: 24
 
 # Offense count: 34
 # Configuration parameters: AllowURI, URISchemes.
@@ -25,11 +25,11 @@ Metrics/LineLength:
 # Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 88
+  Max: 89
 
 # Offense count: 2
 Metrics/PerceivedComplexity:
-  Max: 21
+  Max: 22
 
 # Offense count: 1
 # Configuration parameters: Exclude.

data/.travis.yml

@@ -1,7 +1,11 @@
 notifications:
   email: false
 
+sudo: false
+cache: bundler
+
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.2.1

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/bin/controller

@@ -68,7 +68,8 @@ module RobotController
           running[robot] = 0
         end
         RobotController::Parser.load("robots_#{ENV['ROBOT_ENVIRONMENT']}.yml").each do |h|
-          running[h[:robot]] = h[:n]
+          running[h[:robot]] = 0 if running[h[:robot]].nil?
+          running[h[:robot]] += h[:n]
         end
 
         # verify that all robots running are known to the config/robots.yml

data/lib/robot-controller/robots.rb

@@ -15,7 +15,7 @@ module RobotController
         fail "FileNotFound: #{robots_fn}" unless File.file?(robots_fn)
 
         # read the YAML file with the configuration of all the robots to run
-        robots =  YAML.load_file(robots_fn)
+        robots = YAML.load_file(robots_fn)
 
         # determine current host if not provided
         host ||= `hostname -s`.strip

data/spec/fixtures/multi.yml

@@ -0,0 +1,4 @@
+host1:
+  - X
+  - X:A,B,C:1
+  - X:D:3

data/spec/unit/robots_spec.rb

@@ -52,6 +52,20 @@ describe RobotController::Parser do
     end
   end
 
+  context 'multi' do
+    subject do
+      RobotController::Parser.load('multi.yml', 'spec/fixtures', 'host1')
+    end
+
+    it 'parses correctly' do
+      expect(subject).to eq [
+        { robot: 'X', queues: %w(X_default), n: 1 },
+        { robot: 'X', queues: %w(X_A X_B X_C), n: 1 },
+        { robot: 'X', queues: %w(X_D), n: 3 }
+      ]
+    end
+  end
+
   context 'file-not-found' do
     it 'reports error' do
       expect do

data/spec/unit/verify_spec.rb

@@ -158,4 +158,22 @@ describe RobotController::Verify do
       )
     end
   end
+
+  context 'verify method with multiple robot queues' do
+    subject do
+      RobotController::Verify.new('dor_gisAssemblyWF_assign-placenames' => 3)
+    end
+
+    it 'runs controller status for up' do
+      allow(subject).to receive(:controller_status).and_return([
+        'robot01_01_dor_gisAssemblyWF_assign-placenames(pid:29483): up',
+        'robot02_01_dor_gisAssemblyWF_foobar(pid:29485): up',
+        'robot03_01_dor_gisAssemblyWF_assign-placenames(pid:29484): up',
+        'robot04_01_dor_gisAssemblyWF_assign-placenames(pid:29486): up'
+      ])
+      expect(subject.verify).to eq(
+        'dor_gisAssemblyWF_assign-placenames' => { state: :up, running: 3 }
+      )
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robot-controller
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Darren Hardy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bluepill
@@ -28,140 +28,140 @@ dependencies:
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: version_bumper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -172,11 +172,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -198,6 +198,7 @@ files:
 - lib/tasks/yard.rake
 - robot-controller.gemspec
 - spec/fixtures/matcher.yml
+- spec/fixtures/multi.yml
 - spec/fixtures/standard.yml
 - spec/spec_helper.rb
 - spec/unit/robots_spec.rb
@@ -213,23 +214,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Monitors and controls running workflow robots off of priority queues and
   within a cluster
 test_files:
 - spec/fixtures/matcher.yml
+- spec/fixtures/multi.yml
 - spec/fixtures/standard.yml
 - spec/spec_helper.rb
 - spec/unit/robots_spec.rb