albacore 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6190d557757ec5403d5130f33f4a6624706dcdf9
-  data.tar.gz: 5a504676193b9b48e97c4e7ba0cfa398b2062cce
+  metadata.gz: c0a173804828e8fec262da15c11b33854eb576d9
+  data.tar.gz: 947fd7c8917e02c47fd004cb194e2f039f9c9438
 SHA512:
-  metadata.gz: ed4520ea1d241ade3934c4ed3c18efbf602d3ea52882aaba59545ee7b5a2d9eda22af70fed18eec93a64c4b12536a68e33f01f97bebab745f0bd46f35dc9c785
-  data.tar.gz: 5b1b34ffeb2684ccb4b4d22251ff8a17fd5276df49015c65ab19dd91befdad76c1daa0ac404ff885717536dbb703857325f5cd556ccf6b118625e4099c9bbe79
+  metadata.gz: 9a594f836cf00d4626dbc828dc8bafcd301dfa8d916f1d25e22ea8425fe343cad2acd02555e512d0c8c42b8c9cf78f7141736ada333611a370157f43e82206ed
+  data.tar.gz: 59d3576f7a92a9e984ba47497212a11f1c59ee155befc5b8302cd5b0c36be935839330fec9d1f209b123dbd96c73b08286942dc9251aa229f64c6e6b71f137c6

data/lib/albacore/cross_platform_cmd.rb

@@ -51,7 +51,7 @@ module Albacore
     #
     # system(cmd, [args array], Hash(opts), block|ok,status|)
     #  ok => false if bad exit code, or the output otherwise
-    # 
+    #
     # options are passed as the last argument
     #
     # options:
@@ -110,7 +110,7 @@ module Albacore
         ret_str = inmem.string.encode 'utf-8', invalid: :replace, undef: :replace, replace: ''
         return block.call(status.success? && ret_str, status, ret_str)
       end
-    end  
+    end
 
     def stop
       if pid
@@ -162,7 +162,7 @@ module Albacore
         return block.call($? == 0 && lines, $?, lines)
       end
     end
-    
+
     # shell ignore exit code
     # returns:
     #  [ok, status]
@@ -193,15 +193,16 @@ module Albacore
       parameters = []
       parameters << Paths.normalise_slashes(file) if dir == '.'
       parameters << Paths.normalise_slashes("#{dir}:#{file}") unless dir == '.'
+      parameters << '2> nul' if ::Rake::Win32.windows?
       cmd, parameters = Paths.normalise cmd, parameters
+      cmd = "#{cmd} #{parameters.join(' ')}"
 
-      trace { "#{cmd} #{parameters.join(' ')} [cross_platform_cmd #which]" }
+      trace { "#{cmd} [cross_platform_cmd #which]" }
 
-      null = ::Rake::Win32.windows? ? "NUL" : "/dev/null"
-      res = IO.popen([cmd, *parameters]) do |io|
+      res = IO.popen(cmd) do |io|
         io.read.chomp
       end
-      
+
       unless $? == 0
         nil
       else
@@ -211,7 +212,7 @@ module Albacore
       trace "which/where returned #{$?}: #{e} [cross_platform_cmd #which]"
       nil
     end
-    
+
     def chdir wd, &block
       return block.call if wd.nil?
       Dir.chdir wd do
@@ -221,14 +222,14 @@ module Albacore
         return res
       end
     end
-    
+
     private
 
     def prepare_command cmd, clr_command = false, &block
       cmd = cmd.unshift 'mono' if clr_command && ! ::Albacore.windows?
       pars = cmd[1..-1].flatten
       raise ArgumentError, "arguments 1..-1 must be an array" unless pars.is_a? Array
-      exe, pars = ::Albacore::Paths.normalise cmd[0], pars 
+      exe, pars = ::Albacore::Paths.normalise cmd[0], pars
       printable = %Q{#{exe} #{pars.join(' ')}}
       handler = block_given? ? block : handler_with_message(printable)
       [exe, pars, printable, handler]
@@ -244,7 +245,7 @@ module Albacore
     rescue Errno::ENOENT => e
       rescue_block.call(nil, PseudoStatus.new(127), e.to_s)
     rescue IOError => e # rescue for JRuby
-      rescue_block.call(nil, PseudoStatus.new(127), e.to_s) 
+      rescue_block.call(nil, PseudoStatus.new(127), e.to_s)
     end
 
 
@@ -267,7 +268,7 @@ module Albacore
       else
         %{Command failed with status (#{status.exitstatus}):
   #{cmd}}
-      end 
+      end
     end
 
     # shuffle the executable to be a parameter to

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake