paraduct 0.0.1.beta11 → 0.0.1.beta12

data/lib/paraduct.rb

@@ -4,15 +4,15 @@ require "active_support/core_ext"
 require "pathname"
 
 module Paraduct
-  autoload :Configuration    , 'paraduct/configuration'
-  autoload :Errors           , 'paraduct/errors'
-  autoload :ParallelRunner   , 'paraduct/parallel_runner'
-  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'
+  autoload :ColoredLabelLogger, 'paraduct/colored_label_logger'
+  autoload :Configuration     , 'paraduct/configuration'
+  autoload :Errors            , 'paraduct/errors'
+  autoload :ParallelRunner    , 'paraduct/parallel_runner'
+  autoload :Runner            , 'paraduct/runner'
+  autoload :SyncUtils         , 'paraduct/sync_utils'
+  autoload :TestResponse      , 'paraduct/test_response'
+  autoload :VariableConverter , 'paraduct/variable_converter'
+  autoload :Version           , 'paraduct/version'
 
   class << self
     def configuration

data/lib/paraduct/{thread_logger.rb → colored_label_logger.rb}

@@ -1,9 +1,9 @@
 module Paraduct
-  class ThreadLogger < ::Logger
-    def initialize(logdev = STDOUT)
+  class ColoredLabelLogger < ::Logger
+    def initialize(label_name, logdev = STDOUT)
       super(logdev)
-      color = Paraduct::ThreadLogger.next_color
-      @label = "[#{object_id.to_s.colorize(color)}]"
+      color = Paraduct::ColoredLabelLogger.next_color
+      @label = "[#{label_name.to_s.colorize(color)}]"
       @formatter = ActiveSupport::Logger::SimpleFormatter.new
     end
 

data/lib/paraduct/parallel_runner.rb

@@ -25,8 +25,8 @@ START matrix test
             base_job_dir: base_job_dir,
             job_id:       index + 1,
           )
-          runner.logger.info "[START] params: #{runner.formatted_params}"
           pool.process do
+            runner.logger.info "[START] params: #{runner.formatted_params}"
             runner.setup_dir
             begin
               stdout = runner.perform

data/lib/paraduct/runner.rb

@@ -3,7 +3,7 @@ module Paraduct
   require "open3"
 
   class Runner
-    attr_reader :script, :params, :base_job_dir, :logger
+    attr_reader :script, :params, :base_job_dir
 
     # @param args
     # @option args :script [String, Array<String>] script file, script(s)
@@ -14,7 +14,6 @@ module Paraduct
       @params       = args[:params]
       @base_job_dir = args[:base_job_dir]
       @job_id       = args[:job_id]
-      @logger       = Paraduct::ThreadLogger.new
     end
 
     def setup_dir
@@ -52,6 +51,16 @@ module Paraduct
       @params.map{ |key, value| "#{key}=#{value}" }.join(", ")
     end
 
+    def logger
+      unless @logger
+        stdout_logger = Paraduct::ColoredLabelLogger.new(object_id)
+        file_logger   = Logger.new(Pathname(@base_job_dir).join("#{job_name}.log"))
+        @logger       = stdout_logger.extend(ActiveSupport::Logger.broadcast(file_logger))
+      end
+
+      @logger
+    end
+
     def self.capitalize_keys(params)
       params.inject({}) do |res, (key, value)|
         res[key.upcase] = value
@@ -65,7 +74,7 @@ module Paraduct
 
       IO.popen(command) do |io|
         while line = io.gets
-          @logger.info(line)
+          logger.info(line)
           lines << line
         end
       end

data/lib/paraduct/test_response.rb

@@ -23,6 +23,14 @@ module Paraduct
 
       message = "======================================================\n"
 
+      if successful_count > 0
+        message << "Passed:\n\n"
+        @jobs.select{ |result| result[:successful] }.each_with_index do |result, i|
+          message << "  #{i + 1}) #{result[:formatted_params]}\n"
+        end
+        message << "\n"
+      end
+
       if failure_count > 0
         message << "Failures:\n\n"
         @jobs.select{ |result| !result[:successful] }.each_with_index do |result, i|
@@ -30,6 +38,7 @@ module Paraduct
         end
         message << "\n"
       end
+
       message << "#{all_count} jobs, #{failure_count} failures, #{successful_count} passed\n"
 
       message

data/lib/paraduct/version.rb

