rukawa 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34dae79e6a5490afb50c25cd0f1a6784bba6e0da
-  data.tar.gz: 3e0df7f16eceb68d984fb0219fa5c7349fb529be
+  metadata.gz: 8087ac19883cd6f2ab570ab99494db140cd86670
+  data.tar.gz: 4b86cea0a91ba32c838a7b80fc7b6f7dc2334666
 SHA512:
-  metadata.gz: aa945187329bc472dc19f63e9086eba30232711100763e461f025cb44f6941755a5036a1fcac7872b414ff427f73ae3887daef221225fb617dca1fafc25650fc
-  data.tar.gz: 5a03f462462c210c33f03ec2bc61acf45c386c4c25314539f4d42af05b7e48aaf870782142df15281a6eb59fc8f4bd3d887e31211927239323e4c1c3bef11f6e
+  metadata.gz: 074ca450e282d2a63198f357df4f0fb1b5c694c04734dea25b23ceb4ca4b8f5e7e5bb90807950ebc2b95c562a08503fa5af8627b61bd37fa266d15aa0223dbb3
+  data.tar.gz: 4847ee20b6163067927180c183ee4f98686f35a8e86375d7035612f04d1dbfdb11ca549dac16c2f6ef2775c1211f48a53f670ded8ba067fd6e59c04d1fa47367

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2
+  - 2.2.5
   - 2.3.0
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -279,6 +279,9 @@ end
 This job use 2 concurrency. (this does not means that job use 2 threads)
 If concurrency is less than jobs's resource count, resource count is set concurrency size.
 
+You can set 0 to resource count.
+If a job is set 0 resource, concurrency of the job is unlimited.
+
 ### Callback
 
 - before\_run

data/lib/rukawa/context.rb

@@ -1,12 +1,13 @@
 module Rukawa
   class Context
-    attr_reader :store, :executor, :semaphore
+    attr_reader :store, :executor, :semaphore, :concurrency
 
-    def initialize(currency = nil)
+    def initialize(concurrency = nil)
+      @concurrency = concurrency || Rukawa.config.concurrency
       @store = Concurrent::Hash.new
-      @executor = Concurrent::FixedThreadPool.new(currency || Rukawa.config.concurrency)
+      @executor = Concurrent::CachedThreadPool.new
       @executor.auto_terminate = true
-      @semaphore = Concurrent::Semaphore.new(currency || Rukawa.config.concurrency)
+      @semaphore = Concurrent::Semaphore.new(@concurrency)
     end
 
     def shutdown

data/lib/rukawa/job.rb

@@ -72,8 +72,6 @@ module Rukawa
       end
     end
 
-    around_run :acquire_resource
-
     around_run do |_, blk|
       Rukawa.logger.info("Start #{self.class}")
       blk.call
@@ -114,8 +112,10 @@ module Rukawa
       return @dataflow = bypass_dataflow if @state.bypassed?
 
       @dataflow = Concurrent.dataflow_with(@context.executor, *depend_dataflows) do |*results|
-        do_run(*results)
-        @state
+        acquire_resource do
+          do_run(*results)
+          @state
+        end
       end
     end
 
@@ -156,6 +156,10 @@ module Rukawa
       end
     end
 
+    def resource_count
+      [self.class.resource_count, Rukawa.config.concurrency].min
+    end
+
     private
 
     def depend_dataflows
@@ -214,15 +218,11 @@ module Rukawa
       @context.store[self.class][key] = value
     end
 
-    def resource_count
-      [self.class.resource_count, Rukawa.config.concurrency].min
-    end
-
     def acquire_resource
-      @context.semaphore.acquire(resource_count)
+      @context.semaphore.acquire(resource_count) if resource_count > 0
       yield
     ensure
-      @context.semaphore.release(resource_count)
+      @context.semaphore.release(resource_count) if resource_count > 0
     end
   end
 end

data/lib/rukawa/job_net.rb

@@ -3,7 +3,7 @@ require 'rukawa/abstract_job'
 module Rukawa
   class JobNet < AbstractJob
     include Enumerable
-    attr_reader :dag, :context
+    attr_reader :dag, :context, :variables
 
     class << self
       def dependencies
@@ -13,6 +13,7 @@ module Rukawa
 
     def initialize(parent_job_net, variables, context, *resume_job_classes)
       @parent_job_net = parent_job_net
+      @variables = variables
       @context = context
       @dag = Dag.new
       @dag.build(self, variables, context, self.class.dependencies)

data/lib/rukawa/overview.rb

@@ -35,7 +35,13 @@ module Rukawa
       end
 
       def display_running_status(root_job_net)
-        table = Terminal::Table.new headings: ["Job", "Status", "Elapsed Time"] do |t|
+        context = root_job_net.context
+        table = Terminal::Table.new(headings: [
+          "Job",
+          "Status",
+          "Elapsed Time",
+          "Resource Count (#{context.semaphore.available_permits}/#{context.concurrency})",
+        ]) do |t|
           root_job_net.each_with_index do |j|
             running_table_row(t, j)
           end
@@ -45,12 +51,17 @@ module Rukawa
 
       def running_table_row(table, job, level = 0)
         if job.is_a?(JobNet)
-          table << [Paint["#{"  " * level}#{job.class}", :bold, :underline], Paint[job.state.colored, :bold, :underline], Paint[job.formatted_elapsed_time_from, :bold, :underline]]
+          table << [
+            Paint["#{"  " * level}#{job.class}", :bold, :underline],
+            Paint[job.state.colored, :bold, :underline],
+            Paint[job.formatted_elapsed_time_from, :bold, :underline],
+            "",
+          ]
           job.each do |inner_j|
             running_table_row(table, inner_j, level + 1)
           end
         else
-          table << [Paint["#{"  " * level}#{job.class}", :bold], job.state.colored, job.formatted_elapsed_time_from]
+          table << [Paint["#{"  " * level}#{job.class}", :bold], job.state.colored, job.formatted_elapsed_time_from, job.resource_count]
         end
       end
     end

data/lib/rukawa/version.rb

@@ -1,3 +1,3 @@
 module Rukawa
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rukawa
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Hyper simple job workflow engine