dev_commands 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5226ff1702d843827a6fc5bce804abdbac01b836
-  data.tar.gz: 6aaf1e5b468a99edf293dc58a7eb3117a6cac0ec
+  metadata.gz: 5827bce78cb19042fdd07b2d243fc155e8cf60c7
+  data.tar.gz: 92ea3e418b5aa08ca64a75cd1c29291d5990e38c
 SHA512:
-  metadata.gz: 63d53a6df6ce5c38dd9f808cf2e79b5ae4e1b86301b997a4c58b3ec33fea33cb9e1ac8de7f85d8c3d240cd450206a86ee5f06d9e34fbdebf06cd04a4046fa546
-  data.tar.gz: b487b239f86e742b70248be2bb332391c624ee6926ff77e3dbde35fbfa062fdd935367b287ae7cbfbfdff1ed95f98ff2028bfab9653fa82fee4a6c54c4461f70
+  metadata.gz: 0e00c251347f44bb2e61f77d9d0607fd9ec52bc4e56d1ece80201eafb8e9adf0d702100844d164c91e01b58abd972e1e06be16a4c78771f550db06358e2c8501
+  data.tar.gz: 17da8d58f365de3f3340fa5ab764991facfb23a7c639d3a3f888b76f8eb024142d3941db284034a1d7a30a3a8a4959c2cc01d465e61fb2311438a68ac26a2e27

data/lib/array.rb

@@ -0,0 +1,18 @@
+class Array
+    def execute
+      i=0
+      while i < self.length
+        self[i]=Command.new(self[i]) if(self[i].is_a?(String))
+        self[i].execute if(self[i].is_a?(Command))
+        i=i+1
+      end
+    end
+
+    def to_html
+      html=Array.new
+      self.each{|e|
+        html << e.to_html if e.respond_to?(:to_html)
+      }
+      html.join
+    end
+end

data/lib/command.rb

@@ -1,3 +1,5 @@
+require_relative('./array.rb')
+require_relative('./hash.rb')
 require_relative('./timer.rb')
 
 class Command < Hash
@@ -10,8 +12,8 @@ class Command < Hash
 		  self[:exit_code] = 0
 		  self[:output] = ''
 		  self[:error] = ''
-		  self[:machine_name] = ''
-		  self[:user_name] = ''
+		  self[:machine] = ''
+		  self[:user] = ''
 		  self[:start_time] = nil
 		  self[:end_time] = nil
         end
@@ -24,12 +26,12 @@ class Command < Hash
 	end
 
 	def execute
-
-		#Logger.start_command self
-
 		pwd=Dir.pwd
 		Dir.chdir(self[:directory]) if(self.has_key?(:directory) && File.exists?(self[:directory]))
-		#print " " + Color.green + self[:input] + Color.clear
+		self[:directory] = pwd if(self[:directory].length==0)
+		
+		self[:machine] = Command.machine
+		self[:user] = Command.user
 
 		self[:start_time]=Time.now
 		timer=Timer.new
@@ -44,7 +46,6 @@ class Command < Hash
 		  	raise "unable to eval(#{ruby})"
 		  end
 
-		  #puts " " + timer.elapsed_str
 		  self[:elapsed] = timer.elapsed_str
 		  self[:end_time] = Time.now
 		else
@@ -55,7 +56,30 @@ class Command < Hash
 		end
 
         Dir.chdir(pwd) if pwd != Dir.pwd
-		#Logger.end_command self
 	end
 
+    def self.machine
+      if !ENV['COMPUTERNAME'].nil? 
+	   return ENV['COMPUTERNAME']
+	  end
+
+      machine = `hostname`
+      machine = machine.split('.')[0] if machine.include?('.')
+	  return machine.strip
+    end
+
+    def self.user
+      ENV['USER'].nil? ? ENV['USERNAME'] : ENV['USER']
+    end 
+
+    def to_html
+      [
+      	'<h2>',
+      	self[:input],
+      	'</h2>',
+        '<ul>',
+        map { |k, v| ["<li><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></li>"] },
+        '</ul>'
+      ].join
+    end
 end

data/lib/hash.rb

@@ -0,0 +1,14 @@
+class Hash
+	def execute
+	  self.each{|k,v|
+	  	v.execute if v.respond_to?(:execute)
+	  }
+    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>'
+      ].join
+    end
+end

data/spec/command_spec.rb

@@ -35,15 +35,15 @@ describe Command do
     cmd[:error]='error_test'
     expect(cmd[:error]).to eq('error_test')
 
-    # MachineName
-    expect(cmd[:machine_name]).to eq('')
-    cmd[:machine_name]='machine_name_test'
-    expect(cmd[:machine_name]).to eq('machine_name_test')
+    # Machine
+    expect(cmd[:machine]).to eq('')
+    cmd[:machine]='machine_test'
+    expect(cmd[:machine]).to eq('machine_test')
 
-    # UserName
-    expect(cmd[:user_name]).to eq('')
-    cmd[:user_name]='user_name_test'
-    expect(cmd[:user_name]).to eq('user_name_test')
+    # User
+    expect(cmd[:user]).to eq('')
+    cmd[:user]='user_test'
+    expect(cmd[:user]).to eq('user_test')
 
     # StartTime
     expect(cmd[:start_time]).to eq(nil)
@@ -81,4 +81,18 @@ describe Command do
     expect(cmd[:output].include?('rake_test')).to eq(true)
     
   end
+
+  it "should be able to execute an array of commands" do
+    help=['git --help','rake --help','ruby --help']
+    help.execute
+    File.open('help.html','w'){|f|f.write(help.to_html)}
+  end
+
+  it "should be able to execute a hash with arrays or commands" do
+    commands=Hash.new
+    commands[:help]=['git --help','rake --help','ruby --help']
+    commands[:version]=['git --version','rake --version','ruby --version']
+    commands.execute
+    File.open('commands.html','w'){|f|f.write(commands.to_html)}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev_commands
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,8 +58,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/array.rb
 - lib/command.rb
 - lib/dev_commands.rb
+- lib/hash.rb
 - lib/timer.rb
 - spec/command_spec.rb
 - LICENSE