masamune 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb31759e76d58c026aeee2bcf241611e9821da4f
-  data.tar.gz: fb82f3c5215527397b742bd0b8108f9f8d58b4c5
+  metadata.gz: fc35b976d3a3db9e1c607ed58c09e38dadbf2928
+  data.tar.gz: 79d7c83267acf6faed9ada08768f515dc927782a
 SHA512:
-  metadata.gz: a8c29df50f07a4d7bbc56b66940bbb1b4352ad8d2489740741cabe056803d196375c75c217d28be4d0feabf257f3a1f84788594163467b36885ae6565aa4e1b2
-  data.tar.gz: 4e0b4decd60fe42953ccd0ac92c7c4077137e4c85db42e238893e769b86c5f159a94f505b13cc0bc681a20d0b819562afb9c121e6f435e06e9010667c51b9c7b
+  metadata.gz: ee73bba553255b67aa74bf852cc36a1d7a345cf9d1f586f85c115ac384e044c7e658e4c40d4f32707647ab846030c4635ac8dab5aa962f6e7525a619cd8effca
+  data.tar.gz: a428ee198c1e77a39f8a3ea362fd525c09dbda6efba3ef9ac6d4688c8a7860d2584dc747485872e080224bf182b16ed44923f50af223410436ecbd785b32ca0e

data/lib/masamune/actions/invoke_parallel.rb

@@ -31,16 +31,16 @@ module Masamune::Actions
     include Masamune::Actions::Execute
 
     included do |base|
-      base.class_option :max_tasks, aliases: '-p', type: :numeric, desc: 'Maximum number of tasks to execute in parallel', default: 4
+      base.class_option :max_tasks, aliases: '-p', type: :numeric, desc: 'Maximum number of tasks to execute in parallel', default: Parallel.processor_count
     end
 
     def invoke_parallel(*task_group)
-      per_task_opts = task_group.last.is_a?(Array) ? task_group.pop : [{}]
-      all_task_opts = task_group.last.is_a?(Hash) ? task_group.pop : {}
-      max_tasks = [all_task_opts.delete(:max_tasks), task_group.count].min
+      per_task_opts = task_group.last.is_a?(Array) ? task_group.pop.dup : [{}]
+      all_task_opts = task_group.last.is_a?(Hash) ? task_group.pop.dup : {}
+      task_group_by_task_opts = task_group.product(per_task_opts)
+      max_tasks = [all_task_opts.delete(:max_tasks), task_group_by_task_opts.count].min
       console("Setting max_tasks to #{max_tasks}")
       bail_fast task_group, all_task_opts if all_task_opts[:version]
-      task_group_by_task_opts = task_group.product(per_task_opts)
       Parallel.each(task_group_by_task_opts, in_processes: max_tasks) do |task_name, task_opts|
         task_env = task_opts[:env] || {}
         begin

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.18.2'.freeze
+  VERSION = '0.18.3'.freeze
 end

data/spec/masamune/actions/invoke_parallel_spec.rb

@@ -29,6 +29,7 @@ describe Masamune::Actions::InvokeParallel do
   end
 
   let(:instance) { klass.new }
+  let(:task_opts) { { max_tasks: 0 }.freeze }
 
   describe '.invoke_parallel' do
     context 'with a single thor command' do
@@ -37,7 +38,7 @@ describe Masamune::Actions::InvokeParallel do
       end
 
       subject do
-        instance.invoke_parallel('list', max_tasks: 0)
+        instance.invoke_parallel('list', task_opts)
       end
 
       it { expect { subject }.to_not raise_error }
@@ -50,7 +51,7 @@ describe Masamune::Actions::InvokeParallel do
       end
 
       subject do
-        instance.invoke_parallel('list', { max_tasks: 0 }, [{ a: true, b: false }, { a: false, b: true }])
+        instance.invoke_parallel('list', task_opts, [{ a: true, b: false }, { a: false, b: true }])
       end
 
       it { expect { subject }.to_not raise_error }
@@ -63,7 +64,7 @@ describe Masamune::Actions::InvokeParallel do
       end
 
       subject do
-        instance.invoke_parallel('list', { max_tasks: 0 }, [{ env: { 'MASAMUNE_ENV' => 'test_1' } }, { env: { 'MASAMUNE_ENV' => 'test_2' } }])
+        instance.invoke_parallel('list', task_opts, [{ env: { 'MASAMUNE_ENV' => 'test_1' } }, { env: { 'MASAMUNE_ENV' => 'test_2' } }])
       end
 
       it { expect { subject }.to_not raise_error }
@@ -78,7 +79,7 @@ describe Masamune::Actions::InvokeParallel do
       end
 
       subject do
-        instance.invoke_parallel('list', 'help', { max_tasks: 0 }, [{ env: { 'MASAMUNE_ENV' => 'test_1' } }, { env: { 'MASAMUNE_ENV' => 'test_2' } }])
+        instance.invoke_parallel('list', 'help', task_opts, [{ env: { 'MASAMUNE_ENV' => 'test_1' } }, { env: { 'MASAMUNE_ENV' => 'test_2' } }])
       end
 
       it { expect { subject }.to_not raise_error }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor