makit 0.0.98 → 0.0.111

data/lib/makit/tasks.rb

@@ -1,150 +1,5 @@
-# frozen_string_literal: true
-require "digest"
-require "rake/clean"
-#require "sqlite3"
-
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for managing persistent data for the makit gem
-  class Tasks
-    def self.run_default_commands(task_name)
-      Makit::LOGGER.debug("Running default commands for task: #{task_name}")
-    end
-  end
-end
-
-desc "Remove any temporary products."
-task :clean do
-  Makit::SHOW.task(:clean)
-  Makit::RUNNER.run(Makit::RUNNER.parse_command_request("git clean -dXf"))
-end
-
-desc "Integrate changes into the git repository."
-task :integrate do
-  Makit::TaskInfo.track(:integrate) do
-    unstaged_files = Makit::Git.unstaged_files
-    untracked_files = Makit::Git.untracked_files
-    if unstaged_files.length > 0 || untracked_files.length > 0
-      Makit::Git.integrate
-    else
-      puts "  No unstaged or untracked files found".colorize(:grey)
-    end
-  end
-end
-
-#
-# Tag task
-#
-desc "tag the current version"
-task :tag do
-  Makit::TaskInfo.track(:tag) do
-    # check if the variable VERSION is defined
-    if !defined?(VERSION)
-      puts "  VERSION is not defined".colorize(:red)
-      return
-    end
-
-    Makit::Git.tag(VERSION)
-  end
-end
-
-desc "Sync changes with the git repository."
-task :sync => [:integrate, :pull_incoming] do
-  Makit::TaskInfo.track(:sync) do
-    #Makit::SHOW.task(:sync)
-    Makit::Git.sync
-  end
-end
-
-task :pull do
-  Makit::SHOW.task(:pull)
-  Makit::Git.pull
-end
-
-desc "pull changes from the remote branch, preferring incoming changes for conflicts"
-task :pull_incoming do
-  Makit::TaskInfo.track(:pull_incoming) do
-    #Makit::SHOW.task(:pull_incoming)
-    puts "  git branch is ".colorize(:grey) + "#{Makit::Git.branch}".colorize(:green)
-    "git pull origin #{Makit::Git.branch} -X theirs".try
-  end
-end
-
-desc "Format source code."
-task :format do
-  Makit::SHOW.task(:format)
-  Makit::RUNNER.try("rufo .") if File.exist?("Gemfile") || File.exist?("Rakefile")
-end
-
-#
-# Update docs task
-#
-desc "update the docs for the project"
-task :update_docs do
-  Makit::TaskInfo.track(:update_docs) do
-    mod_time = Makit::GIT_FILE_INFOS.select {
-      |file|
-      file.name.include?("src/" || file.name.include?("test/") || file.name.include?("artifacts/"))
-    }.first.mtime
-    if (Makit::Git.untracked_files.length > 0 ||
-        Makit::Git.unstaged_files.length > 0)
-      File.delete("docs/Rake.md") if File.exist?("docs/Rake.md")
-      File.delete("docs/Files.md") if File.exist?("docs/Files.md")
-    end
-
-    Makit::Docs::Rake.generate if File.exist?("docs/Rake.md")
-    Makit::Docs::Files.generate if File.exist?("docs/Files.md")
-    Makit::DotNet.generate_docs
-  end
-end
-
-desc "Update dependencies."
-task :update do
-  Makit::SHOW.task(:update)
-  yesterday = Time.now - 24 * 60 * 60
-  system("bundle update") if File.exist?("Gemfile")
-  # glob all *.csproj files
-  Dir.glob("**/*.csproj").each do |file|
-    #"dotnet format #{file}".cache_try(yesterday)
-  end
-end
-
-desc "Upgrade the nuget packages to the latest available version"
-task :update_nuget_packages do
-  "dotnet tool install --global dotnet-outdated-tool".try
-  "dotnet outdated --upgrade:Auto .".try
-end
-
-# Register the at_exit hook for cleanup
-at_exit do
-  #puts "at_exit in tasks.rb...."
-
-  puts " "
-
-  if (Makit::Docs::Rake.get_top_task_name == "default")
-    # let define some properties
-    properties = {
-      "version" => (defined?(VERSION) ? VERSION : ""),
-      "branch" => Makit::Git.branch,
-      "user" => ENV["USER"],
-      "machine" => ENV["COMPUTERNAME"],
-      "os" => ENV["OS"],
-      "largest src" => (tracked = Makit::Git.get_file_infos).empty? ? "none" : tracked.max_by(&:size).name,
-      "largest src size" => (tracked = Makit::Git.get_file_infos).empty? ? "0 bytes" : Makit::Humanize.get_humanized_size(tracked.max_by(&:size).size),
-      "largest artifact" => (untracked = Makit::Git.get_untracked_file_infos).empty? ? "none" : untracked.max_by(&:size).name,
-      "largest artifact size" => (untracked = Makit::Git.get_untracked_file_infos).empty? ? "0 bytes" : Makit::Humanize.get_humanized_size(untracked.max_by(&:size).size),
-      "slowest task" => Makit::TaskInfo.slowest_task_name,
-    }
-
-    # display the properties as a table, right justify the key to 20 characters
-    properties.each do |key, value|
-      puts "  #{key.ljust(25)} ".colorize(:grey) + "#{value}".colorize(:green)
-    end
-    puts " "
-  end
-
-  # display the duration
-
-  duration = Time.now - Makit::STARTTIME
-  puts "  rake #{Makit::Docs::Rake.get_top_task_name}".colorize(:green) + " on branch ".colorize(:grey) + "#{Makit::Git.branch}".colorize(:green) + " completed in ".colorize(:grey) + Makit::Humanize.get_humanized_duration(duration).colorize(:green)
-end
+# frozen_string_literal: true
+
+# Load all task-related modules
+require_relative "tasks/hook_manager"
+require_relative "tasks/task_monkey_patch"

