robot-controller 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851d1325290f4f380a96c4ea9cfa145cab641bae
-  data.tar.gz: f5b352dc771d7748faaf998ad34f5be12b3fb3f9
+  metadata.gz: 0acb2a8aa3413747076dac05fc5c889357c00fd4
+  data.tar.gz: 8692def8629151ccb3217d591909a3342870d945
 SHA512:
-  metadata.gz: 5feda681dd061289ca70b4979d09d12b093a535c2bed25352ee79c5b8102ff86c3a072897573692e20879d9166a4d4a766eb96fb36219166fdd06324dd5cb3c5
-  data.tar.gz: 8337653c9a1ad2052fe6686bd1458fa8a4a6af25fb508060cbb134a2b5289ad4e964000cfd217413428ff792eb9fe681846630b979607095aa778640b3dfde5f
+  metadata.gz: ad5c6d906a1fc3cb465d4f42992502bcc54a485d1de556ed004c8776d970e60c1441e4c96c35dbc1d9492d399276f72bcd7fdf1cb2c3113c64c752fae8383329
+  data.tar.gz: a5e75b22049082d804928398d17e86f877ac82c07aa18556709bd8e7f8452aba8f5d00c72bbaccbc8a9c388a70979e0192f055cc2471eae7e15b9f58efbe28cc

data/.gitignore

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

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bin/controller

@@ -2,8 +2,9 @@
 
 if ARGV.size == 0
   puts '
-Usage: controller [ boot | quit ]
-       controller [ start | status | stop | restart | log ] [worker]
+Usage: controller ( boot | quit )
+       controller ( start | status | stop | restart | log ) [worker]
+       controller [--help]
 
 Example:
   % controller boot    # start bluepilld and jobs
@@ -11,15 +12,28 @@ 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)
+  ROBOT_ENVIRONMENT - (default: development)
+  
+Configuration files (in search order)
+  config/environments/bluepill_development.rb
+  config/environments/bluepill.rb
+  config/bluepill.rb
 '
   exit -1
 end
 
 ENV['ROBOT_ENVIRONMENT'] ||= 'development'
+ENV['BLUEPILL_BASE_DIR'] ||= File.expand_path('run/bluepill')
+ENV['BLUEPILL_LOGFILE']  ||= File.expand_path('log/bluepill.log')
 
-cmd = "bluepill --no-privileged"
-cmd << " --base-dir #{ENV['BLUEPILL_BASE_DIR'] || File.expand_path('run/bluepill')}"
-cmd << " --logfile #{ENV['BLUEPILL_LOGFILE'] || File.expand_path('log/bluepill.log')}"
+cmd = 'bluepill'
+cmd << ' --no-privileged'
+cmd << " --base-dir #{ENV['BLUEPILL_BASE_DIR']}"
+cmd << " --logfile #{ENV['BLUEPILL_LOGFILE']}"
 
 if ARGV[0] == 'boot'
   ["config/environments/bluepill_#{ENV['ROBOT_ENVIRONMENT']}.rb",

data/example/config/boot.rb

@@ -31,10 +31,7 @@ REDIS_URL ||= "localhost:6379/resque:#{ENV['ROBOT_ENVIRONMENT']}"
 Resque.redis = REDIS_URL
 
 require 'active_support/core_ext' # camelcase
-require 'druid-tools'
 require 'robot-controller'
-require 'robots'
-
 
 
 

data/example/config/environments/workflows_development.rb

@@ -23,9 +23,3 @@ WORKFLOW_STEPS = %w{
 WORKFLOW_N = Hash[*%w{
   dor:assemblyWF:checksum-compute     3
 }]
-
-# starts up 2 workers -- one for this priority and another for all
-# XXX: not implemented
-WORKFLOW_PRIORITIES = Hash[*%w{
-  dor:assemblyWF:checksum-compute     critical,high
-}]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robot-controller
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Darren Hardy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bluepill