dev 2.0.268 → 2.0.269

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 313d2e1a3959cd2a061d6da9c2e38e2172cdf50e
-  data.tar.gz: ff3e2cff769253f5e0f17cffaefe483944bfd44e
+  metadata.gz: 0b589fd7c6e934568a25fedd9390eb9eb34c249b
+  data.tar.gz: f3120161faf84cb33c7ecde90ca3a36f69d0e378
 SHA512:
-  metadata.gz: 0a18b7d175c5068791fcf29800def536abccf08c44ba4a90a89fe2919535954b3da7266bc9f1284c157a52bc0aafc48dac908cfa0be8ecd13e533c00fad6db8d
-  data.tar.gz: b8922ab20d26b1ba881c0f1fb94022db185b867d12132adb5c90057e0d3d4e48009b500d838ab0ee34c2af9a205155c665684194303b9a6c7d2d9935d764b0bc
+  metadata.gz: 4a1005b6587fe75f6552d75f47753651b71f9968a8cfd4a75499d1252ccc4ccec35ce7599322ebb79c9d440613f337b4e65f2ec3bd215d00e5af37cceab91aae
+  data.tar.gz: cdd95c1496bdbca9e0d5cc90fc44a252ab5b51ce391f56fd932b848044316ede3488d7332c6df9d8ab42a5426c8b2e54e2295987eb98595f491a5ae29123c46f

data/bin/dev

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/usr/bin/evn ruby
 require 'dev'
 DEV.execute ARGV

data/lib/base/array.rb

@@ -1,7 +1,14 @@
-puts __FILE__ if defined?(DEBUG)
-
+require_relative('environment.rb')
 class Array
+    attr_accessor :env
+    def intialize env=nil
+      @env=env
+      @env=Environment.new() if @env.nil? 
+      @env=Environmnet.new() if !@env.kind_of?(Environment)
+    end
+
     def execute value=nil
+      @env=Environment.new() if @env.nil? 
       i=0
       while i < self.length
         self[i]=Command.new(self[i]) if(self[i].is_a?(String))
@@ -11,13 +18,36 @@ class Array
           value.each{|k,v|self[i][k]=v}
         end
 
-        self[i].execute if(self[i].is_a?(Command))
+        #self[i].execute if(self[i].is_a?(Command))
+        if(self[i].is_a?(Command))
+          self[i].execute
+          @env.out self[i].summary
+        end
+
         i=i+1
       end
     end
 
     def add command
-      self << command if(!include?(command))
+      self << command if !has_command? command
+    end
+
+    def has_command? command
+      return true if(command.kind_of?(String) && !include?(command))
+      if(command.kind_of?(Command))
+        self.each{|c|
+           return true if(c[:input] == command[:input])
+        }
+      end
+      false
+    end
+
+    def add_quiet command
+      add Command.new({ :input => command, :quiet => true })
+    end
+
+    def add_passive command
+      add Command.new({ :input => command, :quiet => true, :ignore_failure => true })
     end
 
     def to_html

data/lib/base/command.rb

@@ -1,10 +1,12 @@
-puts __FILE__ if defined?(DEBUG)
-
+require 'time'
 require 'open3'
 require_relative('timeout.rb')
 require_relative('timer.rb')
 require_relative('array.rb')
 require_relative('hash.rb')
+require_relative('string.rb')
+require_relative('environment.rb')
+require_relative('dir.rb')
 BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
             
 # = Command
@@ -51,6 +53,10 @@ class Command < Hash
     end
 	end
 
+  def save filename
+    File.open(filename,'w'){|f|f.write(to_json)}
+  end
+
   def open filename=''
     @filename=filename if filename.length > 0
     self.clear
@@ -63,6 +69,17 @@ class Command < Hash
     (self.has_key?(:quiet) && self[:quiet])
   end
 
+  def exit_code
+    self[:exit_code]
+  end
+
+  def output
+    self[:output]
+  end
+  def error
+    self[:error]
+  end
+
 	def execute value=nil
 
     if(!value.nil? && value.is_a?(Hash))
@@ -105,11 +122,14 @@ class Command < Hash
     			  self[:elapsed] = timer.elapsed_str
     			  self[:end_time] = Time.now
           else