@@ -1,3 +1,3 @@
 module Paraduct
-  VERSION = "0.0.1.beta11"
+  VERSION = "0.0.1.beta12"
 end

data/spec/paraduct/colored_label_logger_spec.rb

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

data/spec/paraduct/runner_spec.rb

@@ -8,7 +8,9 @@ describe Paraduct::Runner do
     )
   end
 
-  let(:base_job_dir){ "/tmp/jobs" }
+  include_context "uses temp dir"
+
+  let(:base_job_dir){ temp_dir }
   let(:script)      { "" }
   let(:params)      { {} }
   let(:job_id)      { 1 }
@@ -67,7 +69,7 @@ DATABASE=mysql
 
     let(:params) { { "ruby" => "1.9", "database" => "mysql" } }
 
-    it { should eq Pathname("/tmp/jobs/RUBY_1.9_DATABASE_mysql") }
+    it { should eq temp_dir_path.join("RUBY_1.9_DATABASE_mysql") }
   end
 
   describe "#formatted_params" do

data/spec/paraduct/test_response_spec.rb

@@ -28,14 +28,20 @@ describe Paraduct::TestResponse do
 
     context "when successful" do
       before do
-        test_response.jobs_push(successful: true)
-        test_response.jobs_push(successful: true)
-        test_response.jobs_push(successful: true)
+        test_response.jobs_push(successful: true, params: { "ruby" => "1.8", "database" => "sqlite3" }   , formatted_params: "ruby=1.8, database=sqlite3")
+        test_response.jobs_push(successful: true, params: { "ruby" => "1.9", "database" => "mysql" }     , formatted_params: "ruby=1.9, database=mysql")
+        test_response.jobs_push(successful: true, params: { "ruby" => "2.0", "database" => "postgresql" }, formatted_params: "ruby=2.0, database=postgresql")
       end
 
       it do
         should eq <<-EOS
 ======================================================
+Passed:
+
+  1) ruby=1.8, database=sqlite3
+  2) ruby=1.9, database=mysql
+  3) ruby=2.0, database=postgresql
+
 3 jobs, 0 failures, 3 passed
         EOS
       end
@@ -43,7 +49,7 @@ describe Paraduct::TestResponse do
 
     context "when failure" do
       before do
-        test_response.jobs_push(successful: true)
+        test_response.jobs_push(successful: true , params: { "ruby" => "1.8", "database" => "sqlite3" }   , formatted_params: "ruby=1.8, database=sqlite3")
         test_response.jobs_push(successful: false, params: { "ruby" => "1.9", "database" => "mysql" }     , formatted_params: "ruby=1.9, database=mysql")
         test_response.jobs_push(successful: false, params: { "ruby" => "2.0", "database" => "postgresql" }, formatted_params: "ruby=2.0, database=postgresql")
       end
@@ -51,6 +57,10 @@ describe Paraduct::TestResponse do
       it do
         should eq <<-EOS
 ======================================================
+Passed:
+
+  1) ruby=1.8, database=sqlite3
+
 Failures:
 
   1) ruby=1.9, database=mysql

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta11
+  version: 0.0.1.beta12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -321,6 +321,7 @@ files:
 - bin/paraduct
 - lib/paraduct.rb
 - lib/paraduct/cli.rb
+- lib/paraduct/colored_label_logger.rb
 - lib/paraduct/configuration.rb
 - lib/paraduct/errors.rb
 - lib/paraduct/parallel_runner.rb
@@ -329,7 +330,6 @@ 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
@@ -337,12 +337,12 @@ files:
 - spec/.paraduct_rsync_exclude.txt
 - spec/.rubocop.yml
 - spec/paraduct/cli_spec.rb
+- spec/paraduct/colored_label_logger_spec.rb
 - spec/paraduct/configuration_spec.rb
 - spec/paraduct/parallel_runner_spec.rb
 - 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
@@ -369,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1831065147149086006
+      hash: -2946467396040530577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -387,12 +387,12 @@ test_files:
 - spec/.paraduct_rsync_exclude.txt
 - spec/.rubocop.yml
 - spec/paraduct/cli_spec.rb
+- spec/paraduct/colored_label_logger_spec.rb
 - spec/paraduct/configuration_spec.rb
 - spec/paraduct/parallel_runner_spec.rb
 - 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

data/spec/paraduct/thread_logger_spec.rb

@@ -1,9 +0,0 @@
-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