libis-workflow 2.0.beta.18 → 2.0.beta.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab1fb2a05e34660de16b7d6f5e5a63ab6e82010e
-  data.tar.gz: 9cb25d10d768ae11a0c819706c86a3bb2b5563f8
+  metadata.gz: 2e5a0e42c41ae73d9a6b852917818dc9cebd97ef
+  data.tar.gz: e4fb088019e7d60aad2b6b28323b2a5c777dbe64
 SHA512:
-  metadata.gz: 296a6a7ee5c10280d419a444b1fe09fa80d843c293f0ed68fc27ac40b9d6a5e23bc5167b64f46a687e33a28c9b42edbba5ed2a40ce18b17558b8a90cdbfc3582
-  data.tar.gz: d1caeafd347a546ea67f1e25017aea1077d8b8b9b9f52400624e29c584ebed6143c813f7930f095794c87434badb540c80fe6e3f7dd9531dc58f0bbbb62f2eab
+  metadata.gz: bfa5b177b528c9c5e8a33e9087b2698c9f1b7a3a54c986ebb4fe00150eb700fe694055239678cd5d50d8a696e555a215ad8028a30db0bc708495684e1b48a3ac
+  data.tar.gz: 68f3312f5d681a3730bff41ec4e995408b986ec58a62f62ebd53d3c11882585dfe83e497d16e2f9702aff2719c70358bc7ee54bc996143d8a97d13e7c4cdf14d

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

@@ -110,15 +110,21 @@ module Libis
         end
 
         # Iterates over the work item clients and invokes code on each of them.
-        def each
-          self.items.each { |item| yield item }
+        def each(&block)
+          self.items.each(&block)
         end
 
+        def size
+          self.items.size
+        end
+
+        alias_method :count, :size
+
         # Add a child work item
         #
         # @param [WorkItem] item to be added to the child list :items
         def add_item(item)
-          return self unless item and item.is_a? Libis::Workflow::Base::WorkItem
+          return self unless item and item.is_a?(Libis::Workflow::Base::WorkItem)
           self.items << item
           item.parent = self
           self.save!
@@ -128,14 +134,6 @@ module Libis
 
         alias_method :<<, :add_item
 
-        def get_items
-          self.items.dup
-        end
-
-        def item_count
-          self.items.size
-        end
-
         # Return item's parent
         # @return [Libis::Workflow::Base::WorkItem]
         def get_parent

data/lib/libis/workflow/task.rb

@@ -158,16 +158,18 @@ module Libis
 
       def run_subitems(parent_item)
         return unless check_processing_subitems
-        return unless parent_item.count > 0
+
+        items = subitems(parent_item)
+        return unless items.size > 0
 
         status = Hash.new(0)
-        subitems(parent_item).each_with_index do |item, i|
-          debug 'Processing subitem (%d/%d): %s', parent_item, i+1, parent_item.count, item.to_s
+        items.each_with_index do |item, i|
+          debug 'Processing subitem (%d/%d): %s', parent_item, i+1, items.size, item.to_s
           run_item item
           status[item.status(self.namepath)] += 1
         end
 
-        debug '%d of %d subitems passed', parent_item, status[:DONE], parent_item.count
+        debug '%d of %d subitems passed', parent_item, status[:DONE], items.size
         substatus_check(status, parent_item, 'item')
       end
 
@@ -267,7 +269,7 @@ module Libis
       end
 
       def subitems(item = nil)
-        (item || self.workitem).get_items
+        (item || self.workitem).items
       end
 
       def default_values

data/lib/libis/workflow/task_group.rb

@@ -32,11 +32,11 @@ module Libis
         return unless check_processing_subtasks
 
         tasks = subtasks
-        return unless tasks.count > 0
+        return unless tasks.size > 0
 
         status = Hash.new(0)
         tasks.each_with_index do |task, i|
