libis-workflow 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfab02f94fe4c007febd5cb3a6a3f90bc690578d
-  data.tar.gz: b28951ed4a7d771c600f8c1b80b47c5c708bc5b7
+  metadata.gz: 9327567da6093380f849f0deacb992873af61e60
+  data.tar.gz: 5478d89b9e65716195e371dd0dcb667b89445161
 SHA512:
-  metadata.gz: f880d8a3daaf98ab41826055e8c9138146c253cd4a63af933302ee1277253e94b51a3ddd71175c6351eff24f54ef1b02eb4c953363b260077f8172fe302938ef
-  data.tar.gz: 65ecec01867987ee515d8af5e5f9b2aa4a6cd274fcf0343bd04a2221d1c0438bcbd95a50cdbd517459c8d226750ffd30d45e08ec684af54927b2f85ab20b5305
+  metadata.gz: 72ffe0fcc00964f7ec170d4b8595d220c0f9027735f22c8b76d6fa000c96ea4681854abb91452f13c274b6161b6deeaa9b9c59dfdc4efd0e9d72994b2778de25
+  data.tar.gz: 26accfb461c22d93319bf955eed26ff3dbbd60fe2de62b4debd32f5e73bfd04d7ced849b55412a6d9db89ea73af02bf05fd556f4990c127fad1d9d7c04c8d216

data/lib/libis/workflow/base/file_item.rb

@@ -11,11 +11,11 @@ module Libis
         include Libis::Workflow::Base::WorkItem
 
         def filename
-          File.basename(self.properties[:filename]) || self.properties[:link]
+          File.basename(self.properties['filename']) || self.properties['link']
         end
 
         def name
-          self.properties[:name] || self.filename
+          self.properties['name'] || self.filename
         end
 
         def filelist
@@ -27,40 +27,40 @@ module Libis
         end
 
         def fullpath
-          self.properties[:filename]
+          self.properties['filename']
         end
 
         def filename=(name)
           begin
             stats = ::File.stat name
-            self.properties[:size] = stats.size
-            self.properties[:access_time] = stats.atime
-            self.properties[:modification_time] = stats.mtime
-            self.properties[:creation_time] = stats.ctime
-            self.properties[:mode] = stats.mode
-            self.properties[:uid] = stats.uid
-            self.properties[:gid] = stats.gid
+            self.properties['size'] = stats.size
+            self.properties['access_time'] = stats.atime
+            self.properties['modification_time'] = stats.mtime
+            self.properties['creation_time'] = stats.ctime
+            self.properties['mode'] = stats.mode
+            self.properties['uid'] = stats.uid
+            self.properties['gid'] = stats.gid
             set_checksum(:MD5, ::Digest::MD5.hexdigest(File.read(name))) if File.file?(name)
           rescue
             # ignored
           end
-          self.properties[:filename] = name
+          self.properties['filename'] = name
         end
 
         def checksum(checksum_type)
-          self.properties[('checksum_' + checksum_type.to_s.downcase).to_sym]
+          self.properties[('checksum_' + checksum_type.to_s.downcase)]
         end
 
         def set_checksum(checksum_type, value)
-          self.properties[('checksum_' + checksum_type.to_s.downcase).to_sym] = value
+          self.properties[('checksum_' + checksum_type.to_s.downcase)] = value
         end
 
         def link
-          self.properties[:link]
+          self.properties['link']
         end
 
         def link=(name)
-          self.properties[:link] = name
+          self.properties['link'] = name
         end
 
         def set_info(info)

data/lib/libis/workflow/base/job.rb

@@ -47,11 +47,11 @@ module Libis
           self.name ||= ''
           self.description ||= ''
           self.input ||= {}
-          self.name = cfg[:name] if cfg.has_key?(:name)
-          self.description = cfg[:description] if cfg.has_key?(:description)
-          self.workflow = cfg[:workflow] if cfg.has_key?(:workflow)
-          self.run_object = cfg[:run_object] if cfg.has_key?(:run_object)
-          self.input.merge!(cfg[:input] || {})
+          self.name = cfg['name'] if cfg.has_key?('name')
+          self.description = cfg['description'] if cfg.has_key?('description')
+          self.workflow = cfg['workflow'] if cfg.has_key?('workflow')
+          self.run_object = cfg['run_object'] if cfg.has_key?('run_object')
+          self.input.merge!(cfg['input'] || {})
         end
 
         # noinspection RubyResolve
@@ -61,10 +61,9 @@ module Libis
           raise RuntimeError.new "Could not create instance of run object '#{self.run_object}'" unless run
 
           run.job = self
-          opts.key_strings_to_symbols!(recursive: true)
-          (opts.delete(:run_config) || {}).each { |key,value| run.send(key, value) }
-          run.options.merge!(self.input.merge(opts))
-          run.save
+          (opts.delete('run_config') || {}).each { |key,value| run.send(key, value) }
+          run.options = self.input.merge(opts)
+          run.save!
 
           run.run
 

