dev_commands 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5827bce78cb19042fdd07b2d243fc155e8cf60c7
-  data.tar.gz: 92ea3e418b5aa08ca64a75cd1c29291d5990e38c
+  metadata.gz: c9172a254dca436cd1ae2b8c87126a7640371e49
+  data.tar.gz: b3b4d0264b2de92e4f5a3076de7bcd62192e37a6
 SHA512:
-  metadata.gz: 0e00c251347f44bb2e61f77d9d0607fd9ec52bc4e56d1ece80201eafb8e9adf0d702100844d164c91e01b58abd972e1e06be16a4c78771f550db06358e2c8501
-  data.tar.gz: 17da8d58f365de3f3340fa5ab764991facfb23a7c639d3a3f888b76f8eb024142d3941db284034a1d7a30a3a8a4959c2cc01d465e61fb2311438a68ac26a2e27
+  metadata.gz: 15c8d7c143dca42534965ed376af389ffde7e184e60809ddcfe8ab6bd614efaf942a0dfecf241d6e23b6ebab41952589aaab546fe1236c600a428f0bbde90283
+  data.tar.gz: dfee1127ace3bb8305f0ef27ccfa6c2a98290ca2b7a5c49b2264a12639193f50950766a733e621ac8969df3cef61192bf404ee7afe5843236e91cf1e1e5c680a

data/README.md

@@ -5,15 +5,25 @@ A ruby gem to aid in the definition and execution of system commands
 ### Installation
 
 The gem can be installed by the single command
+
 ```
- gem install dev_commands
+gem install dev_commands
 ```
  
 ### Usage
 
 This is an example of a simple usage
+
 ```
  require 'dev_commands'
+
+ cmd=Command.new 'ruby --version'
+ cmd.execute
+ puts "exit_code: #{cmd[:exit_code]}" 
+ puts "output: #{cmd[:output]}"
+
+ # exit_code: 0
+ # output": ruby 2.0.0p481 (2014-05-08 revision 45883) [universal.x86_64-darwin14]
 ```
 
 ### License

data/lib/array.rb

@@ -10,9 +10,11 @@ class Array
 
     def to_html
       html=Array.new
+      html << '<div>'
       self.each{|e|
         html << e.to_html if e.respond_to?(:to_html)
       }
+      html << '</div>'
       html.join
     end
 end

data/lib/command.rb

@@ -1,3 +1,4 @@
+require 'open3'
 require_relative('./array.rb')
 require_relative('./hash.rb')
 require_relative('./timer.rb')
@@ -26,6 +27,7 @@ class Command < Hash
 	end
 
 	def execute
+		puts "#{self[:input]}"
 		pwd=Dir.pwd
 		Dir.chdir(self[:directory]) if(self.has_key?(:directory) && File.exists?(self[:directory]))
 		self[:directory] = pwd if(self[:directory].length==0)
@@ -41,7 +43,7 @@ class Command < Hash
 		  begin
 		  	puts "eval(#{ruby})"
 		    self[:output]=eval(ruby)
-		  rescue
+		  rescue 
 		  	puts "unable to eval(#{ruby})"
 		  	raise "unable to eval(#{ruby})"
 		  end
@@ -49,10 +51,20 @@ class Command < Hash
 		  self[:elapsed] = timer.elapsed_str
 		  self[:end_time] = Time.now
 		else
-			self[:output] = `#{self[:input]}`
-			self[:elapsed] = timer.elapsed_str
-			self[:end_time] = Time.now
-			self[:exit_code]=$?.to_i
+			begin
+              self[:output],self[:error],self[:exit_code]= Open3.capture3(self[:input])
+
+
+			  #self[:output] = `#{self[:input]}`
+			  self[:elapsed] = timer.elapsed_str
+			  self[:end_time] = Time.now
+			  #self[:exit_code]=$?.to_i
+			rescue Exception => e
+			  self[:elapsed] = timer.elapsed_str
+			  self[:end_time] = Time.now
+			  self[:error] = "Exception: " + e.to_s
+			  self[:exit_code]=1
+		    end
 		end
 
         Dir.chdir(pwd) if pwd != Dir.pwd
@@ -73,13 +85,21 @@ class Command < Hash
     end 
 
     def to_html
+      if self[:exit_code] == 0
+      [
+      	'<div><table><tr><td width="20"></td><td><pre>',
+      	self[:input],
+      	'</pre></td></tr></table></div>'
+      ].join
+      else
       [
-      	'<h2>',
+      	'<div><table><tr><td width="20"></td><td><pre>',
       	self[:input],
-      	'</h2>',
-        '<ul>',
-        map { |k, v| ["<li><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></li>"] },
-        '</ul>'
+        '</pre><table><tr><td width="20"></td><td><table>',
+        map { |k, v| ["<tr><td><strong>#{k}</strong></td>", v.respond_to?(:to_html) ? v.to_html : "<td><span><pre>#{v}</pre></span></td></tr>"] },
+        '</table>',
+        '</td></tr></table></td></tr></table></div>'
       ].join
+      end
     end
 end

data/lib/dev_commands.rb

@@ -1 +1,3 @@
+require 'json'
+require 'systemu'
 require_relative('command.rb')

data/lib/hash.rb

@@ -1,14 +1,19 @@
 class Hash
 	def execute
 	  self.each{|k,v|
-	  	v.execute if v.respond_to?(:execute)
+      if(v.is_a?(Array) && v.length==0)
+        self.delete k 
+      else
+        #puts "executing #{k}"
+	  	  v.execute if v.respond_to?(:execute)
+      end
 	  }
     end
 	def to_html
       [
-        '<ul>',
-        map { |k, v| ["<li><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></li>"] },
-        '</ul>'
+      	'<div>',
+        map { |k, v| ["<br/><div><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></div><br/>"] },
+        '</div>'
       ].join
     end
 end

data/spec/command_spec.rb

@@ -79,7 +79,6 @@ describe Command do
     cmd.execute
     FileUtils.rm_r("#{File.dirname(__FILE__)}/tmp")
     expect(cmd[:output].include?('rake_test')).to eq(true)
-    
   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.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Lou Parslow
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement