paraduct 1.0.0.beta3 → 1.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44b857ff3d62610894f7bb2c251302415642bc22
-  data.tar.gz: 4744fbe562d1a5ae56eca1ea85e46897e62ff682
+  metadata.gz: 07807e35ce22e33ca717c280bb70742acd00949b
+  data.tar.gz: 302097b3be4e8c2d9aee9eab2e1ecda5b0bebc18
 SHA512:
-  metadata.gz: fc130e6be4ce56c7c1f0ae4ccda80790e88631fdd4d9c8f6c20e31ca6f27fe845749c8872d9190fb4faee843cdc9e96714de971d08651c4f927c8d1833551527
-  data.tar.gz: e6a4990163c8a9e79c28cd1ee1836a4fbd41c331f8b5512e391842839fe553372d8abf1904bad80a4bc5f94636d6f3a2b4e051baae076bfb8b9c9161a640eabe
+  metadata.gz: 91d9a6f52dbad0e290f4880d23e0de5666ab21d65a94bcf8df6c0b1f6faf90f23b0c40a3e82c702d21f7cb59e0ced5e1688975d57d32ba56049c1b13c9288656
+  data.tar.gz: c71d31485ae44b9adcd4fabf260b3af876ed7ebd71382ba458ea488b05a2fcd15eab08a86986ef170e1f7c1c1b4a67846e47d134d7b7658996ea4dc11a2e9c30

data/lib/paraduct/colored_label_logger.rb

@@ -3,18 +3,7 @@ module Paraduct
     def initialize(label_name, logdev = STDOUT)
       super(logdev)
       color = Paraduct::ColoredLabelLogger.next_color
-      @label = "[#{label_name.to_s.colorize(color)}]"
-      @formatter = ActiveSupport::Logger::SimpleFormatter.new
-    end
-
-    SEVERITIES = [:debug, :info, :warn, :error, :fatal]
-    SEVERITIES.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
+      @formatter = Formatter.new(label_name, color)
     end
 
     COLORS = [
@@ -33,9 +22,25 @@ module Paraduct
       :light_blue,
     ]
     def self.next_color
-      @@color_index ||= -1
-      @@color_index = (@@color_index + 1) % COLORS.length
-      COLORS[@@color_index]
+      @color_index ||= -1
+      @color_index = (@color_index + 1) % COLORS.length
+      COLORS[@color_index]
+    end
+
+    class Formatter
+      def initialize(label_name, color)
+        @label = "[#{label_name.to_s.colorize(color)}]"
+      end
+
+      def call(severity, datetime, progname, message)
+        return "" if message.blank?
+
+        content = ""
+        message.each_line do |line|
+          content << "#{datetime} #{@label} #{line.strip}\n"
+        end
+        content
+      end
     end
   end
 end

data/lib/paraduct/runner.rb

@@ -48,7 +48,7 @@ module Paraduct
 
     def logger
       unless @logger
-        stdout_logger = Paraduct::ColoredLabelLogger.new(object_id)
+        stdout_logger = Paraduct::ColoredLabelLogger.new(formatted_params)
         file_logger   = Logger.new(Pathname(@base_job_dir).join("#{job_name}.log"))
         @logger       = stdout_logger.extend(ActiveSupport::Logger.broadcast(file_logger))
       end
@@ -60,8 +60,12 @@ module Paraduct
 
     def run_command(command)
       full_stdout = ""
+      exit_status = nil
+
+      PTY.spawn(command) do |stdin, stdout, pid|
+        stdout.close_write
+        stdin.sync = true
 
-      PTY.spawn(command) do |stdin, _stdout, pid|
         begin
           stdin.each do |line|
             line.strip!
@@ -69,11 +73,13 @@ module Paraduct
             full_stdout << "#{line}\n"
           end
         rescue Errno::EIO
+        ensure
+          _, exit_status = Process.waitpid2(pid)
         end
-        exit_status = PTY.check(pid)
-        raise Paraduct::Errors::ProcessError.new(full_stdout, exit_status) if exit_status && !exit_status.success?
       end
 
+      raise Paraduct::Errors::ProcessError.new(full_stdout, exit_status) unless exit_status.success?
+
       full_stdout
     end
   end

data/lib/paraduct/version.rb

@@ -1,3 +1,3 @@
 module Paraduct
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.beta4"
 end

data/paraduct.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "rspec-collection_matchers"
   spec.add_development_dependency "rspec-its"
-  spec.add_development_dependency "rspec-retry"
   spec.add_development_dependency "rspec-temp_dir"
   spec.add_development_dependency "yard"
 

data/spec/paraduct/cli_spec.rb

@@ -65,9 +65,7 @@ describe Paraduct::CLI do
           }
         end
 
-        it "should raise TestFailureError", with_retry do
-          expect { subject }.to raise_error Paraduct::Errors::TestFailureError
-        end
+        it { expect { subject }.to raise_error Paraduct::Errors::TestFailureError }
       end
     end
 

data/spec/paraduct/runner_spec.rb

@@ -37,7 +37,7 @@ describe Paraduct::Runner do
         it { should match /DATABASE=mysql/ }
       end
 
-      context "when error in script file", with_retry do
+      context "when error in script file" do
         let(:script){ "./script/build_error.sh" }
 
         let(:stdout) do

data/spec/spec_helper.rb

@@ -21,7 +21,6 @@ require 'paraduct/cli'
 require 'rspec/collection_matchers'
 require 'rspec/temp_dir'
 require 'rspec/its'
-require 'rspec/retry'
 require 'pry'
 
 is_verbose = ENV["VERBOSE"].present?
@@ -32,11 +31,6 @@ end
 
 Dir["#{spec_dir}/support/**/*.rb"].sort.each { |f| require f }
 
-# rspec-retry option
-def with_retry
-  {retry: 3, retry_wait: 10}
-end
-
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this
@@ -128,8 +122,6 @@ RSpec.configure do |config|
 
   config.order = :random
 
-  config.verbose_retry = true
-
   config.before do
     unless is_verbose
       # quiet all logs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
 platform: ruby
 authors:
 - sue445
@@ -206,20 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-temp_dir
   requirement: !ruby/object:Gem::Requirement