dev 2.1.153 → 2.1.154

data/lib/tasks/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # nunit dlls may be specified with
 # NUNIT=FileList.new('**/*.Test.dll')
@@ -5,117 +7,129 @@
 # for nunit dlls that must be run in x86 mode,
 # NUNIT_x86=FileList.new('**/*.x86.Test.dll')
 #
-desc 'performs test commands'
-task :test => [:build] do Tasks.execute_task :test;end
+desc "performs test commands"
+task test: [:build] do Tasks.execute_task :test; end
 
 class Test < Array
-	def update
-		add_quiet 'rspec --format documentation' if File.exists?('spec')
-
-		if(defined?(NUNIT))
-			NUNIT.each{|nunit_dll|
-				skip = false
-				skip = true if(nunit_dll.include?('/netcoreapp')) 
-				skip = true if(nunit_dll.include?('packages/'))
-				if(!skip)
-					nunit_arg=Test.nunit_console
-					nunit_arg="\"#{Test.nunit_console}\"" if Test.nunit_console.include?(' ')
-					dll_arg=nunit_dll
-					dll_arg="\"#{nunit_dll}\"" if(nunit_dll.include?(' '))
-					if(Test.nunit_console.include?('nunit3'))
-						xml_arg="--result=#{nunit_dll}.TestResults.xml --labels=All"
-						xml_arg="--result=\"#{nunit_dll}.TestResults.xml\" --labels=All" if(nunit_dll.include?(' '))
-					else
-						xml_arg="/xml:#{nunit_dll}.TestResults.xml"
-						xml_arg="/xml:\"#{nunit_dll}.TestResults.xml\"" if(nunit_dll.include?(' '))
-						end
-					add_quiet "#{nunit_arg} #{dll_arg} #{xml_arg}"
-				end
-			}
-		end
-
-		if(defined?(NUNIT_X86))
-			NUNIT_X86.each{|nunit_dll|
-				if(Test.nunit_console_x86.include?('nunit3'))
-				  add_quiet "\"#{Test.nunit_console_x86}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" --result=\"#{nunit_dll}.TestResults.xml\" --labels=All"
-				else
-				  add_quiet "\"#{Test.nunit_console_x86}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
-				end
-			}
-		end
-
-		# dotnet test
-		puts "scanning for **/*.Test.csproj" if Environment.default.debug?
-		Dir.glob('**/*.Test.csproj'){|proj|
-			puts "found #{proj}" if Environment.default.debug?
-			text = IO.read(proj)
-			if(text.include?('netcoreapp'))
-				add_quiet("dotnet test #{proj}")
-			end
-		}
-
-		if(defined?(TESTS))
-			TEST.each{|t| add_quiet t}
-		end
-	end
-
-    def self.nunit3_console_in_path?
-      command=Command.new('nunit3-console')
-      command[:quiet]=true
-      command[:ignore_failure]=true
-      command.execute
-      return true if(command[:exit_code] == 0) 
-      false
+  def update
+    add_quiet "rspec --format documentation" if File.exist?("spec")
+
+    if defined?(NUNIT)
+      NUNIT.each do |nunit_dll|
+        skip = false
+        skip = true if nunit_dll.include?("/netcoreapp")
+        skip = true if nunit_dll.include?("packages/")
+        next if skip
+
+        nunit_arg = Test.nunit_console
+        nunit_arg = "\"#{Test.nunit_console}\"" if Test.nunit_console.include?(" ")
+        dll_arg = nunit_dll
+        dll_arg = "\"#{nunit_dll}\"" if nunit_dll.include?(" ")
+        if Test.nunit_console.include?("nunit3")
+          xml_arg = "--result=#{nunit_dll}.TestResults.xml --labels=All"
+          xml_arg = "--result=\"#{nunit_dll}.TestResults.xml\" --labels=All" if nunit_dll.include?(" ")
+        else
+          xml_arg = "/xml:#{nunit_dll}.TestResults.xml"
+          xml_arg = "/xml:\"#{nunit_dll}.TestResults.xml\"" if nunit_dll.include?(" ")
+        end
+        add_quiet "#{nunit_arg} #{dll_arg} #{xml_arg}"
+      end
+    end
+
+    if defined?(NUNIT_X86)
+      NUNIT_X86.each do |nunit_dll|
+        if Test.nunit_console_x86.include?("nunit3")
+          add_quiet "\"#{Test.nunit_console_x86}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" --result=\"#{nunit_dll}.TestResults.xml\" --labels=All"
+        else
+          add_quiet "\"#{Test.nunit_console_x86}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
+        end
+      end
     end
 
-    def self.nunit_console_in_path?
-      command=Command.new('nunit-console')
-      command[:quiet]=true
-      command[:ignore_failure]=true
-      command.execute
-      return true if(command[:exit_code] == 0) 
-      false
+    # dotnet test
+    puts "scanning for **/*.Test.csproj" if Environment.default.debug?
+    Dir.glob("**/*.Test.csproj") do |proj|
+      puts "found #{proj}" if Environment.default.debug?
+      text = IO.read(proj)
+      add_quiet("dotnet test #{proj}") if text.include?("netcoreapp")
     end
