execute 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 798cb7001f37401533422316c77c6e1bc4f4aee3
-  data.tar.gz: 975768244e8e9784bd6c20ffdd214e9950d0075b
+  metadata.gz: 0544f6e92540ff7ab8d005b3474208a896741889
+  data.tar.gz: 4ba1872358af9e977c6442e0f26df575e07a1646
 SHA512:
-  metadata.gz: 25babf483591aced7c3ad78a08cdaa39a801c97bcf662ee6d472870aa97f4c306850952d124e85827219511d30bf48df26889e68d501239d44a2d9632348ffc7
-  data.tar.gz: 47647de07f2ae45ac72e06955b14fdcd19ebf98c6f895449caed3dab99206907a1225629f25eaad9b02274b061153dc2b0a627ddb30d51409b6b2c8a5ddc4207
+  metadata.gz: fa1dfd84665ea2ab0e0e3d7a9f09ca796bdb88fe5ae46ed3515cd48e365c38fd795b84c8c0ee7923ae85d86e6a9614270a8c361238c43e62ce101315c0c3e22f
+  data.tar.gz: 6ed1745bf90e2c48f7bbd70224a6c7dc42ba8c3397e74301ac371510d40124f97b1e9747e8cebc05c356ba8e64638cfc300e5c7da08a549b55fa53ec7c1fd80d

data/lib/IOAdapter.rb

@@ -0,0 +1,14 @@
+require 'securerandom'
+require 'tempfile'
+class IOAdapter < DelegateClass(IO)
+  attr_accessor :output_buffer
+  def initialize(io)
+    __setobj__(io)
+	@output_buffer = []
+  end
+  
+  def write(string)
+	@output_buffer << string
+	self.__getobj__.write(string)
+  end
+end

data/lib/cmd.rb

@@ -1,32 +1,57 @@
 require 'open3'
+require 'sys/proctable'
+require_relative 'IOAdapter.rb'
 
 class CMD < Hash
+  private 
+  @@default_options = nil
+  
+  def self.initialize_defaults
+    @@default_options = { echo_command: true, echo_output: true, ignore_exit_code: false, debug: false }
+  end
+
+  public
   def initialize(cmd, options=nil)
    self[:output] = ''
    self[:error] = ''
-   self[:ignore_exit_code] = false
-   self[:debug] = false
-   self[:quiet] = false
-
-   self[:command]=cmd
+   initialize_defaults if(@@default_options.nil?)
+   
+   @@default_options.each { |key, value| self[key] = value}
    options.each { |key, value| self[key] = value} unless(options.nil?)
+   self[:command]=cmd
+  end
+  
+  public
+  def self.default_options(hash)
+    initialize_defaults
+	hash.each { |key, value| @@default_options[key] = value}
   end
   
   def execute
-    begin
-	  puts self[:command] unless(self[:quiet])
-      self[:output],self[:error], self[:exit_code] = Open3.capture3(self[:command])
-      self[:exit_code]=self[:exit_code].to_i
-	  
-	  if(self[:debug])
-		puts "command: #{self[:command]}" if(self[:quiet])
-	    puts "output: #{self[:output]}"
-	    puts "error: #{self[:error]}"
-	    puts "exit_code: #{self[:exit_code]}"
+    #begin
+	  puts self[:command] if(self[:echo_command])
+	
+	  output = {output: [], error:  [] }
+	  Open3.popen3(self[:command]) do |stdin, stdout, stderr, wait_thr|
+		{:output => stdout,:error => stderr}.each do |key, stream|
+		  Thread.new do
+			until(raw_line = stream.gets).nil? do
+			  output[key] << raw_line
+			  puts raw_line if(self[:echo_output])
+			end
+		  end
+		end
+		wait_thr.join
+	    self[:output] = output[:output].join
+	    self[:error] = output[:error].join
+		self[:exit_code] = wait_thr.value.to_i
 	  end
-	rescue Exception => e
-	  self[:error] = "Exception: " + e.to_s
-	  self[:exit_code]=1 unless(has_key('exit_code'))
+
+	if(self[:debug])
+	  puts "command: #{self[:command]}" if(self[:quiet])
+	  puts "output: #{self[:output]}"
+	  puts "error: #{self[:error]}"
+	  puts "exit_code: #{self[:exit_code]}"
 	end
 	
 	if((self[:exit_code] != 0) && !self[:ignore_exit_code])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Class to execute system commands
+description: Class wrapper for system commands
 email: KCCKSMarshall@gmail.com
 executables: []
 extensions: []
@@ -74,6 +74,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- lib/IOAdapter.rb
 - lib/cmd.rb
 homepage: http://rubygems.org/gems/execute
 licenses:
@@ -98,5 +99,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Class to execute system commands
+summary: Class wrapper for system commands
 test_files: []