robot-controller 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1794761a450cd6c42ca4915218eff8fc62479987
-  data.tar.gz: 55091e82043f1257ccedbad8c5287ff0ba3ee32f
+  metadata.gz: 5b6e7b98160ab2e2bafcedeb13febf37519a8b29
+  data.tar.gz: ec59baf962a34f223fb8e7af52f5de9ee76c4818
 SHA512:
-  metadata.gz: 730764d646e9588a538e6cec9abaa51862c52404ce1344e12615141e225b10fb297d8cab6a3764ada1cb1690853e913d891d95094b0edb6fc7caa14bd71ed4bb
-  data.tar.gz: 9e1d35bdde7cc09d3b5a9b2fc4805b355c8028c2129188cde2bd47065da55e80909bc08dede71addcfbc8b84936c4089e5bebb62028f2c365dd4341cdf9613b6
+  metadata.gz: c091e368df94d1b6d5f20debecd7a7e450bf0bd3071c4aa026895a8eb882d96ea80d155abd68706735a791854184ca9ceca7080d1b13bcf283d5c6f7e9d44164
+  data.tar.gz: 474170f9cfeed0aa05ff970ae6bc62dfc068e4f94e3942abec40fce7beef5dcbfa6c01d5ce00b417ea719bd1f1e820e3d41c2d65f0c04e86771b41d5af7033d6

data/.gitignore

@@ -35,5 +35,7 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+.ruby-gemset
+.ruby-version
 
 config/environments

data/Rakefile

@@ -5,4 +5,9 @@ require 'robot-controller/tasks'
 
 Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
+require 'rspec/core/rake_task'
+
+desc "Run specs"
+RSpec::Core::RakeTask.new(:spec)
+
 task :default => [ :yard ]

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/bin/controller

@@ -25,6 +25,12 @@ ENV['ROBOT_ENVIRONMENT'] ||= 'development'
 ENV['BLUEPILL_BASE_DIR'] ||= File.expand_path('run/bluepill')
 ENV['BLUEPILL_LOGFILE']  ||= File.expand_path('log/bluepill.log')
 
+unless File.directory?('config') &&
+       File.directory?(File.dirname(ENV['BLUEPILL_BASE_DIR'])) &&
+       File.directory?(File.dirname(ENV['BLUEPILL_LOGFILE']))
+  raise "Run from root directory"
+end
+
 cmd = 'bluepill'
 cmd << ' --no-privileged'
 cmd << " --base-dir #{ENV['BLUEPILL_BASE_DIR']}"

data/lib/robot-controller.rb

@@ -1,5 +1,4 @@
 # Monitors and controls running workflow robots off of priority queues and within a cluster.
-require 'robot-controller/work_dir'
 
 module RobotController
   # e.g., `1.2.3`

data/lib/robot-controller/bluepill.rb

@@ -1,13 +1,16 @@
-WORKDIR = WorkDir.find Dir.pwd
+WORKDIR = Dir.pwd
 
 robot_environment = ENV['ROBOT_ENVIRONMENT'] || 'development'
 require 'robot-controller/robots'
+ROBOTS = RobotConfigParser.new.load("robots_#{robot_environment}.yml")
 #
 # Expect ROBOTS = [
 #  {:robot => 'x', :queues => ['a', 'b'], :n => 1}
 #  {:robot => 'z', :queues => ['b'], :n => 3}
 # ]
 #
+
+# set application name to parent directory name
 Bluepill.application File.basename(File.dirname(File.dirname(WORKDIR))),
   :log_file => "#{WORKDIR}/log/bluepill.log" do |app|
   app.working_dir = WORKDIR

data/lib/robot-controller/robots.rb

@@ -27,7 +27,7 @@ class RobotConfigParser
   # parse_lanes('A-C,E') == ['A-C', 'E']
   def parse_lanes(lanes_spec)
     return ['default'] if lanes_spec.split(/,/).collect {|l| l.strip}.join('') == ''
-    lanes_spec.split(/,/).collect {|l| l.strip }
+    lanes_spec.split(/,/).collect {|l| l.strip }.uniq
   end
 
   # build_queues('z','A') => ['z_A']
@@ -41,19 +41,20 @@ class RobotConfigParser
   end
 
   # main entry point
-  def load(env)
-    # read the YAML file
-    robots_fn = File.join('config', 'environments', "robots_#{env}.yml")
+  def load(robots_fn, dir = 'config/environments', host = nil)
+    # Validate parameters
+    robots_fn = File.join(dir, robots_fn) if dir
     unless File.file?(robots_fn)
       raise RuntimeError, "FileNotFound: #{robots_fn}"
     end
     
+    # read the YAML file
     puts "Loading #{robots_fn}"
     robots =  YAML.load_file(robots_fn)
     # puts robots
   
     # determine current host
-    host = `hostname -s`.strip
+    host = `hostname -s`.strip unless host
     # puts host
 
     # host = 'sul-robots1-dev' # XXX
@@ -93,6 +94,3 @@ class RobotConfigParser
     r
   end
 end
-
-ROBOTS = RobotConfigParser.new.load(ENV['ROBOT_ENVIRONMENT'] || 'development')
-# puts ROBOTS

