right_git 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/right_git/shell/default.rb

@@ -47,39 +47,75 @@ module RightGit::Shell
         :raise_on_failure => true,
         :set_env_vars     => nil,
         :clear_env_vars   => nil,
-        :logger => default_logger
+        :logger           => default_logger,
+        :timeout          => nil,
       }.merge(options)
       outstream = options[:outstream]
 
       logger = options[:logger]
 
-      # build execution block.
+      # build initial popener.
       exitstatus = nil
-      executioner = lambda do
-        logger.info("+ #{cmd}")
-        ::IO.popen("#{cmd} 2>&1", 'r') do |output|
-          output.sync = true
-          done = false
-          while !done
-            begin
-              data = output.readline
+      popener = lambda do |output|
+        output.sync = true
+        loop do
+          # note stdout remains selectable after process dies.
+          if (::IO.select([output], nil, nil, 0.1) rescue nil)
+            if data = output.gets
               if outstream
                 outstream << data
               else
-                logger.info(data.strip)
+                data = data.strip
+                logger.info(data) unless data.empty?
               end
-            rescue ::EOFError
-              done = true
+            else
+              break
             end
           end
         end
+      end
+
+      # timeout optionally wraps popener. the timeout must happen inside of the
+      # IO.popen block or else it has no good effect.
+      if timeout = options[:timeout]
+        popener = lambda do |p|
+          lambda do |o|
+            ::Timeout.timeout(timeout) { p.call(o) }
+          end
+        end.call(popener)
+      end
+
+      # build initial executioner in terms of popener.
+      executioner = lambda do
+        logger.info("+ #{cmd}")
+        error_msg = nil
+        ::IO.popen("#{cmd} 2>&1", 'r') do |output|
+          begin
+            popener.call(output)
+          rescue ::EOFError
+            # done
+          rescue ::Timeout::Error
+            # kill still-running process or else popen's ensure will hang.
+            ::Process.kill('KILL', output.pid)
+
+            # intentionally not reading last data as that could still block
+            # due to a child of created process inheriting stdout.
+            error_msg = "Execution timed out after #{options[:timeout]} seconds."
+          end
+        end
+
+        # note that a killed process may exit 0 under Windows.
         exitstatus = $?.exitstatus
-        if (!$?.success? && options[:raise_on_failure])
-          raise ShellError, "Execution failed with exitstatus #{exitstatus}"
+        if 0 == exitstatus && error_msg
+          exitstatus = 1
+        end
+        if (exitstatus != 0 && options[:raise_on_failure])
+          error_msg ||= "Execution failed with exitstatus #{exitstatus}"
+          raise ShellError, error_msg
         end
       end
 
-      # configure and invoke.
+      # configure executioner (by options) and then invoke executioner.
       configure_executioner(executioner, options).call
 
       return exitstatus

data/lib/right_git/shell/interface.rb

@@ -48,6 +48,7 @@ module RightGit::Shell
     # @option options :raise_on_failure [TrueClass|FalseClass] if true, wil raise a RuntimeError if the command does not end successfully (default), false to ignore errors
     # @option options :set_env_vars [Hash] environment variables to set during execution (default = none set)
     # @option options :clear_env_vars [Hash] environment variables to clear during execution (default = none cleared but see :clean_bundler_env)
+    # @option options :timeout [Numeric] to kill spawned process when time (in seconds) expires
     #
     # @return [Integer] exitstatus of the command
     #

data/right_git.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: right_git 1.0.0 ruby lib
+# stub: right_git 1.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_git"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro", "Scott Messier"]
-  s.date = "2014-08-13"
+  s.date = "2014-08-20"
   s.description = "An assortment of git-related classes created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_git
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -725937737083672839
+      hash: 3982530629756792101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.26
 signing_key: 
 specification_version: 3
 summary: Reusable Git repository management code.