raykit 0.0.304 → 0.0.305

data/lib/raykit/version.rb

@@ -1,101 +1,94 @@
-#warn "[DEPRECATION] Raykit::VersionHelper is deprecated. Use bump gem for better transparency."
+# frozen_string_literal: true
+
+# warn "[DEPRECATION] Raykit::VersionHelper is deprecated. Use bump gem for better transparency."
 
 module Raykit
-    # Version functionality
-    class Version
-        attr_accessor :start_time
+  # Version functionality
+  class Version
+    attr_accessor :start_time
 
-        # detect a version number based on the NAME variable, if defined
-        def self.detect(name,verbose=false)
-            version=detect_from_file("#{name}/#{name}.csproj",/<Version>([-\w\d\.]+)</,verbose)
-            return version if(version.length>0)
+    # detect a version number based on the NAME variable, if defined
+    def self.detect(name, verbose = false)
+      version = detect_from_file("#{name}/#{name}.csproj", /<Version>([-\w\d.]+)</, verbose)
+      return version if version.length.positive?
 
-            version=detect_from_file("#{name}/Properties/AssemblyInfo.cs",/^\[assembly: AssemblyVersion\(\"([.\w]+)/,verbose)
-            return version if(version.length>0)
+      version = detect_from_file("#{name}/Properties/AssemblyInfo.cs", /^\[assembly: AssemblyVersion\("([.\w]+)/,
+                                 verbose)
+      return version if version.length.positive?
 
-            version=detect_from_file("#{name}.gemspec",/version[\s]+=[\s]+['"]([\w.]+)['"]/,verbose)
-            return version if(version.length>0)
+      version = detect_from_file("#{name}.gemspec", /version\s+=\s+['"]([\w.]+)['"]/, verbose)
+      return version if version.length.positive?
 
-            version=detect_from_file("#{name}.gemspec",/version\s?=\s?['|"]([.\d]+)['|"]/,verbose)
-            return version if(version.length>0)
+      version = detect_from_file("#{name}.gemspec", /version\s?=\s?['|"]([.\d]+)['|"]/, verbose)
+      return version if version.length.positive?
 
-            version=detect_from_file("#{name}.nuspec",/<[Vv]ersion>([\d.]+)</,verbose)
-            return version if(version.length>0)
+      version = detect_from_file("#{name}.nuspec", /<[Vv]ersion>([\d.]+)</, verbose)
+      return version if version.length.positive?
 
-            if(verbose)
-                warning="\u26A0"
-                symbol=Rainbow(warning.encode('utf-8')).yellow
-                puts symbol + ' version not detected'
-            end
-            ''
-        end
+      if verbose
+        warning = "\u26A0"
+        symbol = Rainbow(warning.encode("utf-8")).yellow
+        puts "#{symbol} version not detected"
+      end
+      ""
+    end
 
-        def self.detect_from_file(filename,regex,verbose)
-            version=''
-            if(File.exists?(filename))
-                match = IO.read(filename).match(regex)
-                if(!match.nil? && match.captures.length>0)
-                    version = match.captures[0]
-                end
-            else
-                return ''
-            end
-            if(verbose)
-                if(version.length > 0)
-                    puts "version detected in #{filename}"
-                else
-                    puts "no version detected in #{filename}, regex #{regex.source}"
-                end
-            end
-            version
+    def self.detect_from_file(filename, regex, verbose)
+      version = ""
+      if File.exist?(filename)
+        match = IO.read(filename).match(regex)
+        version = match.captures[0] if !match.nil? && match.captures.length.positive?
+      else
+        return ""
+      end
+      if verbose
+        if version.length.positive?
+          puts "version detected in #{filename}"
+        else
+          puts "no version detected in #{filename}, regex #{regex.source}"
         end
+      end
+      version
+    end
 
-        def self.set_version_in_file(filename,version)
-            text=IO.read(filename)
-            if(filename.include?('.gemspec'))
-                new_text=text.gsub(/version\s?=\s?['|"]([.\d]+)['|"]/,"version='#{version}'")
-            end
-            if(filename.include?('.csproj'))
-                new_text=text.gsub(/<Version>([-\w\d.]+)</,"<Version>#{version}<")
-            end
-            #new_text=text.gsub(/<Version>([-\w\d.]+)</,"<Version>#{version}<")
-            #new_text=new_text.gsub(/version[\s]+=\s?['|"]([.\d]+)['|"]/,"version='#{version}'")
-            #new_text=new_text.gsub(/Version="([.\d]+)"/,"Version=\"#{version}\"")
-            File.open(filename,'w'){|f|f.write(new_text)} if(new_text!=text)
-        end
+    def self.set_version_in_file(filename, version)
+      text = IO.read(filename)
+      new_text = text.gsub(/version\s?=\s?['|"]([.\d]+)['|"]/, "version='#{version}'") if filename.include?(".gemspec")
+      new_text = text.gsub(/<Version>([-\w\d.]+)</, "<Version>#{version}<") if filename.include?(".csproj")
+      # new_text=text.gsub(/<Version>([-\w\d.]+)</,"<Version>#{version}<")
+      # new_text=new_text.gsub(/version[\s]+=\s?['|"]([.\d]+)['|"]/,"version='#{version}'")
+      # new_text=new_text.gsub(/Version="([.\d]+)"/,"Version=\"#{version}\"")
+      File.open(filename, "w") { |f| f.write(new_text) } if new_text != text
+    end
 
-        def self.sync_file_versions(source_filename,destination_filename)
-            version = Version.detect_from_file(source_filename,/<Version>([-\w\d.]+)</,false)
-            Version.set_version_in_file(destination_filename,version)
-        end
+    def self.sync_file_versions(source_filename, destination_filename)
+      version = Version.detect_from_file(source_filename, /<Version>([-\w\d.]+)</, false)
+      Version.set_version_in_file(destination_filename, version)
+    end
 
-        # increment to last digit of a version string
-        def self.bump(version)
-            # major.minor[.build[.revision]]  (example: 1.2.12.102)
-            version_ints = version.split('.').map{|s| s.to_i}
-            version_ints[-1] = version_ints.last + 1;
-            version_ints.map{|i| i.to_s}.join('.')
-        end
+    # increment to last digit of a version string
+    def self.bump(version)
+      # major.minor[.build[.revision]]  (example: 1.2.12.102)
+      version_ints = version.split(".").map(&:to_i)
+      version_ints[-1] = version_ints.last + 1
+      version_ints.map(&:to_s).join(".")
+    end
 
-        def self.bump_file(filename)
-            if(!File.exist?(filename))
-                warn "Raykit::Version.bump_file filename '#{filename}' does not exist."
-            end
-
-            old_version=''
-            if(filename.include?('.gemspec'))
-                old_version=detect_from_file(filename,/version\s?=\s?['|"]([.\d]+)['|"]/,false)
-            end
-            if(filename.include?('.csproj'))
-                old_version=detect_from_file(filename,/<Version>([-\w\d.]+)</,false)
-            end
-
-            if(old_version.length > 0)
-                new_version = bump(old_version)
-                set_version_in_file(filename,new_version)
-            end
-
-            new_version
-        end
+    def self.bump_file(filename)
+      warn "Raykit::Version.bump_file filename '#{filename}' does not exist." unless File.exist?(filename)
+
+      old_version = ""
+      if filename.include?(".gemspec")
+        old_version = detect_from_file(filename, /version\s?=\s?['|"]([.\d]+)['|"]/, false)
+      end
+      old_version = detect_from_file(filename, /<Version>([-\w\d.]+)</, false) if filename.include?(".csproj")
+
+      if old_version.length.positive?
+        new_version = bump(old_version)
+        set_version_in_file(filename, new_version)
+      end
+
+      new_version
     end
-end
+  end
+end

data/lib/raykit/vstest.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module Raykit
-    class VsTest
-        def self.vstest_path
-            ['2019/Community/Common7/IDE/CommonExtensions/Microsoft',
-             '2019/Professional/Common7/IDE/Extensions/TestPlatform',
-             '2019/Community/Common7/IDE/Extensions',
-             '2019/Community/Common7/IDE/Extensions/TestPlatform',
-             '2022/Preview/Common7/IDE/Extensions/TestPlatform'].each{|relative_path|
-                ['C:/Program Files (x86)/Microsoft Visual Studio/',
-                'C:/Program Files/Microsoft Visual Studio/'].each{|root_path|
-                    path = root_path + relative_path
-                    exe_path = path + '/vstest.console.exe'
-                    return path if(Dir.exists?(path)) && File.exist?(exe_path)
-                }  
-            }
-            return "vstest_path not found"
+  class VsTest
+    def self.vstest_path
+      ["2019/Community/Common7/IDE/CommonExtensions/Microsoft",
+       "2019/Professional/Common7/IDE/Extensions/TestPlatform",
+       "2019/Community/Common7/IDE/Extensions",
+       "2019/Community/Common7/IDE/Extensions/TestPlatform",
+       "2022/Preview/Common7/IDE/Extensions/TestPlatform"].each do |relative_path|
+        ["C:/Program Files (x86)/Microsoft Visual Studio/",
+         "C:/Program Files/Microsoft Visual Studio/"].each do |root_path|
+          path = root_path + relative_path
+          exe_path = "#{path}/vstest.console.exe"
+          return path if Dir.exist?(path) && File.exist?(exe_path)
         end
+      end
+      "vstest_path not found"
     end
+  end
 end

data/lib/raykit/zip.rb

@@ -1,46 +1,44 @@
+# frozen_string_literal: true
 
 module Raykit
-    class Zip
-        @filename
-        @source_dir
-        @include_globs
-        @exclude_globs
-
-        def initialize(filename)
-            @filename = filename
-            @source_dir = Dir.pwd
-            @include_globs=Array::new
-            @exclude_globs=Array::new
-            self
-        end
-
-        def source_dir(dir)
-            @source_dir=dir
-            self
-        end
+  class Zip
+    @filename
+    @source_dir
+    @include_globs
+    @exclude_globs
+
+    def initialize(filename)
+      @filename = filename
+      @source_dir = Dir.pwd
+      @include_globs = []
+      @exclude_globs = []
+      self
+    end
 
-        def include_glob(glob)
-            @include_globs << glob
-            self
-        end
+    def source_dir(dir)
+      @source_dir = dir
+      self
+    end
 
-        def exclude_glob(glob)
-            @exclude_globs << glob
-            self
-        end
+    def include_glob(glob)
+      @include_globs << glob
+      self
+    end
 
-        def zip
-            path = File.dirname(@filename)
-            if !Dir.exists?(path)
-                FileUtils.mkdir_p(path)
-            end
+    def exclude_glob(glob)
+      @exclude_globs << glob
+      self
+    end
 
-            Dir.chdir(@source_dir) do
-                include_files=Array::new
-                @include_globs.each{|include_glob|
+    def zip
+      path = File.dirname(@filename)
+      FileUtils.mkdir_p(path) unless Dir.exist?(path)
 
-                }
-            end
+      Dir.chdir(@source_dir) do
+        include_files = []
+        @include_globs.each do |include_glob|
         end
+      end
     end
-end
+  end
+end

data/lib/raykit.rb

@@ -1,17 +1,17 @@
-require 'rainbow'
-require 'rake/clean'
-require 'open3'
-require 'rake/testtask'
-require 'digest'
+# frozen_string_literal: true
 
-lib_dir=File.dirname(__FILE__)
-Dir.glob(lib_dir + '/raykit/**/*.rb') {|file| require file}
+require "rainbow"
+require "rake/clean"
+require "open3"
+require "rake/testtask"
+require "digest"
 
-PROJECT=Raykit::Project.new
-SECRETS=Raykit::Secrets.new
-#TIMER=Raykit::Timer.new
+lib_dir = File.dirname(__FILE__)
+Dir.glob("#{lib_dir}/raykit/**/*.rb").sort.each { |file| require file }
 
-REPOSITORIES = Raykit::Git::Repositories.new(Raykit::Environment::get_dev_dir('log') + "/Raykit.Git.Repositories.json")
-if(Dir.exist?('.git'))
-    GIT_DIRECTORY=Raykit::Git::Directory.new(Rake.application.original_dir)
-end
+PROJECT = Raykit::Project.new
+SECRETS = Raykit::Secrets.new
+# TIMER=Raykit::Timer.new
+
+REPOSITORIES = Raykit::Git::Repositories.new("#{Raykit::Environment.get_dev_dir("log")}/Raykit.Git.Repositories.json")
+GIT_DIRECTORY = Raykit::Git::Directory.new(Rake.application.original_dir) if Dir.exist?(".git")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.304
+  version: 0.0.305
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '0.9'
 description: supports common ci/cd development tasks
 email: lou.parslow@gmail.com
 executables: