paraduct 0.0.1.beta6 → 0.0.1.beta7

data/README.md

@@ -42,11 +42,13 @@ Commands:
 ```bash  
 $ paraduct generate
       create  .paraduct.yml
+      create  .paraduct_rsync_exclude.txt
 ```
 
 ### 2. Customize .paraduct.yml
 ```bash
 $ vi .paraduct.yml
+$ vi .paraduct_rsync_exclude.txt
 ```
 
 ### 3. Run test
@@ -67,6 +69,8 @@ variables:
     - value2a
     - value2b
 max_threads: 4
+rsync_option:
+  exclude_from: .paraduct_rsync_exclude.txt
 ```
 
 ### script
@@ -93,6 +97,9 @@ value1b | value2b | NAME1_value1b_NAME2_value2b   | tmp/paraduct_workspace/NAME1
 ### max_threads
 maximum concurrent execution number of jobs
 
+### rsync_option
+support only `exclude-from`
+
 ## Contributing
 
 1. Fork it ( https://github.com/sue445/paraduct/fork )

data/lib/paraduct/parallel_runner.rb

@@ -16,7 +16,7 @@ module Paraduct
 START matrix test
       EOS
       product_variables.each do |params|
-        Paraduct.logger.info "params: #{params}"
+        Paraduct.logger.info "params: #{params.map{ |key, value| "#{key}=#{value}" }.join(", ")}"
       end
 
       pool = Thread.pool(Paraduct.config.max_threads)

data/lib/paraduct/runner.rb

@@ -1,4 +1,5 @@
 module Paraduct
+  require "colorize"
   require "open3"
 
   class Runner
@@ -12,6 +13,7 @@ module Paraduct
       @script       = args[:script]
       @params       = args[:params]
       @base_job_dir = args[:base_job_dir]
+      @color        = Paraduct::Runner.next_color
     end
 
     def setup_dir
@@ -55,11 +57,45 @@ module Paraduct
       end
     end
 
+    COLORS = [
+      :cyan,
+      :yellow,
+      :green,
+      :magenta,
+      :red,
+      :blue,
+      :light,
+      :cyan,
+      :light_yellow,
+      :light_green,
+      :light_magenta,
+      :light_red,
+      :light_blue,
+    ]
+    def self.next_color
+      @@color_index ||= -1
+      @@color_index = (@@color_index + 1) % COLORS.length
+      COLORS[@@color_index]
+    end
+
     private
     def run_command(command)
-      stdout, stderr, status = Open3.capture3(command)
-      raise Paraduct::Errors::ProcessError.new("#{stdout}\n#{stderr}", status) unless status.success?
-      stdout
+      thread_id = Thread.current.object_id.to_s
+      console_label = "[#{thread_id.colorize(@color)}]"
+
+      lines = ""
+
+      IO.popen(command) do |io|
+        while line = io.gets
+          Paraduct.logger.info "#{console_label} #{line.strip}"
+          lines << line
+        end
+      end
+
+      status = $?
+      raise Paraduct::Errors::ProcessError.new(lines, status) unless status.success?
+
+      lines
     end
   end
 end

data/lib/paraduct/templates/.paraduct.yml.tt

@@ -9,3 +9,5 @@ variables:
     - value2a
     - value2b
 max_threads: 4
+rsync_option:
+  exclude_from: .paraduct_rsync_exclude.txt

data/lib/paraduct/version.rb

@@ -1,3 +1,3 @@
 module Paraduct
-  VERSION = "0.0.1.beta6"
+  VERSION = "0.0.1.beta7"
 end

data/paraduct.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
+  spec.add_dependency "colorize"
   spec.add_dependency "rsync"
   spec.add_dependency "thor"
   spec.add_dependency "thread"

data/spec/paraduct/runner_spec.rb

@@ -40,7 +40,6 @@ describe Paraduct::Runner do
           <<-EOS
 RUBY=1.9
 DATABASE=mysql
-
           EOS
         end
 
@@ -76,4 +75,12 @@ DATABASE=mysql
 
     it{ should eq "ruby=1.9, database=mysql" }
   end
+
+  describe "#next_color" do
+    it "can call many times" do
+      20.times do
+        expect(Paraduct::Runner.next_color).to be_an_instance_of Symbol
+      end
+    end
+  end
 end

data/spec/script/build_error.sh

@@ -3,3 +3,4 @@
 echo "RUBY=${RUBY}"
 echo "DATABASE=${DATABASE}"
 exit 1
+echo "after exit"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta6
+  version: 0.0.1.beta7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rsync
   requirement: !ruby/object:Gem::Requirement
@@ -351,7 +367,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3159191224660044510
+      hash: 3862644888547862433
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: