serverspec-runner 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cfa3c89a3827037a931f66c592ae08dbf90f06d
-  data.tar.gz: a57c6f8f571379d0d6f6f4fb148aed25039d0ff6
+  metadata.gz: 6bea70ba7b7c9f06e8051f853b09e7b467465e8f
+  data.tar.gz: 7bef214aaa76dae41f957ec915b5f370523b0b02
 SHA512:
-  metadata.gz: de14013f8f67c4323642a246379f10ace822969952fd6a725e53e510c97743d9467161949971357a07289f76492b9a8c4a6297851d5a478411d58b4a33508a41
-  data.tar.gz: c9bcee28759fa3a6b3792d84d9b32053cba03948e6f01565c9dacba80413339b04592b7f8161a442eb3b90edffe48202f6fbdaa7522ccb5d52920b645fd3e128
+  metadata.gz: 42ba71e3fc70002f36c8a2f41fb269f1e4d2800b6ba0432403445b9359ae5db5b913c5698be2032d06fe8513d7aafb48f4ef3d7574730f2133eb1093b600029f
+  data.tar.gz: 3f377bbefbcb907060beb5acc1712bdcc10f67733d656e1431f14182bd0f76c716318515ec1ea9f454dc6fb859646acf701f5cc6830c1cd7f54ea15df6688a8b

data/Rakefile

@@ -178,7 +178,7 @@ namespace :spec do
   tasks = []
   gen_exec_plan(nil, scenarios, [], ssh_options, tasks, platform)
 
-  task :stdout => [:test] do
+  task :stdout do
 
     if ENV['tableformat'] == 'bool'
 
@@ -245,13 +245,30 @@ namespace :spec do
     end
   end
 
-  if ENV['exec_mode'] == 'parallel'
-    multitask :test => tasks
+  exec_tasks = []
+  if ENV['parallels']
+    processes = ENV['parallels'].to_i
+
+    split_group = []
+    groups = 0
+    tasks.each_with_index do |t,pos|
+
+      split_group << t
+
+      if pos % processes == 0 || pos == tasks.length - 1
+        multitask "parallel_tasks_#{groups}".to_s => split_group
+        groups += 1
+        split_group = []
+      end
+    end
+
+    groups.times {|i| exec_tasks << "parallel_tasks_#{i}" }
   else
-    task :test => tasks
+    exec_tasks = tasks
   end
 
-  task :all => [:stdout]
+  exec_tasks << :stdout
+  task :all => exec_tasks
 
   # tempファイルに書き出し
   open(ENV['platforms_tmp'] ,"w") do |y|

data/bin/serverspec-runner

@@ -15,7 +15,7 @@ opts = GetoptLong.new(
   ["--ssh_options",  "-o", GetoptLong::REQUIRED_ARGUMENT],
   ["--explain",      "-e", GetoptLong::REQUIRED_ARGUMENT],
   ["--tableformat",  "-t", GetoptLong::REQUIRED_ARGUMENT],
-  ["--parallel",     "-p", GetoptLong::NO_ARGUMENT],
+  ["--parallel",     "-p", GetoptLong::REQUIRED_ARGUMENT],
   ["--help",         "-h", GetoptLong::NO_ARGUMENT],
   ["--tmpdir",       "-1", GetoptLong::REQUIRED_ARGUMENT],
   ["--raketask",     "-2", GetoptLong::REQUIRED_ARGUMENT],
@@ -35,7 +35,7 @@ opts.each do |opt, arg|
   when '--tableformat'
     ENV['tableformat'] = arg
   when '--parallel'
-    ENV['exec_mode'] = 'parallel'
+    ENV['parallels'] = arg
   when '--tmpdir'
     ENV['tmpdir'] = arg
   when '--raketask'

data/lib/serverspec-runner/version.rb

@@ -1,3 +1,3 @@
 module ServerspecRunner
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec-runner
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec