makit 0.0.112 → 0.0.126

data/lib/makit/commands.rb

@@ -1,51 +1,50 @@
-# frozen_string_literal: true
-
-require "English"
-require "open3"
-require "socket"
-require "etc"
-require "logger"
-
-# This module provides classes for the Makit gem.
-module Makit
-  # Commands module provides a modern, flexible command execution framework
-  # with middleware support, validation, caching, and structured logging.
-  module Commands
-    # Custom exception for security-related command validation failures
-    class SecurityError < StandardError; end
-
-    # Custom exception for command execution failures
-    class ExecutionError < StandardError
-      attr_reader :exit_code, :stderr
-
-      def initialize(message, exit_code: nil, stderr: nil)
-        @exit_code = exit_code
-        @stderr = stderr
-        super(message)
-      end
-    end
-  end
-
-  # This class provide methods running commands.
-  #
-  class LegacyCommands < Array
-    # Generate the commands based on the current directory.
-    def auto_generate
-      self << Makit::V1::CommandRequest.new(name: "bundle", arguments: ["install"]) if File.exist?("Gemfile")
-      self << Makit::V1::CommandRequest.new(name: "bundle", arguments: %w[exec rake]) if File.exist?("Rakefile")
-    end
-  end
-end
-
-# Load command system components (load existing components only)
-require_relative "commands/result"
-require_relative "commands/request"
-require_relative "commands/runner"
-require_relative "commands/factory"
-require_relative "commands/middleware/validator"
-require_relative "commands/middleware/cache"
-require_relative "commands/middleware/command_logger"
-require_relative "commands/middleware/unified_logger"
-require_relative "commands/middleware/base"
-require_relative "commands/strategies/base"
-require_relative "commands/strategies/synchronous"
+# frozen_string_literal: true
+
+require "English"
+require "open3"
+require "socket"
+require "etc"
+require "logger"
+
+# This module provides classes for the Makit gem.
+module Makit
+  # Commands module provides a modern, flexible command execution framework
+  # with middleware support, validation, caching, and structured logging.
+  module Commands
+    # Custom exception for security-related command validation failures
+    class SecurityError < StandardError; end
+
+    # Custom exception for command execution failures
+    class ExecutionError < StandardError
+      attr_reader :exit_code, :stderr
+
+      def initialize(message, exit_code: nil, stderr: nil)
+        @exit_code = exit_code
+        @stderr = stderr
+        super(message)
+      end
+    end
+  end
+
+  # This class provide methods running commands.
+  #
+  class LegacyCommands < Array
+    # Generate the commands based on the current directory.
+    def auto_generate
+      self << Makit::V1::CommandRequest.new(name: "bundle", arguments: ["install"]) if File.exist?("Gemfile")
+      self << Makit::V1::CommandRequest.new(name: "bundle", arguments: %w[exec rake]) if File.exist?("Rakefile")
+    end
+  end
+end
+
+# Load command system components (load existing components only)
+require_relative "commands/result"
+require_relative "commands/request"
+require_relative "commands/runner"
+require_relative "commands/factory"
+require_relative "commands/middleware/validator"
+require_relative "commands/middleware/cache"
+require_relative "commands/middleware/command_logger"
+require_relative "commands/middleware/base"
+require_relative "commands/strategies/base"
+require_relative "commands/strategies/synchronous"

data/lib/makit/configuration/gitlab_helper.rb

@@ -1,60 +1,58 @@
-# frozen_string_literal: true
-
-require "yaml"
-
-module Makit
-  module Configuration
-    # Helper for GitLab CI YAML conversion
-    class GitLabHelper
-      def self.to_yaml(project, path)
-        yaml_content = generate_yaml(project)
-        File.write(path, yaml_content)
-      end
-
-      def self.from_yaml(path)
-        content = File.read(path)
-        data = YAML.safe_load(content, symbolize_names: true, permitted_classes: [Symbol])
-
-        project = Project.new(name: data[:name] || "Unknown", version: data[:version] || "1.0.0")
-
-        # Extract steps from GitLab CI jobs
-        data.each do |key, value|
-          next unless value.is_a?(Hash) && value[:script]
-
-          step_name = key.to_s.gsub(/_job$/, "")
-          step = Step.new(
-            name: step_name,
-            description: value[:description] || "GitLab CI job: #{step_name}",
-            commands: value[:script],
-          )
-          project.add_step(step)
-        end
-
-        project
-      end
-
-      private
-
-      def self.generate_yaml(project)
-        yaml = {
-          stages: project.steps.map(&:name),
-          variables: {
-            project_name: project.name,
-            project_version: project.version,
-          },
-        }
-
-        project.steps.each do |step|
-          job_name = "#{step.name}_job"
-          yaml[job_name.to_sym] = {
-            stage: step.name,
-            script: step.commands,
-            description: step.description,
-          }
-        end
-
-        yaml.to_yaml
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "yaml"
+
+module Makit
+  module Configuration
+    # Helper for GitLab CI YAML conversion
+    class GitLabHelper
+      def self.to_yaml(project, path)
+        yaml_content = generate_yaml(project)
+        File.write(path, yaml_content)
+      end
+
+      def self.from_yaml(path)
+        content = File.read(path)
+        data = YAML.safe_load(content, symbolize_names: true, permitted_classes: [Symbol])
+
+        project = Project.new(name: data[:name] || "Unknown", version: data[:version] || "1.0.0")
+
+        # Extract steps from GitLab CI jobs
+        data.each do |key, value|
+          next unless value.is_a?(Hash) && value[:script]
+
+          step_name = key.to_s.gsub(/_job$/, "")
+          step = Step.new(
+            name: step_name,
+            description: value[:description] || "GitLab CI job: #{step_name}",
+            commands: value[:script],
+          )
+          project.add_step(step)
+        end
+
+        project
+      end
+
+      def self.generate_yaml(project)
+        yaml = {
+          stages: project.steps.map(&:name),
+          variables: {
+            project_name: project.name,
+            project_version: project.version,
+          },
+        }
+
+        project.steps.each do |step|
+          job_name = "#{step.name}_job"
+          yaml[job_name.to_sym] = {
+            stage: step.name,
+            script: step.commands,
+            description: step.description,
+          }
+        end
+
+        yaml.to_yaml
+      end
+    end
+  end
+end

data/lib/makit/configuration/project.rb

@@ -1,127 +1,167 @@
-# frozen_string_literal: true
-
-require "json"
-
-module Makit
-  module Configuration
-    # Project configuration management
-    class Project
-      attr_accessor :git_remote_url, :name, :version, :project_type, :steps
-
-      def initialize(name, version = nil, project_type = nil)
-        # Support both keyword arguments and positional arguments for compatibility
-        if name.is_a?(Hash)
-          # Keyword arguments: Project.new(name: "test", version: "1.0.0")
-          @name = name[:name]
-          @version = name[:version]
-          @project_type = name[:project_type]
-        else
-          # Positional arguments: Project.new("test", "1.0.0", "nuget")
-          @name = name
-          @version = version
-          @project_type = project_type
-        end
-
-        @steps = []
-      end
-
-      def add_step(step)
-        raise ArgumentError, "Step must be a Makit::Configuration::Step instance" unless step.is_a?(Step)
-        @steps << step
-      end
-
-      def to_json(*args)
-        {
-          name: @name,
-          version: @version,
-          project_type: @project_type,
-          steps: @steps.map(&:to_h),
-        }.to_json(*args)
-      end
-
-      def to_json_pretty
-        JSON.pretty_generate({
-          name: @name,
-          version: @version,
-          project_type: @project_type,
-          steps: @steps.map(&:to_h),
-        })
-      end
-
-      def self.from_json(path)
-        content = File.read(path)
-        data = JSON.parse(content, symbolize_names: true)
-
-        project = new(data[:name], data[:version], data[:project_type])
-        data[:steps].each do |step_data|
-          step = Step.new(
-            name: step_data[:name],
-            description: step_data[:description],
-            commands: step_data[:commands],
-          )
-          project.add_step(step)
-        end
-
-        project
-      end
-
-      # Class method for deserializing from JSON string (used by serializer)
-      def self.decode_json(json_string)
-        data = JSON.parse(json_string, symbolize_names: true)
-
-        project = new(data[:name], data[:version], data[:project_type])
-        data[:steps].each do |step_data|
-          step = Step.new(
-            name: step_data[:name],
-            description: step_data[:description],
-            commands: step_data[:commands],
-          )
-          project.add_step(step)
-        end
-
-        project
-      end
-
-      def to_gitlab_ci(path)
-        GitLabHelper.to_yaml(self, path)
-      end
-
-      def to_rakefile
-        RakefileHelper.generate(self)
-      end
-
-      # Save the project to a specific path as pretty JSON
-      def save_as(path)
-        File.write(path, to_json_pretty)
-      end
-
-      def save
-        save_as(".makit.json")
-      end
-
-      # Display the project configuration in YAML format
-      def show
-        require "yaml"
-
-        project_data = {
-          name: @name,
-          version: @version,
-          project_type: @project_type,
-          git_remote_url: @git_remote_url,
-          steps: @steps.map(&:to_h),
-        }
-
-        puts YAML.dump(project_data)
-      end
-
-      # Load a project from the default .makit.json file
-      def self.default
-        if File.exist?(".makit.json")
-          from_json(".makit.json")
-        else
-          new(name: "", version: "0.0.0", project_type: "")
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "json"
+
+module Makit
+  module Configuration
+    # Project configuration management
+    class Project
+      attr_accessor :git_remote_url, :name, :version, :project_type, :steps, :authors, :description, :license_expression
+
+      def initialize(name, version = nil, project_type = nil)
+        # Support both keyword arguments and positional arguments for compatibility
+        if name.is_a?(Hash)
+          # Keyword arguments: Project.new(name: "test", version: "1.0.0")
+          @name = name[:name]
+          @version = name[:version]
+          @project_type = name[:project_type]
+        else
+          # Positional arguments: Project.new("test", "1.0.0", "nuget")
+          @name = name
+          @version = version
+          @project_type = project_type
+        end
+        @authors = "authors"
+        @description = "description"
+        @license_expression = "MIT"
+        @steps = []
+      end
+
+      def add_step(step)
+        raise ArgumentError, "Step must be a Makit::Configuration::Step instance" unless step.is_a?(Step)
+
+        @steps << step
+      end
+
+      def to_json(*args)
+        {
+          name: @name,
+          version: @version,
+          project_type: @project_type,
+          authors: @authors,
+          description: @description,
+          license_expression: @license_expression,
+          steps: @steps.map(&:to_h),
+        }.to_json(*args)
+      end
+
+      def to_json_pretty
+        JSON.pretty_generate({
+                               name: @name,
+                               version: @version,
+                               project_type: @project_type,
+                               authors: @authors,
+                               description: @description,
+                               license_expression: @license_expression,
+                               steps: @steps.map(&:to_h),
+                             })
+      end
+
+      def self.from_json(path)
+        content = File.read(path)
+        data = JSON.parse(content, symbolize_names: true)
+
+        project = new(data[:name], data[:version], data[:project_type])
+
+        # Set additional fields if they exist in the JSON
+        project.authors = data[:authors] if data[:authors]
+        project.description = data[:description] if data[:description]
+        project.license_expression = data[:license_expression] if data[:license_expression]
+
+        data[:steps].each do |step_data|
+          step = Step.new(
+            name: step_data[:name],
+            description: step_data[:description],
+            commands: step_data[:commands],
+          )
+          project.add_step(step)
+        end
+
+        project
+      end
+
+      # Class method for deserializing from JSON string (used by serializer)
+      def self.decode_json(json_string)
+        data = JSON.parse(json_string, symbolize_names: true)
+
+        project = new(data[:name], data[:version], data[:project_type])
+
+        # Set additional fields if they exist in the JSON
+        project.authors = data[:authors] if data[:authors]
+        project.description = data[:description] if data[:description]
+        project.license_expression = data[:license_expression] if data[:license_expression]
+
+        data[:steps].each do |step_data|
+          step = Step.new(
+            name: step_data[:name],
+            description: step_data[:description],
+            commands: step_data[:commands],
+          )
+          project.add_step(step)
+        end
+
+        project
+      end
+
+      def to_gitlab_ci(path)
+        GitLabHelper.to_yaml(self, path)
+      end
+
+      def to_rakefile
+        RakefileHelper.generate(self)
+      end
+
+      # Save the project to a specific path as pretty JSON
+      def save_as(path)
+        # Validate that the project has a non-empty name before saving
+        if @name.nil? || @name.strip.empty?
+          raise ArgumentError, "Project name cannot be empty. Please set a valid project name before saving."
+        end
+
+        File.write(path, to_json_pretty)
+      end
+
+      def save
+        # Validate that the project has a non-empty name before saving
+        if @name.nil? || @name.strip.empty?
+          raise ArgumentError, "Project name cannot be empty. Please set a valid project name before saving."
+        end
+
+        save_as(".makit.json")
+      end
+
+      # Display the project configuration in YAML format
+      def show
+        require "yaml"
+
+        project_data = {
+          name: @name,
+          version: @version,
+          project_type: @project_type,
+          git_remote_url: @git_remote_url,
+          steps: @steps.map(&:to_h),
+        }
+
+        puts YAML.dump(project_data)
+      end
+
+      # Load a project from the default .makit.json file
+      def self.default
+        if File.exist?(".makit.json")
+          from_json(".makit.json")
+        else
+          # Makit::Logging.default_logger.warn("Project not configured")
+          #          #if defined?(NAME) && defined?(VERSION) && defined?(PROJECT_TYPE)
+          #  project = new(name: NAME, version: VERSION, project_type: PROJECT_TYPE)
+          #  project.save
+          # else
+          project = new(name: "", version: "0.0.0", project_type: "")
+          Makit::Logging.default_logger.warn("Project not configured")
+          # Makit::Logging.default_logger.warn("Define NAME, VERSION, and PROJECT_TYPE in the Rakefile")
+          # end
+          project
+        end
+      end
+    end
+  end
+end