+            #puts "command execute with timeout #{self[:timeout]}"
             require_relative 'timeout.rb'
             result=run_with_timeout(self[:directory],self[:input], self[:timeout],2)
+            #puts "result #{result}"
             self[:output]=result[0]
-            self[:error]=result[1]
-            self[:exit_code]=result[2]
+            self[:exit_code]=result[1]
+            #self[:error]=result[1]
+            #self[:exit_code]=result[2]
 
             self[:elapsed] = timer.elapsed_str
             self[:end_time] = Time.now
@@ -174,10 +194,19 @@ class Command < Hash
      return dir
     end
 
+    #def self.execute_quiet command
+    #  cmd=Command.new({ :input => command, :quiet => true, :ignore_failure => true})
+    #  cmd.execute
+    #  cmd
+    #end
+
     def self.execute command
-      cmd = Command.new(command)
+      cmd = Command.new({ :input => command, :quiet => true}) if command.kind_of?(String)
+      cmd = command if command.kind_of?(Command)
+      cmd = Command.new(command) if command.kind_of?(Hash)
       cmd.execute
       cmd[:exit_code]
+      cmd
     end
 
     def self.exit_code command
@@ -205,17 +234,77 @@ class Command < Hash
     end
 
     def getFormattedTimeSpan timespan
+      result=''
       seconds = timespan.round
-      seconds.to_s + " sec"
+      if(seconds > 99)
+        minutes=(seconds/60).round
+        result="#{minutes}m"
+      else
+        result="#{seconds}s" # 99s 
+      end
+      result.fix(3)
     end
 
-    def summary
+    def summary include_directory=false
       duration=""
-      duration=getFormattedTimeSpan(self[:end_time]-self[:start_time])# + " - " if(!self[:end_time].nil?)
-      #duration + "#{self[:exit_code].to_s} #{self[:input]} (#{self[:directory]})"
-      status="OK   "
-      status="Error" if(!self.has_key?(:exit_code) || self[:exit_code] != 0)
-      "#{status} '#{self[:input]}' (#{self[:directory]}) #{self[:exit_code].to_s} [#{duration}]"
+      duration=getFormattedTimeSpan(self[:end_time]-self[:start_time])
+      if(Environment.default.colorize?)
+        require 'ansi/code'
+        cduration = ANSI.reset + duration
+        #code=ANSI.green + '+ ' + ANSI.reset
+        #code=ANSI.red   + '- ' + ANSI.reset if exit_code != 0
+        cinput = ANSI.reset + self[:input] + ANSI.reset
+        cinput = ANSI.red   + self[:input] + ANSI.reset if exit_code != 0
+        cdirectory = ''
+        cdirectory = "(#{self[:directory]})" if include_directory
+        "  #{cduration} #{cinput} #{cdirectory}"
+      else
+        code=' '
+        code='X' if exit_code != 0
+        sdirectory = ''
+        sdirectory = "(#{self[:directory]})" if include_directory
+        "#{code} #{duration} #{self[:input]} #{sdirectory}"
+      end
+    end
+
+    def format_property name,value
+        if(Environment.default.colorize?)
+            require 'ansi/code'
+            return "#{name}: " + ANSI.yellow + ANSI.bright + value.to_s.strip + ANSI.reset
+        else
+            return "#{name}: #{value}"
+        end
+    end 
+
+    def info 
+      result=format_property('input'.fix(15),self[:input]) + "\n"
+      result=result + format_property('directory'.fix(15),self[:directory])  + "\n"
+      result=result + format_property('exit_code'.fix(15),self[:exit_code]) + "\n"
+      result=result + format_property('duration'.fix(15),getFormattedTimeSpan(self[:end_time]-self[:start_time])) + "\n"
+      output=['']
+      output=self[:output].strip.split("\n") if !self[:output].nil?
+      if(output.length <= 1)
+        result=result + format_property('output'.fix(15),output[0]) + "\n" 
+        #result=result + format_property('output'.fix(15),'') + "\n" if(output.length==0)
+        #result=result + format_property('output'.fix(15),output) + "\n" if(output.length==1)
+      else
+        result=result + format_property('output'.fix(15),'') + "\n"
+        output.each{|line|
+          result=result + ' '.fix(16) + line + "\n"
+        }
+      end
+      error=['']
+      error=self[:error].strip.split("\n") if !self[:error].nil?
+      if(error.length <= 1) 
+        result=result + format_property('error'.fix(15),error[0]) + "\n"
+        #result=result + format_property('error'.fix(15),'') + "\n" if(error.length==0)
+        #result=result + format_property('error'.fix(15),error) + "\n" if(error.length==1)
+      else
+        result=result + format_property('error'.fix(15),'') + "\n"
+        error.each{|line|
+          result=result + ' '.fix(16) + line + "\n"
+        }
+      end
     end
 
     def to_html

