libis-workflow 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba3fa96f34242e5014b961b73fbf591a4c5b3b1b
-  data.tar.gz: 5912a5ca488f2faff208fa86dcc170c637535aaa
+  metadata.gz: 4811293c017ab0613375ec887877536727046749
+  data.tar.gz: b8180f2d746875ff2475c7760cb31d2c58e781fa
 SHA512:
-  metadata.gz: 3703ecdbb6b1687af55d8398e2a60e4e47f3229febc59c056022576d5ad8cba8fc1955eec9af1e582c4d810ad149ebc9174d62a17f615c505aef8cfedcccad7d
-  data.tar.gz: 625031f3b020ff8ace2368822560257da66cc998dd39b5389f5e4b6d785e9697da1d1d9980ff4418697d8b6434dbc5154bb4ff03cdadfe2245190e0d69141b7d
+  metadata.gz: 55849f68aa4bc0c2c22a7483f361ed47bdee6fb896cf561a81af2df9425865dfe08805e8fb05fe966bec66cd7e02d9df1482fc015267dc5e94a234c88ce2c57c
+  data.tar.gz: bfe38e532a17aad2ad86ae6d2c0731b8f94a0542432fc84559361c1235343f8181d2140ac2b0577d4b4687a7ac0d6a52db66ae8be8abfa118e9c947206b413a7

data/README.md

@@ -214,11 +214,11 @@ Work items that are file-based can derive from the ::Libis::Workflow::FileItem c
       end
 
       def filesize
-        properties['size']
+        properties[:size]
       end
 
       def fixity_check(checksum)
-        properties['checksum'] == checksum
+        properties[:checksum] == checksum
       end
 
     end
@@ -239,11 +239,11 @@ or include the ::Libis::Workflow::Base::FileItem module:
       end
 
       def filesize
-        properties['size']
+        properties[:size]
       end
 
       def fixity_check(checksum)
-        properties['checksum'] == checksum
+        properties[:checksum] == checksum
       end
 
     end

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

@@ -13,11 +13,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
@@ -29,24 +29,24 @@ 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)
@@ -58,11 +58,11 @@ module Libis
         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

@@ -49,7 +49,6 @@ 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)
@@ -64,8 +63,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 = self.input.merge(opts)
+          run.options.merge!(self.input.merge(opts))
           run.save
 
           run.run

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

@@ -50,7 +50,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.
@@ -65,7 +65,7 @@ module Libis
         def run(action = :run)
           self.action = action
 
-          self.start_date = Time.now
+          self.start_date = Time.now unless action == :retry
 
           self.options = workflow.prepare_input(self.options)
 

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

@@ -83,7 +83,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

@@ -2,6 +2,7 @@
 
 require 'libis/tools/parameter'
 require 'libis/workflow/task_group'
+require 'libis/tools/extend/hash'
 
 module Libis
   module Workflow
@@ -73,7 +74,6 @@ module Libis
         end
 
         def self.included(base)
-
           base.extend ClassMethods
         end
 
@@ -85,7 +85,9 @@ module Libis
 
           self.class.require_all
 
-          unless self.config[:tasks].last[:class] && self.config[:tasks].last[:class].split('::').last == '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
 
@@ -124,7 +126,7 @@ module Libis
               task_name, param_name = target.split('#')
               param_name ||= key
               result[task_name] ||= {}
-              result[task_name][param_name.to_s] = value
+              result[task_name][param_name] = value
             end
           end
           result

data/lib/libis/workflow/run.rb

@@ -26,7 +26,7 @@ module Libis
       end
 
       def logger
-        self.properties['logger'] || (job.logger rescue nil)
+        self.properties[:logger] || (job.logger rescue nil)
       end
 
     end

data/lib/libis/workflow/task.rb

@@ -107,6 +107,7 @@ 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, _|

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

@@ -14,7 +14,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|

data/lib/libis/workflow/version.rb

@@ -2,6 +2,6 @@
 
 module Libis
   module Workflow
-    VERSION = '2.0.2' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+    VERSION = '2.0.3' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
   end
 end

data/spec/items/test_dir_item.rb

@@ -9,7 +9,7 @@ class TestDirItem < ::Libis::Workflow::DirItem
   end
 
   def name
-    self.properties['name'] || super
+    self.properties[:name] || super
   end
 
 end

data/spec/items/test_file_item.rb

@@ -12,7 +12,7 @@ class TestFileItem < ::Libis::Workflow::FileItem
   end
 
   def name
-    self.properties['name'] || super
+    self.properties[:name] || super
   end
 
 end

data/spec/tasks/camelize_name.rb

@@ -7,7 +7,7 @@ class CamelizeName < ::Libis::Workflow::Task
 
   def process(item)
     return unless (item.is_a?(TestFileItem) || item.is_a?(TestDirItem))
-    item.properties['name'] = item.name.camelize
+    item.properties[:name] = item.name.camelize
   end
 
 end

metadata

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