paraduct 0.0.3 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54ba56f517217c8daf695f6b9dedeb5bb3b97298
-  data.tar.gz: 250d47b666ffb04d0e71e24a8a89f1238dd4ff13
+  metadata.gz: a9e503239ff974eb782d8661d709310c4f64dd8d
+  data.tar.gz: 51adc18eca955569631ebe3f0ae34300de855fb2
 SHA512:
-  metadata.gz: abf174f88e100d94ac89d4819944c57612fdc5dd852d76f409bb2aa00cf726d01e28d15ba70dcd5caecbc834689dd1b40a9d42002076478286a26d3ea7a22de4
-  data.tar.gz: 3c4511d76ddb57db86cdc1ea71a187b6abf9aaaba9aba4f95a37421992992c41a76e290a4474de93e949f24dc6c5a91ff9ee2d1c7641f9c891c367d43dd14425
+  metadata.gz: cd356d9697d2b13fb8d7a3410d43edfd880bc71385e920d077bd01fb36427ad9bc4e7638ed4ff85fd697930672be97aa359ff0380b6d0770f3d657ee6da01fdc
+  data.tar.gz: 22ff95122ec9bc3dfe6b2771e3311a4bca5118caf165c6d9e83bf3955dbd8ec308d4f3828c2813eb9b7da3650a5697ae2fefa6160a2baffe0e542cbdc095e1c8

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## master
 [full changelog](http://github.com/sue445/paraduct/compare/v0.0.3...master)
 
+* Stop convert key capitalize
+  * https://github.com/sue445/paraduct/pull/77
+* Run under current directory when work_dir is empty
+  * https://github.com/sue445/paraduct/pull/78
+
 ## v0.0.3
 [full changelog](http://github.com/sue445/paraduct/compare/v0.0.2...v0.0.3)
 

data/README.md

@@ -65,18 +65,18 @@ script: |-
   echo "NAME1=${NAME1}, NAME2=${NAME2}"
 work_dir: tmp/paraduct_workspace
 variables:
-  name1:
+  NAME1:
     - value1a
     - value1b
-  name2:
+  NAME2:
     - value2a
     - value2b
 max_threads: 4
 rsync_option:
   exclude_from: .paraduct_rsync_exclude.txt
 exclude:
-  - name1: value1a
-    name2: value2b
+  - NAME1: value1a
+    NAME2: value2b
 ```
 
 ### script
@@ -86,14 +86,15 @@ script to run
 diretory to run
 
 * own job is run under `work_dir/$PARADUCT_JOB_NAME`
+* if `work_dir` is empty, own job is run under current directory. 
+  * rsync is disabled
 
 ### variables
 Parameters to be combined
 
-* key is capitalized (example. `name1` -> `NAME1`)
 * `$PARADUCT_JOB_NAME` is generated with variables
 
-$PARADUCT_JOB_ID   | name1   | name2   | $PARADUCT_JOB_NAME            | current directory where the test is performed
+$PARADUCT_JOB_ID   | NAME1   | NAME2   | $PARADUCT_JOB_NAME            | current directory where the test is performed
 ------------------ | ------- | ------- | ----------------------------- | --------------------------------------------------
 1                  | value1a | value2a | NAME1_value1a_NAME2_value2a   | tmp/paraduct_workspace/NAME1_value1a_NAME2_value2a
 2                  | value1a | value2b | NAME1_value1a_NAME2_value2b   | tmp/paraduct_workspace/NAME1_value1a_NAME2_value2b

data/lib/paraduct/configuration.rb

@@ -30,8 +30,19 @@ module Paraduct
 
     # @return [Pathname]
     def work_dir
-      _work_dir = config_data[:work_dir] || "tmp/paraduct_workspace"
-      root_dir.join(_work_dir)
+      config_data[:work_dir]
+    end
+
+    def base_job_dir
+      if work_dir.blank?
+        root_dir
+      else
+        root_dir.join(work_dir)
+      end
+    end
+
+    def enable_rsync?
+      !work_dir.blank?
     end
 
     # @return [Pathname]

data/lib/paraduct/parallel_runner.rb

@@ -8,7 +8,7 @@ module Paraduct
     # @return [Paraduct::TestResponse]
     def self.perform_all(script, product_variables)
       test_response = Paraduct::TestResponse.new
-      base_job_dir = Paraduct.config.work_dir
+      base_job_dir = Paraduct.config.base_job_dir
       FileUtils.mkdir_p(base_job_dir) unless base_job_dir.exist?
 
       Paraduct.logger.info <<-EOS
@@ -27,7 +27,7 @@ START matrix test
           )
           pool.process do
             runner.logger.info "[START] params: #{runner.formatted_params}"
-            runner.setup_dir
+            runner.setup_dir if Paraduct.config.enable_rsync?
             begin
               stdout = runner.perform
               successful = true

data/lib/paraduct/runner.rb

@@ -25,7 +25,7 @@ module Paraduct
     # @return [String] stdout
     # @raise [Paraduct::Errors::ProcessError] command exited error status
     def perform
-      export_variables = key_capitalized_params.merge("PARADUCT_JOB_ID" => @job_id, "PARADUCT_JOB_NAME" => job_name)
+      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|
@@ -39,11 +39,7 @@ module Paraduct
     end
 
     def job_name
-      key_capitalized_params.map { |key, value| "#{key}_#{value}" }.join("_").gsub(%r([/ ]), "_")
-    end
-
-    def key_capitalized_params
-      self.class.capitalize_keys(@params)
+      @params.map { |key, value| "#{key}_#{value}" }.join("_").gsub(%r([/ ]), "_")
     end
 
     def formatted_params
@@ -60,13 +56,6 @@ module Paraduct
       @logger
     end
 
-    def self.capitalize_keys(params)
-      params.inject({}) do |res, (key, value)|
-        res[key.upcase] = value
-        res
-      end
-    end
-
     private
 
     def run_command(command)

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

@@ -2,15 +2,15 @@ script: |-
   echo "NAME1=${NAME1}, NAME2=${NAME2}"
 work_dir: tmp/paraduct_workspace
 variables:
-  name1:
+  NAME1:
     - value1a
     - value1b
-  name2:
+  NAME2:
     - value2a
     - value2b
 max_threads: 4
 rsync_option:
   exclude_from: .paraduct_rsync_exclude.txt
 exclude:
-  - name1: value1a
-    name2: value2b
+  - NAME1: value1a
+    NAME2: value2b

data/lib/paraduct/version.rb

@@ -1,3 +1,3 @@
 module Paraduct
-  VERSION = "0.0.3"
+  VERSION = "1.0.0.beta1"
 end

data/spec/.paraduct.yml

@@ -1,14 +1,14 @@
 script: ./script/build_success.sh
 work_dir: tmp/paraduct_workspace
 variables:
-  ruby:
+  RUBY:
     - 1.9.3
     - 2.0.0
     - 2.1.2
-  database:
+  DATABASE:
     - mysql
     - postgresql
-  rails:
+  RAILS:
     - 3.2.0
     - 4.0.0
     - 4.1.0

data/spec/paraduct/cli_spec.rb

@@ -26,8 +26,8 @@ describe Paraduct::CLI do
             script: "./script/build_success.sh",
             work_dir: "tmp/paraduct_workspace",
             variables: {
-              ruby:     ["1.9.3", "2.0.0"],
-              database: ["mysql", "postgresql"],
+              "RUBY" =>     ["1.9.3", "2.0.0"],
+              "DATABASE" => ["mysql", "postgresql"],
             },
           }
         end
@@ -35,10 +35,10 @@ describe Paraduct::CLI do
         let(:script){ "./script/build_success.sh" }
         let(:product_variables) do
           [
-            { "ruby" => "1.9.3", "database" => "mysql"      },
-            { "ruby" => "1.9.3", "database" => "postgresql" },
-            { "ruby" => "2.0.0", "database" => "mysql"      },
-            { "ruby" => "2.0.0", "database" => "postgresql" },
+            { "RUBY" => "1.9.3", "DATABASE" => "mysql"      },
+            { "RUBY" => "1.9.3", "DATABASE" => "postgresql" },
+            { "RUBY" => "2.0.0", "DATABASE" => "mysql"      },
+            { "RUBY" => "2.0.0", "DATABASE" => "postgresql" },
           ]
         end
 
@@ -60,7 +60,7 @@ describe Paraduct::CLI do
             script: %q(exit ${STATUS}),
             work_dir: "tmp/paraduct_workspace",
             variables: {
-              status: [0, 1],
+              "STATUS" => [0, 1],
             },
           }
         end

data/spec/paraduct/configuration_spec.rb

@@ -11,17 +11,10 @@ describe Paraduct::Configuration do
 
     it "should get variables in .paraduct.yml" do
       is_expected.to match(
-        "ruby"     => ["1.9.3", "2.0.0", "2.1.2"],
-        "database" => ["mysql", "postgresql"],
-        "rails"    => ["3.2.0", "4.0.0", "4.1.0"],
+        "RUBY"     => ["1.9.3", "2.0.0", "2.1.2"],
+        "DATABASE" => ["mysql", "postgresql"],
+        "RAILS"    => ["3.2.0", "4.0.0", "4.1.0"],
       )
     end
   end
-
-  describe "#work_dir" do
-    subject{ config.work_dir }
-
-    it { should eq spec_dir.join("tmp/paraduct_workspace") }
-  end
-
 end

data/spec/paraduct/parallel_runner_spec.rb

@@ -16,20 +16,28 @@ describe Paraduct::ParallelRunner do
       it { expect(copied_file).to be_exist }
     end
 
+    shared_examples :dont_create_job_directories do
+      let(:job_dir)    { temp_dir_path.join("tmp/paraduct_workspace/#{job_name}") }
+      let(:copied_file){ job_dir.join("script/build_success.sh") }
+
+      it { expect(job_dir).not_to be_exist }
+      it { expect(copied_file).not_to be_exist }
+    end
+
     describe "with script file test" do
       let(:script){ "./script/build_success.sh" }
       let(:product_variables) do
         [
-          { "ruby" => "1.9", "database" => "mysql" },
-          { "ruby" => "2.0", "database" => "postgresql" },
+          { "RUBY" => "1.9", "DATABASE" => "mysql" },
+          { "RUBY" => "2.0", "DATABASE" => "postgresql" },
         ]
       end
 
       its(:jobs) do
         should include(
                  job_name:         "RUBY_1.9_DATABASE_mysql",
-                 params:           { "ruby" => "1.9", "database" => "mysql" },
-                 formatted_params: "ruby=1.9, database=mysql",
+                 params:           { "RUBY" => "1.9", "DATABASE" => "mysql" },
+                 formatted_params: "RUBY=1.9, DATABASE=mysql",
                  successful:       true,
                  stdout:           "RUBY=1.9\nDATABASE=mysql\n"
                )
@@ -38,25 +46,52 @@ describe Paraduct::ParallelRunner do
       its(:jobs) do
         should include(
                  job_name:         "RUBY_2.0_DATABASE_postgresql",
-                 params:           { "ruby" => "2.0", "database" => "postgresql" },
-                 formatted_params: "ruby=2.0, database=postgresql",
+                 params:           { "RUBY" => "2.0", "DATABASE" => "postgresql" },
+                 formatted_params: "RUBY=2.0, DATABASE=postgresql",
                  successful:       true,
                  stdout:           "RUBY=2.0\nDATABASE=postgresql\n"
                )
       end
 
-      describe "should create job directories" do
+      context "When work_dir is not empty" do
         before do
-          # exercise
-          subject
+          allow(Paraduct.config).to receive(:work_dir) { "tmp/paraduct_workspace" }
         end
 
-        it_behaves_like :create_job_directories do
-          let(:job_name){ "RUBY_1.9_DATABASE_mysql" }
+        describe "should create job directories" do
+          before do
+            # exercise
+            subject
+          end
+
+          it_behaves_like :create_job_directories do
+            let(:job_name){ "RUBY_1.9_DATABASE_mysql" }
+          end
+
+          it_behaves_like :create_job_directories do
+            let(:job_name){ "RUBY_2.0_DATABASE_postgresql" }
+          end
         end
+      end
 
-        it_behaves_like :create_job_directories do
-          let(:job_name){ "RUBY_2.0_DATABASE_postgresql" }
+      context "When work_dir is empty" do
+        before do
+          allow(Paraduct.config).to receive(:work_dir) { nil }
+        end
+
+        describe "should not create job directories" do
+          before do
+            # exercise
+            subject
+          end
+
+          it_behaves_like :dont_create_job_directories do
+            let(:job_name){ "RUBY_1.9_DATABASE_mysql" }
+          end
+
+          it_behaves_like :dont_create_job_directories do
+            let(:job_name){ "RUBY_2.0_DATABASE_postgresql" }
+          end
         end
       end
     end
@@ -65,16 +100,16 @@ describe Paraduct::ParallelRunner do
       let(:script){ %q(echo "RUBY=${RUBY} DATABASE=${DATABASE}") }
       let(:product_variables) do
         [
-          { "ruby" => "1.9", "database" => "mysql" },
-          { "ruby" => "2.0", "database" => "postgresql" },
+          { "RUBY" => "1.9", "DATABASE" => "mysql" },
+          { "RUBY" => "2.0", "DATABASE" => "postgresql" },
         ]
       end
 
       its(:jobs) do
         should include(
                  job_name:         "RUBY_1.9_DATABASE_mysql",
-                 params:           { "ruby" => "1.9", "database" => "mysql" },
-                 formatted_params: "ruby=1.9, database=mysql",
+                 params:           { "RUBY" => "1.9", "DATABASE" => "mysql" },
+                 formatted_params: "RUBY=1.9, DATABASE=mysql",
                  successful:       true,
                  stdout:           "RUBY=1.9 DATABASE=mysql\n"
                )
@@ -83,25 +118,52 @@ describe Paraduct::ParallelRunner do
       its(:jobs) do
         should include(
                  job_name:         "RUBY_2.0_DATABASE_postgresql",
-                 params:           { "ruby" => "2.0", "database" => "postgresql" },
-                 formatted_params: "ruby=2.0, database=postgresql",
+                 params:           { "RUBY" => "2.0", "DATABASE" => "postgresql" },
+                 formatted_params: "RUBY=2.0, DATABASE=postgresql",
                  successful:       true,
                  stdout:           "RUBY=2.0 DATABASE=postgresql\n"
                )
       end
 
-      describe "should create job directories" do
+      context "When work_dir is not empty" do
         before do
-          # exercise
-          subject
+          allow(Paraduct.config).to receive(:work_dir) { "tmp/paraduct_workspace" }
+        end
+
+        describe "should create job directories" do
+          before do
+            # exercise
+            subject
+          end
+
+          it_behaves_like :create_job_directories do
+            let(:job_name){ "RUBY_1.9_DATABASE_mysql" }
+          end
+
+          it_behaves_like :create_job_directories do
+            let(:job_name){ "RUBY_2.0_DATABASE_postgresql" }
+          end
         end
+      end
 
-        it_behaves_like :create_job_directories do
-          let(:job_name){ "RUBY_1.9_DATABASE_mysql" }
+      context "When work_dir is empty" do
+        before do
+          allow(Paraduct.config).to receive(:work_dir) { nil }
         end
 
-        it_behaves_like :create_job_directories do
-          let(:job_name){ "RUBY_2.0_DATABASE_postgresql" }
+        describe "should not create job directories" do
+          before do
+            # exercise
+            subject
+          end
+
+          it_behaves_like :dont_create_job_directories do
+            let(:job_name){ "RUBY_1.9_DATABASE_mysql" }
+          end
+
+          it_behaves_like :dont_create_job_directories do
+            let(:job_name){ "RUBY_2.0_DATABASE_postgresql" }
+          end
         end
       end
     end

data/spec/paraduct/runner_spec.rb

@@ -19,8 +19,8 @@ describe Paraduct::Runner do
     subject{ runner.perform }
 
     let(:script) { "./script/build_success.sh" }
-    let(:params) { { "ruby" => "1.9", "database" => "mysql" } }
-    let(:command){ 'export RUBY="1.9"; export DATABASE="mysql"; export PARADUCT_JOB_ID="1"; export PARADUCT_JOB_NAME="RUBY_1.9_DATABASE_mysql"; ./script/build_success.sh' }
+    let(:params) { { "RUBY" => "1.9", "DATABASE" => "mysql" } }
+    let(:command){ 'export PARADUCT_JOB_ID="1"; export PARADUCT_JOB_NAME="RUBY_1.9_DATABASE_mysql"; export RUBY="1.9"; export DATABASE="mysql"; ./script/build_success.sh' }
 
     context "with mock system" do
       it "script is call with capitalized variable" do
@@ -37,7 +37,7 @@ describe Paraduct::Runner do
         it { should match /DATABASE=mysql/ }
       end
 
-      context "when error in script file" do
+      context "when error in script file", with_retry do
         let(:script){ "./script/build_error.sh" }
 
         let(:stdout) do
@@ -67,7 +67,7 @@ DATABASE=mysql
   describe "#job_dir" do
     subject{ runner.job_dir }
 
-    let(:params) { { "ruby" => "1.9", "database" => "mysql" } }
+    let(:params) { { "RUBY" => "1.9", "DATABASE" => "mysql" } }
 
     it { should eq temp_dir_path.join("RUBY_1.9_DATABASE_mysql") }
   end
@@ -75,22 +75,22 @@ DATABASE=mysql
   describe "#formatted_params" do
     subject{ runner.formatted_params }
 
-    let(:params){ { "ruby" => "1.9", "database" => "mysql" } }
+    let(:params){ { "RUBY" => "1.9", "DATABASE" => "mysql" } }
 
-    it{ should eq "ruby=1.9, database=mysql" }
+    it{ should eq "RUBY=1.9, DATABASE=mysql" }
   end
 
   describe "#job_name" do
     subject{ runner.job_name }
 
     context "basic case" do
-      let(:params) { { "ruby" => "1.9", "database" => "mysql" } }
+      let(:params) { { "RUBY" => "1.9", "DATABASE" => "mysql" } }
 
       it { should eq "RUBY_1.9_DATABASE_mysql" }
     end
 
     context "containing slash" do
-      let(:params) { { "ruby" => "1.9", "gemfile" => "gemfiles/rails3_2.gemfile" } }
+      let(:params) { { "RUBY" => "1.9", "GEMFILE" => "gemfiles/rails3_2.gemfile" } }
 
       it { should eq "RUBY_1.9_GEMFILE_gemfiles_rails3_2.gemfile" }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - sue445
@@ -348,9 +348,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1