libis-workflow 2.0.beta.12 → 2.0.beta.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3baa19f0fbc05d8254835124a68bf02dff63952d
-  data.tar.gz: 9a6f33b1e6de7ee1d699aaaca71e80a2194b1d9b
+  metadata.gz: ee7675981468e33b70d8f03bb43ade771225a34b
+  data.tar.gz: 2770f1c82005d427bcc29c8aa08d84f395f971f8
 SHA512:
-  metadata.gz: dd107fb0efd65099dda2c0215d93ad75fde65c0a2e3271f87ce505157ea1b1f321874d426f63a315214e3c09ba3ca3dc3d2f7d620edcdc02c16292912b38df41
-  data.tar.gz: 61199cfae002d01666ae76d76c2e5acdca3c837d99c59f57da0a972d9c21bdb011e59a89ebda3373f9b6387518cc0673f5d9282bf2516a72f7da5983cad36804
+  metadata.gz: 557aa30bcff78d439b02008c86c5a1a4f43264fb23d1405012e0f3430006581c5ee2ce092aa0421fa89357b9ff7576b51cca6788f0fc15d22ca5e99be8f3ab75
+  data.tar.gz: dd1c1fabe78d2ca9a7ad0f89ce6ae0975a478e1383a904119fa6a55fdc2111340f3aa2fbdc9deb56faf43a8d52ac88f9ec18bc61ae6925e17e7f49e7371cb9ee

data/.travis.yml

@@ -25,6 +25,8 @@ matrix:
       jdk: oraclejdk7
     - rvm: ruby-head
       jdk: oraclejdk8
+  allow_failures:
+    - rvm: ruby-head
 branches:
   only:
       - master

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

@@ -98,31 +98,37 @@ module Libis
             name = input_def.first.to_sym
             default = input_def.last[:default]
             parameter = ::Libis::Tools::Parameter.new name, default
-            input_def.last.each { |k, v| parameter[k.to_sym] = v}
-            hash[input_def.first.to_sym] = parameter
+            input_def.last.each { |k, v| parameter[k.to_sym] = v }
+            hash[name] = parameter
             hash
           end
         rescue
           {}
         end
 
-        # @param [Hash] opts
-        def prepare_input(opts)
-          options = opts.dup
+        # @param [Hash] options
+        def prepare_input(options)
+          result = {}
           self.input.each do |key, parameter|
-            options[key] = parameter[:default] unless options.has_key?(key)
-            options[key] = parameter.parse(options[key])
+            if options.has_key?(key)
+              value = parameter.parse(options[key])
+            elsif !parameter[:default].nil?
+              value = parameter[:default]
+            else
+              next
+            end
             propagate_to = []
             propagate_to = parameter[:propagate_to] if parameter[:propagate_to].is_a? Array
             propagate_to = parameter[:propagate_to].split(/[\s,;]+/) if parameter[:propagate_to].is_a? String
+            result[key] = value if propagate_to.empty?
             propagate_to.each do |target|
               task_name, param_name = target.split('#')
               param_name ||= key
-              options[task_name] ||= {}
-              options[task_name][param_name.to_sym] = options[key]
+              result[task_name] ||= {}
+              result[task_name][param_name.to_sym] = value
             end
           end
-          options
+          result
         end
 
         def tasks(parent = nil)

data/lib/libis/workflow/task.rb

@@ -28,6 +28,8 @@ module Libis
       end
 
       def initialize(parent, cfg = {})
+        @subitems_stopper = false
+        @subtasks_stopper = false
         self.parent = parent
         self.tasks = []
         configure cfg
@@ -61,12 +63,7 @@ module Libis
 
           self.workitem = item
 
-          log_started item
-
-          pre_process item
-          i = process_item item
-          item = i if i.is_a? Libis::Workflow::Base::WorkItem
-          post_process item
+          process_item item
 
         rescue WorkflowError => e
           error e.message
@@ -82,8 +79,6 @@ module Libis
           log_failed item
         end
 
-        log_done item unless item.failed?
-
       end
 
       def names
@@ -101,9 +96,9 @@ module Libis
         if o and o.is_a? Hash
           default_values.each do |name, _|
             next unless o.key?(name)
-            next unless o[name]
-            parameter = get_parameter_definition name
-            next unless (value = parameter.parse(o[name]))
+            next if o[name].nil?
+            paramdef = get_parameter_definition name
+            value = paramdef.parse(o[name])
             self.parameter(name, value)
           end
         end
@@ -115,6 +110,34 @@ module Libis
 
       protected
 
+      def stop_processing_subitems
+        @subitems_stopper = true if parameter(:recursive)
+      end
+
+      def check_processing_subitems
+        if @subitems_stopper
+          @subitems_stopper = false
+          return false
+        end
+        true
+      end
+
+      def stop_processing_subtasks
+        @subtasks_stopper= true
+      end
+
+      def check_processing_subtasks
+        if @subtasks_stopper
+          @subtasks_stopper = false
+          return false
+        end
+        true
+      end
+
+      def skip_processing_item
+        @item_skipper = true
+      end
+
       def log_started(item)
         item.status = to_status :started
       end
@@ -129,9 +152,18 @@ module Libis
       end
 
       def process_item(item)
-        process item
-        run_subitems(workitem) if parameter(:recursive)
-        run_subtasks workitem
+        @item_skipper = false
+        pre_process(item)
+        unless @item_skipper
+          log_started item
+          process item
+        end
+        run_subitems(item) if parameter(:recursive)
+        unless @item_skipper
+          run_subtasks item
+          log_done item unless item.failed?
+        end
+        post_process item
       end
 
       def process(item)
@@ -140,6 +172,7 @@ module Libis
       end
 
       def pre_process(_)
+        true
         # optional implementation
       end
 
@@ -168,6 +201,7 @@ module Libis
       end
 
       def run_subitems(parent_item)
+        return unless check_processing_subitems
         items = subitems parent_item
         failed = passed = 0
         items.each_with_index do |item, i|
@@ -195,6 +229,7 @@ module Libis
       end
 
       def run_subtasks(item)
+        return unless check_processing_subtasks
         tasks = subtasks item
         tasks.each_with_index do |task, i|
           debug 'Running subtask (%d/%d): %s', item, i+1, tasks.count, task.name
@@ -211,11 +246,11 @@ module Libis
 
       def configure(cfg)
         self.name = cfg[:name] || (cfg[:class] || self.class).to_s.split('::').last
-        default_values.merge(
-            cfg[:options] || {}
-        ).merge(
-            cfg.reject { |k, _| [:options].include? k.to_sym }
-        ).symbolize_keys!.each { |k,v| self[k] = v }
+        (cfg[:options] || {}).merge(
+            cfg.reject { |k, _| [:options, :name, :class].include? k.to_sym }
+        ).symbolize_keys.each do |k,v|
+          self.parameter(k,v)
+        end
       end
 
       def to_status(text)

data/lib/libis/workflow/version.rb

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

data/spec/workflow_spec.rb

@@ -65,7 +65,8 @@ describe 'TestWorkflow' do
 
   # noinspection RubyResolve
   it 'should camelize the workitem name' do
-    expect(run.options[:dirname]).to eq dirname
+    puts run.options
+    expect(run.options['CollectFiles'][:location]).to eq dirname
     expect(run.items.count).to eq 1
     expect(run.items.first.class).to eq TestDirItem
     expect(run.items.first.count).to eq 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.12
+  version: 2.0.beta.13
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: LIBIS Workflow framework.