makit 0.0.98 → 0.0.111

data/lib/makit/dotnet/solution_wpf.rb

@@ -0,0 +1,304 @@
+# frozen_string_literal: true
+
+module Makit
+  class DotNet
+    class SolutionWpf
+      def self.setup(name)
+        # Check if running on Windows
+        unless RUBY_PLATFORM.include?("mswin") || RUBY_PLATFORM.include?("mingw")
+          raise "WPF projects can only be created on Windows platforms"
+        end
+
+        Makit::DotNet::Project.new_project("wpf", name, "source/#{name}", "--framework net8.0-windows")
+        Makit::DotNet::Project.new_project("TUnit", "#{name}.Tests", "tests/#{name}")
+        Makit::DotNet::Project.add_reference("tests/#{name}/#{name}.Tests.csproj", "source/#{name}/#{name}.csproj")
+
+        # Generate additional project files
+        generate_rakefile(name)
+        generate_gitlab_ci(name)
+      end
+
+      def self.generate_rakefile(project_name)
+        rakefile_content = <<~RUBY
+          # frozen_string_literal: true
+
+          require "makit"
+
+          #
+          # #{project_name} WPF Project Rakefile
+          #
+          desc "default task - builds and tests the WPF project"
+          task :default => [:build, :test]
+
+          desc "build the #{project_name} WPF project"
+          task :build do
+            puts "Building #{project_name} WPF project..."
+            project_path = "source/#{project_name}/#{project_name}.csproj"
+          #{"  "}
+            if File.exist?(project_path)
+              sh "dotnet build \#{project_path} --configuration Release"
+              puts "WPF project build completed successfully!"
+            else
+              puts "Error: Project file not found at \#{project_path}"
+              exit 1
+            end
+          end
+
+          desc "test the #{project_name} WPF project"
+          task :test do
+            puts "Testing #{project_name} WPF project..."
+            project_path = "source/#{project_name}/#{project_name}.csproj"
+          #{"  "}
+            if File.exist?(project_path)
+              sh "dotnet test \#{project_path} --configuration Release --verbosity normal"
+              puts "WPF project tests completed successfully!"
+            else
+              puts "Error: Project file not found at \#{project_path}"
+              exit 1
+            end
+          end
+
+          desc "run the #{project_name} WPF project"
+          task :run => [:build] do
+            puts "Running #{project_name} WPF project..."
+            project_path = "source/#{project_name}/#{project_name}.csproj"
+          #{"  "}
+            if File.exist?(project_path)
+              sh "dotnet run --project \#{project_path} --configuration Debug"
+            else
+              puts "Error: Project file not found at \#{project_path}"
+              exit 1
+            end
+          end
+
+          desc "clean build artifacts"
+          task :clean do
+            puts "Cleaning WPF project build artifacts..."
+            sh "dotnet clean source/#{project_name}/#{project_name}.csproj"
+            puts "Clean completed successfully!"
+          end
+
+          desc "restore packages"
+          task :restore do
+            puts "Restoring WPF project packages..."
+            sh "dotnet restore source/#{project_name}/#{project_name}.csproj"
+            puts "Restore completed successfully!"
+          end
+
+          desc "publish the WPF project"
+          task :publish do
+            puts "Publishing #{project_name} WPF project..."
+            output_dir = "artifacts/publish/#{project_name}"
+            FileUtils.mkdir_p(output_dir)
+            sh "dotnet publish source/#{project_name}/#{project_name}.csproj --configuration Release --output \#{output_dir}"
+            puts "WPF project publish completed successfully! Output: \#{output_dir}"
+          end
+
+          desc "create Windows installer using WiX"
+          task :create_installer => [:publish] do
+            puts "Creating Windows installer for #{project_name}..."
+            output_dir = "artifacts/publish/#{project_name}"
+            installer_dir = "artifacts/installer"
+            FileUtils.mkdir_p(installer_dir)
+          #{"  "}
+            if Dir.exist?(output_dir)
+              # Create a simple batch installer script
+              installer_script = <<~BAT
+                @echo off
+                echo Installing #{project_name}...
+                echo.
+                echo Copying files to Program Files...
+                xcopy /E /I /Y "#{output_dir}" "C:\\Program Files\\#{project_name}"
+                echo.
+                echo Creating desktop shortcut...
+                echo [InternetShortcut] > "%USERPROFILE%\\Desktop\\#{project_name}.url"
+                echo URL=file:///C:/Program Files/#{project_name}/#{project_name}.exe >> "%USERPROFILE%\\Desktop\\#{project_name}.url"
+                echo.
+                echo Installation completed successfully!
+                pause
+              BAT
+          #{"    "}
+              File.write(File.join(installer_dir, "install_#{project_name}.bat"), installer_script)
+              puts "Installer script created at \#{installer_dir}/install_#{project_name}.bat"
+            else
+              puts "Error: Published output directory not found at \#{output_dir}"
+              exit 1
+            end
+          end
+
+          desc "create self-contained deployment"
+          task :publish_self_contained do
+            puts "Creating self-contained deployment for #{project_name}..."
+            output_dir = "artifacts/publish/#{project_name}-self-contained"
+            FileUtils.mkdir_p(output_dir)
+          #{"  "}
+            # Publish for Windows x64
+            puts "Publishing for Windows x64..."
+            sh "dotnet publish source/#{project_name}/#{project_name}.csproj --configuration Release --runtime win-x64 --self-contained true --output \#{output_dir}/win-x64"
+          #{"  "}
+            puts "Self-contained deployment completed successfully! Output: \#{output_dir}"
+          end
+        RUBY
+
+        File.write("Rakefile", rakefile_content)
+      end
+
+      def self.generate_gitlab_ci(project_name)
+        gitlab_ci_content = <<~YAML
+          # #{project_name} WPF Project GitLab CI/CD Pipeline
+          # frozen_string_literal: true
+
+          stages:
+            - build
+            - test
+            - publish
+
+          variables:
+            DOTNET_VERSION: "8.0.x"
+            PROJECT_PATH: "source/#{project_name}/#{project_name}.csproj"
+            BUILD_CONFIGURATION: "Release"
+            TEST_RESULTS_DIR: "test-results"
+            COVERAGE_DIR: "coverage"
+            PUBLISH_DIR: "artifacts/publish"
+
+          # Cache NuGet packages between jobs
+          cache:
+            paths:
+              - "**/bin/"
+              - "**/obj/"
+              - "**/packages/"
+              - "~/.nuget/packages/"
+
+          # Build job (Windows only)
+          build:
+            stage: build
+            image: mcr.microsoft.com/dotnet/sdk:8.0
+            tags:
+              - windows
+            script:
+              - echo "Building #{project_name} WPF project..."
+              - dotnet --version
+              - dotnet restore $PROJECT_PATH
+              - dotnet build $PROJECT_PATH --configuration $BUILD_CONFIGURATION --no-restore
+              - echo "WPF project build completed successfully!"
+            artifacts:
+              paths:
+                - "**/bin/"
+                - "**/obj/"
+              expire_in: 1 week
+              when: on_success
+            rules:
+              - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+              - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+              - if: $CI_COMMIT_TAG
+
+          # Test job (Windows only)
+          test:
+            stage: test
+            image: mcr.microsoft.com/dotnet/sdk:8.0
+            tags:
+              - windows
+            dependencies:
+              - build
+            script:
+              - echo "Testing #{project_name} WPF project..."
+              - dotnet test $PROJECT_PATH --configuration $BUILD_CONFIGURATION --no-build --verbosity normal
+              - echo "WPF project tests completed successfully!"
+            artifacts:
+              paths:
+                - $TEST_RESULTS_DIR/
+                - $COVERAGE_DIR/
+              reports:
+                junit: $TEST_RESULTS_DIR/*.xml
+              expire_in: 1 week
+              when: always
+            rules:
+              - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+              - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+              - if: $CI_COMMIT_TAG
+
+          # Publish job (Windows only)
+          publish:
+            stage: publish
+            image: mcr.microsoft.com/dotnet/sdk:8.0
+            tags:
+              - windows
+            dependencies:
+              - test
+            script:
+              - echo "Publishing #{project_name} WPF project..."
+              - mkdir -p $PUBLISH_DIR
+              - dotnet publish $PROJECT_PATH --configuration $BUILD_CONFIGURATION --output $PUBLISH_DIR/#{project_name}
+              - echo "WPF project publish completed successfully!"
+            artifacts:
+              paths:
+                - $PUBLISH_DIR/
+              expire_in: 1 month
+              when: on_success
+            rules:
+              - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+              - if: $CI_COMMIT_TAG
+
+          # Self-contained publish job (Windows only)
+          publish_self_contained:
+            stage: publish
+            image: mcr.microsoft.com/dotnet/sdk:8.0
+            tags:
+              - windows
+            dependencies:
+              - test
+            script:
+              - echo "Creating self-contained deployment for #{project_name}..."
+              - mkdir -p $PUBLISH_DIR
+              - dotnet publish $PROJECT_PATH --configuration $BUILD_CONFIGURATION --runtime win-x64 --self-contained true --output $PUBLISH_DIR/#{project_name}-self-contained
+              - echo "Self-contained deployment completed successfully!"
+            artifacts:
+              paths:
+                - $PUBLISH_DIR/
+              expire_in: 1 month
+              when: on_success
+            rules:
+              - if: $CI_COMMIT_TAG
+
+          # Code quality job (Windows only)
+          code_quality:
+            stage: test
+            image: mcr.microsoft.com/dotnet/sdk:8.0
+            tags:
+              - windows
+            dependencies:
+              - build
+            script:
+              - echo "Running code quality checks..."
+              - dotnet tool install --global dotnet-format
+              - dotnet format --verify-no-changes $PROJECT_PATH
+              - echo "Code quality checks completed!"
+            allow_failure: true
+            rules:
+              - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+              - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+
+          # Security scan job (Windows only)
+          security_scan:
+            stage: test
+            image: mcr.microsoft.com/dotnet/sdk:8.0
+            tags:
+              - windows
+            dependencies:
+              - build
+            script:
+              - echo "Running security scan..."
+              - dotnet tool install --global dotnet-outdated-tool
+              - dotnet outdated $PROJECT_PATH
+              - echo "Security scan completed!"
+            allow_failure: true
+            rules:
+              - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+              - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+        YAML
+
+        File.write(".gitlab-ci.yml", gitlab_ci_content)
+      end
+    end
+  end
+end

data/lib/makit/dotnet.rb

@@ -1,219 +1,102 @@
+# frozen_string_literal: true
+
+require_relative "dotnet/solution"
+require_relative "dotnet/project"
+require_relative "dotnet/cli"
+
 module Makit
+  # Main interface for .NET operations, providing a unified API for project management,
+  # solution handling, and CLI operations.
+  #
+  # This class serves as a backward-compatible facade that delegates to the organized
+  # DotNet::Project, DotNet::Solution, and DotNet::CLI classes while maintaining
+  # the existing public API.
+  #
+  # @example Basic usage
+  #   Makit::DotNet.new_project("console", "MyApp", "src")
+  #   Makit::DotNet.build("src/MyApp.csproj")
+  #
   class DotNet
+    # Backward compatibility methods - delegate to appropriate classes
+    # These methods maintain the existing API while using the new organized structure
+
+    # Project-related methods
+    def self.installed?
+      Project.installed?
+    end
+
+    # Backward compatibility - deprecated method name
     def self.is_installed?
-      File.exist?(Makit::Environment.which("dotnet"))
+      installed?
     end
 
     def self.version
-      `dotnet --version`
+      Project.version
     end
 
     def self.project_short_name(project_path)
-      project_name = File.basename(project_path, ".csproj")
-      project_name
+      Project.project_short_name(project_path)
     end
 
     def self.new_project(template, name, output, args = "")
-      if Dir.exist? output
-        puts "  .csproj ".colorize(:grey) + "#{name}".colorize(:green)
-      else
-        "dotnet new #{template} --name #{name} --output #{output} #{args}".run
-      end
+      Project.new_project(template, name, output, args)
     end
 
     def self.set_project_target_framework(project_hint, target_framework)
-      project_path = find_project(project_hint)
-      project_content = File.read(project_path)
-      project_content.gsub!(/<TargetFramework>.*<\/TargetFramework>/, "<TargetFramework>#{target_framework}</TargetFramework>")
-      File.write(project_path, project_content)
+      Project.set_project_target_framework(project_hint, target_framework)
     end
 
     def self.find_project(project_hint)
-      matches = []
-      Dir.glob("**/*.csproj").each do |project_path|
-        #project_name = File.basename(project_path, ".csproj")
-        if project_path.include?(project_hint)
-          matches << project_path
-        end
-      end
-      if matches.length == 1
-        return matches.first
-      elsif matches.length > 1
-        raise "Multiple projects found matching #{project_hint}".colorize(:red)
-      end
-      raise "No project found matching #{project_hint}".colorize(:red)
+      Project.find_project(project_hint)
     end
 
     def self.add_package(project_path, package_name)
-      if (!File.exist?(project_path))
-        actual_project_path = Makit::DotNet::find_project(project_path)
-        if (!File.exist?(actual_project_path))
-          raise "Project #{project_path} does not exist".colorize(:red)
-        else
-          project_path = actual_project_path
-        end
-      end
-      project_content = File.read(project_path)
-      if (!project_content.include?("\"#{package_name}\""))
-        "dotnet add #{project_path} package #{package_name}".run
-      else
-        puts "  package ".colorize(:grey) + "#{package_name}".colorize(:green)
-        #puts "  #{project_short_name(project_path)} has package #{package_name}".colorize(:grey)
-      end
+      Project.add_package(project_path, package_name)
     end
 
     def self.add_packages(project_path, packages)
-      packages.each do |package|
-        add_package(project_path, package)
-      end
+      Project.add_packages(project_path, packages)
     end
 
     def self.add_reference(project_path, reference_path)
-      if (!File.exist?(project_path))
-        actual_project_path = Makit::DotNet::find_project(project_path)
-        if (!File.exist?(actual_project_path))
-          raise "Project #{project_path} does not exist".colorize(:red)
-        else
-          project_path = actual_project_path
-        end
-      end
-      if (!File.exist?(reference_path))
-        actual_reference_path = Makit::DotNet::find_project(reference_path)
-        if (!File.exist?(actual_reference_path))
-          raise "Project #{reference_path} does not exist".colorize(:red)
-        else
-          reference_path = actual_reference_path
-        end
-      end
-      project_content = File.read(project_path)
-      if (project_content.include?(File.basename(reference_path)))
-        puts "  reference ".colorize(:grey) + "#{reference_path}".colorize(:green)
-        #puts "  #{project_short_name(project_path)} references #{project_short_name(reference_path)}".colorize(:grey)
-        #puts "  reference ".colorize(:grey) + "#{reference_path}".colorize(:yellow) + " is in ".colorize(:grey) + "#{project_path}".colorize(:yellow)
-      else
-        "dotnet add #{project_path} reference #{reference_path}".run
-      end
+      Project.add_reference(project_path, reference_path)
     end
 
     def self.add_references(project_path, references)
