makit 0.0.157 → 0.0.158

data/lib/makit/tasks/init.rb

@@ -1,49 +1,49 @@
-# frozen_string_literal: true
-
-Rake.application.top_level_tasks.unshift("init")
-
-task :init do
-  puts "-" * 80
-  humanized_timestamp = Makit::Humanize.get_humanized_timestamp(Time.now)
-  # log the rake + arguments, as it would be invoke at the console.
-  # for instance: rake -T
-  # or: rake
-  # or: rake clean
-  # or: rake LOG_LEVEL=debug
-  command = "rake #{ARGV.join(" ")}"
-  message = "#{command} (#{humanized_timestamp})"
-
-  # Create filename-friendly version of rake command
-  rake_name = command.gsub(/[^a-zA-Z0-9\-_]/, "_").gsub(/_+/, "_").gsub(/^_|_$/, "")
-
-  # Get the default logger and add custom file logging sinks
-  log = Makit::Logging.default_logger
-
-  # Add structured JSON and simple text logging sinks to the default logger
-  additional_sinks = [
-    Makit::Logging::Sinks::UnifiedFileSink.new(
-      configurations: [
-        # Structured JSON logging
-        {
-          file: "artifacts/#{rake_name}.json",
-          format: :json,
-          append: true,
-          include_metadata: true,
-        },
-        # Simple text logging with rendered context
-        {
-          file: "artifacts/#{rake_name}.txt",
-          format: :plain,
-          append: true,
-          include_context: true,
-        },
-      ],
-    ),
-  ]
-
-  # Add the additional sinks to the default logger
-  log.sinks.concat(additional_sinks)
-
-  # Log with the enhanced default logger
-  log.info(message)
-end
+# frozen_string_literal: true
+
+Rake.application.top_level_tasks.unshift("init")
+
+task :init do
+  puts "-" * 80
+  humanized_timestamp = Makit::Humanize.get_humanized_timestamp(Time.now)
+  # log the rake + arguments, as it would be invoke at the console.
+  # for instance: rake -T
+  # or: rake
+  # or: rake clean
+  # or: rake LOG_LEVEL=debug
+  command = "rake #{ARGV.join(" ")}"
+  message = "#{command} (#{humanized_timestamp})"
+
+  # Create filename-friendly version of rake command
+  rake_name = command.gsub(/[^a-zA-Z0-9\-_]/, "_").gsub(/_+/, "_").gsub(/^_|_$/, "")
+
+  # Get the default logger and add custom file logging sinks
+  log = Makit::Logging.default_logger
+
+  # Add structured JSON and simple text logging sinks to the default logger
+  additional_sinks = [
+    Makit::Logging::Sinks::UnifiedFileSink.new(
+      configurations: [
+        # Structured JSON logging
+        {
+          file: "artifacts/#{rake_name}.json",
+          format: :json,
+          append: true,
+          include_metadata: true,
+        },
+        # Simple text logging with rendered context
+        {
+          file: "artifacts/#{rake_name}.txt",
+          format: :plain,
+          append: true,
+          include_context: true,
+        },
+      ],
+    ),
+  ]
+
+  # Add the additional sinks to the default logger
+  log.sinks.concat(additional_sinks)
+
+  # Log with the enhanced default logger
+  log.info(message)
+end

data/lib/makit/tasks/integrate.rb

@@ -1,56 +1,60 @@
-# frozen_string_literal: true
-
-require_relative "../git/repository"
-
-if Dir.exist?(".git")
-  desc "Integrate changes into the git repository (only runs on default branch)."
-  task :integrate do
-    Makit::Logging.default_logger.task_start("integrate")
-    
-    # Check if we're on the default branch
-    current_branch = Makit::Git.branch
-    if current_branch.nil? || current_branch.empty?
-      Makit::Logging.default_logger.info("Skipping integrate: cannot determine current branch")
-      next
-    end
-    
-    # Get default branch from remote
-    default_branch = nil
-    begin
-      default_branch_output = `git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null`.strip
-      if default_branch_output && !default_branch_output.empty?
-        default_branch = default_branch_output.sub('refs/remotes/origin/', '')
-      end
-    rescue
-      # If we can't determine default branch, assume it's 'main'
-      default_branch = 'main'
-    end
-    
-    # Skip if not on default branch
-    if current_branch != default_branch
-      Makit::Logging.default_logger.info("Skipping integrate: not on default branch (current: #{current_branch}, default: #{default_branch || 'unknown'})")
-      next
-    end
-    
-    # Proceed with integration
-    unstaged_files = Makit::Git::Repository.unstaged_files
-    untracked_files = Makit::Git::Repository.untracked_files
-    if unstaged_files.length.positive? || untracked_files.length.positive?
-      #Makit::Git::CLI.integrate
-      #return unless Repository.git_repo? && !Repository.detached
-
-      ## check for unstaged or untracked files
-      #  unstaged_files = `git status --porcelain`.split("\n")
-      #  untracked_files = `git ls-files --others --exclude-standard`.split("\n")
-      #  return unless unstaged_files.length.positive? || untracked_files.length.positive?
-
-      "git add .".try
-      "git commit -m \"integrate\"".run unless Makit::Git::Repository.clean?
-    else
-      Makit::Logging.default_logger.info("No unstaged or untracked files found")
-      # puts "  No unstaged or untracked files found".colorize(:grey)
-    end
-  end
-else
-  Makit::Logging.default_logger.debug("Not a git repository, skipping integrate")
-end
+# frozen_string_literal: true
+
+require "open3"
+require_relative "../git/repository"
+
+if Dir.exist?(".git")
+  desc "Integrate changes into the git repository (only runs on default branch)."
+  task :integrate do
+    Makit::Logging.default_logger.task_start("integrate")
+    
+    # Check if we're on the default branch
+    current_branch = Makit::Git.branch
+    if current_branch.nil? || current_branch.empty?
+      Makit::Logging.default_logger.info("Skipping integrate: cannot determine current branch")
+      next
+    end
+    
+    # Get default branch from remote (Windows-safe: use Open3 for proper error handling)
+    default_branch = nil
+    begin
+      default_branch_output, _stderr, status = Open3.capture3('git', 'symbolic-ref', 'refs/remotes/origin/HEAD')
+      if status.success? && default_branch_output && !default_branch_output.strip.empty?
+        default_branch = default_branch_output.strip.sub('refs/remotes/origin/', '')
+      end
+    rescue
+      # If we can't determine default branch, assume it's 'main'
+      default_branch = 'main'
+    end
+    
+    # Fallback to 'main' if default_branch is still nil
+    default_branch ||= 'main'
+    
+    # Skip if not on default branch
+    if current_branch != default_branch
+      Makit::Logging.default_logger.info("Skipping integrate: not on default branch (current: #{current_branch}, default: #{default_branch || 'unknown'})")
+      next
+    end
+    
+    # Proceed with integration
+    unstaged_files = Makit::Git::Repository.unstaged_files
+    untracked_files = Makit::Git::Repository.untracked_files
+    if unstaged_files.length.positive? || untracked_files.length.positive?
+      #Makit::Git::CLI.integrate
+      #return unless Repository.git_repo? && !Repository.detached
+
+      ## check for unstaged or untracked files
+      #  unstaged_files = `git status --porcelain`.split("\n")
+      #  untracked_files = `git ls-files --others --exclude-standard`.split("\n")
+      #  return unless unstaged_files.length.positive? || untracked_files.length.positive?
+
+      "git add .".try
+      "git commit -m \"integrate\"".run unless Makit::Git::Repository.clean?
+    else
+      Makit::Logging.default_logger.info("No unstaged or untracked files found")
+      # puts "  No unstaged or untracked files found".colorize(:grey)
+    end
+  end
+else
+  Makit::Logging.default_logger.debug("Not a git repository, skipping integrate")
+end

data/lib/makit/tasks/pull_incoming.rb