data/robot-controller.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
   s.add_development_dependency 'redcarpet' # provides Markdown
   s.add_development_dependency 'version_bumper'
   s.add_development_dependency 'yard'

data/spec/fixtures/standard.yml

@@ -0,0 +1,9 @@
+host1:
+  - X
+  - Y:B
+  - Z:C:3
+host2:
+  - A:*
+  - B:X,Y
+  - C:X,Y,Z:5
+  - D:default

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+ENV['ROBOT_ENVIRONMENT'] ||= 'development'
+ENV['ROBOT_LOG'] ||= '/dev/null'
+ENV['ROBOT_LOG_LEVEL'] ||= 'debug'
+
+require 'simplecov'
+SimpleCov.start
+
+require 'bundler/setup'
+Bundler.require(:default, :development)
+
+RSpec.configure do |config|  
+end
+
+Rails = Object.new unless defined? Rails

data/spec/unit/robots_spec.rb

@@ -0,0 +1,87 @@
+require 'robot-controller/robots'
+
+describe RobotConfigParser do
+  
+  context "simple" do
+    subject {
+      RobotConfigParser.new.load('standard.yml', 'spec/fixtures', 'host1')
+    }
+
+    it "pass1" do
+     expect(subject).to eq [
+        {:robot=>"X", :queues=>["X_default"], :n=>1},
+        {:robot=>"Y", :queues=>["Y_B"], :n=>1},
+        {:robot=>"Z", :queues=>["Z_C"], :n=>3}
+      ]
+    end    
+  end
+  
+  context "expanded" do
+    subject {
+      RobotConfigParser.new.load('standard.yml', 'spec/fixtures', 'host2')
+    }
+
+    it "pass2" do
+     expect(subject).to eq [
+        {:robot=>"A", :queues=>["A_*"], :n=>1},
+        {:robot=>"B", :queues=>["B_X", "B_Y"], :n=>1},
+        {:robot=>"C", :queues=>["C_X", "C_Y", "C_Z"], :n=>5},
+        {:robot=>"D", :queues=>["D_default"], :n=>1},
+      ]
+    end    
+  end
+  
+  context "parse_instances" do
+    subject {
+      RobotConfigParser.new
+    }
+    it "valid inputs" do
+      expect(subject.parse_instances(0)).to eq 1
+      expect(subject.parse_instances(1)).to eq 1
+      expect(subject.parse_instances(16)).to eq 16
+    end
+    
+    it "invalid inputs" do
+      expect {
+        subject.parse_instances(17)
+      }.to raise_error RuntimeError
+    end
+  end
+  
+  context "parse_lanes" do
+    subject {
+      RobotConfigParser.new
+    }
+    
+    it "valid inputs" do
+      expect(subject.parse_lanes('*')).to eq ['*']
+      expect(subject.parse_lanes('')).to eq ['default']
+      expect(subject.parse_lanes('default')).to eq ['default']
+      expect(subject.parse_lanes('A')).to eq ['A']
+      expect(subject.parse_lanes('A,B')).to eq ['A', 'B']
+    end
+    
+    it "tricky inputs" do
+      expect(subject.parse_lanes(' ')).to eq ['default']
+      expect(subject.parse_lanes(' , ')).to eq ['default']
+      expect(subject.parse_lanes(' ,,')).to eq ['default']
+      expect(subject.parse_lanes('A , B')).to eq ['A','B']
+      expect(subject.parse_lanes('A-B')).to eq ['A-B']
+      expect(subject.parse_lanes('A,B,A')).to eq ['A','B']
+    end
+
+  end
+  
+  context "build_queues" do
+    subject {
+      RobotConfigParser.new
+    }
+    
+    it "valid inputs" do
+      expect(subject.build_queues('z','*')).to eq ['z_*']
+      expect(subject.build_queues('z','default')).to eq ['z_default']
+      expect(subject.build_queues('z','A,B,C')).to eq ['z_A','z_B','z_C']
+    end
+    
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robot-controller
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Darren Hardy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bluepill
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !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
@@ -144,9 +158,11 @@ files:
 - lib/robot-controller/bluepill.rb
 - lib/robot-controller/robots.rb
 - lib/robot-controller/tasks.rb
-- lib/robot-controller/work_dir.rb
 - lib/tasks/doc.rake
 - robot-controller.gemspec
+- spec/fixtures/standard.yml
+- spec/spec_helper.rb
+- spec/unit/robots_spec.rb
 homepage: http://github.com/sul-dlss/robot-controller
 licenses:
 - ALv2
@@ -173,5 +189,8 @@ signing_key:
 specification_version: 4
 summary: Monitors and controls running workflow robots off of priority queues and
   within a cluster
-test_files: []
+test_files:
+- spec/fixtures/standard.yml
+- spec/spec_helper.rb
+- spec/unit/robots_spec.rb
 has_rdoc: true

data/lib/robot-controller/work_dir.rb

@@ -1,17 +0,0 @@
-class WorkDir
-
-  def self.find base_dir
-    return ROBOT_ROOT if defined? ROBOT_ROOT
-
-    bot_root = base_dir
-    base = Pathname.new base_dir
-    base.ascend do |p|
-      if p.parent.basename.to_s =~ /releases/
-        bot_root = p
-        break
-      end
-    end
-    bot_root
-  end
-
-end