maestro_shell 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7202e558e1c7bc226196fa6580f929837523680a
-  data.tar.gz: 2c56889dba049af09e23c1ad5fd9c888d3658df8
+  metadata.gz: 88171ef0a700d5b2c309660e5e5aeff781480e84
+  data.tar.gz: d62a916f0f7d61eee252491dfbc032fc9442b93b
 SHA512:
-  metadata.gz: 1671da72da032d007631ba2e9761f5ad2914e6aae54c334ecce0b4694e7f54660fda8cdfb93130d0761bc4814292e63f884aca5705d5a706d7ef73e4cbb39f93
-  data.tar.gz: 6c820aadf68fd69a0e0c98862584226e0c4fa398686e5b08f68c445de08bd62f5b0bc5e4beec3e0bed78a697886873a8416840dbd007a1ffff6410e4fac2be18
+  metadata.gz: 15924167ec09f21f4698fc5ddd67414fcedfdbfb3090c862e7dcb90095f7f7362cdcdc5900d5345a2ec69492d225b454b83d7a35979674f94055a69722402bde
+  data.tar.gz: d4fb0dfeefaa76cbe32bd034277634c437bd42f7d8606c2d4c3a1c72c02ee8fd041cdb3ed5ef726a91a8a3743514d775f759082404b3d6e4909ce3dd096bbef7

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock
 
 # YARD artifacts
 .yardoc

data/lib/util/shell.rb

@@ -32,6 +32,7 @@ module Maestro
       COMMAND_SEPARATOR  = '&&' # IS_WINDOWS ? '&&' : '&&'
       SCRIPT_EXTENSION   = IS_WINDOWS ? '.bat' : '.shell'
       SHELL_EXECUTABLE   = IS_WINDOWS ? '' : 'bash '
+      COMMAND_SUFFIX     = IS_WINDOWS ? '' : ' 2>&1 | tee'
 
       def Shell.unset_env_variable(var)
         IS_WINDOWS ? "set #{var}=" : "unset #{var}"
@@ -91,7 +92,7 @@ module Maestro
                   out_file.write(text)
 
                   if delegate && on_output
-                    delegate.send(on_output, text, fd == stderr)
+                    delegate.send(on_output, text)
                   end
                 end
               end
@@ -116,7 +117,7 @@ module Maestro
       private
       
       def get_command(path)
-        @command_line = "#{SHELL_EXECUTABLE}#{path}"
+        @command_line = "#{SHELL_EXECUTABLE}#{path}#{COMMAND_SUFFIX}"
         @command_line
       end
 

data/lib/util/version.rb

@@ -1,7 +1,7 @@
 module Maestro
   module Util
     class Shell
-      VERSION = '0.0.4'
+      VERSION = '0.0.5'
     end
   end
 end

data/spec/shell_spec.rb

@@ -68,7 +68,7 @@ describe Maestro::Util::Shell do
    it 'should run with with export inline' do
      command =<<-CMD
 #{Maestro::Util::Shell::ENV_EXPORT_COMMAND} BLAH=blah; echo $BLAH
-     CMD
+CMD
      
      path = subject.create_script command
      
@@ -80,8 +80,8 @@ describe Maestro::Util::Shell do
    it 'should run multiline command' do
      command =<<-CMD
 echo hello\r\n
-echo goodbye     
-     CMD
+echo goodbye
+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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Doug Henderson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -118,7 +118,6 @@ files:
 - .gitignore
 - .ruby-version
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,41 +0,0 @@
-PATH
-  remote: .
-  specs:
-    maestro_shell (0.0.4)
-      json (>= 1.4.6)
-      logging (= 1.8.0)
-      rubyzip (= 0.9.8)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.4)
-    json (1.8.0-java)
-    little-plugger (1.1.3)
-    logging (1.8.0)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.3.6)
-    metaclass (0.0.1)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    rake (10.1.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rubyzip (0.9.8)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  maestro_shell!
-  mocha (>= 0.10.0)
-  rake
-  rspec (~> 2.13.0)