dev 2.1.153 → 2.1.154

data/lib/base/dir.rb

@@ -1,114 +1,111 @@
-require 'fileutils'
+# frozen_string_literal: true
+
+require "fileutils"
 
 class Dir
-  def self.make directory
-  	FileUtils.mkdir_p directory if !File.exists? directory
+  def self.make(directory)
+    FileUtils.mkdir_p directory unless File.exist? directory
   end
-  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
+
+  def self.remove(directory, remove_empty_parents = false)
+    FileUtils.rm_rf directory unless Dir.empty?(directory)
+    FileUtils.rm_r directory if File.exist?(directory)
+    if remove_empty_parents
+      parent_dir = File.dirname(directory)
+      Dir.remove parent_dir, true if Dir.empty?(parent_dir)
     end
+  rescue StandardError
   end
-  def self.empty? directory
-    if((Dir.entries(directory) - %w{ . .. }).empty?)
-      return true
-    end
+
+  def self.empty?(directory)
+    return true if (Dir.entries(directory) - %w[. ..]).empty?
+
     false
   end
 
-  def self.get_latest_mtime directory
-    mtime=Time.new(1980)
-    Dir.chdir(directory)  do
-      latest_filename=''
-      Dir.glob('**/*.*').each{|f|
+  def self.get_latest_mtime(directory)
+    mtime = Time.new(1980)
+    Dir.chdir(directory) do
+      latest_filename = ""
+      Dir.glob("**/*.*").each do |f|
         if mtime.nil? || File.mtime(f) > mtime
-          mtime=File.mtime(f) 
-          latest_filename=f
+          mtime = File.mtime(f)
+          latest_filename = f
         end
-      }
-      puts "   latest_mtime #{mtime.to_s} #{latest_filename}" if Environment.default.debug?
+      end
+      puts "   latest_mtime #{mtime} #{latest_filename}" if Environment.default.debug?
     end
     mtime
   end
 
-  def self.get_project_name directory
-    name = directory.split('/').last
+  def self.get_project_name(directory)
+    name = directory.split("/").last
     rakefile = "#{directory}/rakefile.rb"
