paraduct 0.0.1.beta5 → 0.0.1.beta6

data/README.md

@@ -10,7 +10,8 @@ Paraduct (**parallel** + **parameterize** + **product**) is matrix test runner
 [![Stories in Ready](https://badge.waffle.io/sue445/paraduct.svg?label=ready&title=Ready)](http://waffle.io/sue445/paraduct)
 
 ## Requirements
-ruby 1.9+
+* ruby 1.9+
+* rsync
 
 ## Installation
 

data/lib/paraduct/cli.rb

@@ -5,6 +5,14 @@ module Paraduct
   class CLI < Thor
     include Thor::Actions
 
+    class_option :version, type: :boolean
+
+    desc "version", "Show paraduct version"
+    def version
+      puts Paraduct::VERSION
+    end
+    default_task :version
+
     desc "test", "run matrix test"
     def test
       script = Paraduct.config.script
@@ -22,6 +30,7 @@ module Paraduct
     desc "generate", "generate .paraduct.yml"
     def generate
       template(".paraduct.yml")
+      template(".paraduct_rsync_exclude.txt")
     end
 
     def self.source_root

data/lib/paraduct/configuration.rb

@@ -5,29 +5,28 @@ module Paraduct
   class Configuration
     include Singleton
 
-    def initialize
-      raise "not found .paraduct.yml" unless config_file.exist?
-      @config = YAML.load_file(config_file)
-    end
-
     # @return [Pathname]
     def variables
-      @config["variables"]
+      config_data[:variables]
     end
 
     # @return [String, Array<String>]
     def script
-      @config["script"]
+      config_data[:script]
     end
 
     # @return [Integer]
     def max_threads
-      @config["max_threads"] || 4
+      config_data[:max_threads] || 4
+    end
+
+    def rsync_option
+      config_data[:rsync_option] || {}
     end
 
     # @return [Pathname]
     def work_dir
-      _work_dir = @config["work_dir"] || "tmp/paraduct_workspace"
+      _work_dir = config_data[:work_dir] || "tmp/paraduct_workspace"
       root_dir.join(_work_dir)
     end
 
@@ -40,5 +39,11 @@ module Paraduct
     def root_dir
       Pathname.pwd
     end
+
+    private
+
+    def config_data
+      @config_data ||= YAML.load_file(config_file).with_indifferent_access
+    end
   end
 end

data/lib/paraduct/runner.rb

@@ -16,7 +16,7 @@ module Paraduct
 
     def setup_dir
       FileUtils.mkdir_p(job_dir) unless job_dir.exist?
-      self.class.copy_recursive(Paraduct.config.root_dir, job_dir)
+      Paraduct::SyncUtils.copy_recursive(Paraduct.config.root_dir, job_dir)
       Dir.chdir(job_dir)
     end
 
@@ -48,20 +48,6 @@ module Paraduct
       @params.map{ |key, value| "#{key}=#{value}" }.join(", ")
     end
 
-    # @param source_dir      [Pathname]
-    # @param destination_dir [Pathname]
-    def self.copy_recursive(source_dir, destination_dir)
-      FileUtils.mkdir_p(destination_dir)
-      source_dir.children.each do |source_child_dir|
-        begin
-          FileUtils.cp_r(source_child_dir, destination_dir)
-        rescue ArgumentError => e
-          # TODO: refactoring
-          raise unless e.message =~ /^cannot copy directory .+ to itself /
-        end
-      end
-    end
-
     def self.capitalize_keys(params)
       params.inject({}) do |res, (key, value)|
         res[key.upcase] = value

data/lib/paraduct/sync_utils.rb

@@ -0,0 +1,20 @@
+module Paraduct
+  require "rsync"
+
+  class SyncUtils
+    # @param source_dir      [Pathname]
+    # @param destination_dir [Pathname]
+    def self.copy_recursive(source_dir, destination_dir)
+      FileUtils.mkdir_p(destination_dir)
+
+      rsync_options = %W(
+        --recursive
+        --delete
+        --exclude-from=#{Paraduct.config.rsync_option[:exclude_from]}
+      )
+      result = Rsync.run(source_dir.to_s + "/", destination_dir, rsync_options)
+      raise result.error unless result.success?
+      result
+    end
+  end
+end

data/lib/paraduct/templates/.paraduct_rsync_exclude.txt.tt

@@ -0,0 +1,2 @@
+.git/
+tmp/

data/lib/paraduct/version.rb

@@ -1,3 +1,3 @@
 module Paraduct
-  VERSION = "0.0.1.beta5"
+  VERSION = "0.0.1.beta6"
 end

data/lib/paraduct.rb

@@ -8,6 +8,7 @@ module Paraduct
   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'

data/paraduct.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
+  spec.add_dependency "rsync"
   spec.add_dependency "thor"
   spec.add_dependency "thread"
 

data/spec/.paraduct.yml

@@ -13,3 +13,5 @@ variables:
     - 4.0.0
     - 4.1.0
 max_threads: 4
+rsync_option:
+  exclude_from: .paraduct_rsync_exclude.txt

data/spec/.paraduct_rsync_exclude.txt

@@ -0,0 +1,2 @@
+.git/
+tmp/

data/spec/paraduct/cli_spec.rb

@@ -3,33 +3,41 @@ describe Paraduct::CLI do
 
   let(:args){ [command] }
 
+  describe "#version" do
+    %w(version --version).each do |_command|
+      context "with #{_command}" do
+        let(:command){ _command }
+
+        it { expect{ subject }.to output("#{Paraduct::VERSION}\n").to_stdout }
+      end
+    end
+  end
+
   describe "#test" do
     let(:command){ "test" }
 
-    include_context :within_temp_work_dir
+    include_context :stub_configuration
+    include_context :within_temp_dir
 
     context "successful test" do
+      let(:config_data) do
+        {
+          script: "./script/build_success.sh",
+          work_dir: "tmp/paraduct_workspace",
+          variables: {
+            ruby:     ["1.9.3", "2.0.0"],
+            database: ["mysql", "postgresql"],
+          },
+        }
+      end
+
       let(:script){ "./script/build_success.sh" }
       let(:product_variables) do
         [
-          { "ruby" => "1.9.3", "database" => "mysql"     , "rails" => "3.2.0" },
-          { "ruby" => "1.9.3", "database" => "mysql"     , "rails" => "4.0.0" },
-          { "ruby" => "1.9.3", "database" => "mysql"     , "rails" => "4.1.0" },
-          { "ruby" => "1.9.3", "database" => "postgresql", "rails" => "3.2.0" },
-          { "ruby" => "1.9.3", "database" => "postgresql", "rails" => "4.0.0" },
-          { "ruby" => "1.9.3", "database" => "postgresql", "rails" => "4.1.0" },
-          { "ruby" => "2.0.0", "database" => "mysql"     , "rails" => "3.2.0" },
-          { "ruby" => "2.0.0", "database" => "mysql"     , "rails" => "4.0.0" },
-          { "ruby" => "2.0.0", "database" => "mysql"     , "rails" => "4.1.0" },
-          { "ruby" => "2.0.0", "database" => "postgresql", "rails" => "3.2.0" },
-          { "ruby" => "2.0.0", "database" => "postgresql", "rails" => "4.0.0" },
-          { "ruby" => "2.0.0", "database" => "postgresql", "rails" => "4.1.0" },
-          { "ruby" => "2.1.2", "database" => "mysql"     , "rails" => "3.2.0" },
-          { "ruby" => "2.1.2", "database" => "mysql"     , "rails" => "4.0.0" },
-          { "ruby" => "2.1.2", "database" => "mysql"     , "rails" => "4.1.0" },
-          { "ruby" => "2.1.2", "database" => "postgresql", "rails" => "3.2.0" },
-          { "ruby" => "2.1.2", "database" => "postgresql", "rails" => "4.0.0" },
-          { "ruby" => "2.1.2", "database" => "postgresql", "rails" => "4.1.0" },
+          { "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
 
@@ -46,9 +54,14 @@ describe Paraduct::CLI do
     end
 
     context "failure test" do
-      before do
-        allow(Paraduct.config).to receive(:script)   { %q(exit ${STATUS}) }
-        allow(Paraduct.config).to receive(:variables){ { status: [0, 1] } }
+      let(:config_data) do
+        {
+          script: %q(exit ${STATUS}),
+          work_dir: "tmp/paraduct_workspace",
+          variables: {
+            status: [0, 1],
+          },
+        }
       end
 
       it { expect{ subject }.to raise_error Paraduct::Errors::TestFailureError }
@@ -58,21 +71,19 @@ describe Paraduct::CLI do
   describe "#generate" do
     let(:command){ "generate" }
 
-    include_context "uses temp dir"
-
-    around do |example|
-      Dir.chdir(temp_dir) do
-        example.run
-      end
-    end
+    include_context :within_temp_dir
 
     before do
       # exercise
       subject
     end
 
-    let(:generated_config_file){ temp_dir_path.join(".paraduct.yml") }
+    %w(.paraduct.yml .paraduct_rsync_exclude.txt).each do |template_file|
+      describe "whether copy #{template_file}" do
+        let(:generated_config_file){ temp_dir_path.join(template_file) }
 
-    it { expect(generated_config_file).to be_exist }
+        it { expect(generated_config_file).to be_exist }
+      end
+    end
   end
 end

data/spec/paraduct/runner_spec.rb

@@ -69,34 +69,6 @@ DATABASE=mysql
     it { should eq Pathname("/tmp/jobs/RUBY_1.9_DATABASE_mysql") }
   end
 
-  describe "#copy_recursive" do
-    subject{ Paraduct::Runner.copy_recursive(source_dir, destination_dir) }
-
-    include_context "uses temp dir"
-
-    let(:source_dir)     { temp_dir_path }
-    let(:destination_dir){ temp_dir_path.join("tmp/paraduct_workspace/RUBY_1.9_DATABASE_mysql") }
-    let(:copied_file)    { destination_dir.join("build_success.sh") }
-    let(:not_copied_file){ destination_dir.join("tmp/paraduct_workspace/dummy.txt") }
-
-    before do
-      # setup
-      FileUtils.cp_r(spec_dir.join("script/tmp/paraduct_workspace"), source_dir)
-      FileUtils.cp_r(spec_dir.join("script/build_success.sh"), source_dir)
-
-      # exercise
-      subject
-    end
-
-    # after do
-    #   puts `tree #{source_dir}`
-    # end
-
-    it { expect(destination_dir).to be_exist }
-    it { expect(copied_file).to be_exist }
-    it { expect(not_copied_file).not_to be_exist }
-  end
-
   describe "#formatted_params" do
     subject{ runner.formatted_params }
 

data/spec/paraduct/sync_utils_spec.rb

@@ -0,0 +1,39 @@
+describe Paraduct::SyncUtils do
+  describe "#copy_recursive" do
+    subject{ Paraduct::SyncUtils.copy_recursive(source_dir, destination_dir) }
+
+    include_context :within_temp_dir
+    include_context :stub_configuration
+
+    let(:config_data) do
+      {
+        rsync_option: {
+          exclude_from: ".paraduct_rsync_exclude.txt",
+        },
+      }
+    end
+
+    let(:source_dir)     { temp_dir_path }
+    let(:destination_dir){ temp_dir_path.join("tmp/paraduct_workspace/RUBY_1.9_DATABASE_mysql") }
+    let(:copied_file)    { destination_dir.join("build_success.sh") }
+    let(:not_copied_file){ destination_dir.join("tmp/paraduct_workspace/dummy.txt") }
+
+    before do
+      # setup
+      FileUtils.cp_r(spec_dir.join("script/tmp/paraduct_workspace"), source_dir)
+      FileUtils.cp(spec_dir.join("script/build_success.sh"), source_dir)
+      FileUtils.cp(spec_dir.join(".paraduct_rsync_exclude.txt"), source_dir)
+
+      # exercise
+      subject
+    end
+
+    # after do
+    #   puts `tree #{source_dir}`
+    # end
+
+    it { expect(destination_dir).to be_exist }
+    it { expect(copied_file).to be_exist }
+    it { expect(not_copied_file).not_to be_exist }
+  end
+end

data/spec/support/contexts/stub_configuration.rb

@@ -0,0 +1,16 @@
+shared_context :stub_configuration do
+  before do
+    allow_any_instance_of(Paraduct::Configuration).to receive(:config_data){ config_data.stringify_keys.with_indifferent_access }
+  end
+
+  let(:config_data) do
+    {
+      script: %q(echo "NAME1=${NAME1}, NAME2=${NAME2}"),
+      work_dir: "tmp/paraduct_workspace",
+      variables: {
+        name1: ["value1a", "value1b"],
+        name2: ["value2a", "value2b"],
+      },
+    }
+  end
+end

data/spec/support/contexts/within_temp_dir.rb

@@ -0,0 +1,13 @@
+shared_context :within_temp_dir do
+  include_context "uses temp dir"
+
+  before do
+    # avoid "warning: conflicting chdir during another chdir block"
+    @current_dir = Pathname.pwd
+    Dir.chdir(temp_dir)
+  end
+
+  after do
+    Dir.chdir(@current_dir)
+  end
+end

data/spec/support/contexts/within_temp_work_dir.rb

@@ -6,7 +6,8 @@ shared_context :within_temp_work_dir do
     @current_dir = Pathname.pwd
     Dir.chdir(temp_dir)
     FileUtils.cp_r(spec_dir.join("script"), temp_dir)
-    FileUtils.cp_r(spec_dir.join(".paraduct.yml"), temp_dir)
+    FileUtils.cp(spec_dir.join(".paraduct.yml"), temp_dir)
+    FileUtils.cp(spec_dir.join(".paraduct_rsync_exclude.txt"), temp_dir)
   end
 
   after do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta5
+  version: 0.0.1.beta6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rsync
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -293,17 +309,21 @@ files:
 - lib/paraduct/errors.rb
 - lib/paraduct/parallel_runner.rb
 - lib/paraduct/runner.rb
+- lib/paraduct/sync_utils.rb
 - lib/paraduct/templates/.paraduct.yml.tt
+- lib/paraduct/templates/.paraduct_rsync_exclude.txt.tt
 - lib/paraduct/test_response.rb
 - lib/paraduct/variable_converter.rb
 - lib/paraduct/version.rb
 - paraduct.gemspec
 - spec/.paraduct.yml
+- spec/.paraduct_rsync_exclude.txt
 - spec/.rubocop.yml
 - spec/paraduct/cli_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/variable_converter_spec.rb
 - spec/paraduct_spec.rb
@@ -311,7 +331,9 @@ files:
 - spec/script/build_success.sh
 - spec/script/tmp/paraduct_workspace/dummy.txt
 - spec/spec_helper.rb
+- spec/support/contexts/stub_configuration.rb
 - spec/support/contexts/within_spec_dir.rb
+- spec/support/contexts/within_temp_dir.rb
 - spec/support/contexts/within_temp_work_dir.rb
 - tmp/.gitkeep
 homepage: https://github.com/sue445/paraduct
@@ -329,7 +351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 981450971291940130
+      hash: 3159191224660044510
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -344,11 +366,13 @@ specification_version: 3
 summary: matrix test runner
 test_files:
 - spec/.paraduct.yml
+- spec/.paraduct_rsync_exclude.txt
 - spec/.rubocop.yml
 - spec/paraduct/cli_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/variable_converter_spec.rb
 - spec/paraduct_spec.rb
@@ -356,6 +380,8 @@ test_files:
 - spec/script/build_success.sh
 - spec/script/tmp/paraduct_workspace/dummy.txt
 - spec/spec_helper.rb
+- spec/support/contexts/stub_configuration.rb
 - spec/support/contexts/within_spec_dir.rb
+- spec/support/contexts/within_temp_dir.rb
 - spec/support/contexts/within_temp_work_dir.rb
 has_rdoc: