makit 0.0.48 → 0.0.50

data/lib/makit/dotnet.rb

@@ -1,162 +1,170 @@
-module Makit
-  class DotNet
-    def self.is_installed?
-      File.exist?(Makit::Environment.which("dotnet"))
-    end
-
-    def self.version
-      `dotnet --version`
-    end
-
-    def self.new_project(template, name, output, args = "")
-      if Dir.exist? output
-        puts "  dotnet project ".colorize(:grey) + "#{name}".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!(/<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|
-        #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)
-    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(:yellow) + " is in ".colorize(:grey) + "#{project_path}".colorize(:yellow)
-      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)
-      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(:yellow) + " is in ".colorize(:grey) + "#{project_path}".colorize(:yellow)
-      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.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
-    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
-    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
-    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
-    end
-  end # class DotNet
-end # module Makit
+module Makit
+  class DotNet
+    def self.is_installed?
+      File.exist?(Makit::Environment.which("dotnet"))
+    end
+
+    def self.version
+      `dotnet --version`
+    end
+
+    def self.project_short_name(project_path)
+      project_name = File.basename(project_path, ".csproj")
+      project_name
+    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
+    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)
+    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)
+    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
+    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)
+      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
+    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
+    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
+    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
+    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
+    end
+  end # class DotNet
+end # module Makit

data/lib/makit/environment.rb

