raykit 0.0.504 → 0.0.505

data/lib/raykit/tasks.rb

@@ -1,99 +1,99 @@
-# frozen_string_literal: true
-
-desc "Display project information"
-task :info do
-  PROJECT.info
-end
-
-desc "integrate changes into the git repository"
-task :integrate do
-  puts Rainbow(": integrate").blue.bright
-
-  if PROJECT.read_only?
-    puts "  read only state, skipping integrate operations"
-  else
-    git_dir = Raykit::Git::Directory.new(Rake.application.original_dir)
-    if git_dir.detached?
-      puts "  detached head state, skipping integrate operations"
-    else
-      if PROJECT.outstanding_commit?
-        Rake::Task["test"].invoke if Rake::Task.task_defined?("test")
-      else
-        puts "  no outstanding commits detected"
-      end
-
-      if !File.exist?(".gitignore")
-        puts "warning: .gitignore does not exist."
-      else
-        PROJECT.run("git add --all")
-        unless `git status`.include?("nothing to commit")
-          commit_message = "integrate"
-          PROJECT.run("git commit -m\"#{commit_message}\"") if PROJECT.outstanding_commit?
-        end
-        PROJECT.run("git pull", false)
-      end
-    end
-  end
-end
-
-desc "push changes including tags"
-task :push do
-  puts Rainbow(": push").blue.bright
-  git_dir = Raykit::Git::Directory.new(Rake.application.original_dir)
-  if git_dir.detached?
-    puts "detached head state, skipping push operations"
-  else
-    PROJECT.run("git push") if (!PROJECT.read_only?)
-    PROJECT.run("git push --tags") if (!PROJECT.read_only?)
-  end
-end
-
-desc "clean files not tracked by git"
-task :clean do
-  puts Rainbow(": clean").blue.bright
-  PROJECT.run("git clean -dXf", false)
-end
-
-desc "tag the git repository at the current version"
-task :tag do
-  puts Rainbow(": tag").blue.bright
-  if PROJECT.read_only?
-    puts "  read only state, skipping tag operation"
-  else
-    if (GIT_DIRECTORY.has_tag "v#{PROJECT.version}")
-      puts "  tag #{PROJECT.latest_tag} already exists."
-    else
-      GIT_DIRECTORY.tag_version PROJECT.version
-      try "git push --tags"
-    end
-    #if (PROJECT.latest_tag != "v#{PROJECT.version}")
-    #  GIT_DIRECTORY.tag_version PROJECT.version
-    #if (PROJECT.version != PROJECT.latest_tag)
-    #try "git tag -a #{PROJECT.version} -m\"version #{PROJECT.version}\""
-    #  try "git push --tags"
-    #else
-    #  puts "  tag #{PROJECT.latest_tag} already exists."
-    #end
-  end
-end
-
-desc "update_source from sourceImports.json"
-task :update_source do
-  if File.exist?("sourceImports.json")
-    puts Rainbow(":update_source").blue.bright
-    sourceImports = Raykit::SourceImports.load("sourceImports.json")
-    json = sourceImports.to_json
-    sourceImports.update
-
-    json2 = sourceImports.to_json
-    if json2 != json || !sourceImports.targets_exist?
-      sourceImports.save("sourceImports.json")
-      sourceImports.copy
-    else
-      puts "        no update required."
-    end
-  end
-end
-
-desc "update source files"
-task update: [:update_source]
+# frozen_string_literal: true
+
+desc "Display project information"
+task :info do
+  PROJECT.info
+end
+
+desc "integrate changes into the git repository"
+task :integrate do
+  puts Rainbow(": integrate").blue.bright
+
+  if PROJECT.read_only?
+    puts "  read only state, skipping integrate operations"
+  else
+    git_dir = Raykit::Git::Directory.new(Rake.application.original_dir)
+    if git_dir.detached?
+      puts "  detached head state, skipping integrate operations"
+    else
+      if PROJECT.outstanding_commit?
+        Rake::Task["test"].invoke if Rake::Task.task_defined?("test")
+      else
+        puts "  no outstanding commits detected"
+      end
+
+      if !File.exist?(".gitignore")
+        puts "warning: .gitignore does not exist."
+      else
+        PROJECT.run("git add --all")
+        unless `git status`.include?("nothing to commit")
+          commit_message = "integrate"
+          PROJECT.run("git commit -m\"#{commit_message}\"") if PROJECT.outstanding_commit?
+        end
+        PROJECT.run("git pull", false)
+      end
+    end
+  end
+end
+
+desc "push changes including tags"
+task :push do
+  puts Rainbow(": push").blue.bright
+  git_dir = Raykit::Git::Directory.new(Rake.application.original_dir)
+  if git_dir.detached?
+    puts "detached head state, skipping push operations"
+  else
+    PROJECT.run("git push") if (!PROJECT.read_only?)
+    PROJECT.run("git push --tags") if (!PROJECT.read_only?)
+  end
+end
+
+desc "clean files not tracked by git"
+task :clean do
+  puts Rainbow(": clean").blue.bright
+  PROJECT.run("git clean -dXf", false)
+end
+
+desc "tag the git repository at the current version"
+task :tag do
+  puts Rainbow(": tag").blue.bright
+  if PROJECT.read_only?
+    puts "  read only state, skipping tag operation"
+  else
+    if (GIT_DIRECTORY.has_tag "v#{PROJECT.version}")
+      puts "  tag #{PROJECT.latest_tag} already exists."
+    else
+      GIT_DIRECTORY.tag_version PROJECT.version
+      try "git push --tags"
+    end
+    #if (PROJECT.latest_tag != "v#{PROJECT.version}")
+    #  GIT_DIRECTORY.tag_version PROJECT.version
+    #if (PROJECT.version != PROJECT.latest_tag)
+    #try "git tag -a #{PROJECT.version} -m\"version #{PROJECT.version}\""
+    #  try "git push --tags"
+    #else
+    #  puts "  tag #{PROJECT.latest_tag} already exists."
+    #end
+  end
+end
+
+desc "update_source from sourceImports.json"
+task :update_source do
+  if File.exist?("sourceImports.json")
+    puts Rainbow(":update_source").blue.bright
+    sourceImports = Raykit::SourceImports.load("sourceImports.json")
+    json = sourceImports.to_json
+    sourceImports.update
+
+    json2 = sourceImports.to_json
+    if json2 != json || !sourceImports.targets_exist?
+      sourceImports.save("sourceImports.json")
+      sourceImports.copy
+    else
+      puts "        no update required."
+    end
+  end
+end
+
+desc "update source files"
+task update: [:update_source]

data/lib/raykit/text.rb

@@ -1,32 +1,32 @@
-# frozen_string_literal: true
-
-module Raykit
-  class Text
-    def self.replace_in_glob(glob, search, replace)
-      Dir.glob(glob).each { |f| replace_in_file(f, search, replace) }
-    end
-
-    def self.replace_in_file(filename, search, replace)
-      text1 = IO.read(filename)
-      text2 = text1.gsub(search) { |_str| str = replace }
-      unless text1 == text2
-        File.open(filename, "w") { |f| f.puts text2 }
-        return true
-      end
-      false
-    end
-
-    def self.copy_if_different(source, destination)
-      if !File.exist?(destination)
-        FileUtils.cp source, destination
-      else
-        source_text = IO.read(source)
-        destination_text = IO.read(destination)
-        if source_text != destination_text
-          FileUtils.rm destination
-          FileUtils.cp source, destination
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Raykit
+  class Text
+    def self.replace_in_glob(glob, search, replace)
+      Dir.glob(glob).each { |f| replace_in_file(f, search, replace) }
+    end
+
+    def self.replace_in_file(filename, search, replace)
+      text1 = IO.read(filename)
+      text2 = text1.gsub(search) { |_str| str = replace }
+      unless text1 == text2
+        File.open(filename, "w") { |f| f.puts text2 }
+        return true
+      end
+      false
+    end
+
+    def self.copy_if_different(source, destination)
+      if !File.exist?(destination)
+        FileUtils.cp source, destination
+      else
+        source_text = IO.read(source)
+        destination_text = IO.read(destination)
+        if source_text != destination_text
+          FileUtils.rm destination
+          FileUtils.cp source, destination
+        end
+      end
+    end
+  end
+end

data/lib/raykit/timer.rb

@@ -1,31 +1,31 @@
-# frozen_string_literal: true
-
-require "time"
-
-module Raykit
-  # Provides functionality to record the time execution times
-  class Timer
-    # The time at which start occurred
-    attr_accessor :start_time
-
-    def initialize
-      @start_time = Time.now
-    end
-
-    # The elapsed time, in seconds, since the timer started
-    def elapsed
-      Time.now - @start_time
-    end
-
-    # The elapsed time, in seconds, as a formatted string
-    def elapsed_str(pad = 0)
-      Timer.get_elapsed_str(elapsed, pad)
-    end
-
-    # Converts a time span in seconds to a formatted string
-    def self.get_elapsed_str(elapsed, pad = 0)
-      # "[" + "%.0f" % (elapsed) + "s]".ljust(pad)
-      format("%.0f", elapsed) + "s".ljust(pad)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "time"
+
+module Raykit
+  # Provides functionality to record the time execution times
+  class Timer
+    # The time at which start occurred
+    attr_accessor :start_time
+
+    def initialize
+      @start_time = Time.now
+    end
+
+    # The elapsed time, in seconds, since the timer started
+    def elapsed
+      Time.now - @start_time
+    end
+
+    # The elapsed time, in seconds, as a formatted string
+    def elapsed_str(pad = 0)
+      Timer.get_elapsed_str(elapsed, pad)
+    end
+
+    # Converts a time span in seconds to a formatted string
+    def self.get_elapsed_str(elapsed, pad = 0)
+      # "[" + "%.0f" % (elapsed) + "s]".ljust(pad)
+      format("%.0f", elapsed) + "s".ljust(pad)
+    end
+  end
+end

