execute 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8092c81d49b0155e507821497351080cd849e2fd
-  data.tar.gz: a7d996ca8087684e3011f54eb7ce5c44b66fc8ad
+  metadata.gz: cbf8302ef5762c5a88bd8031c6eeec431e3f59b0
+  data.tar.gz: a8e0bceb270da38b54131ebc1e3d615f3b0df656
 SHA512:
-  metadata.gz: 48009fb0c04c7f0f624444053bb8fc16d80204d5a9d041b2dbe5d4e834f05d4f85d9c8f6d0d3848d6df00428b1634e4f73ce351c89cbae2256e2d65d6e941566
-  data.tar.gz: 0701ebd759826e07725561b604230e45728f57c33acff06294c639e571bc94e2bd97f912f0c021189568d3b9643695e66779aabb5a52ef1d14128e9914774a5b
+  metadata.gz: 8edb50d16bb521a208c9a4db542fe715adcf38036472b9dd307ea59a61a8bc3edeea85a03612a51fcf187e46e2df04fb5cf684ddb278014f5ba7101c1901a9dc
+  data.tar.gz: 7f59512206dff638b3109c278f0142ff5317d64ac66a4cdf27a31a0721c83a45d5df4f15c8d6f0c6ff2153c49c9cb947702cd97800bdb9d3c2621dc588c0767c

data/lib/cmd.rb

@@ -22,44 +22,44 @@ class CMD < Hash
   end
 
   def execute
+	puts self[:command] if(self[:echo_command] || self[:debug])
+	system	  
+    	
+	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])
+	  exception_text = "Exit code: #{self[:exit_code]}"
+	  exception_text = "#{exception_text}\n#{self[:error]}"
+	  exception_text = "#{exception_text}\n#{self[:output]}" if(self[:error].empty?)
+	  raise exception_text 
+	end
+  end
+
+  def system
 	begin
-	  puts self[:command] if(self[:echo_command] || self[:debug])
-		  
-	  output = {output: [], error:  [] }
+      output = {output: [], error:  [] }
 	  Open3.popen3(self[:command]) do |stdin, stdout, stderr, wait_thr|
         self[:pid] = wait_thr.pid 
   	    {:output => stdout,:error => stderr}.each do |key, stream|
-		  Thread.new do
-			while wait_thr.alive? do
-			  if(!(char = stream.getc).nil?)
-  			    output[key] << char
+          Thread.new do
+	        while wait_thr.alive? do
+		      if(!(char = stream.getc).nil?)
+		        output[key] << char
 			    putc char if(self[:echo_output])
-			  else
-			    sleep(0.1)
+		      else
+		        sleep(0.1)
 			  end
-			end
+	        end
 		  end
 		end
-		
-	    # $stdin.gets reads from the console
-	    # stdin.puts writes to child process
-	    #
-	    # while thread.alive? means that we keep on
-	    # reading input until the child process ends
-        #Thread.new do
-		#  while wait_thr.alive? do
-		#    #begin
-		#	  puts "HERE"
-		#	  c = STDIN.gets
-		#	  puts "char: #{c}"
-        #      stdin.puts c
-		#    #rescue Interrupt, Errno::EINTR
-        #    #  exit(1)
-        #    #end
-		#  end
-        #end
-		
+
 		wait_thr.join
+
 	    self[:output] = output[:output].join unless(output[:output].empty?)
 	    self[:error] = output[:error].join unless(output[:error].empty?)
 		self[:exit_code] = wait_thr.value.to_i
@@ -68,19 +68,5 @@ class CMD < Hash
 	  self[:error] = "#{self[:error]}\nException: #{e.to_s}"
 	  self[:exit_code]=1 unless(self[:exit_code].nil? || (self[:exit_code] == 0))
 	end
-	
-	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])
-	  exception_text = "Exit code: #{self[:exit_code]}"
-	  exception_text = "#{exception_text}\n#{self[:error]}"
-	  exception_text = "#{exception_text}\n#{self[:output]}" if(self[:error].empty?)
-	  raise exception_text 
-	end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Kevin Marshall