mixlib-shellout 1.0.0.rc.1 → 1.0.0

data/lib/mixlib/shellout/unix.rb

@@ -185,7 +185,7 @@ module Mixlib
         end
       rescue Errno::EAGAIN
       rescue EOFError
-        open_pipes.delete_at(0)
+        open_pipes.delete(child_stdout)
       end
 
       def read_stderr_to_buffer
@@ -194,7 +194,7 @@ module Mixlib
         end
       rescue Errno::EAGAIN
       rescue EOFError
-        open_pipes.delete_at(1)
+        open_pipes.delete(child_stderr)
       end
 
       def fork_subprocess

data/lib/mixlib/shellout/version.rb

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

data/lib/mixlib/shellout/windows.rb

@@ -42,6 +42,7 @@ module Mixlib
         #
         stdout_read, stdout_write = IO.pipe
         stderr_read, stderr_write = IO.pipe
+        stdin_read, stdin_write = IO.pipe
         open_streams = [ stdout_read, stderr_read ]
 
         begin
@@ -55,7 +56,8 @@ module Mixlib
             :command_line => command_line,
             :startup_info => {
               :stdout => stdout_write,
-              :stderr => stderr_write
+              :stderr => stderr_write,
+              :stdin => stdin_read
             },
             :environment => inherit_environment.map { |k,v| "#{k}=#{v}" },
             :close_handles => false
@@ -88,7 +90,7 @@ module Mixlib
               when WAIT_TIMEOUT
                 # Kill the process
                 if (Time.now - start_wait) > timeout
-                  raise Mixlib::ShellOut::CommandTimeout, "command timed out:\n#{format_for_exception}"
+                  raise Mixlib::ShellOut::Exceptions::CommandTimeout, "command timed out:\n#{format_for_exception}"
                 end
 
                 consume_output(open_streams, stdout_read, stderr_read)
@@ -119,6 +121,9 @@ module Mixlib
 
       class ThingThatLooksSortOfLikeAProcessStatus
         attr_accessor :exitstatus
+        def success?
+          exitstatus == 0
+        end
       end
 
       def consume_output(open_streams, stdout_read, stderr_read)
@@ -149,13 +154,33 @@ module Mixlib
         return true
       end
 
-      SHOULD_USE_CMD = /['"<>|&%]|\b(?:assoc|break|call|cd|chcp|chdir|cls|color|copy|ctty|date|del|dir|echo|endlocal|erase|exit|for|ftype|goto|if|lfnfor|lh|lock|md|mkdir|move|path|pause|popd|prompt|pushd|rd|rem|ren|rename|rmdir|set|setlocal|shift|start|time|title|truename|type|unlock|ver|verify|vol)\b/
+      IS_BATCH_FILE = /\.bat|\.cmd$/i
 
       def command_to_run
-        if command =~ SHOULD_USE_CMD
+        if command =~ /^\s*"(.*)"/
+          # If we have quotes, do an exact match
+          candidate = $1
+        else
+          # Otherwise check everything up to the first space
+          candidate = command[0,command.index(/\s/) || command.length].strip
+        end
+
+        # Don't do searching for empty commands.  Let it fail when it runs.
+        if candidate.length == 0
+          return [ nil, command ]
+        end
+
+        # Check if the exe exists directly.  Otherwise, search PATH.
+        exe = find_exe_at_location(candidate)
+        if exe.nil? && exe !~ /[\\\/]/
+          exe = which(command[0,command.index(/\s/) || command.length])
+        end
+
+        if exe.nil? || exe =~ IS_BATCH_FILE
+          # Batch files MUST use cmd; and if we couldn't find the command we're looking for, we assume it must be a cmd builtin.
           [ ENV['COMSPEC'], "cmd /c #{command}" ]
         else
-          [ which(command[0,command.index(/\s/) || command.length]), command ]
+          [ exe, command ]
         end
       end
 
@@ -175,14 +200,23 @@ module Mixlib
         result
       end
 
+      def pathext
+        @pathext ||= ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') + [''] : ['']
+      end
+
       def which(cmd)
-        return cmd if File.executable? cmd
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') + [''] : ['']
         ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each { |ext|
-            exe = "#{path}/#{cmd}#{ext}"
-            return exe if File.executable? exe
-          }
+          exe = find_exe_at_location("#{path}/${cmd}")
+          return exe if exe
+        end
+        return nil
+      end
+
+      def find_exe_at_location(path)
+        return path if File.executable? path
+        pathext.each do |ext|
+          exe = "#{path}#{ext}"
+          return exe if File.executable? exe
         end
         return nil
       end

metadata

@@ -1,35 +1,38 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mixlib-shellout
-version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 1.0.0
 platform: ruby
-authors:
+authors: 
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70226438013220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70226438013220
+  version_requirements: *id001
 description: Run external commands on Unix or Windows
 email: info@opscode.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
 - LICENSE
-files:
+files: 
 - LICENSE
 - README.md
 - lib/mixlib/shellout/exceptions.rb
@@ -39,26 +42,30 @@ files:
 - lib/mixlib/shellout.rb
 homepage: http://wiki.opscode.com/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Run external commands on Unix or Windows
 test_files: []
+