-      references.each do |reference|
-        add_reference(project_path, reference)
-      end
-    end
-
-    def self.new_solution(name)
-      if File.exist? "#{name}.sln"
-        #puts "Solution #{name}.sln already exists".colorize(:yellow)
-        #puts "  #{name}.sln".colorize(:green) + " exists".colorize(:grey)
-      else
-        "dotnet new sln --name #{name}".run
-      end
+      Project.add_references(project_path, references)
     end
 
     def self.build(project_path, configuration = "Release", output = "artifacts")
-      project_dir = File.dirname(project_path)
-      newest_file = Makit::Directory::get_newest_file(project_dir)
-      command_request = Makit::RUNNER::parse_command_request("dotnet build #{project_path} --configuration #{configuration} --output #{output}")
-      if newest_file.nil?
-        newest_file_date = Time.now
-        RUNNER.cache_run(command_request, newest_file_date)
-      else
-        newest_file_date = File.mtime(newest_file)
-        RUNNER.cache_run(command_request, newest_file_date)
-      end
+      Project.build(project_path, configuration, output)
     end
 
     def self.publish(project_path, configuration = "Release", output = "artifacts")
-      project_dir = File.dirname(project_path)
-      newest_file = Makit::Directory::get_newest_file(project_dir)
-      command_request = Makit::RUNNER::parse_command_request("dotnet publish #{project_path} --configuration #{configuration} --output #{output}")
-      if newest_file.nil?
-        newest_file_date = Time.now
-        RUNNER.cache_run(command_request, newest_file_date)
-      else
-        newest_file_date = File.mtime(newest_file)
-        RUNNER.cache_run(command_request, newest_file_date)
-      end
+      Project.publish(project_path, configuration, output)
     end
 
     def self.test(project_path, configuration = "Release", output = "artifacts")
-      project_dir = File.dirname(project_path)
-      newest_file = Makit::Directory::get_newest_file(project_dir)
-      command_request = Makit::RUNNER::parse_command_request("dotnet test #{project_path} --configuration #{configuration} --output #{output}")
-      if newest_file.nil?
-        newest_file_date = Time.now
-        RUNNER.cache_run(command_request, newest_file_date)
-      else
-        newest_file_date = File.mtime(newest_file)
-        RUNNER.cache_run(command_request, newest_file_date)
-      end
-    end
-
-    def self.sln_add_projects(sln_name)
-      if !File.exist? "#{sln_name}.sln"
-        raise "Solution #{sln_name}.sln does not exist"
-      else
-        sln_path = "#{sln_name}.sln"
-        sln_content = File.read(sln_path)
-        Dir.glob("**/*.csproj").each do |project_path|
-          project_name = File.basename(project_path, ".csproj")
-          if (sln_content.include?("\"#{project_name}\""))
-            #puts "  #{project_name}".colorize(:green) + " is in ".colorize(:grey) + "#{sln_path}".colorize(:green)
-            #puts "Project #{project_name} already exists in #{sln_path}".colorize(:yellow)
-          else
-            "dotnet sln #{sln_path} add #{project_path}".run
-          end
-        end
-      end
+      Project.test(project_path, configuration, output)
     end
 
     def self.format_project(project_path)
-      project_name = File.basename(project_path, ".csproj")
-      "dotnet tool update --global dotnet-format".run
-      "dotnet format #{project_path}".run
+      Project.format_project(project_path)
     end
 
     def self.upgrade_project(project_path)
-      project_name = File.basename(project_path, ".csproj")
-      "dotnet tool install --global dotnet-outdated-tool".run
-      "dotnet outdated #{project_path} --upgrade:Auto".run
+      Project.upgrade_project(project_path)
+    end
+
+    # CLI-related methods
+    def self.new_solution(name)
+      CLI.new_solution(name)
+    end
+
+    def self.sln_add_projects(sln_name)
+      CLI.sln_add_projects(sln_name)
     end
 
-    #
-    # generate docs/DotNet.md
-    #
     def self.generate_docs
-      content = "# DotNet\n\n"
-      content += "## Projects\n\n"
-      # scan for .csproj files in src directory
-      src_projects = Dir.glob("src/**/*.csproj")
-      src_projects.each do |project_path|
-        project_name = File.basename(project_path, ".csproj")
-        #"dotnet tool update --global dotnet-aspnet-codegenerator".run
-        #"dotnet aspnet-codegenerator controller --name #{project_name}Controller --output ~/Projects/makit/src/makit/Controllers --controllerName #{project_name}Controller --useAsyncActions --relativeFolderPath Controllers".run
-      end
-      content += "## Packages\n\n"
-      # scan for packages.config files in src directory
-      src_packages = Dir.glob("src/**/packages.config")
-      src_packages.each do |packages_path|
-        packages_name = File.basename(packages_path, ".packages.config")
-      end
-      content += "## References\n\n"
-      # scan for project.json files in src directory
-      src_references = Dir.glob("src/**/project.json")
-      src_references.each do |references_path|
-        references_name = File.basename(references_path, ".project.json")
-      end
-
-      # write content to docs/DotNet.md file
-      if (File.exist?("docs/DotNet.md"))
-        existing_content = File.read("docs/DotNet.md")
-        if (existing_content != content)
-          File.write("docs/DotNet.md", content)
-        end
-      else
-        File.write("docs/DotNet.md", content)
-      end
-    end
-  end # class DotNet
-end # module Makit
+      CLI.generate_docs
+    end
+  end
+end

data/lib/makit/email.rb

@@ -1,58 +1,87 @@
-require 'mail'
+# frozen_string_literal: true
 
 module Makit
+  # Provides email functionality for sending notifications and reports.
+  #
+  # This class handles SMTP configuration and email delivery, with built-in support
+  # for Gmail SMTP and graceful handling when the mail gem is not available.
+  #
+  # @example Basic usage
+  #   email = Makit::Email.new
+  #   email.configure_gmail_defaults
+  #   email.send(subject: "Build Complete", body: "Your build finished successfully")
+  #
   class Email
+    begin
+      require "mail"
+      MAIL_AVAILABLE = true
+    rescue LoadError
+      MAIL_AVAILABLE = false
+    end
+
     def configure_gmail_defaults
+      unless MAIL_AVAILABLE
+        raise LoadError, "Mail gem is not available. Add 'mail' to your Gemfile to use email functionality."
+      end
+
       Mail.defaults do
         delivery_method :smtp, {
-          address: 'smtp.gmail.com',
+          address: "smtp.gmail.com",
           port: 587,
-          domain: 'gmail.com',
-          user_name: ENV['SMTP_USERNAME'],
-          password: ENV['SMTP_PASSWORD'],
-          authentication: 'plain',
-          enable_starttls_auto: true
+          domain: "gmail.com",
+          user_name: ENV.fetch("SMTP_USERNAME", nil),
+          password: ENV.fetch("SMTP_PASSWORD", nil),
+          authentication: "plain",
+          enable_starttls_auto: true,
         }
       end
     end
 
-    def send_test_email(to: ENV['MAKIT_EMAIL_RECIPIENT'], subject:, body:)
+    def send_test_email(subject:, body:, to: ENV.fetch("MAKIT_EMAIL_RECIPIENT", nil))
+      unless MAIL_AVAILABLE
+        raise LoadError, "Mail gem is not available. Add 'mail' to your Gemfile to use email functionality."
+      end
+
       raise ArgumentError, "Recipient email not set. Please set MAKIT_EMAIL_RECIPIENT environment variable" unless to
 
       mail = Mail.new do
-        from    ENV['SMTP_USERNAME']
-        to      to
+        from ENV.fetch("SMTP_USERNAME", nil)
+        to to
         subject subject
-        body    body
+        body body
       end
 
       begin
         mail.deliver!
         true
-      rescue => e
+      rescue StandardError => e
         puts "Failed to send email: #{e.message}"
         false
       end
     end
 
     def send(subject:, body:)
-      send_to(to: ENV['MAKIT_EMAIL_RECIPIENT'], subject: subject, body: body)
+      send_to(to: ENV.fetch("MAKIT_EMAIL_RECIPIENT", nil), subject: subject, body: body)
     end
 
     def send_to(to:, subject:, body:)
+      unless MAIL_AVAILABLE
+        raise LoadError, "Mail gem is not available. Add 'mail' to your Gemfile to use email functionality."
+      end
+
       raise ArgumentError, "Recipient email not set" unless to
 
       mail = Mail.new do
-        from    ENV['SMTP_USERNAME']
-        to      to
+        from ENV.fetch("SMTP_USERNAME", nil)
+        to to
         subject subject
-        body    body
+        body body
       end
 
       begin
         mail.deliver!
         true
-      rescue => e
+      rescue StandardError => e
         puts "Failed to send email: #{e.message}"
         false
       end