robot-controller 0.3.0 → 0.3.2

data/README.md

@@ -11,7 +11,6 @@ In your `Gemfile`, add:
 
 In your `Rakefile`, add the following (if you don't want to include the environment unconditionally):
 
-    require 'resque/tasks'
     require 'robot-controller/tasks'
     
 Create the following configuration files based on the examples in `example/config`:
@@ -36,11 +35,11 @@ controller, then add:
     Example:
       % controller boot    # start bluepilld and jobs
       % controller status  # check on status of jobs
-      % controller log dor_accessionWF_descriptive-metadata # view log for worker
+      % controller log 1_dor_accessionWF_descriptive-metadata # view log for worker
       % controller stop    # stop jobs
       % controller quit    # stop bluepilld
   
     Environment:
       BLUEPILL_BASEDIR - where bluepill stores its state (default: run/bluepill)
       BLUEPILL_LOGFILE - output log (default: log/bluepill.log)
-      ROBOT_ENVIRONMENT - (default: development)
+      ROBOT_ENVIRONMENT - (default: development)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/bin/controller

@@ -12,7 +12,7 @@ Example:
   % controller log dor_accessionWF_descriptive-metadata # view log for worker
   % controller stop    # stop jobs
   % controller quit    # stop bluepilld
-  
+
 Environment:
   BLUEPILL_BASEDIR - where bluepill stores its state (default: run/bluepill)
   BLUEPILL_LOGFILE - output log (default: log/bluepill.log)
@@ -38,11 +38,12 @@ if ARGV[0] == 'boot'
   end
   if File.file?(fn)
     puts "Loading #{fn}"
-    system "#{cmd} load #{fn}"
-    exit 0
+    exec "#{cmd} load #{fn}"
+    # NOTREACHED
   end
   puts "ERROR: Cannot find bluepill configuration file for #{ENV['ROBOT_ENVIRONMENT']}"
   exit -1
 else
-  system "#{cmd} #{ARGV.join(' ')}"
+  exec "#{cmd} #{ARGV.join(' ')}"
+  # NOTREACHED
 end

data/example/config/environments/robots_development.yml

@@ -9,78 +9,77 @@
 #  where
 #    1. robot is a single robot identifier (fully-qualified with
 #       REPO_SUITE_ROBOT, e.g., "dor_accessionWF_technical-metadata").
-#    2. lane is a single integer (4), a range (3-5), or a list (2,4,8), 
-#       or an asterix (*).
+#    2. lane is 
+#          - a single identifier ('A'), or 
+#          - a list of identiers ('A,B,C'), or 
+#          - an asterix (*).
 #    3. instances is a single integer.
 #
-#  Both lane and instances are optional. Lane defaults to *, and 
+#  Both lane and instances are optional. Lane defaults to 'default', and 
 #  instances defaults to 1.
 #
 #  When a robot is allocated to multiple lanes, it reads them in
-#  PRIORITY ORDER. That is, if a robot is listening to lanes 1, 2, and 3,
-#  it works on lane 1 until empty, then lane 2 until empty, and then
-#  lane 3 until empty. In the meantime, if a job comes in on a faster
+#  PRIORITY ORDER. That is, if a robot is listening to lanes A, B, and C,
+#  it works on lane A until empty, then lane B until empty, and then
+#  lane C until empty. In the meantime, if a job comes in on a 'faster'
 #  lane, it works on that after finishing it's current job (i.e., after
-#  working on a job in lane 3, if a job comes in on lane 1 in the intermin,
-#  the robot will work on the lane 1 job next before returning to lane 3).
-#
-#  In general, lanes 1-5 are reserved for priority queues, and lanes 6-N
-#  are dedicated lanes. 
+#  working on a job in lane C, if a job comes in on lane A in the intermin,
+#  the robot will work on the lane A job next before returning to lane C).
+#  When using an asterix for the lane designator, the lanes are processed
+#  in alphabetical order.
 #
 #  Note that the syntax is YAML, so the lists must not contain spaces or
 #  needs to be quoted.
 #  
 #    RIGHT
-#      - dor_accessionWF_technical-metadata:10:5
-#      - 'dor_accessionWF_technical-metadata : 10 : 5'
+#      - dor_accessionWF_technical-metadata:A:5
+#      - 'dor_accessionWF_technical-metadata : A : 5'
 #
 #    WRONG
-#      - dor_accessionWF_technical-metadata : 10 : 5
-#      - dor_accessionWF_technical-metadata: 10: 5
+#      - dor_accessionWF_technical-metadata : A : 5
+#      - dor_accessionWF_technical-metadata: A: 5
 #
 
 #
 # Robot 1 (8 CPU) hosts shelving and publish only
 #
 sul-robots1-dev:
+  - dor_accessionWF_shelve:A                  # 1 robot for lane A
+  - dor_accessionWF_shelve:B:3                # 3 robots for lane B
+  - dor_accessionWF_shelve:C:3                # 3 robots for lane C
+  - dor_accessionWF_shelve:D:3                # 3 robots for lane D
+  - dor_accessionWF_shelve:E:3                # 3 robots for lane E
   - dor_accessionWF_shelve:*:3                # 3 robots for all lanes
-  - dor_accessionWF_shelve:6:3                # 3 robots for lane 6
-  - dor_accessionWF_shelve:7:3                # 3 robots for lane 7
-  - dor_accessionWF_shelve:8:3                # 3 robots for lane 8
-  - dor_accessionWF_shelve:9:3                # 3 robots for lane 9
-  - dor_accessionWF_shelve:10:3               # 3 robots for lane 10
-  - dor_accessionWF_publish:1-5:3             # 3 robots for lanes 1 through 5
-  - dor_accessionWF_publish:6:3               # 3 robots for lane 6
-  - dor_accessionWF_publish:7:3               # 3 robots for lane 7
-  - dor_accessionWF_publish:8:3               # 3 robots for lane 8
-  - dor_accessionWF_publish:9:3               # 3 robots for lane 9
-  - dor_accessionWF_publish:10:3              # 3 robots for lane 10
-  - dor_accessionWF_publish:6,9               # 1 robot for lane 6 and 9
+  - dor_accessionWF_shelve::3                 # 3 robots for default lane
+  - dor_accessionWF_publish:A,C:3             # 3 robots for lanes A and C
+  - dor_accessionWF_publish:B,D,E             # 1 robot for lanes B, D and E
+  - dor_accessionWF_descriptive-metadata      # 1 robot for all lanes
+  - dor_accessionWF_rights-metadata           # 1 robot for all lanes
+  - dor_accessionWF_content-metadata          # 1 robot for all lanes
+  - dor_accessionWF_remediate-object          # 1 robot for all lanes
+  - dor_accessionWF_provenance-metadata       # 1 robot for all lanes
+  - dor_accessionWF_sdr-ingest-transfer       # 1 robot for all lanes
+  - dor_accessionWF_end-accession             # 1 robot for all lanes
 
 #
 # Robot 2 (16 CPU) hosts technical metadata creation only
 #
 sul-robots2-dev:
-  - dor_accessionWF_technical-metadata:1:5    # 5 robots for lane 1
-  - dor_accessionWF_technical-metadata:2:5    # 5 robots for lane 2
-  - dor_accessionWF_technical-metadata:3-5:5  # 5 robots for lanes 3, 4, 5
-  - dor_accessionWF_technical-metadata:6:2    # 2 robots for lane 6
-  - dor_accessionWF_technical-metadata:7:2    # 2 robots for lane 7
-  - dor_accessionWF_technical-metadata:8:2    # 2 robots for lane 8
-  - dor_accessionWF_technical-metadata:9:2    # 2 robots for lane 9
-  - dor_accessionWF_technical-metadata:10:2   # 2 robots for lane 10
+  - dor_accessionWF_technical-metadata:A:5    # 5 robots for lane A
+  - dor_accessionWF_technical-metadata:B:5    # 5 robots for lane B
+  - dor_accessionWF_technical-metadata:C,D,E:5  # 5 robots for lanes C, D, and E
 
 #
 # Robot 3 (4 CPU) hosts helper robots for all accessioning workflows
 #
 sul-robots3-dev:
-  - dor_accessionWF_descriptive-metadata      # 1 robot for all lanes
-  - dor_accessionWF_rights-metadata           # 1 robot for all lanes
-  - dor_accessionWF_content-metadata          # 1 robot for all lanes
-  - dor_accessionWF_technical-metadata        # 1 robot for all lanes
-  - dor_accessionWF_remediate-object          # 1 robot for all lanes
-  - dor_accessionWF_shelve:*:5                # 5 robots for all lanes
-  - dor_accessionWF_publish:*:10              # 10 robots for all lanes
-  - dor_accessionWF_provenance-metadata       # 1 robot for all lanes
-  - dor_accessionWF_sdr-ingest-transfer       # 1 robot for all lanes
-  - dor_accessionWF_end-accession             # 1 robot for all lanes
+  - dor_accessionWF_descriptive-metadata      # 1 robot for default lane
+  - dor_accessionWF_rights-metadata           # 1 robot for default lane
+  - dor_accessionWF_content-metadata          # 1 robot for default lane
+  - dor_accessionWF_technical-metadata        # 1 robot for default lane
+  - dor_accessionWF_remediate-object          # 1 robot for default lane
+  - dor_accessionWF_shelve                    # 1 robot for default lane
+  - dor_accessionWF_publish                   # 1 robot for default lane
+  - dor_accessionWF_provenance-metadata       # 1 robot for default lane
+  - dor_accessionWF_sdr-ingest-transfer       # 1 robot for default lane
+  - dor_accessionWF_end-accession             # 1 robot for default lane

data/lib/robot-controller/robots.rb

@@ -2,7 +2,6 @@ require 'yaml'
 
 class RobotConfigParser
   ROBOT_INSTANCE_MAX = 16
-  LANE_INSTANCE_MAX = 99  # sprintf("%02d") maximum
 
   # parse_instances(1) == 1
   # parse_instances(16) == 16
@@ -16,54 +15,27 @@ class RobotConfigParser
     n
   end
 
+  # parse_lanes('') == ['default']
+  # parse_lanes(' ') == ['default']
+  # parse_lanes(' , ') == ['default']
+  # parse_lanes(' , ,') == ['default']
   # parse_lanes('*') == ['*']
-  # parse_lanes('0') == [0]
-  # parse_lanes('1') == [1]
-  # parse_lanes('1-5') == [1,2,3,4,5]
-  # parse_lanes('1,2,3') == [1,2,3]
-  # parse_lanes('1-5,8') == [1,2,3,4,5,8]
-  # parse_lanes('-1') == [0, 1]
-  # parse_lanes('100') == RuntimeException
+  # parse_lanes('1') == ['1']
+  # parse_lanes('A') == ['A']
+  # parse_lanes('A , B') == ['A', 'B']
+  # parse_lanes('A,B,C') == ['A','B','C']
+  # parse_lanes('A-C,E') == ['A-C', 'E']
   def parse_lanes(lanes_spec)
-    lanes = []
-  
-    # parse each comma-seperated specification
-    lanes_spec.split(/,/).each do |i|
-      # this is a range element
-      if i =~ /-/
-        x = i.split(/-/)
-        Range.new(x[0].to_i, x[1].to_i).each do |j|
-          lanes << j
-        end
-      # a wildcard
-      elsif i == '*'
-        lanes << '*'
-      # simple integer
-      else
-        lanes << i.to_i
-      end
-    end
-  
-    # verify that lanes are all within 1 .. LANE_INSTANCE_MAX
-    lanes.each do |j|
-      if j.is_a?(Integer)
-        if j > LANE_INSTANCE_MAX
-          raise RuntimeError, "SyntaxError: Lane #{j} > #{LANE_INSTANCE_MAX}"
-        elsif j < 0
-          raise RuntimeError, "SyntaxError: Lane #{j} < 0"
-        end
-      end
-    end
-    lanes
+    return ['default'] if lanes_spec.split(/,/).collect {|l| l.strip}.join('') == ''
+    lanes_spec.split(/,/).collect {|l| l.strip }
   end
 
-  # build_queues('a','1') => ['a_01']
-  # build_queues('a','1,3') => ['a_01', 'a_03']
-  # build_queues('a','1-3') => ['a_01', 'a_02', 'a_03']
+  # build_queues('z','A') => ['z_A']
+  # build_queues('z','A,C') => ['z_A', 'z_C']
   def build_queues(robot, lanes)
     queues = []
     parse_lanes(lanes).each do |i|
-      queues << [robot, i == '*' ? '*' : sprintf("%02d", i)].join('_')
+      queues << [robot, i].join('_')
     end
     queues
   end
@@ -92,7 +64,7 @@ class RobotConfigParser
     # parse YAML lines for host where i is robot[:lane[:instances]]
     r = []
     robots[host].each do |i|  
-      robot = i.split(/:/)
+      robot = i.split(/:/).collect {|j| j.strip}
       robot.each do |j|
         if j.strip == ''
           raise RuntimeError, "SyntaxError: #{i}"

data/lib/robot-controller/tasks.rb

@@ -1,3 +1,5 @@
+require 'resque/tasks'
+
 desc "Start multiple Resque workers using environment"
 task :workers => [ :environment ] do
   threads = []

data/robot-controller.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   
   s.add_dependency 'bluepill', '~> 0.0.67'
+  s.add_dependency 'resque', '~> 1.25.2'
   
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'pry'

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: robot-controller
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Darren Hardy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bluepill
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,92 +22,121 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.67
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.25.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.25.2
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: version_bumper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -136,26 +167,27 @@ homepage: http://github.com/sul-dlss/robot-controller
 licenses:
 - ALv2
 - Stanford University
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Monitors and controls running workflow robots off of priority queues and
   within a cluster
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c01c2e8362bea0af35c415127c35e2b6fd5a643d
-  data.tar.gz: 3bea75dfaa22001504e2a7db019ae406e4b81c00
-SHA512:
-  metadata.gz: e4c6de1781095edee97a52db140f4e6b9e7ca538ccaf66982ef0ce7f50467e2a998ac8c37334bc89fabd58dfe0420a7eb66604b51e593effd6a6870655f6bcf4
-  data.tar.gz: cc1b11f2655f960195a56ce760d19ebc39babd02e797002b19dce8ad3c4336213f2bb7a8ce7ad8b736ece255a259b2cf47db832fd1fcc2ffe4b8751dcc12160e