data/lib/makit/test_cache.rb

@@ -0,0 +1,239 @@
+# frozen_string_literal: true
+
+module Makit
+  class TestCache
+    # Cache configuration
+    CACHE_BASE_DIR = File.join(Makit::Directories::PROJECT_ARTIFACTS, "test_cache").freeze
+    CACHE_METADATA_FILE = ".cache_metadata.json"
+    DEFAULT_TTL = 3600 # 1 hour cache by default
+
+    class << self
+      def setup
+        FileUtils.mkdir_p(CACHE_BASE_DIR)
+      end
+
+      # Main caching method - wraps expensive test operations
+      def with_cache(test_instance, cache_key, dependencies: [], ttl: DEFAULT_TTL, &block)
+        return yield unless should_cache?
+
+        cache_dir = cache_directory_for(test_instance, cache_key)
+        metadata = read_cache_metadata(cache_dir)
+
+        if cache_valid?(cache_dir, metadata, dependencies, ttl)
+          skip_with_cache_message(test_instance, cache_key, metadata)
+          return :cached
+        end
+
+        # Cache miss or invalid - run the expensive operation
+        cleanup_cache_directory(cache_dir)
+        FileUtils.mkdir_p(cache_dir)
+
+        # Execute the block in the cache directory context
+        result = Dir.chdir(cache_dir, &block)
+
+        # Write cache metadata
+        write_cache_metadata(cache_dir, dependencies)
+
+        result
+      end
+
+      # Directory-based caching - checks if directory exists and is valid
+      def cache_directory(test_instance, cache_key, dependencies: [], ttl: DEFAULT_TTL)
+        return nil unless should_cache?
+
+        cache_dir = cache_directory_for(test_instance, cache_key)
+        metadata = read_cache_metadata(cache_dir)
+
+        if cache_valid?(cache_dir, metadata, dependencies, ttl)
+          skip_with_cache_message(test_instance, cache_key, metadata)
+          return cache_dir
+        end
+
+        # Prepare fresh cache directory
+        cleanup_cache_directory(cache_dir)
+        FileUtils.mkdir_p(cache_dir)
+
+        cache_dir
+      end
+
+      # File-based caching - checks if specific files exist and are valid
+      def cache_files(test_instance, cache_key, expected_files, dependencies: [], ttl: DEFAULT_TTL)
+        return false unless should_cache?
+
+        cache_dir = cache_directory_for(test_instance, cache_key)
+        metadata = read_cache_metadata(cache_dir)
+
+        # Check if all expected files exist
+        files_exist = expected_files.all? do |file|
+          File.exist?(File.join(cache_dir, file))
+        end
+
+        if files_exist && cache_valid?(cache_dir, metadata, dependencies, ttl)
+          skip_with_cache_message(test_instance, cache_key, metadata)
+          return true
+        end
+
+        false
+      end
+
+      # Clear all test caches
+      def clear_all
+        FileUtils.rm_rf(CACHE_BASE_DIR)
+        puts "🗑️  Cleared all test caches".colorize(:grey)
+      end
+
+      # Clear caches for specific test class
+      def clear_for_class(test_class)
+        class_cache_dir = File.join(CACHE_BASE_DIR, class_cache_key(test_class))
+        FileUtils.rm_rf(class_cache_dir)
+        puts "🗑️  Cleared test caches for #{test_class}".colorize(:grey)
+      end
+
+      # Get cache statistics
+      def cache_stats
+        return { total_size: 0, cache_count: 0, cache_dirs: [] } unless Dir.exist?(CACHE_BASE_DIR)
+
+        cache_dirs = Dir.glob(File.join(CACHE_BASE_DIR, "**", "*")).select { |d| Dir.exist?(d) }
+        total_size = cache_dirs.sum { |dir| directory_size(dir) }
+
+        {
+          total_size: total_size,
+          cache_count: cache_dirs.length,
+          cache_dirs: cache_dirs.map { |d| d.sub("#{CACHE_BASE_DIR}/", "") },
+        }
+      end
+
+      private
+
+      def should_cache?
+        # Don't cache in CI environments by default (ensures clean runs)
+        return false if ENV["CI"] == "true"
+
+        # Don't cache if explicitly disabled
+        return false if ENV["MAKIT_DISABLE_TEST_CACHE"] == "true"
+
+        # Don't cache during test development/debugging
+        return false if ENV["MAKIT_TEST_DEBUG"] == "true"
+
+        # Don't cache in test environment unless explicitly testing the cache
+        return false if ENV["MAKIT_TESTING"] == "true" && ENV["MAKIT_TESTING_CACHE"] != "true"
+
+        true
+      end
+
+      def cache_directory_for(test_instance, cache_key)
+        test_class = test_instance.class.name.gsub("::", "/")
+        test_method = test_instance.name
+
+        File.join(CACHE_BASE_DIR, test_class, test_method, cache_key)
+      end
+
+      def class_cache_key(test_class)
+        test_class.name.gsub("::", "/")
+      end
+
+      def cache_valid?(cache_dir, metadata, dependencies, ttl)
+        return false unless Dir.exist?(cache_dir)
+        return false unless metadata
+
+        # Check TTL
+        cache_age = Time.now - Time.parse(metadata["created_at"])
+        return false if cache_age > ttl
+
+        # Check dependencies
+        return false unless dependencies_current?(metadata["dependencies"], dependencies)
+
+        # Check if cache directory has content
+        entries = Dir.entries(cache_dir) - [".", "..", CACHE_METADATA_FILE]
+        entries.any?
+      end
+
+      def dependencies_current?(cached_deps, current_deps)
+        return true if current_deps.empty?
+
+        current_deps.each do |dep_file|
+          next unless File.exist?(dep_file)
+
+          current_mtime = File.mtime(dep_file).to_i
+          cached_mtime = cached_deps&.dig(dep_file)
+
+          return false if cached_mtime.nil? || current_mtime > cached_mtime
+        end
+
+        true
+      end
+
+      def read_cache_metadata(cache_dir)
+        metadata_file = File.join(cache_dir, CACHE_METADATA_FILE)
+        return nil unless File.exist?(metadata_file)
+
+        JSON.parse(File.read(metadata_file))
+      rescue JSON::ParserError
+        nil
+      end
+
+      def write_cache_metadata(cache_dir, dependencies)
+        metadata = {
+          created_at: Time.now.iso8601,
+          dependencies: dependencies.each_with_object({}) do |dep_file, hash|
+            hash[dep_file] = File.exist?(dep_file) ? File.mtime(dep_file).to_i : nil
+          end,
+        }
+
+        metadata_file = File.join(cache_dir, CACHE_METADATA_FILE)
+        File.write(metadata_file, JSON.pretty_generate(metadata))
+      end
+
+      def skip_with_cache_message(test_instance, cache_key, metadata)
+        cache_age = Time.now - Time.parse(metadata["created_at"])
+        age_text = format_duration(cache_age)
+
+        test_instance.skip("💨 Using cached result for '#{cache_key}' (cached #{age_text} ago)")
+      end
+
+      def cleanup_cache_directory(cache_dir)
+        FileUtils.rm_rf(cache_dir)
+      end
+
+      def directory_size(dir_path)
+        Dir.glob(File.join(dir_path, "**", "*"))
+           .select { |f| File.file?(f) }
+           .sum { |f| File.size(f) }
+      end
+
+      def format_duration(seconds)
+        if seconds < 60
+          "#{seconds.round}s"
+        elsif seconds < 3600
+          minutes = (seconds / 60).round
+          "#{minutes}m"
+        else
+          hours = (seconds / 3600).round
+          "#{hours}h"
+        end
+      end
+    end
+  end
+
+  # Mixin module for test classes to provide caching helpers
+  module TestCacheHelpers
+    def cache_expensive_operation(cache_key, dependencies: [], ttl: Makit::TestCache::DEFAULT_TTL, &block)
+      Makit::TestCache.with_cache(self, cache_key,
+                                  dependencies: dependencies,
+                                  ttl: ttl,
+        &block)
+    end
+
+    def cached_directory(cache_key, dependencies: [], ttl: Makit::TestCache::DEFAULT_TTL)
+      Makit::TestCache.cache_directory(self, cache_key,
+                                       dependencies: dependencies,
+                                       ttl: ttl)
+    end
+
+    def cached_files_exist?(cache_key, expected_files, dependencies: [], ttl: Makit::TestCache::DEFAULT_TTL)
+      Makit::TestCache.cache_files(self, cache_key, expected_files,
+                                   dependencies: dependencies,
+                                   ttl: ttl)
+    end
+  end
+end

