makit 0.0.69 → 0.0.71

data/lib/makit/version.rb

@@ -1,65 +1,65 @@
-# frozen_string_literal: true
-
-module Makit
-  VERSION = "0.0.69"
-
-  class Version
-    # given an array of version strings, return the highest version
-    def self.get_highest_version(versions)
-      versions.sort { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last
-    end
-
-    # example content from .gitlab-ci.yml
-    #variables:
-    #  VERSION: "0.0.26" # Define the version here
-
-    def self.get_version_from_file(path)
-      if (!File.exist?(path))
-        raise "file #{path}does not exist"
-      end
-
-      extension = File.extname(path)
-      #switch = extension.downcase
-      #case switch
-      #if extension == ".csproj"
-      switch = extension.downcase
-      case switch
-      when ".csproj"
-        Makit::Version.detect_from_file(path, /<Version>([-\w\d.]+)</)
-      when ".wxs"
-        Makit::Version.detect_from_file(path, / Version="([\d\.]+)"/)
-      when ".yml"
-        Makit::Version.detect_from_file(path, /VERSION:\s*["']?([\d\.]+)["']?/)
-      else
-        raise "unrecognized file type"
-      end
-    end
-
-    def self.detect_from_file(filename, regex)
-      if File.exist?(filename)
-        match = IO.read(filename).match(regex)
-        match.captures[0] if !match.nil? && match.captures.length.positive?
-      else
-        raise "unable to find version in #{filename}"
-      end
-    end
-
-    def self.set_version_in_file(filename, version)
-      text = IO.read(filename)
-      new_text = text
-      new_text = text.gsub(/VERSION:\s?['|"]([.\d]+)['|"]/, "VERSION: \"#{version}\"") if filename.include?(".yml")
-      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")
-      File.open(filename, "w") { |f| f.write(new_text) } if new_text != text
-    end
-
-    def self.set_version_in_files(glob_pattern, version)
-      Dir.glob(glob_pattern).each do |filename|
-        set_version_in_file(filename, version)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Makit
+  VERSION = "0.0.71"
+
+  class Version
+    # given an array of version strings, return the highest version
+    def self.get_highest_version(versions)
+      versions.sort { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last
+    end
+
+    # example content from .gitlab-ci.yml
+    #variables:
+    #  VERSION: "0.0.26" # Define the version here
+
+    def self.get_version_from_file(path)
+      if (!File.exist?(path))
+        raise "file #{path}does not exist"
+      end
+
+      extension = File.extname(path)
+      #switch = extension.downcase
+      #case switch
+      #if extension == ".csproj"
+      switch = extension.downcase
+      case switch
+      when ".csproj"
+        Makit::Version.detect_from_file(path, /<Version>([-\w\d.]+)</)
+      when ".wxs"
+        Makit::Version.detect_from_file(path, / Version="([\d\.]+)"/)
+      when ".yml"
+        Makit::Version.detect_from_file(path, /VERSION:\s*["']?([\d\.]+)["']?/)
+      else
+        raise "unrecognized file type"
+      end
+    end
+
+    def self.detect_from_file(filename, regex)
+      if File.exist?(filename)
+        match = IO.read(filename).match(regex)
+        match.captures[0] if !match.nil? && match.captures.length.positive?
+      else
+        raise "unable to find version in #{filename}"
+      end
+    end
+
+    def self.set_version_in_file(filename, version)
+      text = IO.read(filename)
+      new_text = text
+      new_text = text.gsub(/VERSION:\s?['|"]([.\d]+)['|"]/, "VERSION: \"#{version}\"") if filename.include?(".yml")
+      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")
+      File.open(filename, "w") { |f| f.write(new_text) } if new_text != text
+    end
+
+    def self.set_version_in_files(glob_pattern, version)
+      Dir.glob(glob_pattern).each do |filename|
+        set_version_in_file(filename, version)
+      end
+    end
+  end
+end

data/lib/makit/wix.rb

@@ -1,95 +1,95 @@
-require "securerandom"
-
-module Makit
-  # This class provide methods for working with the  Nuget package cache
-  #
-  # Example:
-  #
-  #   Makit::Directory.cache("Google.Protobuf", "3.27.2")
-  #
-  # dotnet nuget locals all --list
-  # dotnet nuget locals all --clear
-  #
-  class Wix
-    def self.setup
-      if (Makit::Environment.is_windows?)
-        # test if dotnet is installed
-        if !Makit::DotNet::is_installed? # !File.exist?(Makit::Environment.which("dotnet"))
-          puts "dotnet does not appear to be installed"
-        else
-          # test if wix is already installed
-          if !`dotnet tool list --global`.include?("wix")
-            "dotnet tool install --global wix".run
-          end
-          puts " Wix version " + "#{Wix::version}".colorize(:green)
-          # display the link to https://wixtoolset.org/
-          puts "  https://wixtoolset.org/".colorize(:green)
-          # display the link to https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev17
-          puts "  https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev17".colorize(:green)
-        end
-      else
-        puts "Wix is not supported on non-Windows platforms"
-      end
-    end
-
-    def self.version
-      `wix --version`.strip.split("+").first
-    end
-
-    def self.setup_package(name, path, files)
-      # create the path if it does not exist
-      FileUtils.mkdir_p(path) unless File.directory?(path)
-      # create the #{name}.wixproj file
-      File.open("#{path}/#{name}.wixproj", "w") do |f|
-        f.puts "<Project Sdk=\"WixToolset.Sdk/#{Wix::version}\">"
-        f.puts "</Project>"
-      end
-      # create the Package.wxs file
-      File.open("#{path}/Package.wxs", "w") do |f|
-        f.puts "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">"
-        f.puts "  <Package Name=\"#{name}\" Manufacturer=\"Acme\" Version=\"0.0.0.0\" UpgradeCode=\"#{SecureRandom.uuid}\">"
-        #f.puts "    <MajorUpgrade DowngradeErrorMessage=\"!(loc.DowngradeError)\" />"
-        f.puts "    <Files Include=\"#{files}\" />"
-        #f.puts "    <Feature Id=\"Main\">"
-        #f.puts "      <ComponentGroupRef Id=\"Components\" />"
-        #f.puts "    </Feature>"
-        f.puts "  </Package>"
-        f.puts "</Wix>"
-      end
-    end
-  end # class Wix
-end # module Makit
-
-# Package.wxs with File harvesting
-#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-#    <Package Name="MyProduct" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B0B15C00-1DC4-0374-A1D1-E902240936D5">
-#        <Files Include="path\to\files\**" />
-#    </Package>
-#</Wix>
-
-#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-#  <Package Name="Msi.Demo" Manufacturer="Acme" Version="1.0.0.0" UpgradeCode="a87571ec-8be3-447e-ae23-b3a94a85b727">
-#    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-#    <Feature Id="Main">
-#      <ComponentGroupRef Id="Components" />
-#    </Feature>
-#  </Package>
-#</Wix>
-
-#<Project Sdk="WixToolset.Sdk/5.0.1">
-#</Project>
-
-# Components.wxs
-#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-#  <Fragment>
-#    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
-#		<Component Guid="b8085fb3-3718-46df-8bf6-ecf9f968dd3d">
-#			<File Source="../../artifacts/Msi.Demo.exe" />
-#			<File Source="../../artifacts/Msi.Demo.dll" />
-#			<File Source="../../artifacts/Msi.Demo.deps.json" />
-#			<File Source="../../artifacts/Msi.Demo.runtimeconfig.json" />
-#		</Component>
-#    </ComponentGroup>
-#  </Fragment>
-#</Wix>
+require "securerandom"
+
+module Makit
+  # This class provide methods for working with the  Nuget package cache
+  #
+  # Example:
+  #
+  #   Makit::Directory.cache("Google.Protobuf", "3.27.2")
+  #
+  # dotnet nuget locals all --list
+  # dotnet nuget locals all --clear
+  #
+  class Wix
+    def self.setup
+      if (Makit::Environment.is_windows?)
+        # test if dotnet is installed
+        if !Makit::DotNet::is_installed? # !File.exist?(Makit::Environment.which("dotnet"))
+          puts "dotnet does not appear to be installed"
+        else
+          # test if wix is already installed
+          if !`dotnet tool list --global`.include?("wix")
+            "dotnet tool install --global wix".run
+          end
+          puts " Wix version " + "#{Wix::version}".colorize(:green)
+          # display the link to https://wixtoolset.org/
+          puts "  https://wixtoolset.org/".colorize(:green)
+          # display the link to https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev17
+          puts "  https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev17".colorize(:green)
+        end
+      else
+        puts "Wix is not supported on non-Windows platforms"
+      end
+    end
+
+    def self.version
+      `wix --version`.strip.split("+").first
+    end
+
+    def self.setup_package(name, path, files)
+      # create the path if it does not exist
+      FileUtils.mkdir_p(path) unless File.directory?(path)
+      # create the #{name}.wixproj file
+      File.open("#{path}/#{name}.wixproj", "w") do |f|
+        f.puts "<Project Sdk=\"WixToolset.Sdk/#{Wix::version}\">"
+        f.puts "</Project>"
+      end
+      # create the Package.wxs file
+      File.open("#{path}/Package.wxs", "w") do |f|
+        f.puts "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">"
+        f.puts "  <Package Name=\"#{name}\" Manufacturer=\"Acme\" Version=\"0.0.0.0\" UpgradeCode=\"#{SecureRandom.uuid}\">"
+        #f.puts "    <MajorUpgrade DowngradeErrorMessage=\"!(loc.DowngradeError)\" />"
+        f.puts "    <Files Include=\"#{files}\" />"
+        #f.puts "    <Feature Id=\"Main\">"
+        #f.puts "      <ComponentGroupRef Id=\"Components\" />"
+        #f.puts "    </Feature>"
+        f.puts "  </Package>"
+        f.puts "</Wix>"
+      end
+    end
+  end # class Wix
+end # module Makit
+
+# Package.wxs with File harvesting
+#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+#    <Package Name="MyProduct" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B0B15C00-1DC4-0374-A1D1-E902240936D5">
+#        <Files Include="path\to\files\**" />
+#    </Package>
+#</Wix>
+
+#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+#  <Package Name="Msi.Demo" Manufacturer="Acme" Version="1.0.0.0" UpgradeCode="a87571ec-8be3-447e-ae23-b3a94a85b727">
+#    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+
+#    <Feature Id="Main">
+#      <ComponentGroupRef Id="Components" />
+#    </Feature>
+#  </Package>
+#</Wix>
+
+#<Project Sdk="WixToolset.Sdk/5.0.1">
+#</Project>
+
+# Components.wxs
+#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+#  <Fragment>
+#    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
+#		<Component Guid="b8085fb3-3718-46df-8bf6-ecf9f968dd3d">
+#			<File Source="../../artifacts/Msi.Demo.exe" />
+#			<File Source="../../artifacts/Msi.Demo.dll" />
+#			<File Source="../../artifacts/Msi.Demo.deps.json" />
+#			<File Source="../../artifacts/Msi.Demo.runtimeconfig.json" />
+#		</Component>
+#    </ComponentGroup>
+#  </Fragment>
+#</Wix>

data/lib/makit/yaml.rb

@@ -1,17 +1,17 @@
-require "yaml"
-
-# frozen_string_literal: true
-
-# This module provides classes for the Makit gem.
-module Makit
-  class Yaml
-    def self.validate_yaml(file_path)
-      begin
-        YAML.load_file(file_path)
-        puts "#{file_path} is a valid YAML file."
-      rescue Psych::SyntaxError => e
-        raise "YAML validation failed for #{file_path}: #{e}"
-      end
-    end
-  end
-end
+require "yaml"
+
+# frozen_string_literal: true
+
+# This module provides classes for the Makit gem.
+module Makit
+  class Yaml
+    def self.validate_yaml(file_path)
+      begin
+        YAML.load_file(file_path)
+        puts "#{file_path} is a valid YAML file."
+      rescue Psych::SyntaxError => e
+        raise "YAML validation failed for #{file_path}: #{e}"
+      end
+    end
+  end
+end

data/lib/makit/zip.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
-
-require "zip"
-require "fileutils"
-
-module Makit
-  # Zip a directory
-  class Zip
-    def self.zip_directory(directory, zip_file)
-      ::Zip::File.open(zip_file, ::Zip::File::CREATE) do |zipfile|
-        Dir[File.join(directory, "**", "**")].each do |file|
-          zipfile.add(file.sub("#{directory}/", ""), file)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "zip"
+require "fileutils"
+
+module Makit
+  # Zip a directory
+  class Zip
+    def self.zip_directory(directory, zip_file)
+      ::Zip::File.open(zip_file, ::Zip::File::CREATE) do |zipfile|
+        Dir[File.join(directory, "**", "**")].each do |file|
+          zipfile.add(file.sub("#{directory}/", ""), file)
+        end
+      end
+    end
+  end
+end