raykit 0.0.527 → 0.0.530

data/lib/raykit/version.rb

@@ -1,95 +1,95 @@
-# 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("Cargo.toml", /version\s+=\s+['"]([\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\s+=\s+['"]([\w.]+)['"]/, "version=\"#{version}\"") if filename.include?(".toml")
-
-      # 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
+# 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("Cargo.toml", /version\s+=\s+['"]([\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\s+=\s+['"]([\w.]+)['"]/, "version=\"#{version}\"") if filename.include?(".toml")
+
+      # 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/wix.rb

@@ -1,61 +1,61 @@
-# frozen_string_literal: true
-
-module Raykit
-  class Wix
-    def self.harvest_directory_elements(directory)
-      get_nested_directory_element("", directory)
-    end
-    def self.get_nested_directory_element(id_prefix, directory)
-      Dir.chdir(directory) do
-        results = Array::new
-        Dir.glob("*").reject { |f| !File.directory? f }.each { |d|
-          directoryId = "#{d.upcase.gsub("/", "_").gsub("-", "_")}DIR"
-          directoryId = "#{id_prefix}#{directoryId}"
-          child_elements = get_nested_directory_element("#{directoryId[0...-3]}_", d)
-          if (child_elements.length > 0)
-            results.push("<Directory Id=\"#{directoryId}\" Name=\"#{d}\">")
-            child_elements.each { |child_element|
-              results.push("\t#{child_element}")
-            }
-            results.push("</Directory>")
-          else
-            results.push("<Directory Id=\"#{directoryId}\" Name=\"#{d}\"/>")
-          end
-        }
-        results
-      end
-    end
-    # given a directory, return an array of string the represent wix components for each file in the directory
-    # each string should look like this:
-    # <Component Id="IndexHtmlComponent" Directory="WWWDIR" Guid="*">
-    #	<File Id="IndexHtmlFile" Source="path\to\index.html" KeyPath="yes"/>
-    # </Component>
-    def self.harvest_file_components(directory)
-      components = Array::new
-      Dir.chdir(directory) do
-        index = 0
-        Dir.glob("**/*").reject { |f| File.directory? f }.each { |f|
-          index += 1
-          component = get_indexed_file_component(f, index)
-          components.push(component)
-        }
-        components
-      end
-    end
-    # given a file and an index, return a string that represents a wix component
-    def self.get_indexed_file_component(file, index)
-      componentId = "c#{index}"
-      guid = SecureRandom.uuid
-      fileId = "f#{index}"
-      directory = File.dirname(file)
-      directory = directory.split(/[\/\\]/).last if File.dirname(file).include?("\\") || File.dirname(file).include?("/")
-      directory = "" if directory == "."
-      directoryId = "#{File.dirname(file).upcase.gsub("/", "_").gsub("-", "_")}DIR"
-      component = "<Component Id=\"#{componentId}\" Guid=\"#{guid}\"><File Id=\"#{fileId}\" Source=\"#{file}\" /></Component>"
-      if (directory.length > 0)
-        component = "<Component Id=\"#{componentId}\" Guid=\"#{guid}\" Directory=\"#{directoryId}\"><File Id=\"#{fileId}\" Source=\"#{file}\" /></Component>"
-      end
-      component
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Raykit
+  class Wix
+    def self.harvest_directory_elements(directory)
+      get_nested_directory_element("", directory)
+    end
+    def self.get_nested_directory_element(id_prefix, directory)
+      Dir.chdir(directory) do
+        results = Array::new
+        Dir.glob("*").reject { |f| !File.directory? f }.each { |d|
+          directoryId = "#{d.upcase.gsub("/", "_").gsub("-", "_")}DIR"
+          directoryId = "#{id_prefix}#{directoryId}"
+          child_elements = get_nested_directory_element("#{directoryId[0...-3]}_", d)
+          if (child_elements.length > 0)
+            results.push("<Directory Id=\"#{directoryId}\" Name=\"#{d}\">")
+            child_elements.each { |child_element|
+              results.push("\t#{child_element}")
+            }
+            results.push("</Directory>")
+          else
+            results.push("<Directory Id=\"#{directoryId}\" Name=\"#{d}\"/>")
+          end
+        }
+        results
+      end
+    end
+    # given a directory, return an array of string the represent wix components for each file in the directory
+    # each string should look like this:
+    # <Component Id="IndexHtmlComponent" Directory="WWWDIR" Guid="*">
+    #	<File Id="IndexHtmlFile" Source="path\to\index.html" KeyPath="yes"/>
+    # </Component>
+    def self.harvest_file_components(directory)
+      components = Array::new
+      Dir.chdir(directory) do
+        index = 0
+        Dir.glob("**/*").reject { |f| File.directory? f }.each { |f|
+          index += 1
+          component = get_indexed_file_component(f, index)
+          components.push(component)
+        }
+        components
+      end
+    end
+    # given a file and an index, return a string that represents a wix component
+    def self.get_indexed_file_component(file, index)
+      componentId = "c#{index}"
+      guid = SecureRandom.uuid
+      fileId = "f#{index}"
+      directory = File.dirname(file)
+      directory = directory.split(/[\/\\]/).last if File.dirname(file).include?("\\") || File.dirname(file).include?("/")
+      directory = "" if directory == "."
+      directoryId = "#{File.dirname(file).upcase.gsub("/", "_").gsub("-", "_")}DIR"
+      component = "<Component Id=\"#{componentId}\" Guid=\"#{guid}\"><File Id=\"#{fileId}\" Source=\"#{file}\" /></Component>"
+      if (directory.length > 0)
+        component = "<Component Id=\"#{componentId}\" Guid=\"#{guid}\" Directory=\"#{directoryId}\"><File Id=\"#{fileId}\" Source=\"#{file}\" /></Component>"
+      end
+      component
+    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

data/lib/raykit/zip.rb

@@ -1,73 +1,73 @@
-require "zip"
-
-module Raykit
-  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 source_dir(dir)
-      @source_dir = dir
-      self
-    end
-
-    def include_glob(glob)
-      @include_globs << glob
-      self
-    end
-
-    def exclude_glob(glob)
-      @exclude_globs << glob
-      self
-    end
-
-    def zip
-      path = File.dirname(@filename)
-      FileUtils.mkdir_p(path) unless Dir.exist?(path)
-
-      files_to_archive = Array::new()
-      Dir.chdir(@source_dir) do
-        #include_files = []
-        @include_globs.each do |include_glob|
-          Dir.glob(include_glob) { |f|
-            #puts "\n" + f
-            files_to_archive << f
-          }
-        end
-      end
-
-      ::Zip::File::open(@filename, ::Zip::File::CREATE) { |zipfile|
-        count = 0
-        files_to_archive.each do |file|
-          zipfile.get_output_stream(file) { |f|
-            fr = ::File.open("#{@source_dir}/#{file}", "rb")
-            f.puts(fr.read)
-            fr.close()
-            f.close()
-            count = count + 1
-          }
-        end
-        zipfile.close
-        puts "  added " << count.to_s << " files to " << @filename
-      }
-    end
-
-    def self.zip_directory(directory, zipfile_name, overwrite = true)
-      File.delete(zipfile_name) if File.exist?(zipfile_name) && overwrite
-      ::Zip::File.open(zipfile_name, ::Zip::File::CREATE) do |zipfile|
-        Dir[File.join(directory, "**", "**")].each do |file|
-          zipfile.add(file.sub(directory + "/", ""), file)
-        end
-      end
-    end
-  end
-end
+require "zip"
+
+module Raykit
+  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 source_dir(dir)
+      @source_dir = dir
+      self
+    end
+
+    def include_glob(glob)
+      @include_globs << glob
+      self
+    end
+
+    def exclude_glob(glob)
+      @exclude_globs << glob
+      self
+    end
+
+    def zip
+      path = File.dirname(@filename)
+      FileUtils.mkdir_p(path) unless Dir.exist?(path)
+
+      files_to_archive = Array::new()
+      Dir.chdir(@source_dir) do
+        #include_files = []
+        @include_globs.each do |include_glob|
+          Dir.glob(include_glob) { |f|
+            #puts "\n" + f
+            files_to_archive << f
+          }
+        end
+      end
+
+      ::Zip::File::open(@filename, ::Zip::File::CREATE) { |zipfile|
+        count = 0
+        files_to_archive.each do |file|
+          zipfile.get_output_stream(file) { |f|
+            fr = ::File.open("#{@source_dir}/#{file}", "rb")
+            f.puts(fr.read)
+            fr.close()
+            f.close()
+            count = count + 1
+          }
+        end
+        zipfile.close
+        puts "  added " << count.to_s << " files to " << @filename
+      }
+    end
+
+    def self.zip_directory(directory, zipfile_name, overwrite = true)
+      File.delete(zipfile_name) if File.exist?(zipfile_name) && overwrite
+      ::Zip::File.open(zipfile_name, ::Zip::File::CREATE) do |zipfile|
+        Dir[File.join(directory, "**", "**")].each do |file|
+          zipfile.add(file.sub(directory + "/", ""), file)
+        end
+      end
+    end
+  end
+end