data/lib/base/dir.rb

@@ -1,18 +1,24 @@
-puts __FILE__ if defined?(DEBUG)
-
 require 'fileutils'
 
 class Dir
   def self.make directory
   	FileUtils.mkdir_p directory if !File.exists? directory
   end
-  def self.remove directory
-    if(File.exists?(directory))
-      begin
-        FileUtils.rm_rf directory
-        FileUtils.rm_r directory
-      rescue
+  def self.remove directory, remove_empty_parents=false
+    begin
+      FileUtils.rm_rf directory if(!Dir.empty?(directory))
+      FileUtils.rm_r directory  if(File.exists?(directory))
+      if(remove_empty_parents)
+        parent_dir=File.dirname(directory)
+        Dir.remove parent_dir, true if(Dir.empty?(parent_dir))
       end
+    rescue
+    end
+  end
+  def self.empty? directory
+    if((Dir.entries(directory) - %w{ . .. }).empty?)
+      return true
     end
+    false
   end
 end

data/lib/base/environment.rb

@@ -3,60 +3,177 @@ puts __FILE__ if defined?(DEBUG)
 require_relative('string.rb')
 
 class Environment < Hash
+  attr_accessor :output
+  @@default=nil
+  def self.default
+    @@default=Environment.new if @@default.nil?
+    @@default
+  end
 
-  @@debug=true if defined?(DEBUG)
-  @@debug=false if !defined?(DEBUG)
-  @@development_root=nil
+  def initialize env=nil
+    @output=''
+    @env=Hash.new
+    @env_aliases={'HOME' => ['USERPROFILE'],
+                  'DEV_ROOT' => ['DEV_HOME','HOME','USERPROFILE'],
+                  'USERNAME' => ['USER','USR']
+    }
+    env.each{|k,v| @env[k.to_s]=v} if !env.nil?
+    @@default=self if @@default.nil?
+  end
 
-  def initialize
-    self[:home]=Environment.home
-    self[:machine]=Environment.machine
-    self[:user]=Environment.user
+  #####Begin LEGACY support
+  def self.dev_root
+    default.root_dir
   end
 
-  def self.set_development_root value
-    @@development_root=value
-    if(!value.nil?)
-      FileUtils.mkdir_p value if(!File.exists?(value))
-      ['bin','data','log','make','publish','test'].each{|dir|
-        #FileUtils.mkdir_p("#{value}/#{dir}") if !File.exists? "#{value}/#{dir}"
-      }
+  #####End LEGACY support
+  def root_dir
+    get_env('DEV_ROOT')
+  end
+ 
+  def home_dir
+    get_env('HOME')
+  end
+
+  def log_dir
+    dir="#{get_env('DEV_ROOT')}/log/#{user}@#{machine}"
+    FileUtils.mkdir_p dir if !File.exists? dir
+    dir
+  end
+
+  def make_dir
+    dir="#{get_env('DEV_ROOT')}/make"
+    FileUtils.mkdir_p dir if !File.exists? dir
+    dir
+  end
+
+  def publish_dir
+    dir="#{get_env('DEV_ROOT')}/publish"
+    FileUtils.mkdir_p dir if !File.exists? dir
+    dir
+  end
+
+  def wrk_dir
+    dir="#{get_env('DEV_ROOT')}/wrk"
+    FileUtils.mkdir_p dir if !File.exists? dir
+    dir
+  end
+
+  def machine
+    return ENV['COMPUTERNAME'] if !ENV['COMPUTERNAME'].nil? 
+    machine = `hostname`
+    machine = machine.split('.')[0] if machine.include?('.')
+    return machine.strip
+  end
+
+  def user
+    get_env('USERNAME')
+    #return ENV['USER'] if !ENV['USER'].nil?  #on Unix
+    #ENV['USERNAME']
+  end
+
+  def get_env key
+    if(!@env.nil? && @env.has_key?(key))
+      return @env[key] 
+      end
+    value = ENV[key]
+    if(value.nil?)
+      if(@env_aliases.has_key?(key))
+        @env_aliases[key].each{|akey|
+          value=get_env(akey) if value.nil?
+        }
+      end
     end