-    @@nunit_console=''
-	def self.nunit_console
-		return "nunit3-console" if Test.nunit3_console_in_path?
-		return "nunit-console" if Test.nunit_console_in_path?
-		if(!File.exists?(@@nunit_console))
-			if(defined?(NUNIT_CONSOLE))
-				@@nunit_console = NUNIT_CONSOLE 
-			end
-			@@nunit_console = "packages/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe" if(!File.exists?(@@nunit_console))
-			@@nunit_console = "packages/NUnit.ConsoleRunner.3.8.0/tools/nunit3-console.exe" if(!File.exists?(@@nunit_console))
-			@@nunit_console = "C:\\Program Files (x86)\\NUnit.org\\nunit-console\\nunit3-console.exe" if(!File.exists?(@@nunit_console))
-			@@nunit_console = "C:\\Program Files (x86)\\NUnit 2.6.4\\bin\\nunit-console.exe" if(!File.exists?(@@nunit_console))
-			@@nunit_console = "C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe" if(!File.exists?(@@nunit_console))
-			if(!File.exists?(@@nunit_console))
-				Dir.glob('**/nunit3-console.exe'){|n| @@nunit_console=n}
-			end
-		end
-		if(!File.exists?(@@nunit_console))
-			raise "unable to locate nunit-console.exe, assign NUNIT_CONSOLE to the correct location."
-		end
-		@@nunit_console
-	end
-
-	@@nunit_console_x86=''
-	def self.nunit_console_x86
-		if(!File.exists?(@@nunit_console_x86))
-			if(defined?(NUNIT_CONSOLE_X86))
-				@@nunit_console_x86 = NUNIT_CONSOLE_X86 
-			end
-			@@nunit_console_x86 = "C:\\Program Files (x86)\\NUnit.org\\nunit-console\\nunit3-console.exe" if(!File.exists?(@@nunit_console_x86))
-			@@nunit_console_x86 = "C:\\Program Files (x86)\\NUnit 2.6.4\\bin\\nunit-console-x86.exe" if(!File.exists?(@@nunit_console_x86))
-			@@nunit_console_x86 = "C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console-x86.exe" if(!File.exists?(@@nunit_console_x86))
-		end
-		if(!File.exists?(@@nunit_console_x86))
-			raise "unable to locate nunit-console-x86.exe, assign NUNIT_CONSOLE_X86 to the correct location."
-		end
-		@@nunit_console_x86
-	end
+
+    TEST.each { |t| add_quiet t } if defined?(TESTS)
+  end
+
+  def self.nunit3_console_in_path?
+    command = Command.new("nunit3-console")
+    command[:quiet] = true
+    command[:ignore_failure] = true
+    command.execute
+    return true if (command[:exit_code]).zero?
+
+    false
+  end
+
+  def self.nunit_console_in_path?
+    command = Command.new("nunit-console")
+    command[:quiet] = true
+    command[:ignore_failure] = true
+    command.execute
+    return true if (command[:exit_code]).zero?
+
+    false
+  end
+  @@nunit_console = ""
+  def self.nunit_console
+    return "nunit3-console" if Test.nunit3_console_in_path?
+    return "nunit-console" if Test.nunit_console_in_path?
+
+    unless File.exist?(@@nunit_console)
+      @@nunit_console = NUNIT_CONSOLE if defined?(NUNIT_CONSOLE)
+      unless File.exist?(@@nunit_console)
+        @@nunit_console = "packages/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe"
+      end
+      unless File.exist?(@@nunit_console)
+        @@nunit_console = "packages/NUnit.ConsoleRunner.3.8.0/tools/nunit3-console.exe"
+      end
+      unless File.exist?(@@nunit_console)
+        @@nunit_console = 'C:\\Program Files (x86)\\NUnit.org\\nunit-console\\nunit3-console.exe'
+      end
+      unless File.exist?(@@nunit_console)
+        @@nunit_console = 'C:\\Program Files (x86)\\NUnit 2.6.4\\bin\\nunit-console.exe'
+      end
+      unless File.exist?(@@nunit_console)
+        @@nunit_console = 'C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe'
+      end
+      Dir.glob("**/nunit3-console.exe") { |n| @@nunit_console = n } unless File.exist?(@@nunit_console)
+    end
+    unless File.exist?(@@nunit_console)
+      raise "unable to locate nunit-console.exe, assign NUNIT_CONSOLE to the correct location."
+    end
+
+    @@nunit_console
+  end
+
+  @@nunit_console_x86 = ""
+  def self.nunit_console_x86
+    unless File.exist?(@@nunit_console_x86)
+      @@nunit_console_x86 = NUNIT_CONSOLE_X86 if defined?(NUNIT_CONSOLE_X86)
+      unless File.exist?(@@nunit_console_x86)
+        @@nunit_console_x86 = 'C:\\Program Files (x86)\\NUnit.org\\nunit-console\\nunit3-console.exe'
+      end
+      unless File.exist?(@@nunit_console_x86)
+        @@nunit_console_x86 = 'C:\\Program Files (x86)\\NUnit 2.6.4\\bin\\nunit-console-x86.exe'
+      end
+      unless File.exist?(@@nunit_console_x86)
+        @@nunit_console_x86 = 'C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console-x86.exe'
+      end
+    end
+    unless File.exist?(@@nunit_console_x86)
+      raise "unable to locate nunit-console-x86.exe, assign NUNIT_CONSOLE_X86 to the correct location."
+    end
+
+    @@nunit_console_x86
+  end
 end
 
-if !defined?(NUNIT)
-	NUNIT=FileList.new('**/bin/**/*.Test.dll','**/bin/**/*.Tests.dll','**/lib/**/*.Test.dll','**/lib/**/*.Tests.dll')
-end
+unless defined?(NUNIT)
+  NUNIT = FileList.new("**/bin/**/*.Test.dll", "**/bin/**/*.Tests.dll", "**/lib/**/*.Test.dll",
+                       "**/lib/**/*.Tests.dll")
+end

data/lib/tasks/update.rb

@@ -1,15 +1,17 @@
-desc 'performs svn update'
+# frozen_string_literal: true
+
+desc "performs svn update"
 task :update do Tasks.execute_task :update; end
 
 class Update < Array
-	def update
-		add_quiet 'svn update' if File.exists?('.svn') && Internet.available?
+  def update
+    add_quiet "svn update" if File.exist?(".svn") && Internet.available?
 
-		#if(Dir.glob('**/packages.config').length > 0)
-			Dir.glob('*.sln').each{|sln_file|
-			    #add_quiet "nuget restore #{sln_file}"
-				add_quiet "nuget update #{sln_file}"
-			}
-		#end
-	end
-end
+    # if(Dir.glob('**/packages.config').length > 0)
+    Dir.glob("*.sln").each do |sln_file|
+      # add_quiet "nuget restore #{sln_file}"
+      add_quiet "nuget update #{sln_file}"
+    end
+    # end
+  end
+end

data/lib/tasks.rb

@@ -1,49 +1,45 @@
+# frozen_string_literal: true
+
 class Tasks
-	attr_accessor :env
-	@@default=nil
+  attr_accessor :env
 
-	def initialize env=nil
-		@@default=self
-		@env=env
-		@env=Environment.new if @env.nil?
-	end
+  @@default = nil
 
-    def execute value
-	  if(value.respond_to?(:execute))
-	    value.update if value.respond_to?(:update)
-	    value.execute
-	  else
-	    if(value.is_a?(String))
-	      puts `#{value}`
-	    else
-	      if(value.is_a?(Array))
-	        value.each{|e| execute(e)}
-	      end
-	    end
-	    end
-	end
+  def initialize(env = nil)
+    @@default = self
+    @env = env
+    @env = Environment.new if @env.nil?
+  end
 
-	def execute_task task
-		if(defined?(COMMANDS))
-			if(COMMANDS.has_key?(task))
-				puts DELIMITER if defined?(DEBUG)
-				puts ":#{task}" if !@env.colorize?
-				if @env.colorize?
-					require 'ansi/code'
-				   puts  ANSI.white + ANSI.bold + ":#{task}" + ANSI.reset if @env.colorize?
-			    end
-		  		execute(COMMANDS[task])
-		    end
-		end
-	end
+  def execute(value)
+    if value.respond_to?(:execute)
+      value.update if value.respond_to?(:update)
+      value.execute
+    elsif value.is_a?(String)
+      puts `#{value}`
+    elsif value.is_a?(Array)
+      value.each { |e| execute(e) }
+    end
+  end
 
-	def self.execute_task task
-		@@default=Tasks.new if @@default.nil?
-		@@default.execute_task task
-	end
-end
+  def execute_task(task)
+    if defined?(COMMANDS) && COMMANDS.key?(task)
+      puts DELIMITER if defined?(DEBUG)
+      puts ":#{task}" unless @env.colorize?
+      if @env.colorize?
+        require "ansi/code"
+        puts ANSI.white + ANSI.bold + ":#{task}" + ANSI.reset if @env.colorize?
+      end
+      execute(COMMANDS[task])
+    end
+  end
 
-['add','analyze','build','clobber','commit',
- 'doc','info','package','publish','pull','push','setup','test',
- 'update'].each{|name| require_relative("tasks/#{name}.rb")}
+  def self.execute_task(task)
+    @@default = Tasks.new if @@default.nil?
+    @@default.execute_task task
+  end
+end
 
+%w[add analyze build clobber commit
+   doc info package publish pull push setup test
+   update].each { |name| require_relative("tasks/#{name}.rb") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.1.153
+  version: 2.1.154
 platform: ruby
 authors:
 - Lou Parslow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -46,13 +46,11 @@ dependencies:
         version: '3.0'
 description: development tasks
 email: lou.parslow@gmail.com
-executables:
-- dev
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- bin/dev
 - lib/apps.rb
 - lib/apps/git.rb
 - lib/apps/msbuild.rb
@@ -105,7 +103,7 @@ homepage: http://rubygems.org/gems/dev
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,8 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: dev
 test_files: []

data/bin/dev

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