maestro_shell 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb4621860e28d309824a420fd140272b23fd43db
-  data.tar.gz: 344e12b8ec1cc504dbd71498bd0038314136a247
+  metadata.gz: add94bfda2efcc465922fdd8362802d90c2a69bd
+  data.tar.gz: 5307a7c23ffd113b46050ac1736c15e0e4625188
 SHA512:
-  metadata.gz: d804df5c04030454d597934afa694abded219bae93eabd51d8cb5c7ccd133d5be0baabe7cd604f1dfec51b02c09854d5c671f6910f473014cd270eb571e5b999
-  data.tar.gz: e2288530e8d49bb984e0b7fcb8f2547f36a09f7ebf9ccd4e14c64ea191131009a51025cc181ed89d7093b9f2a7db0a8ba8380fcb088bc4541f54793c57019aad
+  metadata.gz: bdedd12799acc1ccd9191f6419df3581956c1d61ba1f5518277f35a09a04da7f52174605495a38f519fd091bb8c314e3c353b3e100a76f1291c07a30e74c6093
+  data.tar.gz: affb611f2827f41a06873ff1c8458dea6413d787c9eafdd4d991d7258b3e205e2d57c8da533d64496551a0ade1cd5116eb58c773ae65b12ec96197f8431768b0

data/lib/util/shell.rb

@@ -26,7 +26,7 @@ module Maestro
       end
 
       # Utility variables
-      IS_WINDOWS         = RbConfig::CONFIG['host_os'] =~ /mswin/
+      IS_WINDOWS         = ChildProcess.windows?
       SEPARATOR          = IS_WINDOWS ? "\\" : "/"
       MOVE_COMMAND       = IS_WINDOWS ? 'move' : 'mv'
       ENV_EXPORT_COMMAND = IS_WINDOWS ? 'set' : 'export'
@@ -78,10 +78,24 @@ module Maestro
         File.open(@output_file.path, 'a') do |out_file|
           r, w = IO.pipe
           ChildProcess.posix_spawn = true
-          process = IS_WINDOWS ? ChildProcess.build(@command_line) : ChildProcess.build(BASH_EXECUTABLE, @command_line)
+          if IS_WINDOWS
+            if ChildProcess.jruby?
+              # Due to https://github.com/jarib/childprocess/issues/26, we
+              # must use a different implementation of ChildProcess on
+              # Windows + JRuby
+              process = ChildProcess::JRuby::Process.new([@command_line])
+            else
+              process = ChildProcess.build(@command_line)
+            end
+          else
+            process = ChildProcess.build(BASH_EXECUTABLE, @command_line)
+          end
           process.io.stdout = process.io.stderr = w
           process.start
-          w.close
+          # On Windows, can't close the pipe until process has exited or you
+          # get an EOF, see
+          # https://github.com/jarib/childprocess/pull/22#issuecomment-3395687
+          w.close unless IS_WINDOWS
 
           potential_eof = false
           begin
@@ -113,6 +127,7 @@ module Maestro
 
           r.close
           process.wait unless process.exited?
+          w.close if IS_WINDOWS
           @exit_code = ExitCode.new(process.exit_code)
         end
 

data/lib/util/version.rb

@@ -1,7 +1,7 @@
 module Maestro
   module Util
     class Shell
-      VERSION = '0.0.12'
+      VERSION = '0.0.13'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestro_shell
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Doug Henderson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: Maestro Shell utility