maestro_shell 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e64d5765872e7cd5ee7577d58f79435f56c76c56
-  data.tar.gz: b00917d18728c744468b1f0f38d2a8ecd8b90b3b
+  metadata.gz: dc3c43c91ae1ad728a326390268aa61924c77521
+  data.tar.gz: bcc3c16f0f7d1309e0b51dabeccf1698bd9f9d92
 SHA512:
-  metadata.gz: 23eb28703979cb266c516d74ca891e9974cceb2f9c0d046c5ca3bf4696ebc7a98e80c338aafb15d35c98b4b30640cb0ee01aaf337dd88a0d3ff2a19d8925a3cb
-  data.tar.gz: aeb367603f3b4cf1340df35da8505fa553ab6376915192bae4dcecc81c5f02b6a45c2616be5e977bd1e007f54efabdfb236c13648a9583a21935d4f5abf93f5a
+  metadata.gz: 15b0438163743d7540034ffc2375da502e7e0f31d573ae3e89896a2d5ff5efea96726c16bfd0a7de4779082db4b3b7e78520cb1ba9ba674163250c1e8f673013
+  data.tar.gz: 5ff0317c41ceca677029b8dbcd70669efa64e8394b64419244c2514fabf1998ef43307d882285500180b46fd7a13de482b520f969525463bd2d91d2dfa003987

data/lib/util/shell.rb

@@ -1,5 +1,6 @@
 # Copyright 2011 (c) MaestroDev.  All rights reserved.
 
+require 'pty'
 require 'tempfile'
 require 'rbconfig'
 
@@ -32,7 +33,6 @@ module Maestro
       COMMAND_SEPARATOR  = '&&' # IS_WINDOWS ? '&&' : '&&'
       SCRIPT_EXTENSION   = IS_WINDOWS ? '.bat' : '.shell'
       SHELL_EXECUTABLE   = IS_WINDOWS ? '' : 'bash '
-      COMMAND_SUFFIX     = IS_WINDOWS ? '' : ' 2>&1'
 
       def Shell.unset_env_variable(var)
         IS_WINDOWS ? "set #{var}=" : "unset #{var}"
@@ -76,31 +76,26 @@ 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|
-          status = IO.popen4(@command_line) do |pid, stdin, stdout, stderr|
-            # Keep reading input until all (stdin/stderr) streams report eof
-            readers = [stdout, stderr]
-            while readers.any?
-              ready = IO.select(readers, [], readers)
-              # no writers
-              # ready[1].each { ... }
-              ready[0].each do |fd|
-                if fd.eof?
-                  readers.delete fd
-                else
-
-                  text = fd.readpartial(1024)
-                  out_file.write(text)
-
-                  if delegate && on_output
-                    delegate.send(on_output, text)
-                  end
+          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}"
             end
+
+            Process.wait(pid)
           end
-        end
 
-        @exit_code = ExitCode.new($?)
+          @exit_code = ExitCode.new($?)
+        end
 
         return @exit_code
       end
@@ -117,7 +112,7 @@ module Maestro
       private
       
       def get_command(path)
-        @command_line = "#{SHELL_EXECUTABLE}#{path}#{COMMAND_SUFFIX}"
+        @command_line = "#{SHELL_EXECUTABLE}#{path}"
         @command_line
       end
 

data/lib/util/version.rb

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

data/spec/shell_spec.rb

@@ -62,7 +62,13 @@ describe Maestro::Util::Shell do
      path = subject.create_script "blah hello"
      
      subject.run_script.success?.should be_false
-     subject.to_s.should include("blah: command not found")
+     subject.output.should include("blah: command not found")
+   end
+
+   it 'should emit stdout and stderr in order' do
+     subject.create_script("echo stdout1\nsleep 1\necho stderr1 >&2\nsleep 1\necho stdout2\nsleep 1\necho stderr2 >&2\nsleep 1\necho stdout3")
+     subject.run_script.success?.should be_true
+     subject.to_s.should eql("stdout1\nstderr1\nstdout2\nstderr2\nstdout3\n")
    end
 
    it 'should run with with export inline' do
@@ -86,7 +92,8 @@ CMD
      path = subject.create_script command
      
      subject.run_script.success?.should be_true
-     subject.to_s.should eql("hello\r\ngoodbye\n")
+     # Strips \r
+     subject.to_s.should eql("hello\ngoodbye\n")
    end
 
    it 'should create run and return result in on call' do
@@ -102,7 +109,7 @@ CMD
      File.chmod(0777, temp.path)
      command =<<-CMD
 #{Maestro::Util::Shell::ENV_EXPORT_COMMAND} BLAH=blah; echo $BLAH
-#{temp.path}
+#{Maestro::Util::Shell::SHELL_EXECUTABLE} #{temp.path}
      CMD
 
      path = subject.create_script command

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestro_shell
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Doug Henderson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging