paraduct 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b356ec4fc1ad384a7b94c7bd2b154f333623896
-  data.tar.gz: 2cf58a48ce0c7fb0fd73b156d28b2b241dffc0b8
+  metadata.gz: 44b857ff3d62610894f7bb2c251302415642bc22
+  data.tar.gz: 4744fbe562d1a5ae56eca1ea85e46897e62ff682
 SHA512:
-  metadata.gz: 85f5c6e65e5173ca899f65a2bdc7db0dc6af6b665b4adc536db906dec3e951e23b8217545a161654ab2da0eb5e054d114139e0006e964241a2b8844a9d74a182
-  data.tar.gz: 40ce010692cf0e3a889afde1362d3f027712404070bbe58e2990ef46b9e6774263fcdf18f446e00158e57481b24dff03fa646213490aa0f9f3556aedc70d1026
+  metadata.gz: fc130e6be4ce56c7c1f0ae4ccda80790e88631fdd4d9c8f6c20e31ca6f27fe845749c8872d9190fb4faee843cdc9e96714de971d08651c4f927c8d1833551527
+  data.tar.gz: e6a4990163c8a9e79c28cd1ee1836a4fbd41c331f8b5512e391842839fe553372d8abf1904bad80a4bc5f94636d6f3a2b4e051baae076bfb8b9c9161a640eabe

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+- 1.9
 - 2.0
 - 2.1
 - 2.2

data/CHANGELOG.md

@@ -5,10 +5,6 @@
   * https://github.com/sue445/paraduct/pull/77
 * Run under current directory when work_dir is empty
   * https://github.com/sue445/paraduct/pull/78
-* Stop support ruby 1.9
-  * https://github.com/sue445/paraduct/pull/82
-* Use specinfra insteadof PTY.spawn
-  * https://github.com/sue445/paraduct/pull/81
 * some refactorings
   * https://github.com/sue445/paraduct/pull/79
   * https://github.com/sue445/paraduct/pull/80

data/README.md

@@ -13,7 +13,7 @@ Paraduct (**parallel** + **parameterize** + **product**) is matrix test runner
 ![architecture](img/architecture.png)
 
 ## Requirements
-* ruby 2.0+
+* ruby 1.9+
 * rsync
 
 ## Installation

data/lib/paraduct/runner.rb

@@ -1,21 +1,18 @@
 module Paraduct
   require "pty"
-  require 'specinfra/core'
 
   class Runner
     attr_reader :script, :params, :base_job_dir
 
-    # @param script [String, Array<String>] script file, script(s)
-    # @param params [Hash{String => String}] value is quoted (ex. FOO=1 => FOO="1" )
-    # @param base_job_dir [String]
-    # @param job_id [String]
-    def initialize(script: nil, params: nil, base_job_dir: nil, job_id: nil)
-      @script       = script
-      @params       = params
-      @base_job_dir = base_job_dir
-      @job_id       = job_id
-
-      @backend = Specinfra::Backend::Exec.new
+    # @param args
+    # @option args :script [String, Array<String>] script file, script(s)
+    # @option args :params [Hash{String => String}] key is capitalized and value is quoted (ex. foo=1 => FOO="1" )
+    # @option args :base_job_dir [String]
+    def initialize(args={})
+      @script       = args[:script]
+      @params       = args[:params]
+      @base_job_dir = args[:base_job_dir]
+      @job_id       = args[:job_id]
     end
 
     def setup_dir
@@ -62,20 +59,20 @@ module Paraduct
     private
 
     def run_command(command)
-      command_result = @backend.run_command(command)
-
       full_stdout = ""
-      command_result.stdout.each_line do |line|
-        line = line.strip
-        logger.info line
-        full_stdout << "#{line}\n"
-      end
-      command_result.stderr.each_line do |line|
-        line = line.strip
-        logger.info line
-        full_stdout << "#{line}\n"
+
+      PTY.spawn(command) do |stdin, _stdout, pid|
+        begin
+          stdin.each do |line|
+            line.strip!
+            logger.info line
+            full_stdout << "#{line}\n"
+          end
+        rescue Errno::EIO
+        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, command_result.exit_status) if command_result.failure?
 
       full_stdout
     end

data/lib/paraduct/version.rb

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

data/paraduct.gemspec

@@ -17,12 +17,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_dependency "activesupport", "~> 4.0"
   spec.add_dependency "colorize"
   spec.add_dependency "rsync"
-  spec.add_dependency "specinfra"
   spec.add_dependency "thor"
   spec.add_dependency "thread"
 
@@ -38,4 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-retry"
   spec.add_development_dependency "rspec-temp_dir"
   spec.add_development_dependency "yard"
+
+  if RUBY_VERSION.to_i >= 2
+    # NOTE: pry-byebug doesn't support ruby 1.9
+    spec.add_development_dependency "pry-byebug"
+  end
 end

data/spec/paraduct/cli_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - sue445
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: specinfra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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'
 description: Paraduct(parallel + parameterize + product) is matrix test runner
 email:
 - sue445@sue445.net
@@ -329,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"