@@ -1,127 +1,127 @@
-# frozen_string_literal: true
-
-require "sorted_set"
-require_relative "directory"
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for working with the system Environment.
-  #
-  class Environment
-    def self.which(name)
-      return name if File.exist?(name)
-
-      ["", ".exe", ".bat", ".cmd"].each do |ext|
-        aname = name + ext
-        return aname if File.exist?(aname)
-
-        ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
-          apath = "#{path.gsub("\\", "/")}/#{aname}".gsub("//", "/")
-          return apath if File.exist?(apath)
-        end
-      end
-      ""
-    end
-
-    def self.constants_hash
-      constants = {}
-      # collect all constants that are all uppercase
-      Object.constants.each { |c| constants[c] = Object.const_get(c) if c == c.upcase } #	puts "#{c} = #{Object.const_get(c)}" }
-      #Object.constants.each { |c| constants[c] = Object.const_get(c)}#	puts "#{c} = #{Object.const_get(c)}" }
-      constants
-    end
-
-    def self.rake_file_name
-      caller_locations.each do |location|
-        return location.absolute_path if location.absolute_path&.end_with?("Rakefile")
-      end
-      nil
-    end
-
-    def self.gem_data_directory
-      gem_data_directory = File.join(Dir.home, ".makit")
-    end
-
-    def self.project_root_directory
-      if !Makit::Environment.rake_file_name.nil?
-        File.dirname(Makit::Environment.rake_file_name)
-      else
-        Makit::Directory.find_directory_with_pattern(File.dirname(__FILE__), "Rakefile")
-        # lass Directory
-        #  def self.find_directory_with_pattern(starting_directory, pattern)
-        # nil
-      end
-    end
-
-    def self.get_relative_directory(url)
-      url = url.gsub("https://", "").gsub("http://", "")
-      url = url.gsub("gitlab.com", "gitlab")
-      url
-    end
-
-    def self.get_code_root
-      # user home directory  + "code"
-      code_root = File.join(Dir.home, "code")
-    end
-
-    def self.get_work_directory(url)
-      raise "invalid url" if !url.include? "https://"
-      url = url.gsub("https://", "").gsub("http://", "")
-      #url = url.gsub("gitlab.com","gitlab")
-      url
-    end
-
-    def self.is_windows?
-      RbConfig::CONFIG["host_os"] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-    end
-
-    def self.is_mac?
-      RbConfig::CONFIG["host_os"] =~ /darwin/
-    end
-
-    def self.get_os
-      case RbConfig::CONFIG["host_os"]
-      when /linux/
-        "Linux"
-      when /darwin/
-        "macOS"
-      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-        "Windows"
-      else
-        "Unknown"
-      end
-    end
-
-    def self.get_runtime_identifier()
-      os = RbConfig::CONFIG["host_os"]
-      cpu = RbConfig::CONFIG["host_cpu"]
-
-      case os
-      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-        os_rid = "win"
-      when /darwin|mac os/
-        os_rid = "osx"
-      when /linux/
-        os_rid = "linux"
-      when /solaris|bsd/
-        os_rid = "unix"
-      else
-        raise "Unknown operating system: host_os=#{os}"
-      end
-
-      case cpu
-      when /x86_64|amd64|x64/
-        arch_rid = "x64"
-      when /i686|i386/
-        arch_rid = "x86"
-        #when /arm/
-        #  arch_rid = "arm"
-      when /aarch64|arm64/
-        arch_rid = "arm64"
-      else
-        raise "Unknown architecture: host_cpu=#{cpu}"
-      end
-
-      "#{os_rid}-#{arch_rid}"
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "sorted_set"
+require_relative "directory"
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for working with the system Environment.
+  #
+  class Environment
+    def self.which(name)
+      return name if File.exist?(name)
+
+      ["", ".exe", ".bat", ".cmd"].each do |ext|
+        aname = name + ext
+        return aname if File.exist?(aname)
+
+        ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+          apath = "#{path.gsub("\\", "/")}/#{aname}".gsub("//", "/")
+          return apath if File.exist?(apath)
+        end
+      end
+      ""
+    end
+
+    def self.constants_hash
+      constants = {}
+      # collect all constants that are all uppercase
+      Object.constants.each { |c| constants[c] = Object.const_get(c) if c == c.upcase } #	puts "#{c} = #{Object.const_get(c)}" }
+      #Object.constants.each { |c| constants[c] = Object.const_get(c)}#	puts "#{c} = #{Object.const_get(c)}" }
+      constants
+    end
+
+    def self.rake_file_name
+      caller_locations.each do |location|
+        return location.absolute_path if location.absolute_path&.end_with?("Rakefile")
+      end
+      nil
+    end
+
+    def self.gem_data_directory
+      gem_data_directory = File.join(Dir.home, ".makit")
+    end
+
+    def self.project_root_directory
+      if !Makit::Environment.rake_file_name.nil?
+        File.dirname(Makit::Environment.rake_file_name)
+      else
+        Makit::Directory.find_directory_with_pattern(File.dirname(__FILE__), "Rakefile")
+        # lass Directory
+        #  def self.find_directory_with_pattern(starting_directory, pattern)
+        # nil
+      end
+    end
+
+    def self.get_relative_directory(url)
+      url = url.gsub("https://", "").gsub("http://", "")
+      url = url.gsub("gitlab.com", "gitlab")
+      url
+    end
+
+    def self.get_code_root
+      # user home directory  + "code"
+      code_root = File.join(Dir.home, "code")
+    end
+
+    def self.get_work_directory(url)
+      raise "invalid url" if !url.include? "https://"
+      url = url.gsub("https://", "").gsub("http://", "")
+      #url = url.gsub("gitlab.com","gitlab")
+      url
+    end
+
+    def self.is_windows?
+      RbConfig::CONFIG["host_os"] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+    end
+
+    def self.is_mac?
+      RbConfig::CONFIG["host_os"] =~ /darwin/
+    end
+
+    def self.get_os
+      case RbConfig::CONFIG["host_os"]
+      when /linux/
+        "Linux"
+      when /darwin/
+        "macOS"
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        "Windows"
+      else
+        "Unknown"
+      end
+    end
+
+    def self.get_runtime_identifier()
+      os = RbConfig::CONFIG["host_os"]
+      cpu = RbConfig::CONFIG["host_cpu"]
+
+      case os
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        os_rid = "win"
+      when /darwin|mac os/
+        os_rid = "osx"
+      when /linux/
+        os_rid = "linux"
+      when /solaris|bsd/
+        os_rid = "unix"
+      else
+        raise "Unknown operating system: host_os=#{os}"
+      end
+
+      case cpu
+      when /x86_64|amd64|x64/
+        arch_rid = "x64"
+      when /i686|i386/
+        arch_rid = "x86"
+        #when /arm/
+        #  arch_rid = "arm"
+      when /aarch64|arm64/
+        arch_rid = "arm64"
+      else
+        raise "Unknown architecture: host_cpu=#{cpu}"
+      end
+
+      "#{os_rid}-#{arch_rid}"
+    end
+  end
+end

data/lib/makit/fileinfo.rb

@@ -1,16 +1,16 @@
-# frozen_string_literal: true
-
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for working with the system Environment.
-  #
-  class FileInfo
-    attr_accessor :name, :mtime, :size
-
-    def initialize(name:, mtime:, size:)
-      @name = name
-      @mtime = mtime
-      @size = size
-    end
-  end
-end
+# frozen_string_literal: true
+
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for working with the system Environment.
+  #
+  class FileInfo
+    attr_accessor :name, :mtime, :size
+
+    def initialize(name:, mtime:, size:)
+      @name = name
+      @mtime = mtime
+      @size = size
+    end
+  end
+end