wwtd 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6047caedac1a829700e28ccff419fe44d1c88b1a
-  data.tar.gz: fa353d441fa565d52944d724818dd27aaabe3708
+  metadata.gz: aaf173c438b057ddc0fde8ff1b335f076f2ffdcf
+  data.tar.gz: de324a6c925e15d68c9710236e8d23f20a9af746
 SHA512:
-  metadata.gz: 5cc29527b8312b0ab1f27e2f91183e6ae5bfd140352cc179572f83c25668167af90aab50dc607e62f58206964d784dbf489926caa62a1abebbf7203f395063e4
-  data.tar.gz: 3dc6001dc74d8634a9bce4733b71220b3685674a8627e5112399835fbdefcfee50c4d07b7ef89f6fed0acc7daf358ad1a59fe5b1bbc42e720134dbe7c7f7077f
+  metadata.gz: 401234f4b9e42a343b34ef6c44f115f84bb247c8977fbfba06b2096773ccb015627bc4a16db5f6a24d7cedc6077b8b1202e9dce0e96b41498f94dca9dafe1e45
+  data.tar.gz: dae16e6defcbbea3e9aba080565a0aaed888b8d53f03068c59935b6d053780a8702fed63ce8b27d686b882f40ffeef1c11a38446c5ef1d52416e818fc932cc4f

data.tar.gz.sig

@@ -1 +1,2 @@
-��D
U���OT<��7�C.�5���������@�����%����W2��|OG0�0�Hi
G�߻�@�N�\�7-�����:���t�Db��GP
+*dvͺ��)�%HK���.��lg����_oǹ�k�����
+��ӈy"M�"P�|.J��y&�V

data/lib/wwtd.rb

@@ -2,11 +2,12 @@ require "wwtd/version"
 require "optparse"
 require "yaml"
 require "shellwords"
-require "parallel"
 require "tempfile"
 require "tmpdir"
 require "wwtd/ruby"
+require "wwtd/run"
 require "wwtd/cli"
+require "open3"
 
 module WWTD
   CONFIG = ".travis.yml"
@@ -23,37 +24,24 @@ module WWTD
     end
 
     def run(matrix, options, &block)
-      run_in_parallel(matrix, options) do |config, lock|
-        state = if Ruby.available?(config["rvm"])
-          yield(:start, config, matrix)
-          result = run_config(config, lock)
-          result ? :success : :failure
-        else
-          :missing
-        end
-
-        yield(state, config)
-
-        [state, config]
-      end
-    end
-
-    private
-
-    def run_in_parallel(matrix, options)
       results = nil
       with_clean_dot_bundle do
-        Dir.mktmpdir do |lock| # does not return values in ruby 1.8
-          results = Parallel.map(matrix.each_with_index, :in_processes => options[:parallel].to_i) do |config, i|
-            # set env as parallel_tests does to reuse existing infrastructure
-            ENV["TEST_ENV_NUMBER"] = (i == 0 ? "" : (i + 1).to_s) if options[:parallel]
-            yield config, lock
+        with_clean_env do
+          Dir.mktmpdir do |lock| # does not return values in ruby 1.8
+            results = in_multiple_threads(matrix.each_with_index, options[:parallel]) do |config, i|
+              # set env as parallel_tests does to reuse existing infrastructure
+              env = {}
+              env["TEST_ENV_NUMBER"] = (i == 0 ? "" : (i + 1).to_s) if options[:parallel]
+              Run.new(config, env, lock).execute(&block)
+            end
           end
         end
       end
       results
     end
 
+    private
+
     def with_clean_dot_bundle
       had_old = File.exist?(".bundle")
       Dir.mktmpdir do |dir|
@@ -84,61 +72,16 @@ module WWTD
       matrix.map! { |c| config.merge(c) }
     end
 
-    def run_config(config, lock)
-      with_clean_env do
-        Shellwords.split(config["env"] || "").each do |part|
-          name, value = part.split("=", 2)
-          ENV[name] = value
-        end
-
-        if gemfile = config["gemfile"]
-          ENV["BUNDLE_GEMFILE"] = gemfile
-        end
-        wants_bundle = gemfile || File.exist?(DEFAULT_GEMFILE)
-
-        switch_ruby = Ruby.switch_statement(config["rvm"])
-
-        if wants_bundle
-          flock("#{lock}/#{config["rvm"] || "rvm"}") do
-            default_bundler_args = "--deployment --path #{Dir.pwd}/vendor/bundle" if committed?("#{gemfile || DEFAULT_GEMFILE}.lock")
-            bundle_command = "#{switch_ruby}bundle install #{config["bundler_args"] || default_bundler_args}"
-            return false unless sh "#{bundle_command.strip} --quiet"
-          end
-        end
-
-        default_command = (wants_bundle ? "bundle exec rake" : "rake")
-        command = config["script"] || default_command
-        command = "#{switch_ruby}#{command}"
-
-        sh(command)
-      end
-    end
-
-    def committed?(file)
-      @committed_files ||= (File.exist?(".git") && `git ls-files`.split("\n")) || []
-      @committed_files.include?(file)
-    end
-
-    def flock(file)
-      File.open(file, "w") do |f|
-        begin
-          f.flock(File::LOCK_EX)
-          yield
-        ensure
-          f.flock(File::LOCK_UN)
-        end
-      end
-    end
-
     # http://grosser.it/2010/12/11/sh-without-rake/
-    def sh(cmd)
+    def sh(env, cmd=nil)
+      cmd, env = env, {} unless cmd
       puts cmd
-      IO.popen(cmd) do |pipe|
-        while str = pipe.gets
+      Open3.popen2(env, cmd) do |stdin, stdout, wait|
+        while str = stdout.gets
           puts str
         end
+        wait.value.success?
       end
-      $?.success?
     end
 
     def with_clean_env(&block)
@@ -148,5 +91,19 @@ module WWTD
         yield
       end
     end
+
+    def in_multiple_threads(data, count)
+      data = data.to_a.dup
+      threads = [count || 1, data.size].min
+      results = []
+      (0...threads).to_a.map do
+        Thread.new do
+          while slice = data.shift
+            results << yield(slice)
+          end
+        end
+      end.each(&:join)
+      results
+    end
   end
 end

data/lib/wwtd/cli.rb

@@ -37,7 +37,7 @@ module WWTD
 
             Options:
           BANNER
-          opts.on("-p", "--parallel [PROCESSES]", Integer, "Run in parallel") { |c| options[:parallel] = c || Parallel.processor_count }
+          opts.on("-p", "--parallel [COUNT]", Integer, "Run in parallel") { |c| options[:parallel] = c || 4 }
           opts.on("-h", "--help", "Show this.") { puts opts; exit }
           opts.on("-v", "--version", "Show Version"){ puts WWTD::VERSION; exit}
         end.parse!(argv)

data/lib/wwtd/ruby.rb

@@ -5,6 +5,9 @@ module WWTD
         !version || switch_statement(version)
       end
 
+      # - rvm: "rvm xxx do"
+      # - others: env hash
+      # - unknown: nil
       def switch_statement(version)
         return unless version
         version = normalize_ruby_version(version)
@@ -13,23 +16,25 @@ module WWTD
           command if cache_command("#{command} ruby -v")
         else
           if ruby_root = ENV["RUBY_ROOT"] # chruby or RUBY_ROOT set
-            switch_path(File.dirname(ruby_root), version)
+            switch_via_env(File.dirname(ruby_root), version)
           elsif rbenv_executable
             rubies_root = cache_command("which rbenv").sub(%r{/(\.?rbenv)/.*}, "/\\1") + "/versions"
-            switch_path(rubies_root, version)
+            switch_via_env(rubies_root, version)
           end
         end
       end
 
       private
 
-      def switch_path(rubies_root, version)
-        extract_jruby_rbenv_options!(version)
+      def switch_via_env(rubies_root, version)
+        base = extract_jruby_rbenv_options!(version)
         if ruby_root = ruby_root(rubies_root, version)
           gem_home = Dir["#{ruby_root}/lib/ruby/gems/*"].first
-          ENV["PATH"] = "#{ruby_root}/bin:#{ENV["PATH"]}"
-          ENV["GEM_HOME"] = ENV["GEM_PATH"] = gem_home
-          ""
+          base.merge(
+            "PATH" => "#{ruby_root}/bin:#{ENV["PATH"]}",
+            "GEM_HOME" => gem_home,
+            "GEM_PATH" => gem_home
+          )
         end
       end
 
@@ -64,11 +69,12 @@ module WWTD
 
       # set ruby-opts for jruby flavors
       def extract_jruby_rbenv_options!(version)
-        if version.sub!("-d19", "")
-          ENV["JRUBY_OPTS"] = "--1.9"
+        flag = if version.sub!("-d19", "")
+          "--1.9"
         elsif version.sub!("-d18", "")
-          ENV["JRUBY_OPTS"] = "--1.8"
+          "--1.8"
         end
+        { "JRUBY_OPTS" => flag }
       end
 
       def capture(command)

data/lib/wwtd/run.rb

@@ -0,0 +1,87 @@
+module WWTD
+  class Run
+    def initialize(config, env, lock)
+      @config, @env, @lock = config, env, lock
+      add_env_from_config
+      @switch = build_switch_statement
+    end
+
+    def execute(&block)
+      state = if Ruby.available?(config["rvm"])
+        yield(:start, config)
+        success? ? :success : :failure
+      else
+        :missing
+      end
+
+      yield(state, config)
+
+      [state, config]
+    end
+
+    private
+
+    attr_reader :config, :env, :lock, :switch
+
+    def success?
+      if wants_bundle?
+        flock File.join(lock, config["rvm"] || "rvm") do
+          default_bundler_args = "--deployment --path #{Dir.pwd}/vendor/bundle" if committed?("#{gemfile || DEFAULT_GEMFILE}.lock")
+          bundle_command = "#{switch}bundle install #{config["bundler_args"] || default_bundler_args}"
+          return false unless sh(env, "#{bundle_command.strip} --quiet")
+        end
+      end
+
+      default_command = (wants_bundle? ? "bundle exec rake" : "rake")
+      command = config["script"] || default_command
+      command = "#{switch}#{command}"
+
+      sh(env, command)
+    end
+
+    def wants_bundle?
+      gemfile || File.exist?(DEFAULT_GEMFILE)
+    end
+
+    def gemfile
+      config["gemfile"]
+    end
+
+    def build_switch_statement
+      switch_ruby = Ruby.switch_statement(config["rvm"])
+      if switch_ruby.is_a?(Hash)
+        env.merge!(switch_ruby)
+        switch_ruby = nil
+      end
+      switch_ruby
+    end
+
+    def add_env_from_config
+      Shellwords.split(config["env"] || "").each do |part|
+        name, value = part.split("=", 2)
+        env[name] = value
+      end
+      env["BUNDLE_GEMFILE"] = gemfile if gemfile
+    end
+
+    def committed?(file)
+      @committed_files ||= (File.exist?(".git") && `git ls-files`.split("\n")) || []
+      @committed_files.include?(file)
+    end
+
+    def flock(file)
+      File.open(file, "w") do |f|
+        begin
+          f.flock(File::LOCK_EX)
+          yield
+        ensure
+          f.flock(File::LOCK_UN)
+        end
+      end
+    end
+
+    def sh(*args)
+      ::WWTD.send(:sh, *args)
+    end
+  end
+end

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,21 +30,7 @@ cert_chain:
   ycwMXfl0
   -----END CERTIFICATE-----
 date: 2013-11-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: parallel
-  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'
+dependencies: []
 description: 
 email: michael@grosser.it
 executables:
@@ -56,6 +42,7 @@ files:
 - lib/wwtd.rb
 - lib/wwtd/cli.rb
 - lib/wwtd/ruby.rb
+- lib/wwtd/run.rb
 - lib/wwtd/tasks.rb
 - lib/wwtd/version.rb
 homepage: http://github.com/grosser/wwtd