makit 0.0.111 → 0.0.126

data/lib/makit/content/default_gitignore.txt

@@ -0,0 +1,226 @@
+# General
+[Aa]rtifacts/
+artifacts.zip
+[Gg]enerated/
+[Tt]hirdparty/
+
+# Jekyll
+_site/
+
+
+# Ruby
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+.rvmrc
+
+# Rust
+/target/
+Cargo.lock
+**/*.rs.bk
+/target
+/Cargo.lock
+
+# DotNet
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+*.txt
+*.userprefs
+BenchmarkDotNet.Artifacts/
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Aa]rtifacts/
+.vs/
+Generated\ Files/
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+*.VisualState.xml
+TestResult.xml
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+BenchmarkDotNet.Artifacts/
+
+project.lock.json
+project.fragment.lock.json
+artifacts/
+StyleCopReport.xml
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+_Chutzpah*
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+*.psess
+*.vsp
+*.vspx
+*.sap
+*.e2e
+$tf/
+*.gpState
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+.JustCode
+_TeamCity*
+*.dotCover
+.axoCover/*
+!.axoCover/settings.json
+*.coverage
+*.coveragexml
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+*.mm.*
+AutoTest.Net/
+.sass-cache/
+[Ee]xpress/
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+publish/
+*.[Pp]ublish.xml
+*.azurePubxml
+*.pubxml
+*.publishproj
+PublishScripts/
+*.nupkg
+**/[Pp]ackages/*
+!**/[Pp]ackages/build/
+*.nuget.props
+*.nuget.targets
+csx/
+*.build.csdef
+ecf/
+rcf/
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+**/wwwroot/lib/
+Generated_Code/
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+*.mdf
+*.ldf
+*.ndf
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+FakesAssemblies/
+*.GhostDoc.xml
+.ntvs_analysis.dat
+node_modules/
+*.plg
+*.opt
+*.vbw
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+.paket/paket.exe
+paket-files/
+.fake/
+.idea/
+*.sln.iml
+.cr/personal
+__pycache__/
+*.pyc
+tools/**
+!tools/packages.config
+*.tss
+*.jmconfig
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+OpenCover/
+ASALocalRun/
+*.binlog
+*.nvuser
+.mfractor/
+.localhistory/

data/lib/makit/directories.rb

@@ -69,10 +69,9 @@ module Makit
     FileUtils.mkdir_p(REPOS)
     FileUtils.mkdir_p(TEMP)
     FileUtils.mkdir_p(INSTALL)
-    unless Dir.exist?(LOCAL_NUGET_SOURCE)
-      Dir.mkdir(LOCAL_NUGET_SOURCE)
-      system("dotnet nuget add source #{LOCAL_NUGET_SOURCE} --name local")
-    end
+
+    FileUtils.mkdir_p(LOCAL_NUGET_SOURCE)
+    # NOTE: Nuget source setup moved to lazy initialization to avoid blocking module loading
 
     def self.get_project_path(relative_path)
       File.join(PROJECT_ROOT, relative_path)

data/lib/makit/docs/files.rb

@@ -80,7 +80,7 @@ module Makit
           # Git Repository Size
           #
           ## report on the git repository size
-          file.write(Makit::RUNNER.execute("git count-objects -vH").to_markdown)
+          file.write(Makit::Commands::Runner.default.execute("git count-objects -vH").to_markdown)
           file.write("\n\n")
         end
       end

data/lib/makit/docs/rake.rb

@@ -81,7 +81,7 @@ module Makit
         content += "\n\n"
 
         ## report on the available rake tasks
-        content += Makit::RUNNER.execute("rake -T").to_markdown
+        content += Makit::Commands::Runner.default.execute("rake -T").to_markdown
         content += "\n\n"
 
         filename = "docs/Rake.md"

data/lib/makit/dotnet/cli.rb

@@ -1,65 +1,69 @@
-# frozen_string_literal: true
-
-module Makit
-  class DotNet
-    class CLI
-      def self.new_solution(name)
-        if File.exist? "#{name}.sln"
-          # puts "Solution #{name}.sln already exists".colorize(:yellow)
-        else
-          "dotnet new sln --name #{name}".run
-        end
-      end
-
-      def self.sln_add_projects(sln_name)
-        raise "Solution #{sln_name}.sln does not exist" unless File.exist? "#{sln_name}.sln"
-
-        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)
-          else
-            "dotnet sln #{sln_path} add #{project_path}".run
-          end
-        end
-      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|
-          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|
-          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|
-          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")
-          File.write("docs/DotNet.md", content) if existing_content != content
-        else
-          File.write("docs/DotNet.md", content)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Makit
+  class DotNet
+    class CLI
+      def self.is_installed?
+        File.exist?(Makit::Environment.which("dotnet"))
+      end
+
+      def self.new_solution(name)
+        if File.exist? "#{name}.sln"
+          # puts "Solution #{name}.sln already exists".colorize(:yellow)
+        else
+          "dotnet new sln --name #{name}".run
+        end
+      end
+
+      def self.sln_add_projects(sln_name)
+        raise "Solution #{sln_name}.sln does not exist" unless File.exist? "#{sln_name}.sln"
+
+        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)
+          else
+            "dotnet sln #{sln_path} add #{project_path}".run
+          end
+        end
+      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|
+          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|
+          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|
+          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")
+          File.write("docs/DotNet.md", content) if existing_content != content
+        else
+          File.write("docs/DotNet.md", content)
+        end
+      end
+    end
+  end
+end

data/lib/makit/dotnet/project.rb

@@ -3,10 +3,74 @@
 module Makit
   class DotNet
     class Project
-      def self.is_installed?
-        File.exist?(Makit::Environment.which("dotnet"))
+      attr_accessor :filename
+
+      def initialize(filename)
+        @filename = filename
+      end
+
+      def set_version(version)
+        # set the <Version> tag to the version
+        project_content = File.read(filename)
+        if project_content.include?("<Version>")
+          project_content.gsub!(%r{<Version>.*</Version>},
+                                "<Version>#{version}</Version>")
+        else
+          # add the <Version> tag to the next line after the <PropertyGroup> tag
+          project_content.gsub!("<PropertyGroup>",
+                                "<PropertyGroup>\n    <Version>#{version}</Version>")
+        end
+        File.write(filename, project_content)
+      end
+
+      def get_version
+        # get the <Version> tag
+        project_content = File.read(filename)
+        raise "Version not found in #{filename}".colorize(:red) unless project_content.include?("<Version>")
+
+        project_content.match(%r{<Version>(.*)</Version>})[1]
+      end
+
+      # <TargetFramework>net8.0</TargetFramework>
+      # <TargetFrameworks>net8.0;net8.0-browser</TargetFrameworks>
+      def set_target_frameworks(target_frameworks)
+        project_content = File.read(filename)
+        target_frameworks = target_frameworks.join(";") if target_frameworks.is_a?(Array)
+        if target_frameworks.include?(";")
+          # use <TargetFrameworks> tag
+          if project_content.include?("<TargetFrameworks>")
+            project_content.gsub!(%r{<TargetFrameworks>.*</TargetFrameworks>},
+                                  "<TargetFrameworks>#{target_frameworks}</TargetFrameworks>")
+          else
+            project_content.gsub!(%r{<TargetFramework>.*</TargetFramework>},
+                                  "<TargetFrameworks>#{target_frameworks}</TargetFrameworks>")
+          end
+        elsif project_content.include?("<TargetFramework>")
+          # use <TargetFramework> tag
+          project_content.gsub!(%r{<TargetFramework>.*</TargetFramework>},
+                                "<TargetFramework>#{target_frameworks}</TargetFramework>")
+        else
+          project_content.gsub!(%r{<TargetFrameworks>.*</TargetFrameworks>},
+                                "<TargetFramework>#{target_frameworks}</TargetFramework>")
+        end
+        File.write(filename, project_content)
+      end
+
+      def set_nuget_metadata(package_id, authors, description, license_expression)
+        project_content = File.read(filename)
+        if project_content.include?("<PropertyGroup Label=\"NuGet Metadata\">")
+          project_content.gsub!(%r{<PropertyGroup Label="NuGet Metadata">.*</PropertyGroup>},
+                                "  <PropertyGroup Label=\"NuGet Metadata\">\n    <IsPackable>true</IsPackable>\n    <PackageId>#{package_id}</PackageId>\n    <Authors>#{authors}</Authors>\n    <Description>#{description}</Description>\n    <PackageLicenseExpression>#{license_expression}</PackageLicenseExpression>\n\n</PropertyGroup>")
+        else
+          # add the <PropertyGroup Label=\"NuGet Metadata\"> tag before the </Project> closing tag
+          project_content.gsub!(%r{</Project>},
+                                "  <PropertyGroup Label=\"NuGet Metadata\">\n    <IsPackable>true</IsPackable>\n    <PackageId>#{package_id}</PackageId>\n    <Authors>#{authors}</Authors>\n    <Description>#{description}</Description>\n    <PackageLicenseExpression>#{license_expression}</PackageLicenseExpression>\n  </PropertyGroup>\n\n</Project>")
+        end
+
+        File.write(filename, project_content)
       end
 
+      # consider move some of the methods to the CLI class
       def self.installed?
         is_installed?
       end
@@ -22,7 +86,7 @@ module Makit
       def self.new_project(template, name, output, args = "")
         if Dir.exist? output
           Makit::Logging.default_logger.info("#{output}/#{name}.csproj")
-          #puts "  .csproj ".colorize(:grey) + name.to_s.colorize(:green)
+          # puts "  .csproj ".colorize(:grey) + name.to_s.colorize(:green)
         else
           "dotnet new #{template} --name #{name} --output #{output} #{args}".run
         end
@@ -89,7 +153,7 @@ module Makit
 
         project_content = File.read(project_path)
         if project_content.include?(File.basename(reference_path))
-          #puts "  reference ".colorize(:grey) + reference_path.to_s.colorize(:green)
+          # puts "  reference ".colorize(:grey) + reference_path.to_s.colorize(:green)
         else
           "dotnet add #{project_path} reference #{reference_path}".run
         end
@@ -104,7 +168,7 @@ module Makit
       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}")
+        command_request = Makit::Commands::Runner.default.parse_command_request("dotnet build #{project_path} --configuration #{configuration} --output #{output}")
         newest_file_date = if newest_file.nil?
             Time.now
           else
@@ -116,7 +180,7 @@ module Makit
       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}")
+        command_request = Makit::Commands::Runner.default.parse_command_request("dotnet publish #{project_path} --configuration #{configuration} --output #{output}")
         newest_file_date = if newest_file.nil?
             Time.now
           else
@@ -128,7 +192,7 @@ module Makit
       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}")
+        command_request = Makit::Commands::Runner.default.parse_command_request("dotnet test #{project_path} --configuration #{configuration} --output #{output}")
         newest_file_date = if newest_file.nil?
             Time.now
           else

data/lib/makit/examples/runner.rb

@@ -172,7 +172,7 @@ module Makit
       def execute_single_example(example)
         # Display separator and example path
         puts "=" * 80
-        #puts example[:name]
+        # puts example[:name]
         puts example[:rakefile]
 
         log "  Testing example: #{example[:name]}" if @verbose
@@ -184,7 +184,7 @@ module Makit
           Dir.chdir(example[:path]) do
             # Use the default runner with middleware for consistent behavior
             runner = Makit::DEFAULT_COMMANDS_RUNNER
-            custom_logger = Makit::Logging::Logger.new(
+            Makit::Logging::Logger.new(
               Makit::Logging::Sinks::Console.new,
               Makit::Logging::Sinks::FileSink.new(log_file: "artifacts/command_examples.log")
             )

data/lib/makit/logging/configuration.rb

@@ -251,9 +251,12 @@ module Makit
       def validate_single_configuration(config, index)
         raise ArgumentError, "configuration #{index} must be a hash" unless config.is_a?(Hash)
 
-        required_keys = [:file, :format]
+        required_keys = %i[file format]
         missing_keys = required_keys - config.keys
-        raise ArgumentError, "configuration #{index} missing required keys: #{missing_keys.join(", ")}" unless missing_keys.empty?
+        unless missing_keys.empty?
+          raise ArgumentError,
+                "configuration #{index} missing required keys: #{missing_keys.join(", ")}"
+        end
 
         # Validate file
         file = config[:file]
@@ -277,9 +280,9 @@ module Makit
         end
 
         # Validate rotation if specified
-        if config[:rotation] && !valid_rotation_config?(config[:rotation])
-          raise ArgumentError, "configuration #{index} rotation must be a valid rotation configuration"
-        end
+        return unless config[:rotation] && !valid_rotation_config?(config[:rotation])
+
+        raise ArgumentError, "configuration #{index} rotation must be a valid rotation configuration"
       end
 
       # Check if log level is valid
@@ -297,7 +300,7 @@ module Makit
       def valid_rotation_config?(rotation)
         return false unless rotation.is_a?(Hash)
 
-        valid_keys = [:max_size, :max_files, :compress, :pattern]
+        valid_keys = %i[max_size max_files compress pattern]
         rotation.keys.all? { |key| valid_keys.include?(key) }
       end
     end