maestro_shell 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc3c43c91ae1ad728a326390268aa61924c77521
-  data.tar.gz: bcc3c16f0f7d1309e0b51dabeccf1698bd9f9d92
+  metadata.gz: 73beca833565d0135c019fb22c69b23ad6c3cbf0
+  data.tar.gz: b33923670ef19d8189a09ec3742f273f17d08fe2
 SHA512:
-  metadata.gz: 15b0438163743d7540034ffc2375da502e7e0f31d573ae3e89896a2d5ff5efea96726c16bfd0a7de4779082db4b3b7e78520cb1ba9ba674163250c1e8f673013
-  data.tar.gz: 5ff0317c41ceca677029b8dbcd70669efa64e8394b64419244c2514fabf1998ef43307d882285500180b46fd7a13de482b520f969525463bd2d91d2dfa003987
+  metadata.gz: b4d173a49cf9d44a615b7b170eda5b3e5873ff4ec31db8a0335193fec2d32c220699b85645e6398970fc03182a99ae2d4b968ee47d2bc3f266d9e8b8e5088332
+  data.tar.gz: ccb83f5bc3ffe78f91546cbf5fa3c9843fd4213909eb1be830fec90b3f776720958d046beb2559e8955fdf88e00a99702cce8f2cfa1a24e97dd438f40296c909

data/lib/util/shell.rb

@@ -1,6 +1,6 @@
 # Copyright 2011 (c) MaestroDev.  All rights reserved.
 
-require 'pty'
+require 'childprocess'
 require 'tempfile'
 require 'rbconfig'
 
@@ -17,7 +17,7 @@ module Maestro
         attr_reader :exit_code
 
         def initialize(status)
-          @exit_code = status.exitstatus
+          @exit_code = status
         end
 
         def success?
@@ -32,7 +32,7 @@ module Maestro
       ENV_EXPORT_COMMAND = IS_WINDOWS ? 'set' : 'export'
       COMMAND_SEPARATOR  = '&&' # IS_WINDOWS ? '&&' : '&&'
       SCRIPT_EXTENSION   = IS_WINDOWS ? '.bat' : '.shell'
-      SHELL_EXECUTABLE   = IS_WINDOWS ? '' : 'bash '
+      BASH_EXECUTABLE    = 'bash'
 
       def Shell.unset_env_variable(var)
         IS_WINDOWS ? "set #{var}=" : "unset #{var}"
@@ -76,25 +76,25 @@ module Maestro
       #   +err+   Boolean True if line is from stderr
       def run_script_with_delegate(delegate, on_output)
         File.open(@output_file.path, 'a') do |out_file|
-          sleep 0.1
-          status = PTY.spawn(@command_line) do |master, slave, pid|
-            begin
-              while !slave.eof?
-                text = slave.readpartial(1024).gsub(/\r/, '')
-                out_file.write(text)
-
-                if delegate && on_output
-                  delegate.send(on_output, text)
-                end
-              end
-            rescue Exception => e
-              Maestro.log.warn "Got Exception in spawn #{e} #{e.class}"
+          r, w = IO.pipe
+          ChildProcess.posix_spawn = true
+          process = IS_WINDOWS ? ChildProcess.build(@command_line) : ChildProcess.build(BASH_EXECUTABLE, @command_line)
+          process.io.stdout = process.io.stderr = w
+          process.start
+          w.close
+
+          while !r.eof? do
+            text = r.readpartial(1024)
+            out_file.write(text)
+
+            if delegate && on_output
+              delegate.send(on_output, text)
             end
-
-            Process.wait(pid)
           end
 
-          @exit_code = ExitCode.new($?)
+          r.close
+          process.wait
+          @exit_code = ExitCode.new(process.exit_code)
         end
 
         return @exit_code
@@ -112,7 +112,7 @@ module Maestro
       private
       
       def get_command(path)
-        @command_line = "#{SHELL_EXECUTABLE}#{path}"
+        @command_line = path
         @command_line
       end
 

data/lib/util/version.rb

@@ -1,7 +1,7 @@
 module Maestro
   module Util
     class Shell
-      VERSION = '0.0.7'
+      VERSION = '0.0.8'
     end
   end
 end

data/maestro_shell.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'logging', '1.8.0'
   spec.add_dependency 'rubyzip', '0.9.8'
   spec.add_dependency 'json', '>= 1.4.6'
+  spec.add_dependency 'childprocess', '>= 0.3.9'
 
   spec.add_development_dependency "mocha", '>=0.10.0'
   spec.add_development_dependency 'bundler', '~> 1.3'

data/spec/shell_spec.rb

@@ -36,7 +36,6 @@ describe Maestro::Util::Shell do
     # File.exists?(path).should be_true
     
     subject.run_script.success?.should be_true
-    
     subject.to_s.chomp.should eql('willy')
   end
   
@@ -93,7 +92,7 @@ CMD
      
      subject.run_script.success?.should be_true
      # Strips \r
-     subject.to_s.should eql("hello\ngoodbye\n")
+     subject.to_s.should eql("hello\r\ngoodbye\n")
    end
 
    it 'should create run and return result in on call' do
@@ -109,7 +108,7 @@ CMD
      File.chmod(0777, temp.path)
      command =<<-CMD
 #{Maestro::Util::Shell::ENV_EXPORT_COMMAND} BLAH=blah; echo $BLAH
-#{Maestro::Util::Shell::SHELL_EXECUTABLE} #{temp.path}
+#{temp.path}
      CMD
 
      path = subject.create_script command

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestro_shell
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Doug Henderson
@@ -52,6 +52,20 @@ dependencies:
         version: 1.4.6
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.9
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.9
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: mocha
   version_requirements: !ruby/object:Gem::Requirement