right_git 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6060a32522b3f9983de8c6e66290e28a3f0ff883
-  data.tar.gz: 72b6679ef1fc9e57c1bd99ad1fa5a01ac58f9456
+  metadata.gz: c4536d2f26b3ecd60c9159828de9ca5f1d901846
+  data.tar.gz: 7e7076ee4adada10701aaab896a9d0cf40a5c27f
 SHA512:
-  metadata.gz: 5f994c2e443278716b2341e79ee9d03c17b1df2b3f7f5ef2a1a806603b1576aee1b16a3fd22d1d9b3e8fb8da6007c57d18dfe0fc46f613c11e77b76d725c2ffc
-  data.tar.gz: fc896ba323027a2d8993f36119f4f2acb2e2fcf221c7ca1cab2e5e00548dc1fa2499bc7b4f9011fa59dd00c76273be814a9a7ad843d5cb28a58ae2ee4fba2c31
+  metadata.gz: 81a3ae19ffc5d137846b36ec398dcb9f4ab217a40f4f24a68e9f32cbdd36723a956677e59f321f6685f6a1158eb9029be8ef73fae44fc749c92b9b9b08037199
+  data.tar.gz: 00786171049f4b81b81ed92299b770fc8ed6e9bb6335f035e5df4a8e5a0b873239a1febdd5cb6d77766a2cc3fc2ceca0a8641b850949c05fbdc87b123656e00b

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.1

data/lib/right_git/shell/default.rb

@@ -26,6 +26,7 @@ require 'right_git/shell'
 # local
 require 'stringio'
 require 'singleton'
+require 'right_support'
 
 module RightGit::Shell
 
@@ -42,18 +43,35 @@ module RightGit::Shell
     # Implements execute interface.
     def execute(cmd, options = {})
       options = {
-        :directory        => nil,
-        :outstream        => nil,
+        :directory => nil,
+        :outstream => nil,
         :raise_on_failure => true,
-        :set_env_vars     => nil,
-        :clear_env_vars   => nil,
-        :logger           => default_logger,
-        :timeout          => nil,
+        :set_env_vars => nil,
+        :clear_env_vars => nil,
+        :logger => default_logger,
+        :timeout => nil,
+        :keep_alive_interval => nil,
+        :keep_alive_timeout => nil
       }.merge(options)
-      outstream = options[:outstream]
 
+      outstream = options[:outstream]
       logger = options[:logger]
 
+      if keep_alive_interval = options[:keep_alive_interval]
+        keep_alive_wake_time = ::Time.now + keep_alive_interval
+      else
+        keep_alive_wake_time = nil
+      end
+      if keep_alive_timeout = options[:keep_alive_timeout]
+        unless keep_alive_interval
+          raise ::ArgumentError,
+                ':keep_alive_interval is required when using :keep_alive_timeout'
+        end
+        keep_alive_stop_time = ::Time.now + keep_alive_timeout
+      else
+        keep_alive_stop_time = nil
+      end
+
       # build initial popener.
       exitstatus = nil
       popener = lambda do |output|
@@ -68,9 +86,24 @@ module RightGit::Shell
                 data = data.strip
                 logger.info(data) unless data.empty?
               end
+
+              # reset keep alive timer whenever we have normal output.
+              if keep_alive_wake_time
+                keep_alive_wake_time = ::Time.now + keep_alive_interval
+              end
             else
               break
             end
+          elsif keep_alive_wake_time
+            now = ::Time.now
+            if keep_alive_stop_time && now >= keep_alive_stop_time
+              keep_alive_wake_time = nil
+            elsif now >= keep_alive_wake_time
+              # keep-alives go to logger, not the outstream, if any.
+              logger.info('.')
+              keep_alive_wake_time = now + keep_alive_interval
+            end
+            now = nil
           end
         end
       end

data/lib/right_git/shell/interface.rb

@@ -43,12 +43,28 @@ module RightGit::Shell
     #
     # @param [String] cmd the shell command to run
     # @param [Hash] options for execution
-    # @option options :directory [String] to use as working directory during command execution or nil
-    # @option options :outstream [IO] output stream to receive STDOUT and STDERR from command (default = STDOUT)
-    # @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
+    # @option options :directory [String] to use as working directory during
+    #  command execution or nil
+    # @option options :outstream [IO] output stream to receive STDOUT and
+    #  STDERR from command (default = STDOUT)
+    # @option options :raise_on_failure [TrueClass|FalseClass] if true, will
+    #  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
+    # @option options :keep_alive_interval [Numeric] as periodic timer, in
+    #  seconds, for emitting output to keep travis ci from killing job or nil
+    #  to remain silent (default). note that keep-alives are always written to
+    #  the logger even if command output is being captured by :outstream
+    # @option options :keep_alive_timeout [Numeric] as overall timeout, in
+    #  seconds, for periodically emitting shell output when child process is
+    #  silent, which prevents travis ci from killing a silent job, or nil to
+    #  remain silent (default). can be combined with :timeout to ensure child
+    #  process is kept alive for a maximum amount of time before it will be
+    #  abandoned.
     #
     # @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.2 ruby lib
+# stub: right_git 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_git"
-  s.version = "1.0.2"
+  s.version = "1.1.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 = "2015-01-07"
+  s.date = "2015-10-16"
   s.description = "An assortment of git-related classes created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/rightscale/right_git"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.2.3"
   s.summary = "Reusable Git repository management code."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_git
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Tony Spataro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Reusable Git repository management code.