makit 0.0.99 → 0.0.112

data/lib/makit/mp/string_mp.rb

@@ -1,176 +1,193 @@
-# frozen_string_literal: true
-require "json"
-# monkey patch String class with a run method
-
-class String
-  def run(args = nil)
-    if args.nil?
-      command = self
-      Makit::RUNNER.run(Makit::RUNNER::parse_command_request(command))
-    else
-      command = self
-      request = Makit::RUNNER.parse_args(command)
-      if args.is_a?(Hash)
-        args.each do |key, value|
-          request.send("#{key}=", value)
-        end
-      end
-      Makit::RUNNER.run(request)
-    end
-  end
-
-  def cache_run()
-    command = self
-    Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command))
-  end
-
-  def cache_run(timestamp = nil)
-    if timestamp.nil?
-      timestamp = Makit::GIT_FILE_INFOS.first.mtime #GIT_FILE_INFOS. Makit::Directory.get_newest_git_file_timestamp(Makit::Directories::PROJECT_ROOT)
-      #timestamp = Makit::Timestamp.now
-    end
-
-    command = self
-    Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command), timestamp)
-  end
-
-  def try(args = nil)
-    if args.nil?
-      command = self
-      Makit::RUNNER.try(command)
-    else
-      command = self
-      request = Makit::RUNNER.parse_args(command)
-      if args.is_a?(Hash)
-        args.each do |key, value|
-          request.send("#{key}=", value)
-        end
-      end
-      Makit::RUNNER.try(request)
-    end
-  end
-
-  def show(args = nil)
-    if args.nil?
-      command = self
-      Makit::RUNNER.show(command)
-    else
-      command = self
-      request = Makit::RUNNER.parse_args(command)
-      if args.is_a?(Hash)
-        args.each do |key, value|
-          request.send("#{key}=", value)
-        end
-      end
-      Makit::RUNNER.show(request)
-    end
-  end
-  def log(filename)
-    #puts "Logging to file: #{filename}"
-    # does the filename have a directory?
-    if filename.include?("/")
-      # get the directory
-      directory = File.dirname(filename)
-      # create the directory
-      #puts "Creating directory: #{directory}"
-      FileUtils.mkdir_p(directory)
-    end
-    command = self
-
-    cmd =  Makit::RUNNER.run(Makit::RUNNER::parse_command_request(command))
-    # write the cmd output and error to the file
-    #puts "Writing to file: #{filename}"
-    File.write(filename, cmd.output + cmd.error)
-
-    # display the summary of the command
-    #puts "Command: #{command}"
-    #puts "Output: #{cmd.output}"
-    #puts "Error: #{cmd.error}"
-    Makit::RUNNER.show_command(cmd)
-  end
-
-  def cache_try()
-    command = self
-    Makit::RUNNER.cache_try(Makit::RUNNER::parse_command_request(command))
-  end
-
-  def cache_try(timestamp = nil)
-    if timestamp.nil?
-      timestamp = Makit::GIT_FILE_INFOS.first.mtime #GIT_FILE_INFOS. Makit::Directory.get_newest_git_file_timestamp(Makit::Directories::PROJECT_ROOT)
-      #timestamp = Makit::Timestamp.now
-    end
-
-    command = self
-    Makit::RUNNER.cache_try(Makit::RUNNER::parse_command_request(command), timestamp)
-  end
-
-  # Read a value from a JSON file
-  # key is a string with the key to read, e.g. "AzureAd.Authority"
-  def get_json_value(key)
-    json = File.read(self)
-    data = JSON.parse(json)
-
-    # key delimiter is '.' so we can access nested keys
-    key.split(".").each do |k|
-      data = data[k]
-    end
-    data
-  end
-
-  alias_method :retrieve, :get_json_value
-
-  # Set a value in a JSON file
-  # key is a string with the key to set, e.g. "AzureAd.Authority"
-  def set_json_value(key, value)
-    file = File.read(self)
-    data = JSON.parse(file)
-    keys = key.split(".")
-    current = data
-
-    # Traverse and create any missing keys
-    keys[0..-2].each do |k|
-      current[k] ||= {}  # Create a new hash if the key doesn't exist
-      current = current[k]
-    end
-
-    # Set the value for the final key
-    current[keys[-1]] = value
-
-    # Write the JSON back to the file
-    File.write(self, JSON.pretty_generate(data))
-  end
-
-  # Alias for set_json_value
-  alias_method :assign, :set_json_value
-
-  def strip_color_codes
-    # Regular expression to remove ANSI color codes
-    cleaned_content = self.gsub(/\e\[[\d;]+m/, "")
-    cleaned_content
-  end
-
-  def to_lines(max_length = 80, indent_length = 5)
-    if (self.length <= max_length)
-      return self
-    else
-      indent = " " * indent_length
-      words = self.split(" ")
-      lines = []
-      line = ""
-      words.each do |word|
-        if ((line + word).length > max_length)
-          lines << line
-          line = indent + word
-        else
-          if (line.length == 0)
-            line = word
-          else
-            line += " " + word
-          end
-        end
-      end
-      lines << line
-      return lines.join("\n")
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "json"
+require "fileutils"
+# monkey patch String class with command execution methods
+
+class String
+  def run(args = nil)
+    command = self
+    if args.nil?
+      request = Makit::Commands::Request.from_string(command)
+      Makit::Commands::Runner.default.execute(request)
+    else
+      # Parse initial request
+      base_request = Makit::Commands::Request.from_string(command)
+
+      if args.is_a?(Hash)
+        # Create new request with combined options
+        request_options = {
+          command: base_request.command,
+          arguments: base_request.arguments || [],
+          directory: base_request.directory,
+          timeout: base_request.timeout,
+          environment: base_request.environment || {},
+          metadata: base_request.metadata || {},
+        }
+
+        # Apply args to the request options
+        args.each do |key, value|
+          case key.to_s
+          when "arguments"
+            # Append additional arguments
+            request_options[:arguments] = (request_options[:arguments] + Array(value)).flatten
+          when "directory"
+            request_options[:directory] = value
+          when "timeout"
+            request_options[:timeout] = value
+          when "environment"
+            request_options[:environment] = (request_options[:environment] || {}).merge(value)
+          when "metadata"
+            request_options[:metadata] = (request_options[:metadata] || {}).merge(value)
+          else
+            # Add unknown keys to metadata
+            request_options[:metadata] = (request_options[:metadata] || {}).merge(key.to_s => value)
+          end
+        end
+
+        # Create new request with combined options
+        request = Makit::Commands::Request.new(**request_options)
+        Makit::Commands::Runner.default.execute(request)
+      else
+        # args is an array of additional arguments
+        request = Makit::Commands::Request.new(
+          command: base_request.command,
+          arguments: (base_request.arguments || []) + Array(args),
+          directory: base_request.directory,
+          timeout: base_request.timeout,
+          environment: base_request.environment || {},
+          metadata: base_request.metadata || {},
+        )
+        Makit::Commands::Runner.default.execute(request)
+      end
+    end
+  end
+
+  def cache_run(timestamp = nil)
+    puts "cache_run: #{self}"
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    if timestamp
+      # Add timestamp to metadata for cache key generation
+      request = Makit::Commands::Request.new(
+        command: request.command,
+        arguments: request.arguments,
+        directory: request.directory,
+        timeout: request.timeout,
+        environment: request.environment || {},
+        metadata: (request.metadata || {}).merge(timestamp: timestamp),
+      )
+      puts "timestamp: #{timestamp}"
+    else
+      puts "no timestamp"
+    end
+    Makit::Commands::Runner.default.execute(request)
+  end
+
+  def try
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    Makit::Commands::Runner.default.execute(request)
+  end
+
+  def show
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    Makit::Commands::Runner.default.execute(request)
+  end
+
+  def log
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    result = Makit::Commands::Runner.default.execute(request)
+
+    # Log the command execution result
+    if result.success?
+      Makit::Logging.info("Command completed successfully: #{command}")
+    else
+      Makit::Logging.error("Command failed: #{command} (exit code: #{result.exit_code})")
+    end
+
+    result
+  end
+
+  def cache_try(timestamp = nil)
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    if timestamp
+      # Add timestamp to metadata for cache key generation
+      request = Makit::Commands::Request.new(
+        command: request.command,
+        arguments: request.arguments,
+        directory: request.directory,
+        timeout: request.timeout,
+        environment: request.environment || {},
+        metadata: (request.metadata || {}).merge(timestamp: timestamp),
+      )
+    end
+    Makit::Commands::Runner.default.execute(request)
+  end
+
+  def show_command(cmd)
+    if cmd.success?
+      puts "✅ #{cmd.command} #{cmd.arguments&.join(" ")}".colorize(:green)
+    else
+      puts "❌ #{cmd.command} #{cmd.arguments&.join(" ")}".colorize(:red)
+      puts "   Exit code: #{cmd.exit_code}".colorize(:red)
+      puts "   Error: #{cmd.stderr}".colorize(:red) if cmd.stderr && !cmd.stderr.empty?
+    end
+  end
+
+  def to_markdown
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    result = Makit::Commands::Runner.default.execute(request)
+
+    if result.success?
+      "```\n#{result.stdout}\n```"
+    else
+      "```\nError: #{result.stderr}\n```"
+    end
+  end
+
+  def cache_run_with_timestamp(timestamp)
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    request = Makit::Commands::Request.new(
+      command: request.command,
+      arguments: request.arguments,
+      directory: request.directory,
+      timeout: request.timeout,
+      environment: request.environment || {},
+      metadata: (request.metadata || {}).merge(timestamp: timestamp),
+    )
+    Makit::Commands::Runner.default.execute(request)
+  end
+
+  def cache_try_with_timestamp(timestamp)
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    request = Makit::Commands::Request.new(
+      command: request.command,
+      arguments: request.arguments,
+      directory: request.directory,
+      timeout: request.timeout,
+      environment: request.environment || {},
+      metadata: (request.metadata || {}).merge(timestamp: timestamp),
+    )
+    Makit::Commands::Runner.default.execute(request)
+  end
+
+  def cache_log(log_file)
+    command = self
+    request = Makit::Commands::Request.from_string(command)
+    result = Makit::Commands::Runner.default.execute(request)
+
+    # Write output to log file
+    FileUtils.mkdir_p(File.dirname(log_file))
+    File.write(log_file, result.stdout) if result.stdout && !result.stdout.empty?
+    File.write(log_file, result.stderr, mode: "a") if result.stderr && !result.stderr.empty?
+
+    result
+  end
+end

data/lib/makit/nuget.rb

@@ -1,72 +1,74 @@
-require "tmpdir"
-# This module provides classes for the Makit gem.
-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 NuGet
-    def self.get_cache_dir(package, version)
-      File.join(Makit::Directories::NUGET_PACKAGE_CACHE, package, version)
-    end
-
-    def self.cache(package, version)
-      # if the package is already cached, there is nothing to do
-      if (!Dir.exist?(get_cache_dir(package, version)))
-        Dir.mktmpdir do |dir|
-          # Use the temp directory here
-          Dir.chdir(dir) do
-            system("dotnet new classlib -n ClassLib")
-            Dir.chdir("ClassLib") do
-
-              # display a list of directories in the current directory
-              puts Dir.entries(Dir.pwd)
-              # display a list of files in the current directory
-              puts Dir.entries(Dir.pwd)
-              puts "dotnet add ClassLib.csproj package #{package} --version #{version}"
-              system("dotnet add ClassLib.csproj package #{package} --version #{version}")
-            end
-          end
-          # The directory and its contents will be removed automatically after the block
-        end
-      end
-    end
-
-    def self.clear_cache(package, version)
-      if (Dir.exist?(get_cache_dir(package, version)))
-        FileUtils.rm_rf(get_cache_dir(package, version))
-      end
-    end
-
-    # get the latest version of the package
-    def self.get_latest_version(package)
-      dir = File.join(Makit::Directories::NUGET_PACKAGE_CACHE, package)
-      if (Dir.exist?(dir))
-        versions = Dir.entries(dir).select { |entry| File.directory?(File.join(dir, entry)) && !(entry == "." || entry == "..") }
-        highest_version = Makit::Version::get_highest_version(versions)
-        return highest_version
-      end
-      nil
-    end
-
-    # publish a package to a nuget directory feed
-    def self.add_package(package, path)
-      system("dotnet nuget push #{path} --source #{path}")
-    end
-
-    def self.publish_to_directory(nuget_package_path,directory,package_name,version)
-      target_package_path = "#{directory}/#{package_name}/#{version}/#{package_name}.#{version}.nupkg".downcase
-      if (File.exist?(target_package_path))
-        puts "  #{target_package_path} already exists".colorize(:grey)
-      else  
-        "dotnet nuget push #{nuget_package_path} --source #{directory}".run
-      end
-    end
-    
-  end
-end
+# frozen_string_literal: true
+
+require "tmpdir"
+# This module provides classes for the Makit gem.
+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 NuGet
+    def self.get_cache_dir(package, version)
+      File.join(Makit::Directories::NUGET_PACKAGE_CACHE, package, version)
+    end
+
+    def self.cache(package, version)
+      # if the package is already cached, there is nothing to do
+      return if Dir.exist?(get_cache_dir(package, version))
+
+      Dir.mktmpdir do |dir|
+        # Use the temp directory here
+        Dir.chdir(dir) do
+          system("dotnet new classlib -n ClassLib")
+          Dir.chdir("ClassLib") do
+            # display a list of directories in the current directory
+            puts Dir.entries(Dir.pwd)
+            # display a list of files in the current directory
+            puts Dir.entries(Dir.pwd)
+            puts "dotnet add ClassLib.csproj package #{package} --version #{version}"
+            system("dotnet add ClassLib.csproj package #{package} --version #{version}")
+          end
+        end
+        # The directory and its contents will be removed automatically after the block
+      end
+    end
+
+    def self.clear_cache(package, version)
+      return unless Dir.exist?(get_cache_dir(package, version))
+
+      FileUtils.rm_rf(get_cache_dir(package, version))
+    end
+
+    # get the latest version of the package
+    def self.get_latest_version(package)
+      dir = File.join(Makit::Directories::NUGET_PACKAGE_CACHE, package)
+      if Dir.exist?(dir)
+        versions = Dir.entries(dir).select do |entry|
+          File.directory?(File.join(dir, entry)) && ![".", ".."].include?(entry)
+        end
+        highest_version = Makit::Version.get_highest_version(versions)
+        return highest_version
+      end
+      nil
+    end
+
+    # publish a package to a nuget directory feed
+    def self.add_package(_package, path)
+      system("dotnet nuget push #{path} --source #{path}")
+    end
+
+    def self.publish_to_directory(nuget_package_path, directory, package_name, version)
+      target_package_path = "#{directory}/#{package_name}/#{version}/#{package_name}.#{version}.nupkg".downcase
+      if File.exist?(target_package_path)
+        puts "  #{target_package_path} already exists".colorize(:grey)
+      else
+        "dotnet nuget push #{nuget_package_path} --source #{directory}".run
+      end
+    end
+  end
+end

data/lib/makit/port.rb

@@ -1,34 +1,32 @@
-# frozen_string_literal: true
-
-# This module provides classes for the Makit gem.
-module Makit
-    # This class provide methods for working with ports
-    #
-    class Port
-        def self.is_port_available?(port)
-            begin
-                socket = Socket.new(:INET, :STREAM)
-                socket.bind(Socket.sockaddr_in(port, ''))
-                socket.close
-                return true # Port is available for use
-            rescue Errno::EADDRINUSE, Errno::EACCES
-                return false # Port is not available for use
-            end
-        end
-
-        def self.get_available_port(start_port = 1024, end_port = 65535)
-            (start_port..end_port).each do |port|
-                return port if is_port_available?(port)
-            end
-            nil # No available port found in the range
-        end
-
-        def self.get_random_port
-            rand(1024..65535)
-        end
-
-        def self.get_random_available_port
-            get_available_port(get_random_port)
-        end
-    end # class Port
-end # module Makit
+# frozen_string_literal: true
+
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for working with ports
+  #
+  class Port
+    def self.is_port_available?(port)
+      socket = Socket.new(:INET, :STREAM)
+      socket.bind(Socket.sockaddr_in(port, ""))
+      socket.close
+      true # Port is available for use
+    rescue Errno::EADDRINUSE, Errno::EACCES
+      false # Port is not available for use
+    end
+
+    def self.get_available_port(start_port = 1024, end_port = 65_535)
+      (start_port..end_port).each do |port|
+        return port if is_port_available?(port)
+      end
+      nil # No available port found in the range
+    end
+
+    def self.get_random_port
+      rand(1024..65_535)
+    end
+
+    def self.get_random_available_port
+      get_available_port(get_random_port)
+    end
+  end
+end