-    if(File.exists?(rakefile))
-      txt=IO.read(rakefile)
-      if(txt.include?("NAME="))
+    if File.exist?(rakefile)
+      txt = IO.read(rakefile)
+      if txt.include?("NAME=")
         scan = txt.scan(/NAME=['"]([\w.]+)/)
-        if(!scan.nil?)
-          name = scan[0][0] if(scan.length > 0 && !scan[0].nil? && scan[0].length > 0)
-        end
+        name = scan[0][0] if !scan.nil? && (scan.length.positive? && !scan[0].nil? && scan[0].length.positive?)
       end
     end
     name
   end
 
-  def self.zip(directory,files,zipfilename)
-    if Gem::Specification::find_all_by_name('rubyzip').any?
-      require 'zip'
-      File.delete(zipfilename) if(File.exists?(zipfilename))
-      Zip::File.open(zipfilename,Zip::File::CREATE) do |zipfile|
+  def self.zip(directory, files, zipfilename)
+    if Gem::Specification.find_all_by_name("rubyzip").any?
+      require "zip"
+      File.delete(zipfilename) if File.exist?(zipfilename)
+      Zip::File.open(zipfilename, Zip::File::CREATE) do |zipfile|
         Dir.chdir(directory) do
           count = 0
-          files.each{|source_file|
-            zipfile.add(source_file,"#{directory}/#{source_file}")
-            count = count + 1
-          }
+          files.each do |source_file|
+            zipfile.add(source_file, "#{directory}/#{source_file}")
+            count += 1
+          end
           puts "added #{count} files to #{zipfilename}"
         end
       end
     else
       puts "rubyzip gem is not installed 'gem install rubyzip'"
     end
-end
+  end
 
-def self.unzip(zipfilename,directory)
-  if Gem::Specification::find_all_by_name('rubyzip').any?
-    require 'zip'
-    count = 0
-    Zip::File.open(zipfilename) do |zip_file|
-      zip_file.each do |entry|
-        dest = "#{directory}/#{entry.to_s}"
-        parent_dir=File.dirname(dest)
-        FileUtils.mkdir_p parent_dir if(!Dir.exists?(parent_dir))
-        entry.extract("#{directory}/#{entry.to_s}")
-        count = count + 1
+  def self.unzip(zipfilename, directory)
+    if Gem::Specification.find_all_by_name("rubyzip").any?
+      require "zip"
+      count = 0
+      Zip::File.open(zipfilename) do |zip_file|
+        zip_file.each do |entry|
+          dest = "#{directory}/#{entry}"
+          parent_dir = File.dirname(dest)
+          FileUtils.mkdir_p parent_dir unless Dir.exist?(parent_dir)
+          entry.extract("#{directory}/#{entry}")
+          count += 1
+        end
       end
+      puts "extracted #{count} files to #{directory}"
+    else
+      puts "rubyzip gem is not installed 'gem install rubyzip'"
     end
-    puts "extracted #{count} files to #{directory}"
-  else
-    puts "rubyzip gem is not installed 'gem install rubyzip'"
   end
-end
 
-def self.copy_files(src_dir,glob_pattern,exclude_patterns,target_dir)
-	if(Dir.exists?(src_dir))
-		Dir.chdir(src_dir) do
-			Dir.glob(glob_pattern).each{|f|
-        if(File.file?(f))
+  def self.copy_files(src_dir, glob_pattern, exclude_patterns, target_dir)
+    if Dir.exist?(src_dir)
+      Dir.chdir(src_dir) do
+        Dir.glob(glob_pattern).each do |f|
+          next unless File.file?(f)
+
           exclude = false
-          if(!exclude_patterns.nil?)
-            exclude_patterns.each{|p|
-              exclude = true if(f.include?(p))
-            }
-          end
-          if(!exclude)
-            dest = "#{target_dir}/#{f}"
-            FileUtils.mkdir_p(File.dirname(dest)) if(!Dir.exists?(File.dirname(dest)))
-            FileUtils.cp(f,dest)
+          exclude_patterns&.each do |p|
+            exclude = true if f.include?(p)
           end
+          next if exclude
+
+          dest = "#{target_dir}/#{f}"
+          FileUtils.mkdir_p(File.dirname(dest)) unless Dir.exist?(File.dirname(dest))
+          FileUtils.cp(f, dest)
         end
-      }
-		end
-	end
+      end
+    end
+  end
 end
-end

data/lib/base/environment.rb

@@ -1,138 +1,135 @@
+# frozen_string_literal: true
+
 puts DELIMITER if defined?(DEBUG)
 puts __FILE__ if defined?(DEBUG)
 
-require_relative('string.rb')
+require_relative("string")
 
 class Environment < Hash
-  attr_accessor :output,:publish_dir
-  @@default=nil
+  attr_accessor :output, :publish_dir
+
+  @@default = nil
   def self.default
-    @@default=Environment.new if @@default.nil?
+    @@default = Environment.new if @@default.nil?
     @@default
   end
 
-  def initialize env=nil
-    @output=''
+  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?
+    @env = {}
+    @env_aliases = { "HOME" => ["USERPROFILE"],
+                     "DEV_ROOT" => %w[DEV_HOME HOME USERPROFILE],
+                     "USERNAME" => %w[USER USR] }
+    env&.each { |k, v| @env[k.to_s] = v }
+    @@default = self if @@default.nil?
 
-    @publish_dir="#{root_dir}/publish"
-    FileUtils.mkdir_p @publish_dir if !File.exists? @publish_dir
+    @publish_dir = "#{root_dir}/publish"
+    FileUtils.mkdir_p @publish_dir unless File.exist? @publish_dir
   end
 
-  #####Begin LEGACY support
+  # ####Begin LEGACY support
   def self.dev_root
     default.root_dir
   end
-  #####End LEGACY support
+  # ####End LEGACY support
 
   def admin?
-    rights=%x[whoami /priv]
-    return rights.include?('SeCreateGlobalPrivilege')
+    rights = `whoami /priv`
+    rights.include?("SeCreateGlobalPrivilege")
   end
+
   def root_dir
-    get_env('DEV_ROOT').gsub('\\','/')
+    get_env("DEV_ROOT").gsub('\\', "/")
   end
- 
+
   def home_dir
-    get_env('HOME').gsub('\\','/')
+    get_env("HOME").gsub('\\', "/")
   end
 
   def log_dir
-    dir="#{root_dir}/log/#{user}@#{machine}"
-    FileUtils.mkdir_p dir if !File.exists? dir
+    dir = "#{root_dir}/log/#{user}@#{machine}"
+    FileUtils.mkdir_p dir unless File.exist? dir
     dir
   end
 
   def dropbox_dir
-    dropbox_info = "#{ENV['LOCALAPPDATA']}/Dropbox/info.json"
-    if(File.exists?(dropbox_info))
+    dropbox_info = "#{ENV["LOCALAPPDATA"]}/Dropbox/info.json"
+    if File.exist?(dropbox_info)
       info = JSON.parse(IO.read(dropbox_info))
-      if(info.has_key?('personal'))
-        if(info['personal'].has_key?('path'))
-          return info['personal']['path']
-        end
-      end
+      return info["personal"]["path"] if info.key?("personal") && info["personal"].key?("path")
     end
     ""
   end
 
   def tmp_dir
-    dir="#{root_dir}/tmp"
-    FileUtils.mkdir_p dir if !File.exists? dir
+    dir = "#{root_dir}/tmp"
+    FileUtils.mkdir_p dir unless File.exist? dir
     dir
   end
 
   def make_dir
-    dir="#{root_dir}/make"
-    FileUtils.mkdir_p dir if !File.exists? dir
+    dir = "#{root_dir}/make"
+    FileUtils.mkdir_p dir unless File.exist? dir
     dir
   end
 
   def wrk_dir
-    dir="#{root_dir}/work"
-    FileUtils.mkdir_p dir if !File.exists? dir
+    dir = "#{root_dir}/work"
+    FileUtils.mkdir_p dir unless File.exist? dir
     dir
   end
 
   def machine
-    return ENV['COMPUTERNAME'] if !ENV['COMPUTERNAME'].nil? 
+    return ENV["COMPUTERNAME"] unless ENV["COMPUTERNAME"].nil?
+
     machine = `hostname`
-    machine = machine.split('.')[0] if machine.include?('.')
-    return machine.strip
+    machine = machine.split(".")[0] if machine.include?(".")
+    machine.strip
   end
 
   def user
-    get_env('USERNAME')
+    get_env("USERNAME")
   end
 
-  def get_env key
-    if(!@env.nil? && @env.has_key?(key))
-      return @env[key] 
-      end
+  def get_env(key)
+    return @env[key] if !@env.nil? && @env.key?(key)
+
     value = ENV[key]
-    if(value.nil?)
-      if(@env_aliases.has_key?(key))
-        @env_aliases[key].each{|akey|
-          value=get_env(akey) if value.nil?
-        }
+    if value.nil? && @env_aliases.key?(key)
+      @env_aliases[key].each do |akey|
+        value = get_env(akey) if value.nil?
       end
     end
     value
   end
 
-  def set_env key,value
-    @env[key]=value
+  def set_env(key, value)
+    @env[key] = value
   end
 
   def debug?
     return true if defined?(DEBUG)
+
     false
   end
 
   def colorize?
-    colorize=true
+    colorize = true
     if Environment.windows?
-      if(`gem list win32console`.include?('win32console'))
-        require 'ansi/code'
+      if `gem list win32console`.include?("win32console")
+        require "ansi/code"
       else
-        colorize=false
+        colorize = false
       end
     end
-    if Environment.mac?
-      colorize=false
-    end
+    colorize = false if Environment.mac?
     colorize
   end
 
   def working?
     return true if Rake.application.original_dir.include? wrk_dir
+
     false
   end
 
@@ -140,9 +137,9 @@ class Environment < Hash
     true
   end
 
-  def out message
-      puts message if !get_env('SUPPRESS_CONSOLE_OUTPUT')
-      @output=@output+message+'\n'
+  def out(message)
+    puts message unless get_env("SUPPRESS_CONSOLE_OUTPUT")
+    @output = "#{@output}#{message}\\n"
   end
 
   def show_success?
@@ -151,17 +148,13 @@ class Environment < Hash
 
   def self.OS
     if windows?
-      return "windows"
+      "windows"
+    elsif mac?
+      "mac"
+    elsif linux?
+      "linux"
     else
-      if mac?
-        return "mac"
-      else
-        if linux?
-          return "linux"
-        else
-          return "unix"
-        end
-      end
+      "unix"
     end
   end
 
@@ -170,7 +163,7 @@ class Environment < Hash
   end
 
   def self.mac?
-   (/darwin/ =~ RUBY_PLATFORM) != nil
+    (/darwin/ =~ RUBY_PLATFORM) != nil
   end
 
   def self.unix?
@@ -178,46 +171,48 @@ class Environment < Hash
   end
 
   def self.linux?
-    unix? and not mac?
+    unix? and !mac?
   end
 
   def self.check
-    puts 'checking commands...'
-    missing_command=false
-    ['ruby --version','svn --version --quiet','git --version','msbuild /version','nunit-console','nuget','candle','light','gem --version'].each{|cmd|
-      command=Command.new(cmd)
-      command[:quiet]=true
-      command[:ignore_failure]=true
+    puts "checking commands..."
+    missing_command = false
+    ["ruby --version", "svn --version --quiet", "git --version", "msbuild /version", "nunit-console", "nuget", "candle",
+     "light", "gem --version"].each do |cmd|
+      command = Command.new(cmd)
+      command[:quiet] = true
+      command[:ignore_failure] = true
       command.execute
-      if(command[:exit_code] == 0)
-        puts "#{cmd.split(' ')[0]} #{get_version(command[:output])}"
+      if (command[:exit_code]).zero?
+        puts "#{cmd.split(" ")[0]} #{get_version(command[:output])}"
       else
-        puts "#{cmd.split(' ')[0]} not found."
-          missing_command=true
+        puts "#{cmd.split(" ")[0]} not found."
+        missing_command = true
       end
-      
-    }
-    puts "missing commands may be resolved by making sure that are installed and in PATH environment variable." if missing_command
+    end
+    if missing_command
+      puts "missing commands may be resolved by making sure that are installed and in PATH environment variable."
+    end
   end
 
-  def self.get_version text
+  def self.get_version(text)
     text.match(/(\d+\.\d+\.[\d\w]+)/)
   end
 
-  def info 
+  def info
     puts "Environment"
     puts "  ruby version: #{`ruby --version`}"
     puts " ruby platform: #{RUBY_PLATFORM}"
-    puts "      dev_root: #{self.root_dir}"
-    puts "       machine: #{self.machine}"
-    puts "          user: #{self.user}"
+    puts "      dev_root: #{root_dir}"
+    puts "       machine: #{machine}"
+    puts "          user: #{user}"
     puts "            os: #{Environment.OS}"
-    #puts " configuration: #{self.configuration}"
-    puts "         debug: #{self.debug?}"
-    #puts "git user.email: #{Git.user_email}" 
+    # puts " configuration: #{self.configuration}"
+    puts "         debug: #{debug?}"
+    # puts "git user.email: #{Git.user_email}"
     puts " "
-    #puts "Path Commands"
-    #['svn --version --quiet','git --version','msbuild /version','nuget','candle','light','gem --version'].each{|cmd|
+    # puts "Path Commands"
+    # ['svn --version --quiet','git --version','msbuild /version','nuget','candle','light','gem --version'].each{|cmd|
     #  command=Command.new(cmd)
     #  command[:quiet]=true
     #  command[:ignore_failure]=true
@@ -228,9 +223,9 @@ class Environment < Hash
     #    puts "#{cmd.split(' ')[0].fix(14)} not found."
     #      missing_command=true
     #  end
-    #}
+    # }
   end
 end
 
 puts "" if defined?(DEBUG)
-puts Environment.default.info if defined?(DEBUG)
+puts Environment.default.info if defined?(DEBUG)

data/lib/base/file.rb

@@ -1,40 +1,42 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-require 'fileutils'
+require "fileutils"
 
 class File
-	def self.amalgamate filename,source
-		File.open(filename,'w'){|file|
-			source.each{|source_file|
-				file.puts IO.read(source_file)
-			}
-		}
-	end
-
-	def self.publish destination, source_dir, source_glob='**/*', exclude_glob=nil# overwrite_existing=false
+  def self.amalgamate(filename, source)
+    File.open(filename, "w") do |file|
+      source.each do |source_file|
+        file.puts IO.read(source_file)
+      end
+    end
+  end
 
-		output = "\n"
-		FileUtils.mkdir_p destination if !File.exists? destination
+  # overwrite_existing=false
+  def self.publish(destination, source_dir, source_glob = "**/*", exclude_glob = nil)
+    output = "\n"
+    FileUtils.mkdir_p destination unless File.exist? destination
 
-		files=nil
-		Dir.chdir(source_dir) do
-			files=FileList.new(source_glob).to_a
-			if(!exclude_glob.nil?)
-				FileList.new(exclude_glob).to_a.each{|f|
-					files.delete(f) if(files.include?(f))
-				}
-			end
-		end
-		output = output + "\nfiles: #{files}.to_s"
+    files = nil
+    Dir.chdir(source_dir) do
+      files = FileList.new(source_glob).to_a
+      unless exclude_glob.nil?
+        FileList.new(exclude_glob).to_a.each do |f|
+          files.delete(f) if files.include?(f)
+        end
+      end
+    end
+    output += "\nfiles: #{files}.to_s"
 
-		Dir.chdir(source_dir) do
-			files.each{|f|
-				file="#{destination}/#{f}"
-				dirname=File.dirname(file)
-				FileUtils.mkdir_p dirname if !File.exists? dirname
-				FileUtils.cp(f,file) if !File.exists? file# || overwrite_existing
-			}
-		end
-		output
-	end
-end
+    Dir.chdir(source_dir) do
+      files.each do |f|
+        file = "#{destination}/#{f}"
+        dirname = File.dirname(file)
+        FileUtils.mkdir_p dirname unless File.exist? dirname
+        FileUtils.cp(f, file) unless File.exist? file # || overwrite_existing
+      end
+    end
+    output
+  end
+end