makit 0.0.112 → 0.0.126

data/lib/makit/dotnet/project.rb

@@ -1,153 +1,217 @@
-# frozen_string_literal: true
-
-module Makit
-  class DotNet
-    class Project
-      def self.is_installed?
-        File.exist?(Makit::Environment.which("dotnet"))
-      end
-
-      def self.installed?
-        is_installed?
-      end
-
-      def self.version
-        `dotnet --version`
-      end
-
-      def self.project_short_name(project_path)
-        File.basename(project_path, ".csproj")
-      end
-
-      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)
-        else
-          "dotnet new #{template} --name #{name} --output #{output} #{args}".run
-        end
-      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!(%r{<TargetFramework>.*</TargetFramework>},
-                              "<TargetFramework>#{target_framework}</TargetFramework>")
-        File.write(project_path, project_content)
-      end
-
-      def self.find_project(project_hint)
-        matches = []
-        Dir.glob("**/*.csproj").each do |project_path|
-          matches << project_path if project_path.include?(project_hint)
-        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)
-      end
-
-      def self.add_package(project_path, package_name)
-        unless File.exist?(project_path)
-          actual_project_path = Makit::DotNet::Project.find_project(project_path)
-          raise "Project #{project_path} does not exist".colorize(:red) unless File.exist?(actual_project_path)
-
-          project_path = actual_project_path
-        end
-
-        project_content = File.read(project_path)
-        if project_content.include?("\"#{package_name}\"")
-          puts "  package ".colorize(:grey) + package_name.to_s.colorize(:green)
-        else
-          "dotnet add #{project_path} package #{package_name}".run
-        end
-      end
-
-      def self.add_packages(project_path, packages)
-        packages.each do |package|
-          add_package(project_path, package)
-        end
-      end
-
-      def self.add_reference(project_path, reference_path)
-        unless File.exist?(project_path)
-          actual_project_path = Makit::DotNet::Project.find_project(project_path)
-          raise "Project #{project_path} does not exist".colorize(:red) unless File.exist?(actual_project_path)
-
-          project_path = actual_project_path
-        end
-
-        unless File.exist?(reference_path)
-          actual_reference_path = Makit::DotNet::Project.find_project(reference_path)
-          raise "Project #{reference_path} does not exist".colorize(:red) unless File.exist?(actual_reference_path)
-
-          reference_path = actual_reference_path
-        end
-
-        project_content = File.read(project_path)
-        if project_content.include?(File.basename(reference_path))
-          #puts "  reference ".colorize(:grey) + reference_path.to_s.colorize(:green)
-        else
-          "dotnet add #{project_path} reference #{reference_path}".run
-        end
-      end
-
-      def self.add_references(project_path, references)
-        references.each do |reference|
-          add_reference(project_path, reference)
-        end
-      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::Commands::Runner.default.parse_command_request("dotnet build #{project_path} --configuration #{configuration} --output #{output}")
-        newest_file_date = if newest_file.nil?
-            Time.now
-          else
-            File.mtime(newest_file)
-          end
-        RUNNER.cache_run(command_request, newest_file_date)
-      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::Commands::Runner.default.parse_command_request("dotnet publish #{project_path} --configuration #{configuration} --output #{output}")
-        newest_file_date = if newest_file.nil?
-            Time.now
-          else
-            File.mtime(newest_file)
-          end
-        RUNNER.cache_run(command_request, newest_file_date)
-      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::Commands::Runner.default.parse_command_request("dotnet test #{project_path} --configuration #{configuration} --output #{output}")
-        newest_file_date = if newest_file.nil?
-            Time.now
-          else
-            File.mtime(newest_file)
-          end
-        RUNNER.cache_run(command_request, newest_file_date)
-      end
-
-      def self.format_project(project_path)
-        File.basename(project_path, ".csproj")
-        "dotnet tool update --global dotnet-format".run
-        "dotnet format #{project_path}".run
-      end
-
-      def self.upgrade_project(project_path)
-        File.basename(project_path, ".csproj")
-        "dotnet tool install --global dotnet-outdated-tool".run
-        "dotnet outdated #{project_path} --upgrade:Auto".run
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Makit
+  class DotNet
+    class Project
+      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
+
+      def self.version
+        `dotnet --version`
+      end
+
+      def self.project_short_name(project_path)
+        File.basename(project_path, ".csproj")
+      end
+
+      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)
+        else
+          "dotnet new #{template} --name #{name} --output #{output} #{args}".run
+        end
+      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!(%r{<TargetFramework>.*</TargetFramework>},
+                              "<TargetFramework>#{target_framework}</TargetFramework>")
+        File.write(project_path, project_content)
+      end
+
+      def self.find_project(project_hint)
+        matches = []
+        Dir.glob("**/*.csproj").each do |project_path|
+          matches << project_path if project_path.include?(project_hint)
+        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)
+      end
+
+      def self.add_package(project_path, package_name)
+        unless File.exist?(project_path)
+          actual_project_path = Makit::DotNet::Project.find_project(project_path)
+          raise "Project #{project_path} does not exist".colorize(:red) unless File.exist?(actual_project_path)
+
+          project_path = actual_project_path
+        end
+
+        project_content = File.read(project_path)
+        if project_content.include?("\"#{package_name}\"")
+          puts "  package ".colorize(:grey) + package_name.to_s.colorize(:green)
+        else
+          "dotnet add #{project_path} package #{package_name}".run
+        end
+      end
+
+      def self.add_packages(project_path, packages)
+        packages.each do |package|
+          add_package(project_path, package)
+        end
+      end
+
+      def self.add_reference(project_path, reference_path)
+        unless File.exist?(project_path)
+          actual_project_path = Makit::DotNet::Project.find_project(project_path)
+          raise "Project #{project_path} does not exist".colorize(:red) unless File.exist?(actual_project_path)
+
+          project_path = actual_project_path
+        end
+
+        unless File.exist?(reference_path)
+          actual_reference_path = Makit::DotNet::Project.find_project(reference_path)
+          raise "Project #{reference_path} does not exist".colorize(:red) unless File.exist?(actual_reference_path)
+
+          reference_path = actual_reference_path
+        end
+
+        project_content = File.read(project_path)
+        if project_content.include?(File.basename(reference_path))
+          # puts "  reference ".colorize(:grey) + reference_path.to_s.colorize(:green)
+        else
+          "dotnet add #{project_path} reference #{reference_path}".run
+        end
+      end
+
+      def self.add_references(project_path, references)
+        references.each do |reference|
+          add_reference(project_path, reference)
+        end
+      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::Commands::Runner.default.parse_command_request("dotnet build #{project_path} --configuration #{configuration} --output #{output}")
+        newest_file_date = if newest_file.nil?
+            Time.now
+          else
+            File.mtime(newest_file)
+          end
+        RUNNER.cache_run(command_request, newest_file_date)
+      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::Commands::Runner.default.parse_command_request("dotnet publish #{project_path} --configuration #{configuration} --output #{output}")
+        newest_file_date = if newest_file.nil?
+            Time.now
+          else
+            File.mtime(newest_file)
+          end
+        RUNNER.cache_run(command_request, newest_file_date)
+      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::Commands::Runner.default.parse_command_request("dotnet test #{project_path} --configuration #{configuration} --output #{output}")
+        newest_file_date = if newest_file.nil?
+            Time.now
+          else
+            File.mtime(newest_file)
+          end
+        RUNNER.cache_run(command_request, newest_file_date)
+      end
+
+      def self.format_project(project_path)
+        File.basename(project_path, ".csproj")
+        "dotnet tool update --global dotnet-format".run
+        "dotnet format #{project_path}".run
+      end
+
+      def self.upgrade_project(project_path)
+        File.basename(project_path, ".csproj")
+        "dotnet tool install --global dotnet-outdated-tool".run
+        "dotnet outdated #{project_path} --upgrade:Auto".run
+      end
+    end
+  end
+end

data/lib/makit/dotnet/solution.rb

@@ -1,38 +1,38 @@
-# frozen_string_literal: true
-
-require_relative "solution_classlib"
-require_relative "solution_console"
-require_relative "solution_wasm"
-require_relative "solution_maui"
-require_relative "solution_wpf"
-
-module Makit
-  class DotNet
-    class SolutionType
-      ClassLibrary = "classlib"
-      ConsoleApplication = "console"
-      Wasm = "wasm"
-      Maui = "maui"
-      Wpf = "wpf"
-    end
-
-    class Solution
-      def self.setup(solution_type, name)
-        case solution_type
-        when SolutionType::ClassLibrary
-          SolutionClassLib.setup(name)
-        when SolutionType::ConsoleApplication
-          SolutionConsole.setup(name)
-        when SolutionType::Wasm
-          SolutionWasm.setup(name)
-        when SolutionType::Maui
-          SolutionMaui.setup(name)
-        when SolutionType::Wpf
-          SolutionWpf.setup(name)
-        else
-          raise ArgumentError, "Unsupported solution type: #{solution_type}"
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative "solution_classlib"
+require_relative "solution_console"
+require_relative "solution_wasm"
+require_relative "solution_maui"
+require_relative "solution_wpf"
+
+module Makit
+  class DotNet
+    class SolutionType
+      ClassLibrary = "classlib"
+      ConsoleApplication = "console"
+      Wasm = "wasm"
+      Maui = "maui"
+      Wpf = "wpf"
+    end
+
+    class Solution
+      def self.setup(solution_type, name)
+        case solution_type
+        when SolutionType::ClassLibrary
+          SolutionClassLib.setup(name)
+        when SolutionType::ConsoleApplication
+          SolutionConsole.setup(name)
+        when SolutionType::Wasm
+          SolutionWasm.setup(name)
+        when SolutionType::Maui
+          SolutionMaui.setup(name)
+        when SolutionType::Wpf
+          SolutionWpf.setup(name)
+        else
+          raise ArgumentError, "Unsupported solution type: #{solution_type}"
+        end
+      end
+    end
+  end
+end