wwtd 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b1e832c599a16052d46aa694de0b9464c794f73
-  data.tar.gz: 96c4a480a1bc405dc7db98c9b14e89e86dec0daa
+  metadata.gz: 813b49fa2a270e6c009d896acb25a3d27c827345
+  data.tar.gz: 4e6b991e734a921cd6796580ce5867c0ed2f0ca1
 SHA512:
-  metadata.gz: a1ad70dbdf2bd82a827d115ba107effcfc4a360ade2a5931b288d1078f04150d41860c217b724888918b7f723a52a7868dbedc00a9b4c777393cb2fc3e66691a
-  data.tar.gz: acdc3ea7a6d24c9818687ec442d209aa8e4a7b849324888eabb9c4dc4c4e722e07f846fd5ad7548030f7e61b760b7f3693a8920f9ca18cd1f159c7e4bae7590a
+  metadata.gz: 682462687369a8903a0bd765e4da7af6871fe382affe1fddd8225dc31ccf1f09ed42ca237b123a2bebef9db2aed0d3fb48bc94d590e5e27a5edddb4568da469b
+  data.tar.gz: c8d4f247091195cb6acc3737b2e191361230c054552b1e5cc3353e8ab828037ab3d34b97c4e6036c9e0ba2be66c654886f924106051570a195b65576836858c1

data/lib/wwtd.rb

@@ -53,24 +53,29 @@ module WWTD
     end
 
     # internal api
-    def escaped_env(env)
-      env.map {|k,v| "#{k}=#{Shellwords.escape(v)}" }.join(" ")
+    # needs the export to work on ruby 1.9 / linux
+    def escaped_env(env, options={})
+      return "" if env.empty?
+      env = env.map {|k,v| "#{k}=#{Shellwords.escape(v)}" }
+      if options[:rerun]
+        env.join(" ") + " "
+      elsif env.empty?
+        ""
+      else
+        env.map { |e| "export #{e}" }.join(" && ") + " && "
+      end
     end
 
+    private
+
     # internal api
     def sh(env, cmd=nil)
       cmd, env = env, {} unless cmd
-      env = if env.any?
-        escaped_env(env) + " "
-      else
-        ""
-      end
+      env = escaped_env(env)
       puts cmd
       system("#{env}#{cmd}")
     end
 
-    private
-
     def with_clean_dot_bundle
       had_old = File.exist?(".bundle")
       Dir.mktmpdir do |dir|

data/lib/wwtd/cli.rb

@@ -34,7 +34,7 @@ module WWTD
           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) + " ")
+            env = WWTD.escaped_env(env, :rerun => true)
             puts colorize(:red, env + cmd)
           end
         end

data/lib/wwtd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Michael Grosser