makit 0.0.99 → 0.0.112

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>
+# frozen_string_literal: true
+
+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?
+          # test if wix is already installed
+          "dotnet tool install --global wix".run unless `dotnet tool list --global`.include?("wix")
+          puts " Wix version #{Wix.version.to_s.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)
+        else # !File.exist?(Makit::Environment.which("dotnet"))
+          puts "dotnet does not appear to be installed"
+        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
+end
+
+# 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,29 @@
-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
+# frozen_string_literal: true
+
+require "yaml"
+
+# frozen_string_literal: true
+
+# This module provides classes for the Makit gem.
+module Makit
+  # YAML file validation utilities
+  #
+  # This class provides methods for validating YAML file syntax
+  # and structure, helping to catch configuration errors early.
+  class Yaml
+    # Validate YAML file syntax and structure
+    #
+    # Attempts to parse a YAML file to verify it has valid syntax.
+    # Prints a success message if valid, raises an error if invalid.
+    #
+    # @param file_path [String] Path to the YAML file to validate
+    # @return [nil] Prints success message if validation passes
+    # @raise [RuntimeError] If YAML syntax is invalid
+    def self.validate_yaml(file_path)
+      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

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

data/lib/makit copy.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+begin
+  require "colorize"
+rescue LoadError
+  # colorize gem not available, define a no-op colorize method
+  class String
+    def colorize(*args)
+      self
+    end
+  end
+end
+
+require_relative "makit/version"
+
+# Load essential modules for Rakefile
+require_relative "makit/version_util"
+require_relative "makit/configuration"
+require_relative "makit/logging"
+require_relative "makit/commands"
+require_relative "makit/serializer"
+require_relative "makit/humanize"
+require_relative "makit/directories"
+require_relative "makit/files"
+require_relative "makit/tasks"
+require_relative "makit/environment"
+require_relative "makit/process"
+require_relative "makit/mp/string_mp"
+require_relative "makit/git"
+require_relative "makit/protoc"
+
+module Makit
+  class Error < StandardError; end
+
+  # Your code goes here...
+end
+
+# Commands::Runner is now the primary command execution system
+
+# Additional constants needed by Rakefile
+Makit::GIT_FILE_INFOS = Makit::Git::Repository.get_file_infos
+Makit::IS_READ_ONLY = Makit::Git::Repository.read_only?
+Makit::IS_GIT_REPO = Makit::Git::Repository.git_repo?
+Makit::PROJECT = Makit::Configuration::Project.default

data/lib/makit.rb

@@ -1,267 +1,40 @@
-# frozen_string_literal: true
-
-require "rake/clean"
-require "logger"
-require "json"
-require "yaml"
-require "google/protobuf"
-
-#%w[generated/makit].each do |dir|
-#  Dir[File.join(__dir__, dir, "*.rb")].each do |file|
-#    require_relative file
-#  end
-#end
-if (File.exist?("protos/makit/makit.v1.proto.rb"))
-  require_relative "generated/makit/makit.v1_pb"
-else
-  require_relative "makit/v1/makit.v1_pb"
-end
-
-#%w[makit makit/v1 makit/cli makit/content makit/mp].each do |dir|
-%w[makit makit/cli makit/content makit/mp makit/docs].each do |dir|
-  Dir[File.join(__dir__, dir, "*.rb")].each do |file|
-    require_relative file
-  end
-end
-
-module Makit
-  class Error < StandardError; end
-
-  # Constants
-  if File.exist? ".makit.project.json"
-    PROJECT = Makit::Serializer.open(".makit.project.json", Makit::V1::Project)
-  else
-    if File.exist? ".makit.project.yml"
-      PROJECT = Makit::Serializer.open(".makit.project.yml", Makit::V1::Project)
-    else
-      PROJECT = Makit::V1::Project.new
-      PROJECT.set_default_values
-    end
-  end
-
-  STARTTIME = Time.now
-  SHOW = Makit::Show.new
-  IS_GIT_REPO = Dir.exist? ".git"
-  DETACHED = `git status`.include?("detached")
-  IS_READ_ONLY = !IS_GIT_REPO || DETACHED
-  RUNTIME_IDENTIFIER = Makit::Environment::get_runtime_identifier
-  DEVICE = Socket.gethostname
-  LOGGER = Makit::Logging::MultiLogger.create_logger
-
-  # Git Commit and Branch/Tag constants
-  ENV["COMMIT_SHA"] = Makit::Git::commitsha
-  ENV["COMMIT_BRANCH"] = Makit::Git::branch
-
-  RUNNER = CommandRunner.new
-  GIT_FILE_INFOS = Makit::Git::get_file_infos
-  #RUNNER.log_to_artifacts = true
-  # Variables
-  log_level = Logger::INFO
-  package_type = Makit::V1::PackageType::GEM
-  commands = Makit::Commands.new
-
-  # methods
-  #
-  # initialize a git repository
-  def self.init(directory)
-    if !Dir.exist?(directory)
-      FileUtils.mkdir_p(directory)
-    end
-    raise Makit::Error.new("directory does not exist: #{directory}") if !Dir.exist?(directory)
-    Dir.chdir(directory) do
-      File.write(".gitignore", Makit::Content::GITIGNORE) unless File.exist?(".gitignore")
-      init = Makit::RUNNER.execute "git init"
-      if init.exit_code != 0
-        raise Makit::Error.new("failed to initialize local repository: #{directory}\n#{Makit::Humanize.get_command_summary(init)}")
-      end
-      init
-    end
-  end
-
-  # clone a git repository to a local directory in Directories::CLONE
-  # returns the Makit::V1::Command for 'git clone ...'
-  def self.clone(git_repository)
-    commands = []
-    # make sure a local clone of the repository exists
-    clone_dir = Directories::get_clone_directory(git_repository)
-    if (!Dir.exist?(clone_dir))
-      commands << Makit::RUNNER.execute("git clone #{git_repository} #{clone_dir}")
-    end
-    commands
-  end
-
-  # pull the latest changes from the remote repository to a local clone in Directories::CLONE
-  def self.pull(git_repository)
-    clone_dir = Directories::get_clone_directory(git_repository)
-    raise Makit::Error.new("clone directory does not exist: #{clone_dir}") if !Dir.exist?(clone_dir)
-    Dir.chdir(clone_dir) do
-      request = Makit::V1::CommandRequest.new(
-        name: "git",
-        arguments: ["pull"],
-        directory: clone_dir,
-      )
-      pull_command = Makit::RUNNER.execute(request)
-      raise Makit::Error.new(Makit::Humanize::get_command_details(pull_command)) if pull_command.exit_code != 0
-      return pull_command
-    end
-  end
-
-  def self.clone_or_pull(git_repository)
-    commands = []
-    clone_dir = Directories::get_clone_directory(git_repository)
-    if Dir.exist?(clone_dir)
-      commands << pull(git_repository)
-    else
-      commands << clone(git_repository)
-    end
-    commands
-  end
-
-  # log information about a specific repository
-  # return an array of GitLogEntry objects
-  def self.log(git_repository, limit, skip)
-    entries = []
-    clone_dir = Directories::get_clone_directory(git_repository)
-    raise Makit::Error.new("clone directory does not exist: #{clone_dir}") if !Dir.exist?(clone_dir)
-    Dir.chdir(clone_dir) do
-      log_command = Makit::RUNNER.execute("git log -n #{limit} --skip #{skip} --date=iso")
-      if log_command.exit_code != 0
-        lines = log_command.stderr.split("\n")
-        # iterate over the lines, generating a GitLogEntry for each commit
-        lines.each do |line|
-          if line.start_with?("commit")
-            commit = line.split(" ")[1]
-            entries << GitLogEntry.new(commit)
-          end
-          if line.start_with?("Author:")
-            entries.last.author = line.split(" ")[1..-1].join(" ")
-          end
-          if line.start_with?("Date:")
-            entries.last.date = line.split(" ")[1..-1].join(" ")
-          end
-          if line.start_with?("    ")
-            entries.last.message += line[4..-1]
-          end
-        end
-      end
-    end
-    entries
-  end
-
-  # work on a local clone of a git repository
-  # if the repository does not exist, clone it
-  # if the repository exists, pull the latest changes
-  # if a build command can be found, execute it and return the result Makit::V1::WorkResult
-  def self.work(repository)
-    commands = []
-    work_dir = Makit::Directories::get_work_directory(repository)
-    commands << clone_or_pull(repository)
-    clone_dir = Makit::Directories::get_clone_directory(repository)
-    if !Dir.exist?(work_dir)
-      # make the parent directory for work_dir if it does not exist
-      FileUtils.mkdir_p(File.dirname(work_dir)) unless Dir.exist?(File.dirname(work_dir))
-      Makit::RUNNER::execute "git clone #{clone_dir} #{work_dir}"
-    end
-    Dir.chdir(work_dir) do
-      # if there is no .gitignore file, create one
-      File.write(".gitignore", Makit::Content::GITIGNORE) unless File.exist?(".gitignore")
-    end
-    nil?
-  end
-
-  def self.enable_monkey_patch
-    %w[makit/mp].each do |dir|
-      Dir[File.join(__dir__, dir, "*.rb")].each do |file|
-        require_relative file
-      end
-    end
-  end
-  # Given a git repository URL and a commit id, create a new MakeResult object.
-  def self.make(url, commit, force = false)
-    log_filename = File.join(Directories::get_log_directory(url), commit, +"#{RUNTIME_IDENTIFIER}.#{DEVICE}.json")
-    if File.exist?(log_filename) && !force && commit != "latest"
-      begin
-        # deserialize the log file to a Makite::V1::MakeResult object
-        make_result = Makit::V1::MakeResult.decode_json(File.read(log_filename))
-        return make_result
-      rescue => e
-        # if deserialization fails, delete the log file and continue
-        FileUtils.rm(log_filename)
-      end
-    else
-      commands = []
-      begin
-        clone_or_pull(url).each do |command|
-          commands << command
-        end
-        # make sure a local clone of the repository exists
-        clone_dir = Directories::get_clone_directory(url)
-        raise Makit::Error.new("clone directory does not exist: #{clone_dir}") if !Dir.exist?(clone_dir)
-
-        if (commit == "latest")
-          Dir.chdir(clone_dir) do
-            git_log = Makit::RUNNER.execute("git log -n 1 --date=iso")
-
-            commands << git_log
-            # assert that the commit is valid
-            commit = git_log.output.match(/^commit ([0-9a-f]{40})$/i)[1]
-            raise Makit::Error.new("invalid commit: #{commit}") if commit.nil? || commit.empty? || !commit.match?(/\A[0-9a-f]{40}\z/i)
-            log_filename = File.join(Directories::get_log_directory(url), commit, +"#{RUNTIME_IDENTIFIER}.#{DEVICE}.json")
-          end
-        end
-
-        # clone a fresh copy of the repository to a make directory
-        make_dir = Directories::get_make_commit_directory(url, commit)
-        FileUtils.rm_rf(make_dir) if Dir.exist?(make_dir)
-        commands << Makit::RUNNER.execute("git clone #{clone_dir} #{make_dir}")
-        raise Makit::Error.new("failed to clone repository: #{url} to #{make_dir}") if !Dir.exist?(make_dir)
-        Dir.chdir(make_dir) do
-          commands << Makit::RUNNER.execute("git reset --hard #{commit}")
-          commands << Makit::RUNNER.execute("git log -n 1")
-
-          commands << Makit::RUNNER.execute("bundle install") if File.exist? "Gemfile"
-          if File.exist? ("Rakefile")
-            commands << Makit::RUNNER.execute("rake default")
-          else
-            commands << Makit::RUNNER.execute("rake default") if File.exist? "rakefile.rb"
-          end
-
-          make_result = Makit::V1::MakeResult.new(
-            repository: url,
-            commit: commit,
-            branch: "?",
-            tag: "?",
-            device: DEVICE,
-            runtime_identifier: RUNTIME_IDENTIFIER,
-          )
-          commands.flatten.each do |command|
-            make_result.commands << command
-          end
-
-          # save the MakeResult object to a log file as pretty printed json
-          FileUtils.mkdir_p(File.dirname(log_filename)) unless Dir.exist?(File.dirname(log_filename))
-          File.write(log_filename, make_result.to_json)
-
-          return make_result
-        end
-      rescue => e
-        message = "error raised attempting to make repository: #{url} commit: #{commit}\n\n"
-        message += "#{e.message}\n"
-        backtrace = e.backtrace.join("\n")
-        message += "#{backtrace}\n\n"
-        message += "commands:\n"
-        commands.flatten.each do |command|
-          message += Makit::Humanize::get_command_details(command)
-        end
-        raise Makit::Error.new(message)
-      end
-    end
-  end
-end
-
-if !File.exist?(".gitignore")
-  Makit::LOGGER.info("added .gitignore file")
-  File.open(".gitignore", "w") do |file|
-    file.puts Makit::Content::GITIGNORE
-  end
-end
+# frozen_string_literal: true
+
+
+  require "colorize"
+
+
+# Set default LOG_LEVEL if not already set
+ENV["LOG_LEVEL"] ||= "info"
+
+require_relative "makit/version"
+
+# Load essential modules for Rakefile
+require_relative "makit/version_util"
+require_relative "makit/configuration"
+require_relative "makit/logging"
+require_relative "makit/commands"
+require_relative "makit/serializer"
+require_relative "makit/humanize"
+require_relative "makit/directories"
+require_relative "makit/files"
+require_relative "makit/tasks"
+require_relative "makit/environment"
+require_relative "makit/process"
+require_relative "makit/mp/string_mp"
+require_relative "makit/git"
+require_relative "makit/protoc"
+
+module Makit
+  class Error < StandardError; end
+
+  # Your code goes here...
+end
+
+# Commands::Runner is now the primary command execution system
+
+# Additional constants needed by Rakefile
+Makit::GIT_FILE_INFOS = Makit::Git::Repository.get_file_infos
+Makit::IS_READ_ONLY = Makit::Git::Repository.read_only?
+Makit::IS_GIT_REPO = Makit::Git::Repository.git_repo?
+Makit::PROJECT = Makit::Configuration::Project.default