dev_commands 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b0ae71e6301b33d4c845fea6ce37380f17c8a52
-  data.tar.gz: 542e659e0926fa75fddbcde08f0d7da7fcd7e019
+  metadata.gz: ddb5e7dbeac67f1bff9a6f4025e85497c9a001d3
+  data.tar.gz: 4a1887451dcf5ad54eee8d5c0b592d8127567673
 SHA512:
-  metadata.gz: 7bc5e4fac606037686c6cfc7e8bf49058ad64f2e73d37f2bb0bcd07f7211d2e7eaf0a1a9dda205d5e08ae1452f72045c15affc94648bbea293169079930282ee
-  data.tar.gz: 4c6f3584e5347f6ddd92c601a3e84445a18269549f46114f5b0b216d57da2ae833a51cf8a5e22384172fd27b7c53a618db2ae74a81b958ae73318c9edf883491
+  metadata.gz: baaf2c25cae9277a5c558d3809ff4117a518008cafa0a72479f7ed68f03e2da2a3943aa2aa41b3bd9a414edeb81b6fef6e2f619feb892b3b8c6748e5be8d383f
+  data.tar.gz: 3a139999d22aaf6ec49ad4705ac29889f2e63d29ff001300d5c4bb0b0160f1668dbea64b913ccdfdd844db8831bd726f546ffe3151e84f78d573e8ceaa191757

data/lib/command.rb

@@ -74,7 +74,11 @@ class Command < Hash
   			  self[:end_time] = Time.now
         else
           require_relative 'timeout.rb'
-          self[:output] = run_with_timeout(self[:input], self[:timeout], 1)
+          #puts run_with_timeout(self[:input], self[:timeout], 1).to_s
+          #self[:output] = run_with_timeout(self[:input], self[:timeout], 1)
+          result=run_with_timeout(self[:input], self[:timeout], 1)
+          self[:output]=result[0]
+          self[:exit_code]=result[1]
 
           self[:elapsed] = timer.elapsed_str
           self[:end_time] = Time.now

data/lib/timeout.rb

@@ -1,5 +1,6 @@
 ############################################################################
-# The following code was copied from https://gist.github.com/lpar/1032297
+# The following code is based on code originally copied from 
+# https://gist.github.com/lpar/1032297
 # Gist title: lpar/timeout.rb
 ############################################################################
 # Runs a specified shell command in a separate thread.
@@ -12,6 +13,7 @@
 # If you think you can do it with Ruby's Timeout module, think again.
 def run_with_timeout(command, timeout, tick)
   output = ''
+  exit_code=1
   begin
     # Start task in another thread, which spawns a process
     stdin, stderrout, thread = Open3.popen2e(command)
@@ -32,6 +34,7 @@ def run_with_timeout(command, timeout, tick)
         break
       end
     end
+
     # Give Ruby time to clean up the other thread
     sleep 1
 
@@ -39,10 +42,13 @@ def run_with_timeout(command, timeout, tick)
       # We need to kill the process, because killing the thread leaves
       # the process alive but detached, annoyingly enough.
       Process.kill("TERM", pid)
+    else
+      exit_code=thread.value
     end
-  ensure
+
+      ensure
     stdin.close if stdin
     stderrout.close if stderrout
   end
-  return output
+  return [output,exit_code]
 end

data/spec/command_spec.rb

@@ -80,7 +80,7 @@ describe Command do
         f.puts " puts 'rake_test'"
         f.puts "end" 
     }
-    cmd=Command.new({ :input => 'rake', :quiet => true})
+    cmd=Command.new({ :input => 'rake', :quiet => true, :timeout => 2 })
     cmd[:directory]=dir
     cmd.execute
     FileUtils.rm_r("#{File.dirname(__FILE__)}/tmp")
@@ -105,6 +105,11 @@ describe Command do
     cmd[:directory]=dir
     cmd.execute
     expect(cmd[:exit_code]).not_to eq(0)
+
+    cmd=Command.new({ :input => 'rake bogus', :timeout => 3, :ignore_failure => true, :quiet => true})
+    cmd[:directory]=dir
+    cmd.execute
+    expect(cmd[:exit_code]).not_to eq(0)
   end
 
   it "should be able to execute an array of commands" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_commands
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - Lou Parslow