wwtd 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 995fdef7b34eb1430e6b90fd5822fb64f69086f7
-  data.tar.gz: 99bbca6ef441d5692dcb137241529812f916d5a9
+  metadata.gz: fa67745551b56d3fb2c7fbf2e06fb3a253916877
+  data.tar.gz: 5e2fb3b4a30fab6c8e1c12ea35bb36eb4a64d058
 SHA512:
-  metadata.gz: b76c817225c2cda97dcbeea2ffc1ba3e1463f3a9de86afdeab221a0fb6226ba1c947956e85cdaea8a53148b1cc6c255c7e6cf6663a8578c3937f7ecb750c12fe
-  data.tar.gz: 1f10de08156afaa1848fe2f67719d8e55644e31c9ac7041832acaf334eb10e0096ce553fb45959a9b887b413e2c2cc4f855e12151ab12e7c366bc01a3bb8f5a4
+  metadata.gz: e5b6f48c94877458ff7bf8707ad0954eaf12d07a7e7a16e3309039effb34a5843afda6cbc1d7d91b4ad9666f6c04554a907b929a6857a7119e505aa458d3f718
+  data.tar.gz: 70871fa5a3d12a9d986461d0c82406f84d398a8d1b634a2233201b38067ff9fb83d8971bf91c15f6bac0576f8eb2467c5c3ab511d71519ea0b80efb5ffa2210e

data/bin/wwtd

@@ -2,4 +2,4 @@
 $LOAD_PATH << File.expand_path("../../lib", __FILE__)
 require "rubygems" if RUBY_VERSION < "1.9"
 require "wwtd"
-exit WWTD.run(ARGV)
+exit WWTD::CLI.run(ARGV)

data/lib/wwtd.rb

@@ -5,54 +5,50 @@ require "shellwords"
 require "parallel"
 require "tempfile"
 require "tmpdir"
+require "wwtd/colors"
+require "wwtd/ruby"
+require "wwtd/cli"
 
 module WWTD
   CONFIG = ".travis.yml"
   DEFAULT_GEMFILE = "Gemfile"
   COMBINATORS = ["rvm", "gemfile", "env"]
   UNDERSTOOD = ["rvm", "gemfile", "matrix", "script", "bundler_args"]
-  INFO_MAX_CHARACTERS = 30
 
   class << self
-    def run(argv=[])
-      options = parse_options(argv)
-
-      # Read actual .travis.yml
+    def read_travis_yml
       config = (File.exist?(CONFIG) ? YAML.load_file(CONFIG) : {})
       config.delete("source_key") # we don't need that we already have the source
       ignored = config.keys - UNDERSTOOD
-      puts "Ignoring: #{ignored.sort.join(", ")}" unless ignored.empty?
+      [matrix(config), ignored]
+    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
 
-      # Execute tests
-      matrix = matrix(config)
-      results = run_full_matrix(matrix, options)
+        yield(state, config)
 
-      # Summary
-      if matrix.size > 1
-        puts "\nResults:"
-        puts results.map(&:last)
+        [state, config]
       end
-
-      results.all?(&:first) ? 0 : 1
     end
 
     private
 
-    def run_full_matrix(matrix, options)
+    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]
-
-            config_info = config_info(matrix, config)
-            puts "#{yellow("START")} #{config_info}"
-
-            result = run_config(config, lock)
-            info = "#{result ? green("SUCCESS") : red("FAILURE")} #{config_info}"
-            puts info
-
-            [result, info]
+            yield config, lock
           end
         end
       end
@@ -72,35 +68,6 @@ module WWTD
       end
     end
 
-    def config_info(matrix, config)
-      config = config.select { |k,v| matrix.map { |c| c[k] }.uniq.size > 1 }.sort # find non-unique values aka interesting
-      maximum_value_lengths = Hash[config.map { |k,v| [k, matrix.map { |h| h[k].to_s.size }.max ] }] # find maximum value length for each key so we can align
-      config.map do |k, v|
-        value = truncate(v, INFO_MAX_CHARACTERS).ljust([INFO_MAX_CHARACTERS, maximum_value_lengths[k]].min)
-        "#{k}: #{value}"
-      end.join(" ") # truncate values that are too long
-    end
-
-    def tint(color, string)
-      if $stdout.tty?
-        "\e[#{color}m#{string}\e[0m"
-      else
-        string
-      end
-    end
-
-    def red(string)
-      tint(31, string)
-    end
-
-    def green(string)
-      tint(32, string)
-    end
-
-    def yellow(string)
-      tint(33, string)
-    end
-
     def matrix(config)
       matrix = [{}]
       COMBINATORS.each do |multiplier|
@@ -114,15 +81,6 @@ module WWTD
       matrix.map! { |c| config.merge(c) }
     end
 
-    def truncate(value, number)
-      value = value.to_s # accidental numbers like 'rvm: 2.0'
-      if value.size > number
-        "#{value[0...27]}..."
-      else
-        value
-      end
-    end
-
     def run_config(config, lock)
       with_clean_env do
         Shellwords.split(config["env"] || "").each do |part|
@@ -135,7 +93,7 @@ module WWTD
         end
         wants_bundle = gemfile || File.exist?(DEFAULT_GEMFILE)
 
-        switch_ruby = switch_ruby(config["rvm"])
+        switch_ruby = Ruby.switch_statement(config["rvm"])
 
         if wants_bundle
           flock("#{lock}/#{config["rvm"] || "rvm"}") do
@@ -153,86 +111,6 @@ module WWTD
       end
     end
 
-    def switch_ruby(version)
-      return unless version
-      version = normalize_ruby_version(version)
-      if rvm_executable
-        "rvm #{version} do "
-      else
-        if ruby_root = ENV["RUBY_ROOT"] # chruby or RUBY_ROOT set
-          switch_path(File.dirname(ruby_root), version)
-        elsif rbenv_executable
-          rubies_root = cache_command("which rbenv").sub(%r{/(\.?rbenv)/.*}, "/\\1") + "/versions"
-          switch_path(rubies_root, version)
-        else
-          "false # could not find rvm, rbenv or RUBY_ROOT # "
-        end
-      end
-    end
-
-    def switch_path(rubies_root, version)
-      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"] = gem_home
-        ""
-      else
-        "false # could not find #{version} in #{rubies_root} # "
-      end
-    end
-
-    def rvm_executable
-      cache_command("which rvm")
-    end
-
-    def rbenv_executable
-      cache_command("which rbenv")
-    end
-
-    def cache_command(command)
-      cache(command) do
-        if result = capture(command)
-          result.strip
-        end
-      end
-    end
-
-    def ruby_root(root, version)
-      Dir.glob("#{root}/*").detect { |p| File.basename(p).start_with?(version) }
-    end
-
-    def cache(key)
-      @cache ||= {}
-      if @cache.key?(key)
-        @cache[key]
-      else
-        @cache[key] = yield
-      end
-    end
-
-    # set ruby-opts for jruby flavors
-    def extract_jruby_rbenv_options!(version)
-      if version.sub!("-d19", "")
-        ENV["JRUBY_OPTS"] = "--1.9"
-      elsif version.sub!("-d18", "")
-        ENV["JRUBY_OPTS"] = "--1.8"
-      end
-    end
-
-    def capture(command)
-      result = `#{command}`
-      $?.success? ? result : nil
-    end
-
-    # Taken from https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/script/rvm.rb
-    def normalize_ruby_version(rvm)
-      rvm.to_s.
-        gsub(/-(\d{2})mode$/, '-d\1').
-        gsub(/^rbx$/, 'rbx-weekly-d18').
-        gsub(/^rbx-d(\d{2})$/, 'rbx-weekly-d\1')
-    end
-
     def committed?(file)
       @committed_files ||= (File.exist?(".git") && `git ls-files`.split("\n")) || []
       @committed_files.include?(file)
@@ -267,23 +145,5 @@ module WWTD
         yield
       end
     end
-
-    def parse_options(argv)
-      options = {}
-      OptionParser.new do |opts|
-        opts.banner = <<-BANNER.gsub(/^ {10}/, "")
-            WWTD: Travis simulator - faster + no more waiting for build emails
-
-            Usage:
-                wwtd
-
-            Options:
-        BANNER
-        opts.on("-p", "--parallel [PROCESSES]", Integer, "Run in parallel") { |c| options[:parallel] = c || Parallel.processor_count }
-        opts.on("-h", "--help", "Show this.") { puts opts; exit }
-        opts.on("-v", "--version", "Show Version"){ puts WWTD::VERSION; exit}
-      end.parse!(argv)
-      options
-    end
   end
 end

data/lib/wwtd/cli.rb

@@ -0,0 +1,73 @@
+module WWTD
+  module CLI
+    INFO_MAX_CHARACTERS = 30
+    COLOR_MAP = {:start => :yellow, :success => :green}
+
+    class << self
+      def run(argv=[])
+        # Read travis.yml
+        matrix, ignored = ::WWTD.read_travis_yml
+        puts "Ignoring: #{ignored.sort.join(", ")}" unless ignored.empty?
+
+        # Execute tests
+        results = ::WWTD.run(matrix, parse_options(argv)) do |state, config|
+          puts info_line(state, config, matrix)
+        end
+
+        # Summary
+        if results.size > 1
+          puts "\nResults:"
+          puts results.map { |state, config| info_line(state, config, matrix) }
+        end
+
+        results.all? { |state, config| state == :success } ? 0 : 1
+      end
+
+      private
+
+      def info_line(state, config, matrix)
+        config_info = config_info(matrix, config)
+        color = COLOR_MAP[state] || :red
+        "#{Colors.send(color, state.to_s.upcase)} #{config_info}"
+      end
+
+      # human readable config without options that are the same in all configs
+      # {"a" => 1, "b" => 2} + {"a" => 2, "b" => 2} => {"a" => 1} + {"a" => 2}
+      def config_info(matrix, config)
+        config = config.select { |k,v| matrix.map { |c| c[k] }.uniq.size > 1 }.sort # find non-unique values aka interesting
+        maximum_value_lengths = Hash[config.map { |k,v| [k, matrix.map { |h| h[k].to_s.size }.max ] }] # find maximum value length for each key so we can align
+        config.map do |k, v|
+          value = truncate(v, INFO_MAX_CHARACTERS).ljust([INFO_MAX_CHARACTERS, maximum_value_lengths[k]].min)
+          "#{k}: #{value}"
+        end.join(" ") # truncate values that are too long
+      end
+
+      def truncate(value, number)
+        value = value.to_s # accidental numbers like 'rvm: 2.0'
+        if value.size > number
+          "#{value[0...27]}..."
+        else
+          value
+        end
+      end
+
+      def parse_options(argv)
+        options = {}
+        OptionParser.new do |opts|
+          opts.banner = <<-BANNER.gsub(/^ {10}/, "")
+            WWTD: Travis simulator - faster + no more waiting for build emails
+
+            Usage:
+                wwtd
+
+            Options:
+          BANNER
+          opts.on("-p", "--parallel [PROCESSES]", Integer, "Run in parallel") { |c| options[:parallel] = c || Parallel.processor_count }
+          opts.on("-h", "--help", "Show this.") { puts opts; exit }
+          opts.on("-v", "--version", "Show Version"){ puts WWTD::VERSION; exit}
+        end.parse!(argv)
+        options
+      end
+    end
+  end
+end

data/lib/wwtd/colors.rb

@@ -0,0 +1,25 @@
+module WWTD
+  module Colors
+    class << self
+      def tint(color, string)
+        if $stdout.tty?
+          "\e[#{color}m#{string}\e[0m"
+        else
+          string
+        end
+      end
+
+      def red(string)
+        tint(31, string)
+      end
+
+      def green(string)
+        tint(32, string)
+      end
+
+      def yellow(string)
+        tint(33, string)
+      end
+    end
+  end
+end

data/lib/wwtd/ruby.rb

@@ -0,0 +1,88 @@
+module WWTD
+  module Ruby
+    class << self
+      def available?(version)
+        !version || switch_statement(version)
+      end
+
+      def switch_statement(version)
+        return unless version
+        version = normalize_ruby_version(version)
+        if rvm_executable
+          command = "rvm #{version} do "
+          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)
+          elsif rbenv_executable
+            rubies_root = cache_command("which rbenv").sub(%r{/(\.?rbenv)/.*}, "/\\1") + "/versions"
+            switch_path(rubies_root, version)
+          end
+        end
+      end
+
+      private
+
+      def switch_path(rubies_root, version)
+        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"] = gem_home
+          ""
+        end
+      end
+
+      def rvm_executable
+        cache_command("which rvm")
+      end
+
+      def rbenv_executable
+        cache_command("which rbenv")
+      end
+
+      def cache_command(command)
+        cache(command) do
+          if result = capture(command)
+            result.strip
+          end
+        end
+      end
+
+      def ruby_root(root, version)
+        Dir.glob("#{root}/*").detect { |p| File.basename(p).start_with?(version) }
+      end
+
+      def cache(key)
+        @cache ||= {}
+        if @cache.key?(key)
+          @cache[key]
+        else
+          @cache[key] = yield
+        end
+      end
+
+      # set ruby-opts for jruby flavors
+      def extract_jruby_rbenv_options!(version)
+        if version.sub!("-d19", "")
+          ENV["JRUBY_OPTS"] = "--1.9"
+        elsif version.sub!("-d18", "")
+          ENV["JRUBY_OPTS"] = "--1.8"
+        end
+      end
+
+      def capture(command)
+        result = `#{command}`
+        $?.success? ? result : nil
+      end
+
+      # Taken from https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/script/rvm.rb
+      def normalize_ruby_version(rvm)
+        rvm.to_s.
+          gsub(/-(\d{2})mode$/, '-d\1').
+          gsub(/^rbx$/, 'rbx-weekly-d18').
+          gsub(/^rbx-d(\d{2})$/, 'rbx-weekly-d\1')
+      end
+    end
+  end
+end

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser
@@ -29,7 +29,7 @@ cert_chain:
   y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
   ycwMXfl0
   -----END CERTIFICATE-----
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -54,6 +54,9 @@ extra_rdoc_files: []
 files:
 - bin/wwtd
 - lib/wwtd.rb
+- lib/wwtd/cli.rb
+- lib/wwtd/colors.rb
+- lib/wwtd/ruby.rb
 - lib/wwtd/tasks.rb
 - lib/wwtd/version.rb
 homepage: http://github.com/grosser/wwtd