data/lib/makit/configuration/rakefile_helper.rb

@@ -1,43 +1,43 @@
-# frozen_string_literal: true
-
-module Makit
-  module Configuration
-    # Helper for Rakefile generation
-    class RakefileHelper
-      def self.generate(project)
-        rakefile_content = []
-
-        # Add header comment
-        rakefile_content << "# Generated Rakefile for #{project.name} v#{project.version}"
-        rakefile_content << "# Generated by Makit::Configuration::RakefileHelper"
-        rakefile_content << ""
-
-        # Add default task
-        if project.steps.any?
-          default_tasks = project.steps.map(&:name).join(",")
-          rakefile_content << "desc 'Run all project steps'"
-          rakefile_content << "task :default => [:#{default_tasks}]"
-          rakefile_content << ""
-        end
-
-        # Add individual step tasks
-        project.steps.each do |step|
-          rakefile_content << "desc '#{step.description}'"
-          rakefile_content << "task :#{step.name} do"
-          step.commands.each do |command|
-            rakefile_content << "  sh '#{command}'"
-          end
-          rakefile_content << "end"
-          rakefile_content << ""
-        end
-
-        rakefile_content.join("\n")
-      end
-
-      def self.write(project, path)
-        content = generate(project)
-        File.write(path, content)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Makit
+  module Configuration
+    # Helper for Rakefile generation
+    class RakefileHelper
+      def self.generate(project)
+        rakefile_content = []
+
+        # Add header comment
+        rakefile_content << "# Generated Rakefile for #{project.name} v#{project.version}"
+        rakefile_content << "# Generated by Makit::Configuration::RakefileHelper"
+        rakefile_content << ""
+
+        # Add default task
+        if project.steps.any?
+          default_tasks = project.steps.map(&:name).join(",")
+          rakefile_content << "desc 'Run all project steps'"
+          rakefile_content << "task :default => [:#{default_tasks}]"
+          rakefile_content << ""
+        end
+
+        # Add individual step tasks
+        project.steps.each do |step|
+          rakefile_content << "desc '#{step.description}'"
+          rakefile_content << "task :#{step.name} do"
+          step.commands.each do |command|
+            rakefile_content << "  sh '#{command}'"
+          end
+          rakefile_content << "end"
+          rakefile_content << ""
+        end
+
+        rakefile_content.join("\n")
+      end
+
+      def self.write(project, path)
+        content = generate(project)
+        File.write(path, content)
+      end
+    end
+  end
+end