+    value
   end
 
-  def self.debug
-    @@debug
+  def set_env key,value
+    @env[key]=value
   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
+  def debug?
+    return true if get_env('DEBUG')=='true'
+    false
   end
 
-  def self.configuration
-    config="#{Environment.home}/dev.config.rb"
-    if(!File.exists?(config))
-      text=IO.read("#{File.dirname(__FILE__)}/../dev.config.rb")
-      File.open(config,'w'){|f|f.write(text)}
+  def colorize?
+    colorize=true
+    if windows?
+      if(`gem list win32console`.include?('win32console'))
+        require 'ansi/code'
+      else
+        colorize=false
+      end
     end
-    config
+    colorize
+  end
+
+  def out message
+      puts message if !get_env('SUPPRESS_CONSOLE_OUTPUT')
+      @output=@output+message+'\n'
   end
 
-  def self.machine
-     if !ENV['COMPUTERNAME'].nil? 
-	   return ENV['COMPUTERNAME']
-	 end
+  def show_success?
+    true
+  end
 
-     machine = `hostname`
-     machine = machine.split('.')[0] if machine.include?('.')
-	 return machine.strip
+  def windows?
+    Gem.win_platform?
   end
 
+  #@@debug=true if defined?(DEBUG)
+  #@@debug=false if !defined?(DEBUG)
+  #@@development_root=nil
+
+  #def initialize
+    #self[:home]=Environment.home
+    #self[:machine]=Environment.machine
+    #self[:user]=Environment.user
+  #end
+
+  #def self.set_development_root value
+  #  @@development_root=value
+  #  if(!value.nil?)
+  #    FileUtils.mkdir_p value if(!File.exists?(value))
+  #    ['bin','data','log','make','publish','test'].each{|dir|
+  #      #FileUtils.mkdir_p("#{value}/#{dir}") if !File.exists? "#{value}/#{dir}"
+  #    }
+  #  end
+  #end
+
+  #def self.debug
+  #  @@debug
+  #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.configuration
+  #  config="#{Environment.home}/dev.config.rb"
+  #  if(!File.exists?(config))
+  #    text=IO.read("#{File.dirname(__FILE__)}/../dev.config.rb")
+  #    File.open(config,'w'){|f|f.write(text)}
+  #  end
+  #  config
+  #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.remove directory
     if(File.exists?(directory))
       begin
@@ -67,21 +184,21 @@ class Environment < Hash
     end
   end
 
-  def self.user
-  	return ENV['USER'] if !ENV['USER'].nil?  #on Unix
-    ENV['USERNAME']
-  end
+  #def self.user
+ # 	return ENV['USER'] if !ENV['USER'].nil?  #on Unix
+ #   ENV['USERNAME']
+  #end
 
-  def self.dev_root
-    if(!@@development_root.nil?)
-      return @@development_root
-    end
-    ["DEV_HOME","DEV_ROOT"].each {|v|
-      return ENV[v].gsub('\\','/') unless ENV[v].nil?
-    }
-    dir=home
-   return dir
-  end
+  #def self.dev_root
+  #  if(!@@development_root.nil?)
+  #    return @@development_root
+  #  end
+  #  ["DEV_HOME","DEV_ROOT"].each {|v|
+  #    return ENV[v].gsub('\\','/') unless ENV[v].nil?
+  #  }
+  #  dir=home
+  # return dir
+  #end
 
   def self.check
     puts 'checking commands...'
@@ -132,7 +249,7 @@ class Environment < Hash
   end
 
   def self.get_latest_mtime directory
-    mtime=nil
+    mtime=Time.new(1980)
     Dir.chdir(directory)  do
       Dir.glob('**/*.*').each{|f|
         mtime=File.mtime(f) if mtime.nil? || File.mtime(f) > mtime