makit 0.0.111 → 0.0.112

data/lib/makit/markdown.rb

@@ -1,75 +1,75 @@
-# frozen_string_literal: true
-
-require_relative "humanize"
-
-# This module provides classes for the Makit gem.
-module Makit
-  class Markdown
-    def self.get_commands_markdown(commands)
-      summary = ""
-      commands.each do |command|
-        md = Makit::Markdown.get_command_markdown(command)
-        summary += md
-      end
-      summary
-    end
-
-    def self.get_command_markdown(command)
-      md = "<details>\n"
-      md += "<summary>#{Makit::Humanize.get_command_summary(command)}</summary>\n\n"
-
-      if command.output.length.positive?
-        md += "<table><tr><th>output</th></tr><tr><td>\n\n" # <pre>\n"
-        md += "```shell\n"
-        md += "#{command.output}\n"
-        md += "```\n\n"
-        md += "</td></tr></table>\n\n"
-        # md += "output:\n"
-        # md += "```shell\n"
-        # md += "#{command.output}\n"
-        # md += "```\n\n"
-      end
-      if command.error.length.positive?
-        md += "error:\n"
-        md += "```shell\n"
-        md += "#{command.error}\n"
-        md += "```\n\n"
-      end
-      md += "| exit code | started at | duration | user | device | os | directory |\n"
-      md += "| --- | --- | --- | --- | --- | --- | --- |\n"
-      md += "| #{command.exit_code} | #{Makit::Humanize.get_protobuf_timestamp(command.started_at)} | #{Makit::Humanize.get_protobuf_duration(command.duration)} | #{command.user} | #{command.device} | #{command.os} | #{command.directory} |\n"
-
-      # md += "| Name | Value |\n"
-      # md += "| --- | --- |\n"
-      # md += "| exit code | #{command.exit_code} |\n"
-      # md += "| started at | #{Makit::Humanize::get_protobuf_timestamp(command.started_at)} |\n"
-      # md += "| duration | #{Makit::Humanize::get_protobuf_duration(command.duration)} |\n"
-      # md += "| user | #{command.user} |\n"
-      # md += "| device | #{command.device} |\n"
-      # md += "| os | #{command.os} |\n"
-      # md += "| directory | #{command.directory} |\n"
-      md += "</details>\n"
-      md
-    end
-
-    def self.get_make_result_markdown(make_result)
-      md = "# Make Result\n"
-      # display allow of the fields of the MakeResult message
-      md += "| Name | Value |\n"
-      md += "| --- | --- |\n"
-      md += "| repository | #{make_result.repository} |\n"
-      md += "| commit | #{make_result.commit} |\n"
-      md += "| branch | #{make_result.branch} |\n"
-      md += "| tag | #{make_result.tag} |\n"
-      md += "| device | #{make_result.device} |\n"
-      md += "| runtime identifier | #{make_result.runtime_identifier} |\n"
-      md += "| initial size | #{make_result.initial_size} |\n"
-      md += "| final size | #{make_result.final_size} |\n"
-      md += "\n"
-      md += "## Commands\n"
-      make_result.commands.each do |command|
-        md += Makit::Markdown.get_command_markdown(command)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative "humanize"
+
+# This module provides classes for the Makit gem.
+module Makit
+  class Markdown
+    def self.get_commands_markdown(commands)
+      summary = ""
+      commands.each do |command|
+        md = Makit::Markdown.get_command_markdown(command)
+        summary += md
+      end
+      summary
+    end
+
+    def self.get_command_markdown(command)
+      md = "<details>\n"
+      md += "<summary>#{Makit::Humanize.get_command_summary(command)}</summary>\n\n"
+
+      if command.output.length.positive?
+        md += "<table><tr><th>output</th></tr><tr><td>\n\n" # <pre>\n"
+        md += "```shell\n"
+        md += "#{command.output}\n"
+        md += "```\n\n"
+        md += "</td></tr></table>\n\n"
+        # md += "output:\n"
+        # md += "```shell\n"
+        # md += "#{command.output}\n"
+        # md += "```\n\n"
+      end
+      if command.error.length.positive?
+        md += "error:\n"
+        md += "```shell\n"
+        md += "#{command.error}\n"
+        md += "```\n\n"
+      end
+      md += "| exit code | started at | duration | user | device | os | directory |\n"
+      md += "| --- | --- | --- | --- | --- | --- | --- |\n"
+      md += "| #{command.exit_code} | #{Makit::Humanize.get_protobuf_timestamp(command.started_at)} | #{Makit::Humanize.get_protobuf_duration(command.duration)} | #{command.user} | #{command.device} | #{command.os} | #{command.directory} |\n"
+
+      # md += "| Name | Value |\n"
+      # md += "| --- | --- |\n"
+      # md += "| exit code | #{command.exit_code} |\n"
+      # md += "| started at | #{Makit::Humanize::get_protobuf_timestamp(command.started_at)} |\n"
+      # md += "| duration | #{Makit::Humanize::get_protobuf_duration(command.duration)} |\n"
+      # md += "| user | #{command.user} |\n"
+      # md += "| device | #{command.device} |\n"
+      # md += "| os | #{command.os} |\n"
+      # md += "| directory | #{command.directory} |\n"
+      md += "</details>\n"
+      md
+    end
+
+    def self.get_make_result_markdown(make_result)
+      md = "# Make Result\n"
+      # display allow of the fields of the MakeResult message
+      md += "| Name | Value |\n"
+      md += "| --- | --- |\n"
+      md += "| repository | #{make_result.repository} |\n"
+      md += "| commit | #{make_result.commit} |\n"
+      md += "| branch | #{make_result.branch} |\n"
+      md += "| tag | #{make_result.tag} |\n"
+      md += "| device | #{make_result.device} |\n"
+      md += "| runtime identifier | #{make_result.runtime_identifier} |\n"
+      md += "| initial size | #{make_result.initial_size} |\n"
+      md += "| final size | #{make_result.final_size} |\n"
+      md += "\n"
+      md += "## Commands\n"
+      make_result.commands.each do |command|
+        md += Makit::Markdown.get_command_markdown(command)
+      end
+    end
+  end
+end

