dev 2.1.153 → 2.1.154

data/lib/tasks/add.rb

@@ -1,46 +1,40 @@
+# frozen_string_literal: true
+
 if defined?(DEBUG)
-	puts DELIMITER
-	puts __FILE__
+  puts DELIMITER
+  puts __FILE__
 end
 
-desc 'adds source files to git or subversion'
-task :add do Tasks.execute_task :add;end
+desc "adds source files to git or subversion"
+task :add do Tasks.execute_task :add; end
 
 class Add < Array
-	def update
-		if(File.exists?('.git') && File.exists?('.gitignore'))
-			add_quiet 'git add --all' 
-		else
-			if(defined?(SOURCE))
-				if(File.exists?('.svn'))
-					#---
-					list_output = %x[svn list -R]
-	        status_output = %x[svn status]
-	        status_output = status_output.gsub(/\\/,"/")
-					#---
-					SOURCE.each{|f|
-						if(File.exists?(f) && File.file?(f) && !list_output.include?(f))
-							if(m = status_output.match(/^(?<action>.)\s+(?<file>#{f})$/i))
-			          if(m[:file] == f && m[:action] == '?')
-									add_quiet "svn add \"#{f}\" --parents"
-			          end
-		          end
-            end
-					}
-				end
-				if(File.exists?('.git'))
-					SOURCE.each{|f|
-						if(File.exists?(f) && File.file?(f))
-						  status=Command.output("git status #{f} --short")
-						  if status.include?('??') || status.include?(' M ')
-							  add_quiet "git add #{f} -v" 
-						  end
-					  end
-					}
-				end
-			end
-		end
+  def update
+    if File.exist?(".git") && File.exist?(".gitignore")
+      add_quiet "git add --all"
+    elsif defined?(SOURCE)
+      if File.exist?(".svn")
+        #---
+        list_output = `svn list -R`
+        status_output = `svn status`
+        status_output = status_output.gsub(/\\/, "/")
+        #---
+        SOURCE.each do |f|
+          if File.exist?(f) && File.file?(f) && !list_output.include?(f) && (m = status_output.match(/^(?<action>.)\s+(?<file>#{f})$/i)) && (m[:file] == f && m[:action] == "?")
+            add_quiet "svn add \"#{f}\" --parents"
+          end
+        end
+      end
+      if File.exist?(".git")
+        SOURCE.each do |f|
+          if File.exist?(f) && File.file?(f)
+            status = Command.output("git status #{f} --short")
+            add_quiet "git add #{f} -v" if status.include?("??") || status.include?(" M ")
+          end
+        end
+      end
+    end
 
-		log_debug_info("Add") if defined?(DEBUG)
-	end
-end
+    log_debug_info("Add") if defined?(DEBUG)
+  end
+end

data/lib/tasks/analyze.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-desc 'performs analyze commands'
-task :analyze do Tasks.execute_task :analyze;end
+desc "performs analyze commands"
+task :analyze do Tasks.execute_task :analyze; end
 
 class Analyze < Array
-	def update
-		if(`gem list countloc`.include?('countloc ('))
-			FileUtils.mkdir('doc') if(!File.exists?('doc'))
-			add_quiet 'countloc -r * --html doc/countloc.html'
-		end
+  def update
+    if `gem list countloc`.include?("countloc (")
+      FileUtils.mkdir("doc") unless File.exist?("doc")
+      add_quiet "countloc -r * --html doc/countloc.html"
+    end
 
-		if defined?(DEBUG)
-			puts
-			puts "Analyze"
-			pp self 
-			puts
-		end
-	end
-end
+    if defined?(DEBUG)
+      puts
+      puts "Analyze"
+      pp self
+      puts
+    end
+  end
+end

data/lib/tasks/build.rb

@@ -1,114 +1,112 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-require_relative('../base/environment.rb')
+require_relative("../base/environment")
 
-desc 'performs build commands'
-task :build do Tasks.execute_task :build;end
+desc "performs build commands"
+task :build do Tasks.execute_task :build; end
 
-if !defined?(SLN_FILES)
-	SLN_FILES=FileList.new('*.sln','*/*.sln','*/*/*.sln')
-end
+SLN_FILES = FileList.new("*.sln", "*/*.sln", "*/*/*.sln") unless defined?(SLN_FILES)
 
-WXS_FILES=FileList.new('**/*.wxs')
-SMARTASSEMBLY_FILES=FileList.new('**/*.saproj')
+WXS_FILES = FileList.new("**/*.wxs")
+SMARTASSEMBLY_FILES = FileList.new("**/*.saproj")
 
 class Build < Array
-	def update
-
-		#puts "SLN_FILES: #{SLN_FILES}" if(Environment.default.debug?)
-
-    	update_gemspec
-    	update_dotnet
-		update_sln if Environment.windows?
-		update_smartassembly if Environment.windows?
-    	#update_nuget if Environment.windows?
-    	update_wix if Environment.windows? && !defined?(NO_WIX)
-		update_xcode if Environment.mac?
-		
-		log_debug_info("Build") if defined?(DEBUG)
-	end
-
-    def update_gemspec
-    	#puts "Build scanning for gemspec files" if Environment.default.debug?
-		Dir.glob('*.gemspec'){|gemspec|
-	    	add_quiet("gem build #{gemspec}") if !File.exist?(Gemspec.gemfile gemspec)
-	    }
+  def update
+    # puts "SLN_FILES: #{SLN_FILES}" if(Environment.default.debug?)
+
+    update_gemspec
+    update_dotnet
+    update_sln if Environment.windows?
+    update_smartassembly if Environment.windows?
+    # update_nuget if Environment.windows?
+    update_wix if Environment.windows? && !defined?(NO_WIX)
+    update_xcode if Environment.mac?
+
+    log_debug_info("Build") if defined?(DEBUG)
+  end
+
+  def update_gemspec
+    # puts "Build scanning for gemspec files" if Environment.default.debug?
+    Dir.glob("*.gemspec") do |gemspec|
+      add_quiet("gem build #{gemspec}") unless File.exist?(Gemspec.gemfile(gemspec))
+    end
+  end
+
+  def update_dotnet
+    # puts "Build scanning for project.json" if Environment.default.debug?
+    add_quiet "dotnet build" if File.exist?("project.json")
+  end
+
+  def update_sln
+    # puts "Build scanning for sln files" if Environment.default.debug?
+    SLN_FILES.each do |sln_file|
+      puts "  #{sln_file}" if Environment.default.debug?
+      build_commands = MSBuild.get_build_commands sln_file
+      if !build_commands.nil?
+        build_commands.each do |c|
+          puts "  build command #{c} discovered." if Environment.default.debug?
+          add_quiet(c)
+        end
+      elsif Environment.default.debug?
+        puts "  no build command discovered."
+      end
+    end
+  end
+
+  def update_smartassembly
+    # puts "Build scanning for sa (smart assembly) files" if Environment.default.debug?
+    sa = "C:/Program Files/Red Gate/SmartAssembly 6/SmartAssembly.com"
+    if File.exist?("C:/Program Files/Red Gate/SmartAssembly 7/SmartAssembly.com")
+      sa = "C:/Program Files/Red Gate/SmartAssembly 7/SmartAssembly.com"
+    end
+    SMARTASSEMBLY_FILES.each do |saproj_file|
+      puts "  #{saproj_file}" if Environment.default.debug?
+      if !File.exist?(sa)
+        puts "warning: #{sa} does not exist, skipping build command for #{saproj_file}"
+      else
+        add_quiet("\"#{sa}\" /build #{saproj_file}")
+      end
+    end
+  end
+
+  def update_wix
+    # puts "Build scanning for wxs <Product> files" if Environment.default.debug?
+    WXS_FILES.each do |wxs_file|
+      next unless IO.read(wxs_file).include?("<Product")
+
+      build_commands = Wix.get_build_commands wxs_file
+      next if build_commands.nil?
+
+      build_commands.each do |c|
+        add_quiet(c)
+      end
     end
 
-    def update_dotnet
-    	#puts "Build scanning for project.json" if Environment.default.debug?
-    	if(File.exists?('project.json'))
-			add_quiet "dotnet build"
-		end
+    # puts "Build scanning for wxs <Bundle> files" if Environment.default.debug?
+    WXS_FILES.each do |wxs_file|
+      next unless IO.read(wxs_file).include?("<Bundle")
+
+      build_commands = Wix.get_build_commands wxs_file
+      next if build_commands.nil?
+
+      build_commands.each do |c|
+        add_quiet(c)
+      end
     end
+  end
+
+  def update_xcode
+    # puts "Build scanning for xcodeproj folders" if Environment.default.debug?
+    Dir.glob("**/*.xcodeproj").each do |dir|
+      puts dir if Environment.default.debug?
+      build_commands = XCodeBuild.get_build_commands dir
+      next if build_commands.nil?
 
-	def update_sln
-		#puts "Build scanning for sln files" if Environment.default.debug?
-		SLN_FILES.each{|sln_file|
-			puts "  #{sln_file}" if Environment.default.debug?
-			build_commands = MSBuild.get_build_commands sln_file
-			if(!build_commands.nil?)
-				build_commands.each{|c|
-					puts "  build command #{c} discovered." if Environment.default.debug?
-					add_quiet(c)
-				}
-			else
-				puts "  no build command discovered." if Environment.default.debug?
-			end
-		}
-	end
-
-	def update_smartassembly
-		#puts "Build scanning for sa (smart assembly) files" if Environment.default.debug?
-		sa = 'C:/Program Files/Red Gate/SmartAssembly 6/SmartAssembly.com'
-		sa = 'C:/Program Files/Red Gate/SmartAssembly 7/SmartAssembly.com' if File.exists?('C:/Program Files/Red Gate/SmartAssembly 7/SmartAssembly.com')
-		SMARTASSEMBLY_FILES.each{|saproj_file|
-			puts "  #{saproj_file}" if Environment.default.debug?
-			if(!File.exists?(sa))
-				puts "warning: #{sa} does not exist, skipping build command for #{saproj_file}"
-			else
-				add_quiet("\"#{sa}\" /build #{saproj_file}")
-			end
-		}
-	end
-
-
-
-	def update_wix
-		#puts "Build scanning for wxs <Product> files" if Environment.default.debug?
-		WXS_FILES.each{|wxs_file|
-			if(IO.read(wxs_file).include?('<Product'))
-			  build_commands = Wix.get_build_commands wxs_file
-			  if(!build_commands.nil?)
-				build_commands.each{|c|
-					add_quiet(c)
-				}
-			  end
-			end
-		}
-
-		#puts "Build scanning for wxs <Bundle> files" if Environment.default.debug?
-		WXS_FILES.each{|wxs_file|
-			if(IO.read(wxs_file).include?('<Bundle'))
-			  build_commands = Wix.get_build_commands wxs_file
-			  if(!build_commands.nil?)
-				build_commands.each{|c|
-					add_quiet(c)
-				}
-			  end
-			end
-		}
-	end
-	def update_xcode
-		#puts "Build scanning for xcodeproj folders" if Environment.default.debug?
-	    Dir.glob('**/*.xcodeproj').each{|dir|
-	        puts dir if Environment.default.debug?
-	        build_commands = XCodeBuild.get_build_commands dir
-	        if(!build_commands.nil?)
-	        	build_commands.each{|c|
-	    			build_commands << c
-	    		}
-	    	end
-	     }
-	end
-end
+      build_commands.each do |c|
+        build_commands << c
+      end
+    end
+  end
+end

data/lib/tasks/clean.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-require 'rake/clean'
+require "rake/clean"
 # Clean Files
-CLEAN.include('**/*.{sdf,sud,ncb,cache,user,wixobj,wixpdb,nupkg}')
+CLEAN.include("**/*.{sdf,sud,ncb,cache,user,wixobj,wixpdb,nupkg}")
 
 # Clean Folders
-CLEAN.include('obj') if File.exists?('obj')
-CLEAN.include('tmp') if File.exists?('tmp')
+CLEAN.include("obj") if File.exist?("obj")
+CLEAN.include("tmp") if File.exist?("tmp")

data/lib/tasks/clobber.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-require 'rake/clean'
+require "rake/clean"
 # CLOBBER Files
-CLOBBER.include('**/*.nupkg')
-CLOBBER.include('**/*.gem')
-CLOBBER.include('**/*.msi')
+CLOBBER.include("**/*.nupkg")
+CLOBBER.include("**/*.gem")
+CLOBBER.include("**/*.msi")
 
 # CLOBBER Folders
-CLOBBER.include('bin/**/*')
-CLOBBER.include('bin') if File.exists?('bin')
-CLOBBER.include('**/bin')
-CLOBBER.include('doc') if File.exists?('doc')
-CLOBBER.include('obj') if File.exists?('obj')
-CLOBBER.include('**/obj')
-CLOBBER.include('lib') if File.exists?('lib')
-CLOBBER.include('packages') if File.exists?('packages')
-CLOBBER.include('**/.vs')
+CLOBBER.include("bin/**/*")
+CLOBBER.include("bin") if File.exist?("bin")
+CLOBBER.include("**/bin")
+CLOBBER.include("doc") if File.exist?("doc")
+CLOBBER.include("obj") if File.exist?("obj")
+CLOBBER.include("**/obj")
+CLOBBER.include("lib") if File.exist?("lib")
+CLOBBER.include("packages") if File.exist?("packages")
+CLOBBER.include("**/.vs")
 
-CLOBBER.include('*.gem')
-CLOBBER.include('DTAR_*')
-CLOBBER.include('.vs') if File.exists?('.vs')
+CLOBBER.include("*.gem")
+CLOBBER.include("DTAR_*")
+CLOBBER.include(".vs") if File.exist?(".vs")
 
-desc 'performs clobber commands'
-task :clobber => [:clean] do Tasks.execute_task :clobber;end
+desc "performs clobber commands"
+task clobber: [:clean] do Tasks.execute_task :clobber; end

data/lib/tasks/commit.rb

@@ -1,52 +1,50 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-desc 'commits source files to git or subversion'
-if(File.exists?('git'))
-  task :commit=>[:add] do Tasks.execute_task :commit; end
-else
-  task :commit=>[:add] do Tasks.execute_task :commit;end
+desc "commits source files to git or subversion"
+if File.exist?("git")
 end
+task commit: [:add] do Tasks.execute_task :commit; end
 
 class Commit < Array
-	def update
-		message=""
-		message=IO.read('commit.message').strip if File.exists?('commit.message')
+  def update
+    message = ""
+    message = IO.read("commit.message").strip if File.exist?("commit.message")
 
-		if(File.exists?('.git') && `git config --list`.include?('user.name=') && Git.user_email.length > 0)
-			if(!`git status`.include?('nothing to commit') &&
-			   !`git status`.include?('untracked files present') &&
-			   !`git status`.include?('no changes add to commit'))
-			  if(message.length==0)
-				if(defined?(REQUIRE_COMMIT_MESSAGE))
-					Commit.reset_commit_message
-					raise "commit.message required to perform commit"
-				else
-			  		add_passive "git commit -m'all'"
-			  	end
-			  else
-			    add_quiet "git commit -a -v --file commit.message"
-			    add_quiet "<%Commit.reset_commit_message%>"
-			  end
-		    end 		
-		end
-		if(File.exists?('.svn'))
-			if(message.length==0)
-				if(defined?(REQUIRE_COMMIT_MESSAGE))
-					Commit.reset_commit_message
-					raise "commit.message required to perform commit"
-				else
-					add_quiet 'svn commit -m"commit all"'
-				end
-			else
-				add_quiet 'svn commit --file commit.message'
-				add_quiet "<%Commit.reset_commit_message%>"
-			end
-		end
+    if File.exist?(".git") && `git config --list`.include?("user.name=") && Git.user_email.length.positive? && (!`git status`.include?("nothing to commit") &&
+                                                                                                                !`git status`.include?("untracked files present") &&
+                                                                                                                !`git status`.include?("no changes add to commit"))
+      if message.length.zero?
+        if defined?(REQUIRE_COMMIT_MESSAGE)
+          Commit.reset_commit_message
+          raise "commit.message required to perform commit"
+        else
+          add_passive "git commit -m'all'"
+        end
+      else
+        add_quiet "git commit -a -v --file commit.message"
+        add_quiet "<%Commit.reset_commit_message%>"
+      end
+    end
+    if File.exist?(".svn")
+      if message.length.zero?
+        if defined?(REQUIRE_COMMIT_MESSAGE)
+          Commit.reset_commit_message
+          raise "commit.message required to perform commit"
+        else
+          add_quiet 'svn commit -m"commit all"'
+        end
+      else
+        add_quiet "svn commit --file commit.message"
+        add_quiet "<%Commit.reset_commit_message%>"
+      end
+    end
 
-		log_debug_info("Commit") if defined?(DEBUG)
-	end
+    log_debug_info("Commit") if defined?(DEBUG)
+  end
 
-	def self.reset_commit_message
-		File.open('commit.message','w'){|f|f.write('')}
-	end
-end
+  def self.reset_commit_message
+    File.open("commit.message", "w") { |f| f.write("") }
+  end
+end

data/lib/tasks/default.rb

@@ -1,62 +1,64 @@
-require 'rake'
-require_relative('info.rb')
-require_relative('../base/array.rb')
-require_relative('../base/dir.rb')
-require_relative('../base/environment.rb')
-require_relative('../base/projects.rb')
-require_relative('../base/project.rb')
-require_relative('../base/timer.rb')
+# frozen_string_literal: true
+
+require "rake"
+require_relative("info")
+require_relative("../base/array")
+require_relative("../base/dir")
+require_relative("../base/environment")
+require_relative("../base/projects")
+require_relative("../base/project")
+require_relative("../base/timer")
 
 puts "defining DEFAULT TASK" if Environment.default.debug?
 
-work_up_to_date=false
-if(defined?(DEV))
+work_up_to_date = false
+if defined?(DEV)
   puts "DEFAULT: DEV is defined" if DEV.env.debug?
-  project=DEV.projects.current
+  project = DEV.projects.current
   puts "project is nil" if DEV.env.debug? && project.nil?
-  if(!project.nil?)
-    if(project.work_up_to_date?)
+  unless project.nil?
+    if project.work_up_to_date?
       puts "project work is up to date" if DEV.env.debug?
-      work_up_to_date=true
-    else
-      puts "project work is NOT up to date" if DEV.env.debug?
+      work_up_to_date = true
+    elsif DEV.env.debug?
+      puts "project work is NOT up to date"
     end
   end
 end
 
-if(defined?(NO_DEFAULT_TASK))
+if defined?(NO_DEFAULT_TASK)
   puts "NO_DEFAULT_TASK is defined" if Environment.default.debug?
 else
-  default_tasks=nil
-  default_tasks=DEFAULT_TASKS if defined? DEFAULT_TASKS
-  if(default_tasks.nil?)
-    if(work_up_to_date)
-      default_tasks=[]
-    elsif(File.exists?('.git'))
-      if(defined?(NO_AUTO_COMMIT))
-        default_tasks=[:setup,:build,:test,:package,:publish,:clean]
+  default_tasks = nil
+  default_tasks = DEFAULT_TASKS if defined? DEFAULT_TASKS
+  if default_tasks.nil?
+    if work_up_to_date
+      default_tasks = []
+    elsif File.exist?(".git")
+      if defined?(NO_AUTO_COMMIT)
+        default_tasks = %i[setup build test package publish clean]
       else
-        puts ':add,:commit,:push,:pull tasks are part of :default, to opt-out, define NO_AUTO_COMMIT'
-        default_tasks=[:setup,:build,:test,:add,:commit,:package,:publish,:clean,:push,:pull]
+        puts ":add,:commit,:push,:pull tasks are part of :default, to opt-out, define NO_AUTO_COMMIT"
+        default_tasks = %i[setup build test add commit package publish clean push pull]
       end
-    elsif File.exists?('.svn')
-      default_tasks=[:setup,:build,:test,:add,:commit,:publish,:clean]
+    elsif File.exist?(".svn")
+      default_tasks = %i[setup build test add commit publish clean]
     else
-      default_tasks=[:setup,:build,:test,:package,:publish]
+      default_tasks = %i[setup build test package publish]
     end
   end
 
   puts "default_tasks=#{default_tasks}" if Environment.default.debug?
-  desc "default task #{default_tasks.to_s}"
+  desc "default task #{default_tasks}"
   task :default do
-    default_tasks.each{|task| 
-      Rake::Task[task].invoke 
-    }
-    project.mark_work_up_to_date if !project.nil?
-    puts "[:default] completed in #{TIMER.elapsed_str}" if !Environment.default.colorize?
+    default_tasks.each do |task|
+      Rake::Task[task].invoke
+    end
+    project&.mark_work_up_to_date
+    puts "[:default] completed in #{TIMER.elapsed_str}" unless Environment.default.colorize?
     if Environment.default.colorize?
-      require 'ansi/code'
-      puts ANSI.white + ANSI.bold + ":default"  + " completed in " + ANSI.yellow + "#{TIMER.elapsed_str}" + ANSI.reset
+      require "ansi/code"
+      puts "#{ANSI.white}#{ANSI.bold}:default completed in #{ANSI.yellow}#{TIMER.elapsed_str}#{ANSI.reset}"
     end
   end
-end
+end

data/lib/tasks/doc.rb

@@ -1,10 +1,12 @@
-desc 'performs documentation commands'
-task :doc do Tasks.execute_task :doc;end
+# frozen_string_literal: true
+
+desc "performs documentation commands"
+task :doc do Tasks.execute_task :doc; end
 
 class Doc < Array
-	def update
-		if(Command.exit_code('yard --version'))
-		  add_quiet 'yard doc - LICENSE' if File.exists?('README.md') && File.exists?('LICENSE')
-		end
-	end
-end
+  def update
+    if Command.exit_code("yard --version") && (File.exist?("README.md") && File.exist?("LICENSE"))
+      add_quiet "yard doc - LICENSE"
+    end
+  end
+end

data/lib/tasks/info.rb

@@ -1,9 +1,10 @@
-desc 'displays project info'
+# frozen_string_literal: true
+
+desc "displays project info"
 task :info do
-	Environment.default.info
-	puts ' '
-	#PROJECT.info
-	puts ' '
-	COMMANDS.info
+  Environment.default.info
+  puts " "
+  # PROJECT.info
+  puts " "
+  COMMANDS.info
 end
-