@@ -1,13 +1,13 @@
-# frozen_string_literal: true
-
-require_relative "../git/repository"
-
-if Makit::Git::Repository.git_repo?
-  desc "pull changes from the remote branch, preferring incoming changes for conflicts"
-  task :pull_incoming do
-    Makit::Logging.default_logger.task_start("pull_incoming")
-    # Makit::SHOW.task(:pull_incoming)
-    puts "  git branch is ".colorize(:grey) + Makit::Git::Repository.branch.to_s.colorize(:green)
-    "git pull origin #{Makit::Git::Repository.branch} -X theirs".try
-  end
-end
+# frozen_string_literal: true
+
+require_relative "../git/repository"
+
+if Makit::Git::Repository.git_repo?
+  desc "pull changes from the remote branch, preferring incoming changes for conflicts"
+  task :pull_incoming do
+    Makit::Logging.default_logger.task_start("pull_incoming")
+    # Makit::SHOW.task(:pull_incoming)
+    puts "  git branch is ".colorize(:grey) + Makit::Git::Repository.branch.to_s.colorize(:green)
+    "git pull origin #{Makit::Git::Repository.branch} -X theirs".try
+  end
+end

data/lib/makit/tasks/secrets.rb

@@ -1,7 +1,7 @@
-# frozen_string_literal: true
-
-desc "Display a list of available secret names"
-task :secrets do
-  Makit::Secrets.new.info
-end
-
+# frozen_string_literal: true
+
+desc "Display a list of available secret names"
+task :secrets do
+  Makit::Secrets.new.info
+end
+

data/lib/makit/tasks/setup.rb

@@ -1,16 +1,16 @@
-# frozen_string_literal: true
-
-require_relative "../setup/runner"
-
-desc "Setup project files.."
-task :setup do
-  Makit::Logging.default_logger.task_start("setup")
-
-  # if a .git directory exists, then make sure we have a .gitignore
-  if File.exist?(".git")
-    if !File.exist?(".gitignore")
-      File.write(".gitignore", Makit::Content::GITIGNORE)
-    end
-  end
-  Makit::Setup::Runner.run
-end
+# frozen_string_literal: true
+
+require_relative "../setup/runner"
+
+desc "Setup project files.."
+task :setup do
+  Makit::Logging.default_logger.task_start("setup")
+
+  # if a .git directory exists, then make sure we have a .gitignore
+  if File.exist?(".git")
+    if !File.exist?(".gitignore")
+      File.write(".gitignore", Makit::Content::GITIGNORE)
+    end
+  end
+  Makit::Setup::Runner.run
+end

data/lib/makit/tasks/sync.rb

@@ -1,17 +1,14 @@
-# frozen_string_literal: true
-
-require_relative "../git/cli"
-
-if Dir.exist?(".git")
-  desc "Sync changes with the git repository."
-  task :sync do
-    Makit::Logging.default_logger.task_start("sync")
-    # Makit::SHOW.task(:sync)
-    Makit::Git::CLI.sync
-    "git pull".try
-    "git push origin".try
-    "git push origin --tags".try
-  end
-else
-  Makit::Logging.default_logger.debug("Not a git repository, skipping sync")
-end
+# frozen_string_literal: true
+
+require_relative "../git/cli"
+
+if Dir.exist?(".git")
+  desc "Sync changes with the git repository."
+  task :sync do
+    Makit::Logging.default_logger.task_start("sync")
+    # Makit::SHOW.task(:sync)
+    Makit::Git::CLI.sync
+  end
+else
+  Makit::Logging.default_logger.debug("Not a git repository, skipping sync")
+end

data/lib/makit/tasks/tag.rb

@@ -1,27 +1,27 @@
-# frozen_string_literal: true
-
-if Dir.exist?(".git")
-  desc "tag the current version"
-  task :tag do
-    # Get version: use VERSION constant if defined, otherwise use Makit::Version.version
-    version = if defined?(VERSION) && !VERSION.nil?
-      VERSION
-    else
-      begin
-        Makit::Version.version
-      rescue => e
-        puts "  Could not determine version: #{e.message}".colorize(:red)
-        return
-      end
-    end
-
-    if version.nil? || version.to_s.strip.empty?
-      puts "  Version is empty or not found".colorize(:red)
-      return
-    end
-
-    Makit::Git::CLI.tag(version)
-  end
-else
-  Makit::Logging.default_logger.debug("Not a git repository, skipping tag")
-end
+# frozen_string_literal: true
+
+if Dir.exist?(".git")
+  desc "tag the current version"
+  task :tag do
+    # Get version: use VERSION constant if defined, otherwise use Makit::Version.version
+    version = if defined?(VERSION) && !VERSION.nil?
+      VERSION
+    else
+      begin
+        Makit::Version.version
+      rescue => e
+        puts "  Could not determine version: #{e.message}".colorize(:red)
+        return
+      end
+    end
+
+    if version.nil? || version.to_s.strip.empty?
+      puts "  Version is empty or not found".colorize(:red)
+      return
+    end
+
+    Makit::Git::CLI.tag(version)
+  end
+else
+  Makit::Logging.default_logger.debug("Not a git repository, skipping tag")
+end

data/lib/makit/tasks/task_monkey_patch.rb

@@ -1,81 +1,81 @@
-# frozen_string_literal: true
-
-# Monkey patch for Rake::Task to add hook support
-#
-# This module patches Rake::Task to automatically execute pre and post hooks
-# for all task invocations. It preserves the original behavior while adding
-# the hook functionality.
-#
-# @note This file should be required after the HookManager class is defined
-require_relative "hook_manager"
-
-# Monkey patch Rake::Task to add hook support
-module Rake
-  class Task
-    # Store original methods before patching
-    alias original_invoke invoke
-    alias original_execute execute
-
-    # Enhanced invoke method with hook support
-    #
-    # This method wraps the original invoke method to execute pre and post hooks
-    # around task execution. It handles errors gracefully and ensures hooks are
-    # always executed even if the task fails.
-    #
-    # @param args [Array] arguments passed to the task
-    # @return [Object] the result of the task execution
-    def invoke(*args)
-      start_time = Time.now
-      result = nil
-      error = nil
-
-      begin
-        # Execute pre-task hooks
-        Makit::Tasks::HookManager.execute_pre_hooks(name)
-
-        # Execute the original task
-        result = original_invoke(*args)
-      rescue StandardError => e
-        error = e
-        raise
-      ensure
-        # Execute post-task hooks (always runs, even on error)
-        duration = Time.now - start_time
-        Makit::Tasks::HookManager.execute_post_hooks(name, duration, result, error)
-      end
-
-      result
-    end
-
-    # Enhanced execute method with hook support
-    #
-    # This method wraps the original execute method to execute pre and post hooks
-    # around task execution. It handles errors gracefully and ensures hooks are
-    # always executed even if the task fails.
-    #
-    # @param args [Array] arguments passed to the task
-    # @return [Object] the result of the task execution
-    def execute(*args)
-      start_time = Time.now
-      result = nil
-      error = nil
-
-      begin
-        # Execute pre-task hooks
-        Makit::Tasks::HookManager.execute_pre_hooks(name)
-
-        # Execute the original task
-        result = original_execute(*args)
-      rescue StandardError => e
-        error = e
-        raise
-      ensure
-        # Execute post-task hooks (always runs, even on error)
-        duration = Time.now - start_time
-        Makit::Tasks::HookManager.execute_post_hooks(name, duration, result, error)
-      end
-
-      result
-    end
-  end
-end
+# frozen_string_literal: true
+
+# Monkey patch for Rake::Task to add hook support
+#
+# This module patches Rake::Task to automatically execute pre and post hooks
+# for all task invocations. It preserves the original behavior while adding
+# the hook functionality.
+#
+# @note This file should be required after the HookManager class is defined
+require_relative "hook_manager"
+
+# Monkey patch Rake::Task to add hook support
+module Rake
+  class Task
+    # Store original methods before patching
+    alias original_invoke invoke
+    alias original_execute execute
+
+    # Enhanced invoke method with hook support
+    #
+    # This method wraps the original invoke method to execute pre and post hooks
+    # around task execution. It handles errors gracefully and ensures hooks are
+    # always executed even if the task fails.
+    #
+    # @param args [Array] arguments passed to the task
+    # @return [Object] the result of the task execution
+    def invoke(*args)
+      start_time = Time.now
+      result = nil
+      error = nil
+
+      begin
+        # Execute pre-task hooks
+        Makit::Tasks::HookManager.execute_pre_hooks(name)
+
+        # Execute the original task
+        result = original_invoke(*args)
+      rescue StandardError => e
+        error = e
+        raise
+      ensure
+        # Execute post-task hooks (always runs, even on error)
+        duration = Time.now - start_time
+        Makit::Tasks::HookManager.execute_post_hooks(name, duration, result, error)
+      end
+
+      result
+    end
+
+    # Enhanced execute method with hook support
+    #
+    # This method wraps the original execute method to execute pre and post hooks
+    # around task execution. It handles errors gracefully and ensures hooks are
+    # always executed even if the task fails.
+    #
+    # @param args [Array] arguments passed to the task
+    # @return [Object] the result of the task execution
+    def execute(*args)
+      start_time = Time.now
+      result = nil
+      error = nil
+
+      begin
+        # Execute pre-task hooks
+        Makit::Tasks::HookManager.execute_pre_hooks(name)
+
+        # Execute the original task
+        result = original_execute(*args)
+      rescue StandardError => e
+        error = e
+        raise
+      ensure
+        # Execute post-task hooks (always runs, even on error)
+        duration = Time.now - start_time
+        Makit::Tasks::HookManager.execute_post_hooks(name, duration, result, error)
+      end
+
+      result
+    end
+  end
+end

data/lib/makit/tasks/test.rb

@@ -1,22 +1,22 @@
-# frozen_string_literal: true
-
-require_relative "../setup/runner"
-
-if File.exist?(".makit.json")
-  desc "Test project artifacts.."
-  task :test do
-    Makit::Logging.default_logger.task_start("test")
-    # load the default project configuration
-    # puts "loading project configuration"
-    project = Makit::Configuration::Project.default
-
-    # if the project has a build step, run the commands
-    test_step = project.steps.find { |step| step.name == "test" }
-    test_step&.commands&.each do |command|
-      request = Makit::Commands::Request.from_string(command)
-      Makit::Commands::Runner.default.execute(request)
-    end
-  end
-else
-  Makit::Logging.default_logger.debug("Project not configured, skipping setup task definition")
-end
+# frozen_string_literal: true
+
+require_relative "../setup/runner"
+
+if File.exist?(".makit.json")
+  desc "Test project artifacts.."
+  task :test do
+    Makit::Logging.default_logger.task_start("test")
+    # load the default project configuration
+    # puts "loading project configuration"
+    project = Makit::Configuration::Project.default
+
+    # if the project has a build step, run the commands
+    test_step = project.steps.find { |step| step.name == "test" }
+    test_step&.commands&.each do |command|
+      request = Makit::Commands::Request.from_string(command)
+      Makit::Commands::Runner.default.execute(request)
+    end
+  end
+else
+  Makit::Logging.default_logger.debug("Project not configured, skipping setup task definition")
+end

data/lib/makit/tasks/update.rb

@@ -1,18 +1,18 @@
-# frozen_string_literal: true
-
-desc "Update project dependencies"
-task :update do
-  "bundle update".run if File.exist?("Gemfile")
-  # are there any *.sln files?
-  Dir.glob("**/*.sln").each do |sln_file|
-    "dotnet sln migrate #{sln_file}".run
-    FileUtils.rm_f(sln_file) if File.exist?(sln_file.gsub(".sln", ".slnx"))
-  end
-  "dotnet tool update --global dotnet-outdated-tool".run
-  Dir.glob("**/*.slnx").each do |slnx_file|
-    "dotnet outdated #{slnx_file} --upgrade:Auto".run
-  end
-  Dir.glob("**/*.csproj").each do |csproj_file|
-    "dotnet outdated #{csproj_file} --upgrade:Auto".run
-  end
-end
+# frozen_string_literal: true
+
+desc "Update project dependencies"
+task :update do
+  "bundle update".run if File.exist?("Gemfile")
+  # are there any *.sln files?
+  Dir.glob("**/*.sln").each do |sln_file|
+    "dotnet sln migrate #{sln_file}".run
+    FileUtils.rm_f(sln_file) if File.exist?(sln_file.gsub(".sln", ".slnx"))
+  end
+  "dotnet tool update --global dotnet-outdated-tool".run
+  Dir.glob("**/*.slnx").each do |slnx_file|
+    "dotnet outdated #{slnx_file} --upgrade:Auto".run
+  end
+  Dir.glob("**/*.csproj").each do |csproj_file|
+    "dotnet outdated #{csproj_file} --upgrade:Auto".run
+  end
+end

data/lib/makit/tasks/version.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
-
-desc "Display version information for the current project"
-task :version do
-  Makit::Version.info
-end
+# frozen_string_literal: true
+
+desc "Display version information for the current project"
+task :version do
+  Makit::Version.info
+end