data/lib/makit/mp/basic_object_mp.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
-
-require "json"
-require "yaml"
-
-# monkey patch String class with a run method
-
-class BasicObject
-  def to_json(*_args)
-    to_json
-  end
-
-  def to_pretty_json
-    json = to_json
-    ::JSON.pretty_generate(::JSON.parse(json))
-  end
-end
+# frozen_string_literal: true
+
+require "json"
+require "yaml"
+
+# monkey patch String class with a run method
+
+class BasicObject
+  def to_json(*_args)
+    to_json
+  end
+
+  def to_pretty_json
+    json = to_json
+    ::JSON.pretty_generate(::JSON.parse(json))
+  end
+end

data/lib/makit/mp/command_mp.rb

@@ -1,13 +1,13 @@
-# frozen_string_literal: true
-
-module Makit
-  module V1
-    class Command
-      def to_markdown
-        md = "## #{name} #{arguments.join(" ")}\n\n"
-        md += "```\n#{output}\n```\n"
-        md
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Makit
+  module V1
+    class Command
+      def to_markdown
+        md = "## #{name} #{arguments.join(" ")}\n\n"
+        md += "```\n#{output}\n```\n"
+        md
+      end
+    end
+  end
+end

data/lib/makit/mp/command_request.mp.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
-
-require "digest"
-
-module Makit
-  module V1
-    # class CommandRequest
-    #  def to_hash
-    #    int_hash = Digest::SHA256.hexdigest("{self.name}.#{self.arguments.join(" ")}")
-    #     int_hash
-    #   end
-    #   def to_hash_string
-    #     hash_string = "#{int_hash}"
-    #    end
-    #  end
-  end
-end
+# frozen_string_literal: true
+
+require "digest"
+
+module Makit
+  module V1
+    # class CommandRequest
+    #  def to_hash
+    #    int_hash = Digest::SHA256.hexdigest("{self.name}.#{self.arguments.join(" ")}")
+    #     int_hash
+    #   end
+    #   def to_hash_string
+    #     hash_string = "#{int_hash}"
+    #    end
+    #  end
+  end
+end

data/lib/makit/mp/project_mp.rb

@@ -1,199 +1,199 @@
-# frozen_string_literal: true
-
-require "json"
-require "yaml"
-
-module Makit
-  module V1
-    class Project
-      # def to_yaml
-      #  data = JSON.parse(self.to_pretty_json)
-      #  data.to_yaml.sub(/^---\n/, "")
-      # end
-
-      def self.create
-        project = Makit::V1::Project.new
-        project.set_default_values
-        project
-      end
-
-      def open(filename)
-        other = Makit::Serializer.open(filename, Makit::V1::Project)
-        # other = Makit::V1::Project::create_from_file(filename)
-        self.name = other.name
-        self.git_remote_url = other.git_remote_url
-        self.dotnet_projects = other.dotnet_projects
-        self.artifacts = other.artifacts
-      end
-
-      # def self.create_from_file(filename)
-      #  extension = File.extname(filename)
-      #  case extension
-      #  when ".yml"
-      #    yaml = File.read(filename)
-      #    create_from_yaml(yaml)
-      #  when ".json"
-      #    json = File.read(filename)
-      #    create_from_json(json)
-      #  else
-      #    raise "unsupported file extension: #{extension}"
-      #  end
-      # end
-
-      # def self.create_from_yaml(yaml)
-      #  json = JSON.pretty_generate(YAML.load(yaml))
-      #  project = Makit::V1::Project.decode_json(json)
-      #  project
-      # end
-
-      # def self.create_from_json(json)
-      #  project = Makit::V1::Project.decode_json(json)
-      #  project
-      # end
-
-      def set_default_values
-        # self.language = "csharp"
-        # self.primary_artifact_type = "nuget"
-        self.git_remote_url = `git remote get-url origin`.strip if git_remote_url.nil? || git_remote_url.empty?
-        if name.nil? || name.empty?
-          if !git_remote_url.nil? && !git_remote_url.empty?
-            self.name = get_name(File.basename(git_remote_url, ".git")) # get_capitalized_name(File.basename(self.git_remote_url, ".git"))
-          else
-            self.name = get_name(File.basename(Dir.getwd)) # get_capitalized_name(File.basename(Dir.getwd))
-          end
-        end
-        self
-      end
-
-      def get_name(name)
-        if !git_remote_url.nil? && !git_remote_url.empty?
-          is_dotnet = git_remote_url.include?("nuget")
-          get_capitalized_name(name) if is_dotnet
-        end
-        name.downcase
-      end
-
-      def get_capitalized_name(name)
-        name.split(".").map(&:capitalize).join(".")
-      end
-
-      def save_as(filename)
-        Makit::Serializer.save_as(filename, self)
-        # extension = File.extname(filename)
-        # case extension
-        # when ".json"
-        #  File.write(filename, self.to_pretty_json)
-        # when ".yml"
-        #  File.write(filename, self.to_yaml)
-        # else
-        #  raise "unsupported file extension: #{extension}"
-        # end
-      end
-
-      def with_dotnet_project(template, name, output)
-        return if dotnet_projects.any? { |project| project.output == output }
-
-        project = Makit::V1::DotNetProject.new
-        project.template = template
-        project.name = name
-        project.output = output
-        dotnet_projects << project
-      end
-
-      def setup
-        setup_dotnet_projects
-      end
-
-      def make
-        setup_dotnet_projects
-        make_dotnet_projects
-
-        # verify the artifacts exist
-        artifacts.each do |artifact|
-          raise "artifact does not exist: #{artifact}" unless File.exist?(artifact)
-        end
-      end
-
-      def build
-        build_dotnet_projects
-      end
-
-      def test
-        test_dotnet_projects
-      end
-
-      def setup_dotnet_projects
-        if dotnet_projects.any?
-          if !File.exist?("#{name}.sln")
-            puts "  Creating solution file: #{"#{name}.sln".colorize(:green)}"
-            "dotnet new sln -n #{name}".run unless File.exist?("#{name}.sln")
-          else
-            # puts "  Solution file already exists: " + "#{self.name}.sln".colorize(:yellow)
-          end
-          dotnet_projects.each do |project|
-            add_project = true
-            add_project = false if project.os == "windows" && !Makit::Environment.is_windows?
-            next unless add_project
-
-            Makit::DotNet.new_project(project.template, project.name, project.output)
-            # add any nuget packages to the project
-            project_filename = "#{project.output}/#{project.name}.csproj"
-            project.packages.each do |package|
-              Makit::DotNet.add_package(project_filename, package)
-            end
-          end
-          # Makit::DotNet.new_solution(self.name)
-          Makit::DotNet.sln_add_projects(name)
-        else
-          # puts "  no dotnet projects found".colorize(:yellow)
-        end
-      end
-
-      def make_dotnet_projects
-        dotnet_projects.each do |project|
-          next if project.os == "windows" && !Makit::Environment.is_windows?
-
-          project.commands.each do |command|
-            newest_file_timestamp = Makit::Directory.get_newest_file_timestamp(project.output)
-            # newest_file = Makit::Directory::get_newest_file_or_now(project.output)
-            command_request = Makit::RUNNER.parse_command_request(command)
-            RUNNER.cache_run(command_request, newest_file_timestamp)
-          end
-        end
-      end
-
-      def build_dotnet_projects
-        dotnet_projects.each do |project|
-          next if project.os == "windows" && !Makit::Environment.is_windows?
-
-          project.commands.each do |command|
-            newest_file_timestamp = Makit::Directory.get_newest_file_timestamp(project.output)
-            # newest_file = Makit::Directory::get_newest_file_or_now(project.output)
-            command_request = Makit::RUNNER.parse_command_request(command)
-            RUNNER.cache_run(command_request, newest_file_timestamp)
-          end
-          project.build_args.each do |build_arg|
-            project_path = File.join(project.output, "#{project.name}.csproj")
-            Makit::DotNet.build(project_path, build_arg.configuration, build_arg.output)
-          end
-          project.publish_args.each do |publish_arg|
-            project_path = File.join(project.output, "#{project.name}.csproj")
-            Makit::DotNet.publish(project_path, publish_arg.configuration, publish_arg.output)
-          end
-        end
-      end
-
-      def test_dotnet_projects
-        dotnet_projects.each do |project|
-          next if project.os == "windows" && !Makit::Environment.is_windows?
-
-          project.test_args.each do |test_args|
-            project_path = File.join(project.output, "#{project.name}.csproj")
-            Makit::DotNet.test(project_path, test_args.configuration, test_args.output)
-          end
-          # "dotnet test #{project.output} --configuration Release".run
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "json"
+require "yaml"
+
+module Makit
+  module V1
+    class Project
+      # def to_yaml
+      #  data = JSON.parse(self.to_pretty_json)
+      #  data.to_yaml.sub(/^---\n/, "")
+      # end
+
+      def self.create
+        project = Makit::V1::Project.new
+        project.set_default_values
+        project
+      end
+
+      def open(filename)
+        other = Makit::Serializer.open(filename, Makit::V1::Project)
+        # other = Makit::V1::Project::create_from_file(filename)
+        self.name = other.name
+        self.git_remote_url = other.git_remote_url
+        self.dotnet_projects = other.dotnet_projects
+        self.artifacts = other.artifacts
+      end
+
+      # def self.create_from_file(filename)
+      #  extension = File.extname(filename)
+      #  case extension
+      #  when ".yml"
+      #    yaml = File.read(filename)
+      #    create_from_yaml(yaml)
+      #  when ".json"
+      #    json = File.read(filename)
+      #    create_from_json(json)
+      #  else
+      #    raise "unsupported file extension: #{extension}"
+      #  end
+      # end
+
+      # def self.create_from_yaml(yaml)
+      #  json = JSON.pretty_generate(YAML.load(yaml))
+      #  project = Makit::V1::Project.decode_json(json)
+      #  project
+      # end
+
+      # def self.create_from_json(json)
+      #  project = Makit::V1::Project.decode_json(json)
+      #  project
+      # end
+
+      def set_default_values
+        # self.language = "csharp"
+        # self.primary_artifact_type = "nuget"
+        self.git_remote_url = `git remote get-url origin`.strip if git_remote_url.nil? || git_remote_url.empty?
+        if name.nil? || name.empty?
+          if !git_remote_url.nil? && !git_remote_url.empty?
+            self.name = get_name(File.basename(git_remote_url, ".git")) # get_capitalized_name(File.basename(self.git_remote_url, ".git"))
+          else
+            self.name = get_name(File.basename(Dir.getwd)) # get_capitalized_name(File.basename(Dir.getwd))
+          end
+        end
+        self
+      end
+
+      def get_name(name)
+        if !git_remote_url.nil? && !git_remote_url.empty?
+          is_dotnet = git_remote_url.include?("nuget")
+          get_capitalized_name(name) if is_dotnet
+        end
+        name.downcase
+      end
+
+      def get_capitalized_name(name)
+        name.split(".").map(&:capitalize).join(".")
+      end
+
+      def save_as(filename)
+        Makit::Serializer.save_as(filename, self)
+        # extension = File.extname(filename)
+        # case extension
+        # when ".json"
+        #  File.write(filename, self.to_pretty_json)
+        # when ".yml"
+        #  File.write(filename, self.to_yaml)
+        # else
+        #  raise "unsupported file extension: #{extension}"
+        # end
+      end
+
+      def with_dotnet_project(template, name, output)
+        return if dotnet_projects.any? { |project| project.output == output }
+
+        project = Makit::V1::DotNetProject.new
+        project.template = template
+        project.name = name
+        project.output = output
+        dotnet_projects << project
+      end
+
+      def setup
+        setup_dotnet_projects
+      end
+
+      def make
+        setup_dotnet_projects
+        make_dotnet_projects
+
+        # verify the artifacts exist
+        artifacts.each do |artifact|
+          raise "artifact does not exist: #{artifact}" unless File.exist?(artifact)
+        end
+      end
+
+      def build
+        build_dotnet_projects
+      end
+
+      def test
+        test_dotnet_projects
+      end
+
+      def setup_dotnet_projects
+        if dotnet_projects.any?
+          if !File.exist?("#{name}.sln")
+            puts "  Creating solution file: #{"#{name}.sln".colorize(:green)}"
+            "dotnet new sln -n #{name}".run unless File.exist?("#{name}.sln")
+          else
+            # puts "  Solution file already exists: " + "#{self.name}.sln".colorize(:yellow)
+          end
+          dotnet_projects.each do |project|
+            add_project = true
+            add_project = false if project.os == "windows" && !Makit::Environment.is_windows?
+            next unless add_project
+
+            Makit::DotNet.new_project(project.template, project.name, project.output)
+            # add any nuget packages to the project
+            project_filename = "#{project.output}/#{project.name}.csproj"
+            project.packages.each do |package|
+              Makit::DotNet.add_package(project_filename, package)
+            end
+          end
+          # Makit::DotNet.new_solution(self.name)
+          Makit::DotNet.sln_add_projects(name)
+        else
+          # puts "  no dotnet projects found".colorize(:yellow)
+        end
+      end
+
+      def make_dotnet_projects
+        dotnet_projects.each do |project|
+          next if project.os == "windows" && !Makit::Environment.is_windows?
+
+          project.commands.each do |command|
+            newest_file_timestamp = Makit::Directory.get_newest_file_timestamp(project.output)
+            # newest_file = Makit::Directory::get_newest_file_or_now(project.output)
+            command_request = Makit::Commands::Request.from_string(command)
+            Makit::Commands::Runner.default.execute(command_request)
+          end
+        end
+      end
+
+      def build_dotnet_projects
+        dotnet_projects.each do |project|
+          next if project.os == "windows" && !Makit::Environment.is_windows?
+
+          project.commands.each do |command|
+            newest_file_timestamp = Makit::Directory.get_newest_file_timestamp(project.output)
+            # newest_file = Makit::Directory::get_newest_file_or_now(project.output)
+            command_request = Makit::Commands::Request.from_string(command)
+            Makit::Commands::Runner.default.execute(command_request)
+          end
+          project.build_args.each do |build_arg|
+            project_path = File.join(project.output, "#{project.name}.csproj")
+            Makit::DotNet.build(project_path, build_arg.configuration, build_arg.output)
+          end
+          project.publish_args.each do |publish_arg|
+            project_path = File.join(project.output, "#{project.name}.csproj")
+            Makit::DotNet.publish(project_path, publish_arg.configuration, publish_arg.output)
+          end
+        end
+      end
+
+      def test_dotnet_projects
+        dotnet_projects.each do |project|
+          next if project.os == "windows" && !Makit::Environment.is_windows?
+
+          project.test_args.each do |test_args|
+            project_path = File.join(project.output, "#{project.name}.csproj")
+            Makit::DotNet.test(project_path, test_args.configuration, test_args.output)
+          end
+          # "dotnet test #{project.output} --configuration Release".run
+        end
+      end
+    end
+  end
+end