mixlib-shellout 1.4.0 → 1.6.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb92770f369fa7a1e9f8243f593003270d96cb6d
-  data.tar.gz: b09589f82ed5085958214e21258df8cf99127f17
+  metadata.gz: 021c7f8efea2d6d11f349b4a1728d3039567b191
+  data.tar.gz: b9d6684c7b751462d6e4c2cea479f39474e3ee6d
 SHA512:
-  metadata.gz: 52112e577474277ba2f4d63855253f8d4f93c6edda83795486ebec788d07ab5bff038bd9b4c73f32d5ac3a1e056620e04570fc21a81dbbb87616735919635b6c
-  data.tar.gz: dcf9457cf588943d54eafb2448be13c2015ac5b57a32ca02ad1bf16d4102a26e84d29e32f5d06e027336a21bd546751366f89631371e375c3c6dc7760dec91fb
+  metadata.gz: e4a1e30bb080f4bad1697480360acc76b852a32d46d1f8e350e2ce1a0c9024734a5f3ce0377c56ad5a72207084410bcb32eaa1477bb25e7e1ea51f4a1e840e24
+  data.tar.gz: 674076ca9e875c2b2b55d604f6ce3279c99e87014002429e51e1d1eeaac245947dbbbddd3811d32df5ca17e97910687ffaed91f9de7e41950b961be7cfcc27dd

data/README.md

@@ -37,7 +37,7 @@ Invoke crontab to edit user cron:
       crontab.run_command
 
 ## Windows Impersonation Example
-Invoke crontab to edit user cron:
+Invoke "whoami.exe" to demonstrate running a command as another user:
 
       whomai = Mixlib::ShellOut.new("whoami.exe", :user => "username", :domain => "DOMAIN", :password => "password")
       whoami.run_command      
@@ -51,4 +51,4 @@ Apache 2 Licensed. See LICENSE for full details.
 
 ## See Also
 * `Process.spawn` in Ruby 1.9
-* [https://github.com/rtomayko/posix-spawn](posix-spawn)
+* [https://github.com/rtomayko/posix-spawn](https://github.com/rtomayko/posix-spawn)

data/lib/mixlib/shellout.rb

@@ -53,10 +53,13 @@ module Mixlib
     # to determine if the command was successful. Normally set via options to new
     attr_accessor :valid_exit_codes
 
-    # When live_stream is set, stdout of the subprocess will be copied to it as
-    # the subprocess is running. For example, if live_stream is set to STDOUT,
-    # the command's output will be echoed to STDOUT.
-    attr_accessor :live_stream
+    # When live_stdout is set, the stdout of the subprocess will be copied to it
+    # as the subprocess is running.
+    attr_accessor :live_stdout
+
+    # When live_stderr is set, the stderr of the subprocess will be copied to it
+    # as the subprocess is running.
+    attr_accessor :live_stderr
 
     # ShellOut will push data from :input down the stdin of the subprocss.
     # Normally set via options passed to new.
@@ -147,7 +150,7 @@ module Mixlib
     #   cmd.run_command # etc.
     def initialize(*command_args)
       @stdout, @stderr = '', ''
-      @live_stream = nil
+      @live_stdout = @live_stderr = nil
       @input = nil
       @log_level = :debug
       @log_tag = nil
@@ -163,6 +166,18 @@ module Mixlib
       @command = command_args.size == 1 ? command_args.first : command_args
     end
 
+    # Returns the stream that both is being used by both live_stdout and live_stderr, or nil
+    def live_stream
+      live_stdout == live_stderr ? live_stdout : nil
+    end
+
+    # A shortcut for setting both live_stdout and live_stderr, so that both the
+    # stdout and stderr from the subprocess will be copied to the same stream as
+    # the subprocess is running.
+    def live_stream=(stream)
+      @live_stdout = @live_stderr = stream
+    end
+
     # Set the umask that the subprocess will have. If given as a string, it
     # will be converted to an integer by String#oct.
     def umask=(new_umask)
@@ -286,7 +301,11 @@ module Mixlib
         when 'returns'
           self.valid_exit_codes = Array(setting)
         when 'live_stream'
-          self.live_stream = setting
+          self.live_stdout = self.live_stderr = setting
+        when 'live_stdout'
+          self.live_stdout = setting
+        when 'live_stderr'
+          self.live_stderr = setting
         when 'input'
           self.input = setting
         when 'logger'

data/lib/mixlib/shellout/unix.rb

@@ -115,7 +115,7 @@ module Mixlib
         # If the child dies very quickly, @child_pid may be a zombie, so handle
         # ESRCH here.
         @child_pgid = -Process.getpgid(@child_pid)
-      rescue Errno::ESRCH
+      rescue Errno::ESRCH, Errno::EPERM
         @child_pgid = nil
       end
 
@@ -278,7 +278,7 @@ module Mixlib
       def read_stdout_to_buffer
         while chunk = child_stdout.read_nonblock(READ_SIZE)
           @stdout << chunk
-          @live_stream << chunk if @live_stream
+          @live_stdout << chunk if @live_stdout
         end
       rescue Errno::EAGAIN
       rescue EOFError
@@ -288,6 +288,7 @@ module Mixlib
       def read_stderr_to_buffer
         while chunk = child_stderr.read_nonblock(READ_SIZE)
           @stderr << chunk
+          @live_stderr << chunk if @live_stderr
         end
       rescue Errno::EAGAIN
       rescue EOFError
@@ -345,12 +346,12 @@ module Mixlib
 
       def reap_errant_child
         return if attempt_reap
-        @terminate_reason = "Command execeded allowed execution time, process terminated"
-        logger.error("Command execeded allowed execution time, sending TERM") if logger
+        @terminate_reason = "Command exceeded allowed execution time, process terminated"
+        logger.error("Command exceeded allowed execution time, sending TERM") if logger
         Process.kill(:TERM, child_pgid)
         sleep 3
         attempt_reap
-        logger.error("Command execeded allowed execution time, sending KILL") if logger
+        logger.error("Command exceeded allowed execution time, sending KILL") if logger
         Process.kill(:KILL, child_pgid)
         reap
 

data/lib/mixlib/shellout/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class ShellOut
-    VERSION = "1.4.0"
+    VERSION = "1.6.0.rc.0"
   end
 end

data/lib/mixlib/shellout/windows.rb

@@ -165,7 +165,9 @@ module Mixlib
 
         if ready.first.include?(stderr_read)
           begin
-            @stderr << stderr_read.readpartial(READ_SIZE)
+            next_chunk = stderr_read.readpartial(READ_SIZE)
+            @stderr << next_chunk
+            @live_stderr << next_chunk if @live_stderr
           rescue EOFError
             stderr_read.close
             open_streams.delete(stderr_read)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-shellout
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0.rc.0
 platform: ruby
 authors:
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -54,9 +54,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2