paraduct 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07807e35ce22e33ca717c280bb70742acd00949b
-  data.tar.gz: 302097b3be4e8c2d9aee9eab2e1ecda5b0bebc18
+  metadata.gz: 4e5fef286eafebed9c735edbae0c76d512e38039
+  data.tar.gz: 42f3248d1122ac05edc444afc5539dac775fc0ef
 SHA512:
-  metadata.gz: 91d9a6f52dbad0e290f4880d23e0de5666ab21d65a94bcf8df6c0b1f6faf90f23b0c40a3e82c702d21f7cb59e0ced5e1688975d57d32ba56049c1b13c9288656
-  data.tar.gz: c71d31485ae44b9adcd4fabf260b3af876ed7ebd71382ba458ea488b05a2fcd15eab08a86986ef170e1f7c1c1b4a67846e47d134d7b7658996ea4dc11a2e9c30
+  metadata.gz: 2512753e14636f20faf4d42286aa421db999e3e62bc2f95d28166417a1b1535eb793b86a3b87e746ae5d31118389867d4fa26c5d00540b36e3298ce8b8312b2f
+  data.tar.gz: ed9f5e87efeb77fac57ae8e45264a2de1a84d41bc31b584ebb39fb8f5f360fa4a311ce55a4f179d63e91e26d9fff7cce5ec08037fc49f6999fe282bcfd90679c

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,13 +1,21 @@
 ## master
 [full changelog](http://github.com/sue445/paraduct/compare/v0.0.3...master)
 
+### Breaking changes :bomb:
 * Stop convert key capitalize
   * https://github.com/sue445/paraduct/pull/77
+* Stop support ruby 1.9
+  * https://github.com/sue445/paraduct/pull/87
+
+### Enhancements
 * Run under current directory when work_dir is empty
   * https://github.com/sue445/paraduct/pull/78
-* some refactorings
-  * https://github.com/sue445/paraduct/pull/79
-  * https://github.com/sue445/paraduct/pull/80
+* Add `after_script`
+  * https://github.com/sue445/paraduct/pull/88
+
+### some refactorings
+* https://github.com/sue445/paraduct/pull/79
+* https://github.com/sue445/paraduct/pull/80
 
 ## v0.0.3
 [full changelog](http://github.com/sue445/paraduct/compare/v0.0.2...v0.0.3)

data/README.md

@@ -13,7 +13,7 @@ Paraduct (**parallel** + **parameterize** + **product**) is matrix test runner
 ![architecture](img/architecture.png)
 
 ## Requirements
-* ruby 1.9+
+* ruby 2.0+
 * rsync
 
 ## Installation
@@ -59,10 +59,12 @@ $ vi .paraduct_rsync_exclude.txt
 $ paraduct test
 ```
 
-## Format
+## .paraduct.yml Format
 ```yaml
 script: |-
   echo "NAME1=${NAME1}, NAME2=${NAME2}"
+after_script: |-
+  echo "Build is finished"
 work_dir: tmp/paraduct_workspace
 variables:
   NAME1:
@@ -82,6 +84,9 @@ exclude:
 ### script
 script to run
 
+### after_script
+script to run after both `script` successful and `script` failure
+
 ### work_dir
 diretory to run
 

data/lib/paraduct/cli.rb

@@ -31,7 +31,8 @@ module Paraduct
           Paraduct.logger.info "[dry-run] params: #{runner.formatted_params}"
         end
       else
-        test_response = Paraduct::ParallelRunner.perform_all(script, product_variables)
+        after_script = Paraduct.config.after_script
+        test_response = Paraduct::ParallelRunner.perform_all(script: script, after_script: after_script, product_variables: product_variables)
         Paraduct.logger.info test_response.detail_message
         raise Paraduct::Errors::TestFailureError if test_response.failure?
       end

data/lib/paraduct/configuration.rb

@@ -15,6 +15,11 @@ module Paraduct
       config_data[:script]
     end
 
+    # @return [String, Array<String>]
+    def after_script
+      config_data[:after_script]
+    end
+
     # @return [Integer]
     def max_threads
       config_data[:max_threads] || 4

data/lib/paraduct/parallel_runner.rb

@@ -4,9 +4,10 @@ module Paraduct
   class ParallelRunner
     # run script with arguments
     # @param script            [String, Array<String>] script file, script(s)
+    # @param after_script      [String, Array<String>] script file, script(s)
     # @param product_variables [Array<Hash{String => String}>]
     # @return [Paraduct::TestResponse]
-    def self.perform_all(script, product_variables)
+    def self.perform_all(script: nil, after_script: nil, product_variables: nil)
       test_response = Paraduct::TestResponse.new
       base_job_dir = Paraduct.config.base_job_dir
       FileUtils.mkdir_p(base_job_dir) unless base_job_dir.exist?
@@ -20,7 +21,6 @@ START matrix test
       begin
         product_variables.each_with_index do |params, index|
           runner = Paraduct::Runner.new(
-            script:       script,
             params:       params,
             base_job_dir: base_job_dir,
             job_id:       index + 1,
@@ -28,18 +28,13 @@ START matrix test
           pool.process do
             runner.logger.info "[START] params: #{runner.formatted_params}"
             runner.setup_dir if Paraduct.config.enable_rsync?
-            begin
-              stdout = runner.perform
-              successful = true
-            rescue Paraduct::Errors::ProcessError => e
-              runner.logger.error "exitstatus=#{e.status}, #{e.inspect}"
-              stdout = e.message
-              successful = false
 
-            rescue Exception => e
-              runner.logger.error "Unknown error: #{e.inspect}"
-              runner.logger.error e.backtrace.join("\n")
-              successful = false
+            stdout, successful = perform_runner(runner, script)
+
+            unless after_script.blank?
+              after_stdout, after_successful = perform_runner(runner, after_script)
+              stdout << after_stdout
+              successful &&= after_successful
             end
 
             runner.logger.info "[END]   params: #{runner.formatted_params}"
@@ -61,5 +56,21 @@ START matrix test
 
       test_response
     end
+
+    private_class_method
+
+    def self.perform_runner(runner, script)
+      stdout = runner.perform(script)
+      [stdout, true]
+
+    rescue Paraduct::Errors::ProcessError => e
+      runner.logger.error "exitstatus=#{e.status}, #{e.inspect}"
+      [e.message, false]
+
+    rescue Exception => e
+      runner.logger.error "Unknown error: #{e.inspect}"
+      runner.logger.error e.backtrace.join("\n")
+      [nil, false]
+    end
   end
 end

data/lib/paraduct/runner.rb

@@ -2,17 +2,15 @@ module Paraduct
   require "pty"
 
   class Runner
-    attr_reader :script, :params, :base_job_dir
-
-    # @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]
+    attr_reader :params, :base_job_dir
+
+    # @param params [Hash{String => String}] value is quoted (ex. FOO=1 => FOO="1" )
+    # @param base_job_dir [String]
+    # @param job_id [String]
+    def initialize(params: nil, base_job_dir: nil, job_id: nil)
+      @params       = params
+      @base_job_dir = base_job_dir
+      @job_id       = job_id
     end
 
     def setup_dir
@@ -22,13 +20,14 @@ module Paraduct
     end
 
     # run script with params
+    # @param script [String, Array<String>] script file, script(s)
     # @return [String] stdout
     # @raise [Paraduct::Errors::ProcessError] command exited error status
-    def perform
+    def perform(script)
       export_variables = @params.reverse_merge("PARADUCT_JOB_ID" => @job_id, "PARADUCT_JOB_NAME" => job_name)
       variable_string = export_variables.map{ |key, value| %(export #{key}="#{value}";) }.join(" ")
 
-      Array.wrap(@script).inject("") do |stdout, command|
+      Array.wrap(script).inject("") do |stdout, command|
         stdout << run_command("#{variable_string} #{command}")
         stdout
       end

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

@@ -1,5 +1,7 @@
 script: |-
   echo "NAME1=${NAME1}, NAME2=${NAME2}"
+after_script: |-
+  echo "Build is finished"
 work_dir: tmp/paraduct_workspace
 variables:
   NAME1:

data/lib/paraduct/version.rb

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

data/paraduct.gemspec

@@ -17,6 +17,7 @@ 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"
@@ -27,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "redcarpet"
   spec.add_development_dependency "rspec", "~> 3.4"
@@ -35,9 +36,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-its"
   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.yml

@@ -1,4 +1,5 @@
 script: ./script/build_success.sh
+after_acript: ./script/build_finish.sh
 work_dir: tmp/paraduct_workspace
 variables:
   RUBY:

data/spec/paraduct/cli_spec.rb

@@ -24,6 +24,7 @@ describe Paraduct::CLI do
         let(:config_data) do
           {
             script: "./script/build_success.sh",
+            after_script: "./script/build_finish.sh",
             work_dir: "tmp/paraduct_workspace",
             variables: {
               "RUBY" =>     ["1.9.3", "2.0.0"],
@@ -33,6 +34,7 @@ describe Paraduct::CLI do
         end
 
         let(:script){ "./script/build_success.sh" }
+        let(:after_script){ "./script/build_finish.sh" }
         let(:product_variables) do
           [
             { "RUBY" => "1.9.3", "DATABASE" => "mysql"      },
@@ -49,7 +51,8 @@ describe Paraduct::CLI do
         end
 
         it "should call perform_all" do
-          expect(Paraduct::ParallelRunner).to receive(:perform_all).with(script, product_variables){ test_response }
+          expect(Paraduct::ParallelRunner).to receive(:perform_all).
+            with(script: script, after_script: after_script, product_variables: product_variables){ test_response }
           subject
         end
       end

data/spec/paraduct/parallel_runner_spec.rb

@@ -1,6 +1,6 @@
 describe Paraduct::ParallelRunner do
   describe "#perform_all" do
-    subject{ Paraduct::ParallelRunner.perform_all(script, product_variables) }
+    subject{ Paraduct::ParallelRunner.perform_all(script: script, product_variables: product_variables, after_script: after_script) }
 
     include_context :within_temp_work_dir
 
@@ -26,6 +26,7 @@ describe Paraduct::ParallelRunner do
 
     describe "with script file test" do
       let(:script){ "./script/build_success.sh" }
+      let(:after_script) { "./script/build_finish.sh" }
       let(:product_variables) do
         [
           { "RUBY" => "1.9", "DATABASE" => "mysql" },
@@ -39,7 +40,7 @@ describe Paraduct::ParallelRunner do
                  params:           { "RUBY" => "1.9", "DATABASE" => "mysql" },
                  formatted_params: "RUBY=1.9, DATABASE=mysql",
                  successful:       true,
-                 stdout:           "RUBY=1.9\nDATABASE=mysql\n"
+                 stdout:           "RUBY=1.9\nDATABASE=mysql\nFinish: RUBY=1.9, DATABASE=mysql\n"
                )
       end
 
@@ -49,7 +50,7 @@ describe Paraduct::ParallelRunner do
                  params:           { "RUBY" => "2.0", "DATABASE" => "postgresql" },
                  formatted_params: "RUBY=2.0, DATABASE=postgresql",
                  successful:       true,
-                 stdout:           "RUBY=2.0\nDATABASE=postgresql\n"
+                 stdout:           "RUBY=2.0\nDATABASE=postgresql\nFinish: RUBY=2.0, DATABASE=postgresql\n"
                )
       end
 
@@ -98,6 +99,7 @@ describe Paraduct::ParallelRunner do
 
     describe "without script file test" do
       let(:script){ %q(echo "RUBY=${RUBY} DATABASE=${DATABASE}") }
+      let(:after_script) { %q(echo "Finish: RUBY=${RUBY}, DATABASE=${DATABASE}") }
       let(:product_variables) do
         [
           { "RUBY" => "1.9", "DATABASE" => "mysql" },
@@ -111,7 +113,7 @@ describe Paraduct::ParallelRunner do
                  params:           { "RUBY" => "1.9", "DATABASE" => "mysql" },
                  formatted_params: "RUBY=1.9, DATABASE=mysql",
                  successful:       true,
-                 stdout:           "RUBY=1.9 DATABASE=mysql\n"
+                 stdout:           "RUBY=1.9 DATABASE=mysql\nFinish: RUBY=1.9, DATABASE=mysql\n"
                )
       end
 
@@ -121,7 +123,7 @@ describe Paraduct::ParallelRunner do
                  params:           { "RUBY" => "2.0", "DATABASE" => "postgresql" },
                  formatted_params: "RUBY=2.0, DATABASE=postgresql",
                  successful:       true,
-                 stdout:           "RUBY=2.0 DATABASE=postgresql\n"
+                 stdout:           "RUBY=2.0 DATABASE=postgresql\nFinish: RUBY=2.0, DATABASE=postgresql\n"
                )
       end
 

data/spec/paraduct/runner_spec.rb

@@ -1,7 +1,6 @@
 describe Paraduct::Runner do
   let(:runner) do
     Paraduct::Runner.new(
-      script:       script,
       params:       params,
       base_job_dir: base_job_dir,
       job_id:       job_id,
@@ -11,12 +10,11 @@ describe Paraduct::Runner do
   include_context "uses temp dir"
 
   let(:base_job_dir){ temp_dir }
-  let(:script)      { "" }
   let(:params)      { {} }
   let(:job_id)      { 1 }
 
   describe "#perform" do
-    subject{ runner.perform }
+    subject{ runner.perform(script) }
 
     let(:script) { "./script/build_success.sh" }
     let(:params) { { "RUBY" => "1.9", "DATABASE" => "mysql" } }

data/spec/script/build_finish.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "Finish: RUBY=${RUBY}, DATABASE=${DATABASE}"

data/spec/spec_helper.rb

@@ -125,7 +125,7 @@ RSpec.configure do |config|
   config.before do
     unless is_verbose
       # quiet all logs
-      Paraduct::ColoredLabelLogger::SEVERITIES.each do |severity|
+      [:debug, :info, :warn, :error, :fatal].each do |severity|
         allow(Paraduct.logger).to receive(severity)
         allow_any_instance_of(Paraduct::ColoredLabelLogger).to receive(severity)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - sue445
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -234,20 +234,6 @@ 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
@@ -295,6 +281,7 @@ files:
 - spec/paraduct/variable_converter_spec.rb
 - spec/paraduct_spec.rb
 - spec/script/build_error.sh
+- spec/script/build_finish.sh
 - spec/script/build_success.sh
 - spec/script/tmp/paraduct_workspace/dummy.txt
 - spec/spec_helper.rb
@@ -315,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -340,6 +327,7 @@ test_files:
 - spec/paraduct/variable_converter_spec.rb
 - spec/paraduct_spec.rb
 - spec/script/build_error.sh
+- spec/script/build_finish.sh
 - spec/script/build_success.sh
 - spec/script/tmp/paraduct_workspace/dummy.txt
 - spec/spec_helper.rb