dev_commands 0.0.49 → 0.0.50

data/lib/{timer.rb → Timer.rb}

@@ -1,41 +1,41 @@
-class Timer
-  attr_accessor :start_time
-
-  def initialize
-    @start_time=Time.now
-  end
-
-  def elapsed # in seconds
-    return Time.now-@start_time
-  end
-
-  def elapsed_str
-    elapsed_str="[" + "%.0f" %(elapsed) + "s]"
-  end
-
-  def self.elapsed_exceeds?(name,duration_seconds)
-    if(Timer.get_elapsed(name).nil? || Timer.get_elapsed(name) > duration_seconds)
-	  return true
-	end
-	return false
-  end
-
-  def self.get_elapsed(name)
-    timestamp=get_timestamp(name)
-	return Time.now-timestamp if(!timestamp.nil?)
-	nil
-  end
-
-  def self.get_timestamp(name)
-    dir=Rake.application.original_dir
-    if(File.exists?("#{DEV[:dev_root]}/log/#{name}.timestamp"))
-      return Time.parse(File.read("#{DEV[:dev_root]}/log/#{name}.timestamp").strip)
-	end
-	nil
-  end
-
-  def self.set_timestamp(name)
-    Dir.mkdir("#{DEV_TASKS[:dev_root]}/log") if(!Dir.exists?("#{DEV_TASKS[:dev_root]}/log"))
-    File.open("#{DEV_TASKS[:dev_root]}/log/#{name}.timestamp",'w'){|f|f.puts(Time.now.to_s)}
-  end
+class Timer
+  attr_accessor :start_time
+
+  def initialize
+    @start_time=Time.now
+  end
+
+  def elapsed # in seconds
+    return Time.now-@start_time
+  end
+
+  def elapsed_str
+    elapsed_str="[" + "%.0f" %(elapsed) + "s]"
+  end
+
+  def self.elapsed_exceeds?(name,duration_seconds)
+    if(Timer.get_elapsed(name).nil? || Timer.get_elapsed(name) > duration_seconds)
+	  return true
+	end
+	return false
+  end
+
+  def self.get_elapsed(name)
+    timestamp=get_timestamp(name)
+	return Time.now-timestamp if(!timestamp.nil?)
+	nil
+  end
+
+  def self.get_timestamp(name)
+    dir=Rake.application.original_dir
+    if(File.exists?("#{DEV[:dev_root]}/log/#{name}.timestamp"))
+      return Time.parse(File.read("#{DEV[:dev_root]}/log/#{name}.timestamp").strip)
+	end
+	nil
+  end
+
+  def self.set_timestamp(name)
+    Dir.mkdir("#{DEV_TASKS[:dev_root]}/log") if(!Dir.exists?("#{DEV_TASKS[:dev_root]}/log"))
+    File.open("#{DEV_TASKS[:dev_root]}/log/#{name}.timestamp",'w'){|f|f.puts(Time.now.to_s)}
+  end
 end

data/lib/analyze.rb

@@ -1,8 +1,8 @@
-class Analyze < Array
-	def update
-		if(`gem list countloc`.include?('countloc ('))
-			FileUtils.mkdir('doc') if(!File.exists?('doc'))
-			add 'countloc -r * --html doc/countloc.html'
-		end
-	end
+class Analyze < Array
+	def update
+		if(`gem list countloc`.include?('countloc ('))
+			FileUtils.mkdir('doc') if(!File.exists?('doc'))
+			add 'countloc -r * --html doc/countloc.html'
+		end
+	end
 end

data/lib/array.rb