data/lib/raykit/version.rb

@@ -1,103 +1,89 @@
-# 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
-
-    # 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.positive?
-
-      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.positive?
-
-      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
-
-    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 "dete in #{filename}"
-        else
-          puts "no version detected in #{filename}, regex #{regex.source}"
-        end
-      end
-      version
-    end
-
-    def self.set_version_in_glob(glob_pattern, version)
-      Dir.glob(glob_pattern).each { |f|
-        Raykit::Version::set_version_in_file(f, version)
-      }
-    end
-
-    def self.set_version_in_file(filename, version)
-      text = IO.read(filename)
-      new_text = text
-      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}<") if filename.include?(".nuspec")
-      new_text = text.gsub(/Version="([\d\.]+)"/, "Version=\"#{version}\"") if filename.include?(".wxs")
-      # 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
-
-    # 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)
-      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
+# 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
+
+    # detect a version number based on the NAME variable, if defined
+    def self.detect(name)
+      version = detect_from_file("#{name}/#{name}.csproj", /<Version>([-\w\d.]+)</)
+      return version if version.length.positive?
+
+      version = detect_from_file("#{name}/Properties/AssemblyInfo.cs", /^\[assembly: AssemblyVersion\("([.\w]+)/)
+      return version if version.length.positive?
+
+      version = detect_from_file("#{name}.gemspec", /version\s+=\s+['"]([\w.]+)['"]/)
+      return version if version.length.positive?
+
+      version = detect_from_file("#{name}.gemspec", /version\s?=\s?['|"]([.\d]+)['|"]/)
+      return version if version.length.positive?
+
+      version = detect_from_file("#{name}.nuspec", /<[Vv]ersion>([\d.]+)</)
+      return version if version.length.positive?
+      ""
+    end
+
+    def self.detect_from_file(filename, regex)
+      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
+      version
+    end
+
+    def self.set_version_in_glob(glob_pattern, version)
+      Dir.glob(glob_pattern).each { |f|
+        Raykit::Version::set_version_in_file(f, version)
+      }
+    end
+
+    def self.set_version_in_file(filename, version)
+      text = IO.read(filename)
+      new_text = text
+      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}<") if filename.include?(".nuspec")
+      new_text = text.gsub(/Version="([\d\.]+)"/, "Version=\"#{version}\"") if filename.include?(".wxs")
+      # 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
+
+    # 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)
+      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]+)['|"]/)
+      end
+      old_version = detect_from_file(filename, /<Version>([-\w\d.]+)</) 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

data/lib/raykit/vstest.rb

@@ -1,24 +1,24 @@
-# frozen_string_literal: true
-
-module Raykit
-  class VsTest
-    def self.vstest_path
-      ["2022/Community/Common7/IDE/CommonExtensions/Microsoft/TestWindow",
-       "2022/Professional/Common7/IDE/CommonExtensions/Microsoft/TestWindow",
-       "2022/Enterprise/Common7/IDE/CommonExtensions/Microsoft/TestWindow",
-       "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
+# frozen_string_literal: true
+
+module Raykit
+  class VsTest
+    def self.vstest_path
+      ["2022/Community/Common7/IDE/CommonExtensions/Microsoft/TestWindow",
+       "2022/Professional/Common7/IDE/CommonExtensions/Microsoft/TestWindow",
+       "2022/Enterprise/Common7/IDE/CommonExtensions/Microsoft/TestWindow",
+       "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/wt.rb

@@ -1,28 +1,28 @@
-module Raykit
-  class Wt
-    def self.open(names)
-      if names.is_a? String
-        cmd = Raykit::Command.new("wt --maximized #{get_tab_arg(names)}").run
-      end
-      if names.is_a?(Array)
-        cmd = "wt --maximized "
-        index = 0
-        names.each { |url|
-          if index <= 0
-            cmd += get_tab_arg(url)
-          else
-            cmd += ";new-tab " + get_tab_arg(url)
-          end
-          index = index + 1
-        }
-        Raykit::Command.new(cmd).run
-      end
-    end
-
-    def self.get_tab_arg(url)
-      dir = Raykit::Git::Repository.new(url).get_dev_dir("work")
-      name = File.basename(dir)
-      "-d #{dir} --title #{name}"
-    end
-  end
-end
+module Raykit
+  class Wt
+    def self.open(names)
+      if names.is_a? String
+        cmd = Raykit::Command.new("wt --maximized #{get_tab_arg(names)}").run
+      end
+      if names.is_a?(Array)
+        cmd = "wt --maximized "
+        index = 0
+        names.each { |url|
+          if index <= 0
+            cmd += get_tab_arg(url)
+          else
+            cmd += ";new-tab " + get_tab_arg(url)
+          end
+          index = index + 1
+        }
+        Raykit::Command.new(cmd).run
+      end
+    end
+
+    def self.get_tab_arg(url)
+      dir = Raykit::Git::Repository.new(url).get_dev_dir("work")
+      name = File.basename(dir)
+      "-d #{dir} --title #{name}"
+    end
+  end
+end