data/lib/makit/v1/makit.v1_pb.rb

@@ -1,35 +1,34 @@
-# frozen_string_literal: true
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: lib/makit/v1/makit.v1.proto
-
-require 'google/protobuf'
-
-require 'google/protobuf/timestamp_pb'
-require 'google/protobuf/duration_pb'
-
-
-descriptor_data = "\n\x1blib/makit/v1/makit.v1.proto\x12\x08makit.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\"/\n\x0b\x45nvironment\x12\n\n\x02os\x18\x01 \x01(\t\x12\x14\n\x0c\x61rchitecture\x18\x02 \x01(\t\"\x92\x02\n\rDotNetProject\x12\x10\n\x08template\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06output\x18\x03 \x01(\t\x12\x10\n\x08packages\x18\x04 \x03(\t\x12\x12\n\nreferences\x18\x05 \x03(\t\x12\n\n\x02os\x18\x06 \x01(\t\x12\x10\n\x08\x63ommands\x18\x07 \x03(\t\x12-\n\nbuild_args\x18\x08 \x03(\x0b\x32\x19.makit.v1.DotNetBuildArgs\x12\x31\n\x0cpublish_args\x18\t \x03(\x0b\x32\x1b.makit.v1.DotNetPublishArgs\x12+\n\ttest_args\x18\n \x03(\x0b\x32\x18.makit.v1.DotNetTestArgs\"8\n\x0f\x44otNetBuildArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\":\n\x11\x44otNetPublishArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\"7\n\x0e\x44otNetTestArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\"\xa8\x01\n\x07Project\x12\x16\n\x0egit_remote_url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\tartifacts\x18\x03 \x03(\t\x12\x32\n\x10\x63ommand_requests\x18\x04 \x03(\x0b\x32\x18.makit.v1.CommandRequest\x12\x30\n\x0f\x64otnet_projects\x18\x05 \x03(\x0b\x32\x17.makit.v1.DotNetProject\"\xa5\x01\n\x0e\x43ommandRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\targuments\x18\x02 \x03(\t\x12+\n\x07timeout\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x11\n\tdirectory\x18\x04 \x01(\t\x12\x0c\n\x04task\x18\x05 \x01(\t\x12\r\n\x05input\x18\x06 \x01(\x0c\x12\x15\n\rexit_on_error\x18\x07 \x01(\x08\"\x91\x02\n\x07\x43ommand\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\targuments\x18\x03 \x03(\t\x12\x11\n\texit_code\x18\x04 \x01(\x05\x12\r\n\x05input\x18\x05 \x01(\x0c\x12\x0e\n\x06output\x18\x06 \x01(\x0c\x12\r\n\x05\x65rror\x18\x07 \x01(\x0c\x12.\n\nstarted_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12+\n\x08\x64uration\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0c\n\x04user\x18\n \x01(\t\x12\x0e\n\x06\x64\x65vice\x18\x0b \x01(\t\x12\n\n\x02os\x18\x0c \x01(\t\x12\x11\n\tdirectory\x18\r \x01(\t\"I\n\rConfiguration\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\x08\x63ommands\x18\x02 \x03(\x0b\x32\x18.makit.v1.CommandRequest\"3\n\rGitRepository\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x15\n\rrelative_path\x18\x02 \x01(\t\"h\n\x0bGitLogEntry\x12\x0e\n\x06\x63ommit\x18\x01 \x01(\t\x12\x0e\n\x06\x61uthor\x18\x02 \x01(\t\x12(\n\x04\x64\x61te\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07message\x18\x04 \x01(\t\"\xc8\x01\n\nMakeResult\x12\x12\n\nrepository\x18\x01 \x01(\t\x12\x0e\n\x06\x63ommit\x18\x02 \x01(\t\x12\x0e\n\x06\x62ranch\x18\x03 \x01(\t\x12\x0b\n\x03tag\x18\x04 \x01(\t\x12\x0e\n\x06\x64\x65vice\x18\x05 \x01(\t\x12\x1a\n\x12runtime_identifier\x18\x06 \x01(\t\x12#\n\x08\x63ommands\x18\x07 \x03(\x0b\x32\x11.makit.v1.Command\x12\x14\n\x0cinitial_size\x18\x08 \x01(\x05\x12\x12\n\nfinal_size\x18\t \x01(\x05\"?\n\rDotNetNewArgs\x12\x10\n\x08template\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06output\x18\x03 \x01(\t\"^\n\rManifestEntry\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x31\n\rlast_modified\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0c\n\x04size\x18\x03 \x01(\x03**\n\x08Language\x12\x08\n\x04RUBY\x10\x00\x12\n\n\x06\x43SHARP\x10\x01\x12\x08\n\x04RUST\x10\x02*,\n\x0bPackageType\x12\x07\n\x03GEM\x10\x00\x12\t\n\x05NUGET\x10\x01\x12\t\n\x05\x43RATE\x10\x03\x32H\n\x0e\x43ommandService\x12\x36\n\x07\x45xecute\x12\x18.makit.v1.CommandRequest\x1a\x11.makit.v1.Commandb\x06proto3"
-
-pool = Google::Protobuf::DescriptorPool.generated_pool
-pool.add_serialized_file(descriptor_data)
-
-module Makit
-  module V1
-    Environment = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Environment").msgclass
-    DotNetProject = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetProject").msgclass
-    DotNetBuildArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetBuildArgs").msgclass
-    DotNetPublishArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetPublishArgs").msgclass
-    DotNetTestArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetTestArgs").msgclass
-    Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Project").msgclass
-    CommandRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.CommandRequest").msgclass
-    Command = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Command").msgclass
-    Configuration = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Configuration").msgclass
-    GitRepository = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.GitRepository").msgclass
-    GitLogEntry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.GitLogEntry").msgclass
-    MakeResult = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.MakeResult").msgclass
-    DotNetNewArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetNewArgs").msgclass
-    ManifestEntry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.ManifestEntry").msgclass
-    Language = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Language").enummodule
-    PackageType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.PackageType").enummodule
-  end
-end
+# frozen_string_literal: true
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: lib/makit/v1/makit.v1.proto
+
+require "google/protobuf"
+
+require "google/protobuf/timestamp_pb"
+require "google/protobuf/duration_pb"
+
+descriptor_data = "\n\x1blib/makit/v1/makit.v1.proto\x12\x08makit.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\"/\n\x0b\x45nvironment\x12\n\n\x02os\x18\x01 \x01(\t\x12\x14\n\x0c\x61rchitecture\x18\x02 \x01(\t\"\x92\x02\n\rDotNetProject\x12\x10\n\x08template\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06output\x18\x03 \x01(\t\x12\x10\n\x08packages\x18\x04 \x03(\t\x12\x12\n\nreferences\x18\x05 \x03(\t\x12\n\n\x02os\x18\x06 \x01(\t\x12\x10\n\x08\x63ommands\x18\x07 \x03(\t\x12-\n\nbuild_args\x18\x08 \x03(\x0b\x32\x19.makit.v1.DotNetBuildArgs\x12\x31\n\x0cpublish_args\x18\t \x03(\x0b\x32\x1b.makit.v1.DotNetPublishArgs\x12+\n\ttest_args\x18\n \x03(\x0b\x32\x18.makit.v1.DotNetTestArgs\"8\n\x0f\x44otNetBuildArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\":\n\x11\x44otNetPublishArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\"7\n\x0e\x44otNetTestArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\"\xa8\x01\n\x07Project\x12\x16\n\x0egit_remote_url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\tartifacts\x18\x03 \x03(\t\x12\x32\n\x10\x63ommand_requests\x18\x04 \x03(\x0b\x32\x18.makit.v1.CommandRequest\x12\x30\n\x0f\x64otnet_projects\x18\x05 \x03(\x0b\x32\x17.makit.v1.DotNetProject\"\xa5\x01\n\x0e\x43ommandRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\targuments\x18\x02 \x03(\t\x12+\n\x07timeout\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x11\n\tdirectory\x18\x04 \x01(\t\x12\x0c\n\x04task\x18\x05 \x01(\t\x12\r\n\x05input\x18\x06 \x01(\x0c\x12\x15\n\rexit_on_error\x18\x07 \x01(\x08\"\x91\x02\n\x07\x43ommand\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\targuments\x18\x03 \x03(\t\x12\x11\n\texit_code\x18\x04 \x01(\x05\x12\r\n\x05input\x18\x05 \x01(\x0c\x12\x0e\n\x06output\x18\x06 \x01(\x0c\x12\r\n\x05\x65rror\x18\x07 \x01(\x0c\x12.\n\nstarted_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12+\n\x08\x64uration\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0c\n\x04user\x18\n \x01(\t\x12\x0e\n\x06\x64\x65vice\x18\x0b \x01(\t\x12\n\n\x02os\x18\x0c \x01(\t\x12\x11\n\tdirectory\x18\r \x01(\t\"I\n\rConfiguration\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\x08\x63ommands\x18\x02 \x03(\x0b\x32\x18.makit.v1.CommandRequest\"3\n\rGitRepository\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x15\n\rrelative_path\x18\x02 \x01(\t\"h\n\x0bGitLogEntry\x12\x0e\n\x06\x63ommit\x18\x01 \x01(\t\x12\x0e\n\x06\x61uthor\x18\x02 \x01(\t\x12(\n\x04\x64\x61te\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07message\x18\x04 \x01(\t\"\xc8\x01\n\nMakeResult\x12\x12\n\nrepository\x18\x01 \x01(\t\x12\x0e\n\x06\x63ommit\x18\x02 \x01(\t\x12\x0e\n\x06\x62ranch\x18\x03 \x01(\t\x12\x0b\n\x03tag\x18\x04 \x01(\t\x12\x0e\n\x06\x64\x65vice\x18\x05 \x01(\t\x12\x1a\n\x12runtime_identifier\x18\x06 \x01(\t\x12#\n\x08\x63ommands\x18\x07 \x03(\x0b\x32\x11.makit.v1.Command\x12\x14\n\x0cinitial_size\x18\x08 \x01(\x05\x12\x12\n\nfinal_size\x18\t \x01(\x05\"?\n\rDotNetNewArgs\x12\x10\n\x08template\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06output\x18\x03 \x01(\t\"^\n\rManifestEntry\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x31\n\rlast_modified\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0c\n\x04size\x18\x03 \x01(\x03**\n\x08Language\x12\x08\n\x04RUBY\x10\x00\x12\n\n\x06\x43SHARP\x10\x01\x12\x08\n\x04RUST\x10\x02*,\n\x0bPackageType\x12\x07\n\x03GEM\x10\x00\x12\t\n\x05NUGET\x10\x01\x12\t\n\x05\x43RATE\x10\x03\x32H\n\x0e\x43ommandService\x12\x36\n\x07\x45xecute\x12\x18.makit.v1.CommandRequest\x1a\x11.makit.v1.Commandb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+pool.add_serialized_file(descriptor_data)
+
+module Makit
+  module V1
+    Environment = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Environment").msgclass
+    DotNetProject = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetProject").msgclass
+    DotNetBuildArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetBuildArgs").msgclass
+    DotNetPublishArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetPublishArgs").msgclass
+    DotNetTestArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetTestArgs").msgclass
+    Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Project").msgclass
+    CommandRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.CommandRequest").msgclass
+    Command = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Command").msgclass
+    Configuration = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Configuration").msgclass
+    GitRepository = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.GitRepository").msgclass
+    GitLogEntry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.GitLogEntry").msgclass
+    MakeResult = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.MakeResult").msgclass
+    DotNetNewArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetNewArgs").msgclass
+    ManifestEntry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.ManifestEntry").msgclass
+    Language = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Language").enummodule
+    PackageType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.PackageType").enummodule
+  end
+end

data/lib/makit/v1/makit.v1_services_pb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # Source: lib/makit/v1/makit.v1.proto for package 'makit.v1'
 

data/lib/makit/version.rb

@@ -1,64 +1,5 @@
 # frozen_string_literal: true
 
 module Makit
-  VERSION = "0.0.98"
-
-  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"
-      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
+  VERSION = "0.0.111"
 end

data/lib/makit/wix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "securerandom"
 
 module Makit
@@ -12,20 +14,18 @@ module Makit
   #
   class Wix
     def self.setup
-      if (Makit::Environment.is_windows?)
+      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
+        if Makit::DotNet.is_installed?
           # 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)
+          "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"
@@ -41,33 +41,33 @@ module Makit
       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 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 "    <MajorUpgrade DowngradeErrorMessage=\"!(loc.DowngradeError)\" />"
         f.puts "    <Files Include=\"#{files}\" />"
-        #f.puts "    <Feature Id=\"Main\">"
-        #f.puts "      <ComponentGroupRef Id=\"Components\" />"
-        #f.puts "    </Feature>"
+        # 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
+  end
+end
 
 # Package.wxs with File harvesting
-#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+# <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>
 
-#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+# <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)" />
 
@@ -75,13 +75,13 @@ end # module Makit
 #      <ComponentGroupRef Id="Components" />
 #    </Feature>
 #  </Package>
-#</Wix>
+# </Wix>
 
-#<Project Sdk="WixToolset.Sdk/5.0.1">
-#</Project>
+# <Project Sdk="WixToolset.Sdk/5.0.1">
+# </Project>
 
 # Components.wxs
-#<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+# <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 #  <Fragment>
 #    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
 #		<Component Guid="b8085fb3-3718-46df-8bf6-ecf9f968dd3d">
@@ -92,4 +92,4 @@ end # module Makit
 #		</Component>
 #    </ComponentGroup>
 #  </Fragment>
-#</Wix>
+# </Wix>