@@ -1,30 +1,30 @@
-class Array
-    def execute value=nil
-      i=0
-      while i < self.length
-        self[i]=Command.new(self[i]) if(self[i].is_a?(String))
-        self[i]=Command.new(self[i]) if(self[i].is_a?(Hash) && !self[i].is_a?(Command))
-
-        if(!value.nil? && value.is_a?(Hash))
-          value.each{|k,v|self[i][k]=v}
-        end
-
-        self[i].execute if(self[i].is_a?(Command))
-        i=i+1
-      end
-    end
-
-    def add command
-      self << command if(!include?(command))
-    end
-
-    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
+class Array
+    def execute value=nil
+      i=0
+      while i < self.length
+        self[i]=Command.new(self[i]) if(self[i].is_a?(String))
+        self[i]=Command.new(self[i]) if(self[i].is_a?(Hash) && !self[i].is_a?(Command))
+
+        if(!value.nil? && value.is_a?(Hash))
+          value.each{|k,v|self[i][k]=v}
+        end
+
+        self[i].execute if(self[i].is_a?(Command))
+        i=i+1
+      end
+    end
+
+    def add command
+      self << command if(!include?(command))
+    end
+
+    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,204 +1,208 @@
-require 'open3'
-require_relative('./array.rb')
-require_relative('./hash.rb')
-require_relative('./timer.rb')
-
-BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
-            
-# = Command
-#
-# execution of system commands
-#
-# = Keys
-#
-# - :input The input of the commands.
-# - :timeout The timeout in seconds.
-#          a value of zero is to infinite timeout.
-#          defaults to zero
-# - :directory The working directory for the command.
-#             defaults to the current directory
-# - :exit_code The exit code of the command
-# - :output The output contains the stdout output of the command
-# - :error The error contains stderr output of the command
-# - :machine The name of the machine the command executed on
-# - :user The user name
-# - :start_time
-# - :end_time
-#
-class Command < Hash
-	def initialize command
-
-    self[:input] = ''
-		self[:timeout] = 0
-		self[:directory] = ''
-		self[:exit_code] = 0
-		self[:output] = ''
-		self[:error] = ''
-		self[:machine] = ''
-		self[:user] = ''
-		self[:start_time] = nil
-		self[:end_time] = nil
-
-		if(command.kind_of?(String))
-		  self[:input] = command
-        end
-
-        if(command.kind_of?(Hash))
-        	command.each{|k,v|
-        		self[k.to_sym]=v
-        	}
-        end
-	end
-
-  def quiet?
-    (self.has_key?(:quiet) && self[:quiet])
-  end
-
-	def execute value=nil
-
-    if(!value.nil? && value.is_a?(Hash))
-      value.each{|k,v|self[k]=v}
-    end
-
-		pwd=Dir.pwd
-		self[:directory] = pwd if(!self.has_key?(:directory) || self[:directory].length==0)
-
-    if(self[:timeout] > 0)
-      puts "#{self[:input]} (#{self[:directory]}) timeout #{self[:timeout].to_s}" if(!quiet?)
-    else
-		  puts "#{self[:input]} (#{self[:directory]})" if(!quiet?)
-    end
-
-		self[:machine] = Command.machine
-		self[:user] = Command.user
-
-		self[:start_time]=Time.now
-		timer=Timer.new
-
-    Dir.chdir(self[:directory]) do
-  		if self[:input].include?('<%') && self[:input].include?('%>')
-  		  ruby = self[:input].gsub("<%","").gsub("%>","")
-
-  		  begin
-  		    self[:output]=eval(ruby)
-  		  rescue 
-  		  	self[:exit_code]=1
-  		  	self[:error]="unable to eval(#{ruby})"
-  		  end
-
-  		  self[:elapsed] = timer.elapsed_str
-  		  self[:end_time] = Time.now
-  		else
-  			begin
-          if(self[:timeout] <= 0)
-            self[:output],self[:error],status= Open3.capture3(self[:input])
-            self[:exit_code]=status.to_i
-    			  self[:elapsed] = timer.elapsed_str
-    			  self[:end_time] = Time.now
-          else
-            require_relative 'timeout.rb'
-            #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[:directory],self[:input], self[:timeout], 1)
-            self[:output]=result[0]
-            self[:exit_code]=result[1]
-
-            self[:elapsed] = timer.elapsed_str
-            self[:end_time] = Time.now
-            
-            if(timer.elapsed >= self[:timeout])
-              self[:exit_code]=1 
-              self[:error] = self[:error] + "timed out"
-            end
-          end
-  			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
-    end
-       
-
-    if(self[:exit_code] != 0)
-      if(!quiet?)
-    	  puts "exit_code=#{self[:exit_code]}"
-    	  puts self[:output]
-    	  puts self[:error]
-      end
-    	if(!self.has_key?(:ignore_failure) || !self[:ignore_failure])
-    		raise "#{self[:input]} failed" 
-    	end #unless (self.has_key?(:ignore_failure) && self[:ignore_failure]==true)
-    end
-      
-	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 self.home 
-      ["USERPROFILE","HOME"].each {|v|
-        return ENV[v].gsub('\\','/') unless ENV[v].nil?
-      }
-      dir="~"
-      dir=ENV["HOME"] unless ENV["HOME"].nil?
-      dir=ENV["USERPROFILE"].gsub('\\','/') unless ENV["USERPROFILE"].nil?
-      return dir
-    end
-
-    def self.dev_root
-      ["DEV_HOME","DEV_ROOT"].each {|v|
-        return ENV[v].gsub('\\','/') unless ENV[v].nil?
-      }
-      dir=home
-      #dir=ENV["DEV_ROOT"].gsub('\\','/') unless ENV["DEV_ROOT"].nil?
-     return dir
-    end
-
-    def self.exit_code command
-    	cmd = Command.new(command)
-    	cmd[:ignore_failure]=true
-      cmd[:quiet]=true
-    	cmd.execute
-    	cmd[:exit_code]
-    end
-
-    def self.output command
-    	cmd = Command.new(command)
-    	cmd[:ignore_failure]=true
-      cmd[:quiet]=true
-    	cmd.execute
-    	cmd[:output]
-    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
-      [
-      	'<div><table><tr><td width="20"></td><td><pre>',
-      	self[:input],
-        '</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
+require 'open3'
+require_relative('./array.rb')
+require_relative('./hash.rb')
+require_relative('./timer.rb')
+
+BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
+            
+# = Command
+#
+# execution of system commands
+#
+# = Keys
+#
+# - :input The input of the commands.
+# - :timeout The timeout in seconds.
+#          a value of zero is to infinite timeout.
+#          defaults to zero
+# - :directory The working directory for the command.
+#             defaults to the current directory
+# - :exit_code The exit code of the command
+# - :output The output contains the stdout output of the command
+# - :error The error contains stderr output of the command
+# - :machine The name of the machine the command executed on
+# - :user The user name
+# - :start_time
+# - :end_time
+#
+class Command < Hash
+	def initialize command
+
+    self[:input] = ''
+		self[:timeout] = 0
+		self[:directory] = ''
+		self[:exit_code] = 0
+		self[:output] = ''
+		self[:error] = ''
+		self[:machine] = ''
+		self[:user] = ''
+		self[:start_time] = nil
+		self[:end_time] = nil
+
+		if(command.kind_of?(String))
+		  self[:input] = command
+        end
+
+        if(command.kind_of?(Hash))
+        	command.each{|k,v|
+        		self[k.to_sym]=v
+        	}
+        end
+	end
+
+  def quiet?
+    (self.has_key?(:quiet) && self[:quiet])
+  end
+
+	def execute value=nil
+
+    if(!value.nil? && value.is_a?(Hash))
+      value.each{|k,v|self[k]=v}
+    end
+
+		pwd=Dir.pwd
+		self[:directory] = pwd if(!self.has_key?(:directory) || self[:directory].length==0)
+
+    if(self[:timeout] > 0)
+      puts "#{self[:input]} (#{self[:directory]}) timeout #{self[:timeout].to_s}" if(!quiet?)
+    else
+		  puts "#{self[:input]} (#{self[:directory]})" if(!quiet?)
+    end
+
+		self[:machine] = Command.machine
+		self[:user] = Command.user
+
+		self[:start_time]=Time.now
+		timer=Timer.new
+
+    Dir.chdir(self[:directory]) do
+  		if self[:input].include?('<%') && self[:input].include?('%>')
+  		  ruby = self[:input].gsub("<%","").gsub("%>","")
+
+  		  begin
+  		    self[:output]=eval(ruby)
+  		  rescue 
+  		  	self[:exit_code]=1
+  		  	self[:error]="unable to eval(#{ruby})"
+  		  end
+
+  		  self[:elapsed] = timer.elapsed_str
+  		  self[:end_time] = Time.now
+  		else
+  			begin
+          if(self[:timeout] <= 0)
+            self[:output],self[:error],status= Open3.capture3(self[:input])
+            self[:exit_code]=status.to_i
+    			  self[:elapsed] = timer.elapsed_str
+    			  self[:end_time] = Time.now
+          else
+            require_relative 'timeout.rb'
+            #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[:directory],self[:input], self[:timeout], 1)
+            self[:output]=result[0]
+            self[:exit_code]=result[1]
+
+            self[:elapsed] = timer.elapsed_str
+            self[:end_time] = Time.now
+            
+            if(timer.elapsed >= self[:timeout])
+              self[:exit_code]=1 
+              self[:error] = self[:error] + "timed out"
+            end
+          end
+  			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
+    end
+       
+
+    if(self[:exit_code] != 0)
+      if(!quiet?)
+    	  puts "exit_code=#{self[:exit_code]}"
+    	  puts self[:output]
+    	  puts self[:error]
+      end
+    	if(!self.has_key?(:ignore_failure) || !self[:ignore_failure])
+    		raise "#{self[:input]} failed" 
+    	end #unless (self.has_key?(:ignore_failure) && self[:ignore_failure]==true)
+    end
+      
+	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 self.home 
+      ["USERPROFILE","HOME"].each {|v|
+        return ENV[v].gsub('\\','/') unless ENV[v].nil?
+      }
+      dir="~"
+      dir=ENV["HOME"] unless ENV["HOME"].nil?
+      dir=ENV["USERPROFILE"].gsub('\\','/') unless ENV["USERPROFILE"].nil?
+      return dir
+    end
+
+    def self.dev_root
+      ["DEV_HOME","DEV_ROOT"].each {|v|
+        return ENV[v].gsub('\\','/') unless ENV[v].nil?
+      }
+      dir=home
+      #dir=ENV["DEV_ROOT"].gsub('\\','/') unless ENV["DEV_ROOT"].nil?
+     return dir
+    end
+
+    def self.exit_code command
+    	cmd = Command.new(command)
+    	cmd[:ignore_failure]=true
+      cmd[:quiet]=true
+    	cmd.execute
+    	cmd[:exit_code]
+    end
+
+    def self.output command
+    	cmd = Command.new(command)
+    	cmd[:ignore_failure]=true
+      cmd[:quiet]=true
+    	cmd.execute
+    	cmd[:output]
+    end
+
+    def self.summary
+      "#{self[:exit_code].to_s} #{self[:input]} (#{self[:directory]})"
+    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
+      [
+      	'<div><table><tr><td width="20"></td><td><pre>',
+      	self[:input],
+        '</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