paraduct 0.0.1.beta7 → 0.0.1.beta8

data/lib/paraduct/parallel_runner.rb

@@ -15,20 +15,17 @@ module Paraduct
 ======================================================
 START matrix test
       EOS
-      product_variables.each do |params|
-        Paraduct.logger.info "params: #{params.map{ |key, value| "#{key}=#{value}" }.join(", ")}"
-      end
 
       pool = Thread.pool(Paraduct.config.max_threads)
       begin
         product_variables.each do |params|
+          runner = Paraduct::Runner.new(
+            script:       script,
+            params:       params,
+            base_job_dir: base_job_dir,
+          )
+          runner.logger.info "[START] params: #{runner.formatted_params}"
           pool.process do
-            runner = Paraduct::Runner.new(
-              script:       script,
-              params:       params,
-              base_job_dir: base_job_dir,
-            )
-
             runner.setup_dir
             begin
               stdout = runner.perform
@@ -38,14 +35,7 @@ START matrix test
               successful = false
             end
 
-            Paraduct.logger.info <<-EOS
-======================================================
-params:   #{runner.formatted_params}
-job_name: #{runner.job_name}
-job_dir:  #{runner.job_dir}
-
-            #{stdout}
-            EOS
+            runner.logger.info "[END]   params: #{runner.formatted_params}"
 
             test_response.jobs_push(
               job_name:         runner.job_name,
@@ -56,7 +46,6 @@ job_dir:  #{runner.job_dir}
             )
           end
         end
-
       ensure
         pool.shutdown
       end

data/lib/paraduct/runner.rb

@@ -3,7 +3,7 @@ module Paraduct
   require "open3"
 
   class Runner
-    attr_reader :script, :params, :base_job_dir
+    attr_reader :script, :params, :base_job_dir, :logger
 
     # @param args
     # @option args :script [String, Array<String>] script file, script(s)
@@ -13,7 +13,7 @@ module Paraduct
       @script       = args[:script]
       @params       = args[:params]
       @base_job_dir = args[:base_job_dir]
-      @color        = Paraduct::Runner.next_color
+      @logger       = Paraduct::ThreadLogger.new
     end
 
     def setup_dir
@@ -57,37 +57,13 @@ 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)
-      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}"
+          @logger.info(line)
           lines << line
         end
       end

data/lib/paraduct/thread_logger.rb

@@ -0,0 +1,41 @@
+module Paraduct
+  class ThreadLogger < ::Logger
+    def initialize(logdev = STDOUT)
+      super(logdev)
+      thread_id = Thread.current.object_id.to_s
+      color = Paraduct::ThreadLogger.next_color
+      @label = "[#{thread_id.colorize(color)}]"
+      @formatter = ActiveSupport::Logger::SimpleFormatter.new
+    end
+
+    [:debug, :info, :warn, :error, :fatal].each do |severity|
+      define_method "#{severity}_with_label" do |message|
+        message.each_line do |line|
+          send "#{severity}_without_label", "#{@label} #{line.strip}" unless line.blank?
+        end
+      end
+      alias_method_chain severity, :label
+    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
+  end
+end

data/lib/paraduct/version.rb

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

data/lib/paraduct.rb

@@ -10,6 +10,7 @@ module Paraduct
   autoload :Runner           , 'paraduct/runner'
   autoload :SyncUtils        , 'paraduct/sync_utils'
   autoload :TestResponse     , 'paraduct/test_response'
+  autoload :ThreadLogger     , 'paraduct/thread_logger'
   autoload :VariableConverter, 'paraduct/variable_converter'
   autoload :Version          , 'paraduct/version'
 

data/spec/paraduct/runner_spec.rb

@@ -75,12 +75,4 @@ 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/paraduct/thread_logger_spec.rb

@@ -0,0 +1,9 @@
+describe Paraduct::ThreadLogger do
+  describe "#next_color" do
+    it "can call many times" do
+      20.times do
+        expect(Paraduct::ThreadLogger.next_color).to be_an_instance_of Symbol
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta7
+  version: 0.0.1.beta8
   prerelease: 6
 platform: ruby
 authors:
@@ -329,6 +329,7 @@ files:
 - lib/paraduct/templates/.paraduct.yml.tt
 - lib/paraduct/templates/.paraduct_rsync_exclude.txt.tt
 - lib/paraduct/test_response.rb
+- lib/paraduct/thread_logger.rb
 - lib/paraduct/variable_converter.rb
 - lib/paraduct/version.rb
 - paraduct.gemspec
@@ -341,6 +342,7 @@ files:
 - spec/paraduct/runner_spec.rb
 - spec/paraduct/sync_utils_spec.rb
 - spec/paraduct/test_response_spec.rb
+- spec/paraduct/thread_logger_spec.rb
 - spec/paraduct/variable_converter_spec.rb
 - spec/paraduct_spec.rb
 - spec/script/build_error.sh
@@ -367,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3862644888547862433
+      hash: 965454421282758881
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -390,6 +392,7 @@ test_files:
 - spec/paraduct/runner_spec.rb
 - spec/paraduct/sync_utils_spec.rb
 - spec/paraduct/test_response_spec.rb
+- spec/paraduct/thread_logger_spec.rb
 - spec/paraduct/variable_converter_spec.rb
 - spec/paraduct_spec.rb
 - spec/script/build_error.sh