data/lib/libis/workflow/base/logging.rb

@@ -40,7 +40,7 @@ module Libis
         def add_log(message = {})
           msg = message_struct(message)
           add_log_entry(msg)
-          self.save
+          self.save!
         end
 
         def <=(message = {})

data/lib/libis/workflow/base/run.rb

@@ -48,7 +48,7 @@ module Libis
         end
 
         def logger
-          self.properties[:logger] || self.job.logger rescue ::Libis::Workflow::Config.logger
+          self.properties['logger'] || self.job.logger rescue ::Libis::Workflow::Config.logger
         end
 
         # Execute the workflow.

data/lib/libis/workflow/base/work_item.rb

@@ -81,7 +81,7 @@ module Libis
         # @return [String] string identification for this work item.
         def name
           # noinspection RubyResolve
-          self.properties[:name] || self.inspect
+          self.properties['name'] || self.inspect
         end
 
         def to_s;

data/lib/libis/workflow/base/workflow.rb

@@ -76,28 +76,29 @@ module Libis
         end
 
         def configure(cfg)
-          self.name = cfg.delete(:name) || self.class.name
-          self.description = cfg.delete(:description) || ''
-          self.config.merge! input: {}, tasks: []
+          self.name = cfg.delete('name') || self.class.name
+          self.description = cfg.delete('description') || ''
+          self.config['input'] = {}
+          self.config['tasks'] = []
           self.config.merge! cfg
 
           self.class.require_all
 
-          unless !self.config[:tasks].empty? &&
-              self.config[:tasks].last[:class] &&
-              self.config[:tasks].last[:class].split('::').last == 'Analyzer'
-            self.config[:tasks] << {class: '::Libis::Workflow::Tasks::Analyzer'}
+          unless !self.config['tasks'].empty? &&
+              self.config['tasks'].last['class'] &&
+              self.config['tasks'].last['class'].split('::').last == 'Analyzer'
+            self.config['tasks'] << {'class' => '::Libis::Workflow::Tasks::Analyzer'}
           end
 
           self.config
         end
 
         def input
-          self.config[:input].inject({}) do |hash, input_def|
-            name = input_def.first.to_sym
+          self.config.key_strings_to_symbols(recursive: true)[:input].inject({}) do |hash, input_def|
+            name = input_def.first
             default = input_def.last[:default]
             parameter = ::Libis::Tools::Parameter.new name, default
-            input_def.last.each { |k, v| parameter[k.to_sym] = v }
+            input_def.last.each { |k, v| parameter[k] = v }
             hash[name] = parameter
             hash
           end
@@ -107,6 +108,7 @@ module Libis
 
         # @param [Hash] options
         def prepare_input(options)
+          options = options.key_strings_to_symbols
           result = {}
           self.input.each do |key, parameter|
             if options.has_key?(key)
@@ -122,7 +124,7 @@ module Libis
             result[key] = value if propagate_to.empty?
             propagate_to.each do |target|
               task_name, param_name = target.split('#')
-              param_name ||= key
+              param_name ||= key.to_s
               result[task_name] ||= {}
               result[task_name][param_name] = value
             end
@@ -131,17 +133,17 @@ module Libis
         end
 
         def tasks(parent = nil)
-          self.config[:tasks].map do |cfg|
+          self.config['tasks'].map do |cfg|
             instantize_task(parent || nil, cfg)
           end
         end
 
         def instantize_task(parent, cfg)
           task_class = Libis::Workflow::TaskGroup
-          task_class = cfg[:class].constantize if cfg[:class]
+          task_class = cfg['class'].constantize if cfg['class']
           # noinspection RubyArgCount
           task_instance = task_class.new(parent, cfg)
-          cfg[:tasks] && cfg[:tasks].map do |task_cfg|
+          cfg['tasks'] && cfg['tasks'].map do |task_cfg|
             task_instance << instantize_task(task_instance, task_cfg)
           end
           task_instance

data/lib/libis/workflow/status.rb

@@ -17,7 +17,7 @@ module Libis
       def status=(x)
         s, task = x
         self.add_status_log(task: task, status: s)
-        self.save
+        self.save!
       end
 
       # Get last known status symbol for a given task

data/lib/libis/workflow/task.rb

@@ -17,7 +17,7 @@ module Libis
 
       attr_accessor :parent, :name, :workitem
 
-      parameter quiet: false, description: 'Prevemt generating log output.'
+      parameter quiet: false, description: 'Prevent generating log output.'
       parameter recursive: false, description: 'Run the task on all subitems recursively.'
       parameter retry_count: 0, description: 'Number of times to retry the task if waiting for another process.'
       parameter retry_interval: 10, description: 'Number of seconds to wait between retries.'
@@ -44,7 +44,10 @@ module Libis
 
         case self.action
           when :retry
-            return if item.check_status(:DONE, self.namepath)
+            if item.check_status(:DONE, self.namepath)
+              debug 'Retry: skipping task %s because it has finished successfully.', item, self.namepath
+              return
+            end
           when :failed
             return
           else
@@ -90,7 +93,7 @@ module Libis
         debug e.backtrace.join("\n")
 
       ensure
-        item.save
+        item.save!
 
       end
 
@@ -106,7 +109,6 @@ module Libis
         o = {}
         o.merge!(opts[self.class.to_s] || {})
         o.merge!(opts[self.name] || opts[self.names.join('/')] || {})
-        o.key_symbols_to_strings!
 
         if o and o.is_a? Hash
           default_values.each do |name, _|
@@ -144,12 +146,13 @@ module Libis
       def logger
         (self.parent || self.get_run).logger
       end
+
       protected
 
       def configure(cfg)
-        self.name = cfg[:name] || (cfg[:class] || self.class).to_s.split('::').last
-        (cfg[:options] || {}).merge(
-            cfg.reject { |k, _| [:options, :name, :class].include? k.to_sym }
+        self.name = cfg['name'] || (cfg['class'] || self.class).to_s.split('::').last
+        (cfg['options'] || {}).merge(
+            cfg.reject { |k, _| %w(options name class).include? k }
         ).symbolize_keys.each do |k, v|
           self.parameter(k, v)
         end

data/lib/libis/workflow/tasks/analyzer.rb

@@ -12,7 +12,7 @@ module Libis
         # @param [Libis::Workflow::Base::WorkItem] item
         def run(item)
 
-          item.properties[:ingest_failed] = item.check_status(:FAILED)
+          item.properties['ingest_failed'] = item.check_status(:FAILED)
 
           item.summary = {}
           item.log_history.each do |log|
@@ -36,7 +36,7 @@ module Libis
 
         ensure
 
-          item.save
+          item.save!
 
         end
 

data/lib/libis/workflow/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Workflow
-    VERSION = '2.0.6' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+    VERSION = '2.0.7' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
   end
 end

data/lib/libis/workflow/worker.rb

@@ -1,5 +1,6 @@
 require 'sidekiq'
 
+require 'libis/tools/extend/hash'
 require 'libis/workflow/config'
 require 'libis/workflow/workflow'
 
@@ -31,7 +32,7 @@ module Libis
 
       def get_job(job_config)
         job = ::Libis::Workflow::Job.new
-        job.configure job_config
+        job.configure job_config.key_symbols_to_strings(recursive: true)
         job
       end
 

data/spec/workflow_spec.rb

@@ -24,21 +24,21 @@ describe 'TestWorkflow' do
   let(:workflow) {
     workflow = ::Libis::Workflow::Workflow.new
     workflow.configure(
-        name: 'TestWorkflow',
-        description: 'Workflow for testing',
-        tasks: [
-            {class: 'CollectFiles', recursive: true},
+        'name' => 'TestWorkflow',
+        'description' => 'Workflow for testing',
+        'tasks' => [
+            {'class' => 'CollectFiles', 'recursive' => true},
             {
-                name: 'ProcessFiles', recursive: false,
-                tasks: [
-                    {class: 'ChecksumTester', recursive: true},
-                    {class: 'CamelizeName', recursive: true}
+                'name' => 'ProcessFiles', 'recursive' => false,
+                'tasks' => [
+                    {'class' => 'ChecksumTester', 'recursive' => true},
+                    {'class' => 'CamelizeName', 'recursive' => true}
                 ]
             }
         ],
-        input: {
-            dirname: {default: '.', propagate_to: 'CollectFiles#location'},
-            checksum_type: {default: 'SHA1', propagate_to: 'ChecksumTester'}
+        'input' => {
+            'dirname' => {'default' => '.', 'propagate_to' => 'CollectFiles#location'},
+            'checksum_type' => {'default' => 'SHA1', 'propagate_to' => 'ChecksumTester'}
         }
     )
     workflow
@@ -47,19 +47,19 @@ describe 'TestWorkflow' do
   let(:job) {
     job = ::Libis::Workflow::Job.new
     job.configure(
-        name: 'TestJob',
-        description: 'Job for testing',
-        workflow: workflow,
-        run_object: 'TestRun',
-        input: {dirname: dirname, checksum_type: 'SHA256'},
+        'name' => 'TestJob',
+        'description' => 'Job for testing',
+        'workflow' => workflow,
+        'run_object' => 'TestRun',
+        'input' => {'dirname' => dirname, 'checksum_type' => 'SHA256'},
     )
     job
   }
 
   it 'should contain three tasks' do
-    expect(workflow.config[:tasks].size).to eq 3
-    expect(workflow.config[:tasks].first[:class]).to eq 'CollectFiles'
-    expect(workflow.config[:tasks].last[:class]).to eq '::Libis::Workflow::Tasks::Analyzer'
+    expect(workflow.config['tasks'].size).to eq 3
+    expect(workflow.config['tasks'].first['class']).to eq 'CollectFiles'
+    expect(workflow.config['tasks'].last['class']).to eq '::Libis::Workflow::Tasks::Analyzer'
   end
 
   # noinspection RubyResolve

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler