wwtd 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b2f6dec282d80a8cdaf53008e2dfff1e89264af
-  data.tar.gz: 778218ac2e072752b8ac7bc27328c1d01f05a324
+  metadata.gz: 5b1e832c599a16052d46aa694de0b9464c794f73
+  data.tar.gz: 96c4a480a1bc405dc7db98c9b14e89e86dec0daa
 SHA512:
-  metadata.gz: 6cd6dd3d26f1127be7245841bc50f4bd05be9c34b92bc2b916d332811102ca271b7dfe5fe6ae24acb5936f764eb91f706cdadc0ba406828aa835b20640cc0c5a
-  data.tar.gz: 1dc94f737ee7be9d707136f5fca76bbe1da0520e85f0c412d4ab187f5666cb3cc1b8b4d44d91f44d7b15f4c11047023ed907a85ae0556cb71325cedfeefc95dc
+  metadata.gz: a1ad70dbdf2bd82a827d115ba107effcfc4a360ade2a5931b288d1078f04150d41860c217b724888918b7f723a52a7868dbedc00a9b4c777393cb2fc3e66691a
+  data.tar.gz: acdc3ea7a6d24c9818687ec442d209aa8e4a7b849324888eabb9c4dc4c4e722e07f846fd5ad7548030f7e61b760b7f3693a8920f9ca18cd1f159c7e4bae7590a

data/lib/wwtd.rb

@@ -52,6 +52,23 @@ module WWTD
       end
     end
 
+    # internal api
+    def escaped_env(env)
+      env.map {|k,v| "#{k}=#{Shellwords.escape(v)}" }.join(" ")
+    end
+
+    # internal api
+    def sh(env, cmd=nil)
+      cmd, env = env, {} unless cmd
+      env = if env.any?
+        escaped_env(env) + " "
+      else
+        ""
+      end
+      puts cmd
+      system("#{env}#{cmd}")
+    end
+
     private
 
     def with_clean_dot_bundle
@@ -89,17 +106,6 @@ module WWTD
       matrix.map! { |c| config.merge(c) }
     end
 
-    def sh(env, cmd=nil)
-      cmd, env = env, {} unless cmd
-      env = if env.any?
-        env.map {|k,v| "export #{k}=#{Shellwords.escape(v)}" }.join(" && ") + " && "
-      else
-        ""
-      end
-      puts cmd
-      system("#{env}#{cmd}")
-    end
-
     def with_clean_env(&block)
       if defined?(Bundler)
         Bundler.with_clean_env(&block)

data/lib/wwtd/cli.rb

@@ -19,21 +19,37 @@ module WWTD
           end
         end
 
-        # Summary
-        if results.size > 1
-          puts "\nResults:"
-          puts results.map { |state, config| info_line(state, config, matrix) }
-        end
+        print_summary(matrix, results)
+        print_rerun(results)
 
         results.all? { |state, config| state == :success } ? 0 : 1
       end
 
       private
 
+      def print_rerun(results)
+        failed = results.select { |s, c| s == :failure }
+        if failed.any?
+          puts "\nFailed:"
+          failed.each do |state, config|
+            runner = WWTD::Run.new(config.merge(:rerun => true), {}, nil)
+            env, cmd = runner.env_and_command
+            env = (env.empty? ? "" : WWTD.escaped_env(env) + " ")
+            puts colorize(:red, env + cmd)
+          end
+        end
+      end
+
+      def print_summary(matrix, results)
+        if results.size > 1
+          puts "\nResults:"
+          results.each { |state, config| puts info_line(state, config, matrix) }
+        end
+      end
+
       def protect_against_nested_runs
         env = (defined?(Bundler) ? Bundler::ORIGINAL_ENV : ENV)
 
-        r = rand
         raise "Already running WWTD" if env["INSIDE_WWTD"]
         env['INSIDE_WWTD'] = "1"
         yield
@@ -67,6 +83,7 @@ module WWTD
       def info_line(state, config, matrix)
         config_info = config_info(matrix, config)
         color = STATE_COLOR_MAP[state] || :red
+
         "#{colorize(color, state.to_s.upcase)} #{config_info}"
       end
 

data/lib/wwtd/ruby.rb

@@ -8,12 +8,20 @@ module WWTD
       # - rvm: "rvm xxx do"
       # - others: env hash
       # - unknown: nil
-      def switch_statement(version)
+      def switch_statement(version, options={})
         return unless version
         version = normalize_ruby_version(version)
         if rvm_executable
           command = "rvm #{version} do "
           command if cache_command("#{command} ruby -v")
+        elsif options[:rerun]
+          if rbenv_executable
+            # cannot call different ruby from inside ruby, but ok for copy-paste
+            "RBENV_VERSION=#{version} "
+          else
+            # don't print giant path hack :/
+            "USE-RUBY-#{version}"
+          end
         else
           if ruby_root = ENV["RUBY_ROOT"] # chruby or RUBY_ROOT set
             switch_via_env(File.dirname(ruby_root), version)

data/lib/wwtd/run.rb

@@ -19,10 +19,21 @@ module WWTD
       [state, config]
     end
 
+    # internal api
+    def env_and_command
+      default_command = (wants_bundle? ? "bundle exec rake" : "rake")
+      command = config["script"] || default_command
+      command = command.join(" && ") if Array === command
+      command = "#{switch}#{command}"
+
+      [env, command]
+    end
+
     private
 
     attr_reader :config, :env, :lock, :switch
 
+
     def success?
       if wants_bundle?
         flock File.join(lock, (config["rvm"] || "rvm").to_s) do
@@ -32,12 +43,7 @@ module WWTD
         end
       end
 
-      default_command = (wants_bundle? ? "bundle exec rake" : "rake")
-      command = config["script"] || default_command
-      command = command.join(" && ") if Array === command
-      command = "#{switch}#{command}"
-
-      sh(env, command)
+      sh(*env_and_command)
     end
 
     def wants_bundle?
@@ -49,7 +55,7 @@ module WWTD
     end
 
     def build_switch_statement
-      switch_ruby = Ruby.switch_statement(config["rvm"])
+      switch_ruby = Ruby.switch_statement(config["rvm"], :rerun => config[:rerun])
       if switch_ruby.is_a?(Hash)
         env.merge!(switch_ruby)
         switch_ruby = nil

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it