-          debug 'Running subtask (%d/%d): %s', item, i+1, tasks.count, task.name
+          debug 'Running subtask (%d/%d): %s', item, i+1, tasks.size, task.name
           task.run item
           status[item.status(task.namepath)] += 1
         end

data/lib/libis/workflow/version.rb

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

data/libis-workflow.gemspec

@@ -5,32 +5,34 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'libis/workflow/version'
 
-Gem::Specification.new do |gem|
-  gem.name = 'libis-workflow'
-  gem.version = ::Libis::Workflow::VERSION
-  gem.date = Date.today.to_s
+Gem::Specification.new do |spec|
+  spec.name = 'libis-workflow'
+  spec.version = ::Libis::Workflow::VERSION
+  spec.date = Date.today.to_s
 
-  gem.summary = %q{LIBIS Workflow framework.}
-  gem.description = %q{A simple framework to build custom task/workflow solutions.}
+  spec.summary = %q{LIBIS Workflow framework.}
+  spec.description = %q{A simple framework to build custom task/workflow solutions.}
 
-  gem.author = 'Kris Dekeyser'
-  gem.email = 'kris.dekeyser@libis.be'
-  gem.homepage = 'https://github.com/Kris-LIBIS/workflow'
-  gem.license = 'MIT'
+  spec.author = 'Kris Dekeyser'
+  spec.email = 'kris.dekeyser@libis.be'
+  spec.homepage = 'https://github.com/Kris-LIBIS/workflow'
+  spec.license = 'MIT'
 
-  gem.files = `git ls-files -z`.split("\x0")
-  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
+  spec.platform = Gem::Platform::JAVA if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
-  gem.require_paths = ['lib']
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
 
-  gem.add_development_dependency 'bundler', '~> 1.6'
-  gem.add_development_dependency 'rake', '~> 10.3'
-  gem.add_development_dependency 'rspec', '~> 3.1'
-  gem.add_development_dependency 'simplecov', '~> 0.9'
-  gem.add_development_dependency 'coveralls', '~> 0.7'
+  spec.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'libis-tools', '~> 0.9'
-  gem.add_runtime_dependency 'sidekiq', '~> 3.3'
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'rspec', '~> 3.1'
+  spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'coveralls', '~> 0.7'
+
+  spec.add_runtime_dependency 'libis-tools', '~> 0.9'
+  spec.add_runtime_dependency 'sidekiq', '~> 3.3'
 
 end

data/spec/workflow_spec.rb

@@ -63,9 +63,11 @@ describe 'TestWorkflow' do
   it 'should camelize the workitem name' do
     run = job.execute
     expect(run.options['CollectFiles'][:location]).to eq dirname
-    expect(run.items.count).to eq 1
+    expect(run.size).to eq 1
+    expect(run.items.size).to eq 1
     expect(run.items.first.class).to eq TestDirItem
-    expect(run.items.first.count).to eq 3
+    expect(run.items.first.size).to eq 3
+    expect(run.items.first.items.size).to eq 3
     expect(run.items.first.first.class).to eq TestFileItem
 
     expect(run.items.first.name).to eq 'Items'
@@ -104,16 +106,16 @@ STR
     run = job.execute
     output = logoutput.string.lines.to_a
 
-    expect(output.count).to eq sample_out.count
+    expect(output.size).to eq sample_out.size
     output.each_with_index do |o, i|
       expect(o[/(?<=\] ).*/]).to eq sample_out[i].strip
     end
 
     expect(run.summary['DEBUG']).to eq 20
-    expect(run.log_history.count).to eq 8
-    expect(run.status_log.count).to eq 8
-    expect(run.items.first.log_history.count).to eq 12
-    expect(run.items.first.status_log.count).to eq 6
+    expect(run.log_history.size).to eq 8
+    expect(run.status_log.size).to eq 8
+    expect(run.items.first.log_history.size).to eq 12
+    expect(run.items.first.status_log.size).to eq 6
 
     [
         {task: 'CollectFiles', status: :STARTED},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.18
+  version: 2.0.beta.20
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler