makit 0.0.40 → 0.0.41

data/lib/makit/mp/string_mp.rb

@@ -1,122 +1,140 @@
-# frozen_string_literal: true
-require "json"
-# monkey patch String class with a run method
-
-class String
-  def run(args = nil)
-    if args.nil?
-      command = self
-      Makit::RUNNER.run(Makit::RUNNER::parse_command_request(command))
-    else
-      command = self
-      request = Makit::RUNNER.parse_args(command)
-      if args.is_a?(Hash)
-        args.each do |key, value|
-          request.send("#{key}=", value)
-        end
-      end
-      Makit::RUNNER.run(request)
-    end
-  end
-
-  def try(args = nil)
-    if args.nil?
-      command = self
-      Makit::RUNNER.try(command)
-    else
-      command = self
-      request = Makit::RUNNER.parse_args(command)
-      if args.is_a?(Hash)
-        args.each do |key, value|
-          request.send("#{key}=", value)
-        end
-      end
-      Makit::RUNNER.try(request)
-    end
-  end
-
-  def cache_run()
-    command = self
-    Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command))
-  end
-
-  def cache_run(timestamp = nil)
-    if timestamp.nil?
-      timestamp = Makit::GIT_FILE_INFOS.first.mtime #GIT_FILE_INFOS. Makit::Directory.get_newest_git_file_timestamp(Makit::Directories::PROJECT_ROOT)
-      #timestamp = Makit::Timestamp.now
-    end
-
-    command = self
-    Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command), timestamp)
-  end
-
-  # Read a value from a JSON file
-  # key is a string with the key to read, e.g. "AzureAd.Authority"
-  def get_json_value(key)
-    json = File.read(self)
-    data = JSON.parse(json)
-
-    # key delimiter is '.' so we can access nested keys
-    key.split(".").each do |k|
-      data = data[k]
-    end
-    data
-  end
-
-  alias_method :retrieve, :get_json_value
-
-  # Set a value in a JSON file
-  # key is a string with the key to set, e.g. "AzureAd.Authority"
-  def set_json_value(key, value)
-    file = File.read(self)
-    data = JSON.parse(file)
-    keys = key.split(".")
-    current = data
-
-    # Traverse and create any missing keys
-    keys[0..-2].each do |k|
-      current[k] ||= {}  # Create a new hash if the key doesn't exist
-      current = current[k]
-    end
-
-    # Set the value for the final key
-    current[keys[-1]] = value
-
-    # Write the JSON back to the file
-    File.write(self, JSON.pretty_generate(data))
-  end
-
-  # Alias for set_json_value
-  alias_method :assign, :set_json_value
-
-  def strip_color_codes
-    # Regular expression to remove ANSI color codes
-    cleaned_content = self.gsub(/\e\[[\d;]+m/, "")
-    cleaned_content
-  end
-
-  def to_lines(max_length = 80, indent_length = 5)
-    if (self.length <= max_length)
-      return self
-    else
-      indent = " " * indent_length
-      words = self.split(" ")
-      lines = []
-      line = ""
-      words.each do |word|
-        if ((line + word).length > max_length)
-          lines << line
-          line = indent + word
-        else
-          if (line.length == 0)
-            line = word
-          else
-            line += " " + word
-          end
-        end
-      end
-      lines << line
-      return lines.join("\n")
-    end
-  end
-end
+# frozen_string_literal: true
+require "json"
+# monkey patch String class with a run method
+
+class String
+  def run(args = nil)
+    if args.nil?
+      command = self
+      Makit::RUNNER.run(Makit::RUNNER::parse_command_request(command))
+    else
+      command = self
+      request = Makit::RUNNER.parse_args(command)
+      if args.is_a?(Hash)
+        args.each do |key, value|
+          request.send("#{key}=", value)
+        end
+      end
+      Makit::RUNNER.run(request)
+    end
+  end
+
+  
+
+  def cache_run()
+    command = self
+    Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command))
+  end
+
+  def cache_run(timestamp = nil)
+    if timestamp.nil?
+      timestamp = Makit::GIT_FILE_INFOS.first.mtime #GIT_FILE_INFOS. Makit::Directory.get_newest_git_file_timestamp(Makit::Directories::PROJECT_ROOT)
+      #timestamp = Makit::Timestamp.now
+    end
+
+    command = self
+    Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command), timestamp)
+  end
+
+  def try(args = nil)
+    if args.nil?
+      command = self
+      Makit::RUNNER.try(command)
+    else
+      command = self
+      request = Makit::RUNNER.parse_args(command)
+      if args.is_a?(Hash)
+        args.each do |key, value|
+          request.send("#{key}=", value)
+        end
+      end
+      Makit::RUNNER.try(request)
+    end
+  end
+
+  def cache_try()
+    command = self
+    Makit::RUNNER.cache_try(Makit::RUNNER::parse_command_request(command))
+  end
+
+  def cache_try(timestamp = nil)
+    if timestamp.nil?
+      timestamp = Makit::GIT_FILE_INFOS.first.mtime #GIT_FILE_INFOS. Makit::Directory.get_newest_git_file_timestamp(Makit::Directories::PROJECT_ROOT)
+      #timestamp = Makit::Timestamp.now
+    end
+
+    command = self
+    Makit::RUNNER.cache_try(Makit::RUNNER::parse_command_request(command), timestamp)
+  end
+
+
+  # Read a value from a JSON file
+  # key is a string with the key to read, e.g. "AzureAd.Authority"
+  def get_json_value(key)
+    json = File.read(self)
+    data = JSON.parse(json)
+
+    # key delimiter is '.' so we can access nested keys
+    key.split(".").each do |k|
+      data = data[k]
+    end
+    data
+  end
+
+  alias_method :retrieve, :get_json_value
+
+  # Set a value in a JSON file
+  # key is a string with the key to set, e.g. "AzureAd.Authority"
+  def set_json_value(key, value)
+    file = File.read(self)
+    data = JSON.parse(file)
+    keys = key.split(".")
+    current = data
+
+    # Traverse and create any missing keys
+    keys[0..-2].each do |k|
+      current[k] ||= {}  # Create a new hash if the key doesn't exist
+      current = current[k]
+    end
+
+    # Set the value for the final key
+    current[keys[-1]] = value
+
+    # Write the JSON back to the file
+    File.write(self, JSON.pretty_generate(data))
+  end
+
+  # Alias for set_json_value
+  alias_method :assign, :set_json_value
+
+  def strip_color_codes
+    # Regular expression to remove ANSI color codes
+    cleaned_content = self.gsub(/\e\[[\d;]+m/, "")
+    cleaned_content
+  end
+
+  def to_lines(max_length = 80, indent_length = 5)
+    if (self.length <= max_length)
+      return self
+    else
+      indent = " " * indent_length
+      words = self.split(" ")
+      lines = []
+      line = ""
+      words.each do |word|
+        if ((line + word).length > max_length)
+          lines << line
+          line = indent + word
+        else
+          if (line.length == 0)
+            line = word
+          else
+            line += " " + word
+          end
+        end
+      end
+      lines << line
+      return lines.join("\n")
+    end
+  end
+end

data/lib/makit/nuget.rb

@@ -1,57 +1,57 @@
-require "tmpdir"
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for working with the  Nuget package cache
-  #
-  # Example:
-  #
-  #   Makit::Directory.cache("Google.Protobuf", "3.27.2")
-  #
-  # dotnet nuget locals all --list
-  # dotnet nuget locals all --clear
-  #
-  class NuGet
-    def self.get_cache_dir(package, version)
-      File.join(Makit::Directories::NUGET_PACKAGE_CACHE, package, version)
-    end
-
-    def self.cache(package, version)
-      # if the package is already cached, there is nothing to do
-      if (!Dir.exist?(get_cache_dir(package, version)))
-        Dir.mktmpdir do |dir|
-          # Use the temp directory here
-          Dir.chdir(dir) do
-            system("dotnet new classlib -n ClassLib")
-            Dir.chdir("ClassLib") do
-
-              # display a list of directories in the current directory
-              puts Dir.entries(Dir.pwd)
-              # display a list of files in the current directory
-              puts Dir.entries(Dir.pwd)
-              puts "dotnet add ClassLib.csproj package #{package} --version #{version}"
-              system("dotnet add ClassLib.csproj package #{package} --version #{version}")
-            end
-          end
-          # The directory and its contents will be removed automatically after the block
-        end
-      end
-    end
-
-    def self.clear_cache(package, version)
-      if (Dir.exist?(get_cache_dir(package, version)))
-        FileUtils.rm_rf(get_cache_dir(package, version))
-      end
-    end
-
-    # get the latest version of the package
-    def self.get_latest_version(package)
-      dir = File.join(Makit::Directories::NUGET_PACKAGE_CACHE, package)
-      if (Dir.exist?(dir))
-        versions = Dir.entries(dir).select { |entry| File.directory?(File.join(dir, entry)) && !(entry == "." || entry == "..") }
-        highest_version = Makit::Version::get_highest_version(versions)
-        return highest_version
-      end
-      nil
-    end
-  end
-end
+require "tmpdir"
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for working with the  Nuget package cache
+  #
+  # Example:
+  #
+  #   Makit::Directory.cache("Google.Protobuf", "3.27.2")
+  #
+  # dotnet nuget locals all --list
+  # dotnet nuget locals all --clear
+  #
+  class NuGet
+    def self.get_cache_dir(package, version)
+      File.join(Makit::Directories::NUGET_PACKAGE_CACHE, package, version)
+    end
+
+    def self.cache(package, version)
+      # if the package is already cached, there is nothing to do
+      if (!Dir.exist?(get_cache_dir(package, version)))
+        Dir.mktmpdir do |dir|
+          # Use the temp directory here
+          Dir.chdir(dir) do
+            system("dotnet new classlib -n ClassLib")
+            Dir.chdir("ClassLib") do
+
+              # display a list of directories in the current directory
+              puts Dir.entries(Dir.pwd)
+              # display a list of files in the current directory
+              puts Dir.entries(Dir.pwd)
+              puts "dotnet add ClassLib.csproj package #{package} --version #{version}"
+              system("dotnet add ClassLib.csproj package #{package} --version #{version}")
+            end
+          end
+          # The directory and its contents will be removed automatically after the block
+        end
+      end
+    end
+
+    def self.clear_cache(package, version)
+      if (Dir.exist?(get_cache_dir(package, version)))
+        FileUtils.rm_rf(get_cache_dir(package, version))
+      end
+    end
+
+    # get the latest version of the package
+    def self.get_latest_version(package)
+      dir = File.join(Makit::Directories::NUGET_PACKAGE_CACHE, package)
+      if (Dir.exist?(dir))
+        versions = Dir.entries(dir).select { |entry| File.directory?(File.join(dir, entry)) && !(entry == "." || entry == "..") }
+        highest_version = Makit::Version::get_highest_version(versions)
+        return highest_version
+      end
+      nil
+    end
+  end
+end

data/lib/makit/protoc.rb

@@ -1,104 +1,104 @@
-# frozen_string_literal: true
-require "pathname"
-
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for working with the system Environment.
-  #
-  class Protoc
-    def self.grpc_tools_path
-      File.join(Makit::Directories::NUGET_PACKAGE_CACHE, "grpc.tools", Makit::Protoc::get_latest_grpc_tools_version)
-    end
-
-    def self.grpc_csharp_plugin_path
-      Makit::Protoc::find_plugin_path("grpc_csharp_plugin")
-    end
-    def self.setup
-      if (!Dir.exist?(Makit::Directories::NUGET_PACKAGE_CACHE))
-        puts "  warning: Nuget package cache directory #{Makit::Directories::NUGET_PACKAGE_CACHE} not found".colorize(:red)
-        puts "  warning: Unable to proceed with protoc setup".colorize(:red)
-      else
-        Makit::NuGet::cache("Grpc.Tools", "2.66.0")
-        raise "Nuget package path #{Makit::Directories::NUGET_PACKAGE_CACHE} not found" if !Dir.exist?(Makit::Directories::NUGET_PACKAGE_CACHE)
-
-        # test if protoc is installed by running >protoc --version
-        which_protoc = Makit::Environment.which("protoc")
-        if (Makit::Environment.which("protoc").nil?)
-          puts "  protoc not found, installing...".colorize(:red)
-          "go version".run
-          "go install google.golang.org/protobuf/cmd/protoc-gen-go@latest".run
-          "go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest".run
-          "go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@latest".run
-        else
-          puts "  protoc found at #{which_protoc}".colorize(:green)
-        end
-        raise "protoc not found" if !Makit::Environment.which("protoc")
-
-        #"git clone https://github.com/googleapis/googleapis.git third_party".run unless File.directory?("third_party/google")
-        puts "  grpc_tools_path " + "#{Makit::Protoc::grpc_tools_path}".colorize(:green)
-        puts "  grpc_csharp_plugin_path " + "#{Makit::Protoc::grpc_csharp_plugin_path}".colorize(:green)
-      end
-    end
-
-    # get the latest version of the grpc.tools package
-    def self.get_latest_grpc_tools_version
-      Makit::NuGet::get_latest_version("Grpc.Tools")
-    end
-
-    #GRPC_CSHARP_PLUGIN_PATH = Makit::Protoc::find_plugin_path("grpc_csharp_plugin")
-    def self.find_plugin_path(plugin_name)
-      # search for a file matching the pattern *grpc_csharp_plugin* in the grpc.tools directory
-      # should match on Windows and Linux
-      if (Makit::Environment.is_windows?)
-        plugin_name = plugin_name + ".exe"
-      end
-
-      plugin_path = Dir.glob("#{Makit::Directories::GRPC_TOOLS_PATH}/**/#{plugin_name}").first
-
-      raise "Plugin path #{plugin_path} not found" if !File.exist?(plugin_path)
-      plugin_path
-    end
-
-    def self.get_proto_files_from_path(proto_source_dir)
-      proto_files = Array.new()
-      Dir.chdir(proto_source_dir) do
-        Dir.glob("**/*.proto").each do |proto|
-          proto_files << proto
-        end
-      end
-      proto_files
-    end
-
-    def self.generate_source_file(proto_filename, language, csharp_output_dir)
-      FileUtils.mkdir_p(csharp_output_dir) unless Dir.exist?(csharp_output_dir)
-      "protoc --#{language}_out=#{csharp_output_dir} #{proto_filename}".run
-    end
-
-    # language: charp, ruby, go, etc.
-    def self.generate_source_files(proto_source_dir, language, output_dir)
-      debug = false
-      puts "Generating source files for #{language} in #{proto_source_dir} to #{output_dir}" if debug
-      FileUtils.mkdir_p(output_dir) unless Dir.exist?(output_dir)
-
-      path_a = Pathname.new(proto_source_dir)
-      path_b = Pathname.new(output_dir)
-      output_relative_path = path_b.relative_path_from(path_a)
-      puts "output_relative_path: #{output_relative_path}" if debug
-
-      Dir.chdir(proto_source_dir) do
-        Dir.glob("**/*.proto").each do |proto|
-          puts "Generating #{proto}" if debug
-          if (language == "csharp")
-            namespace_dir = File.dirname(proto)
-            output_dir = "#{output_relative_path}/#{namespace_dir}"
-            puts "Generating #{proto} in #{output_dir}" if debug
-            FileUtils.mkdir_p("#{output_dir}") unless Dir.exist?("#{output_dir}")
-            "protoc --csharp_out=#{output_dir} #{proto}".run
-          else
-            "protoc --#{language}_out=#{output_relative_path} #{proto}".run
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+require "pathname"
+
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for working with the system Environment.
+  #
+  class Protoc
+    def self.grpc_tools_path
+      File.join(Makit::Directories::NUGET_PACKAGE_CACHE, "grpc.tools", Makit::Protoc::get_latest_grpc_tools_version)
+    end
+
+    def self.grpc_csharp_plugin_path
+      Makit::Protoc::find_plugin_path("grpc_csharp_plugin")
+    end
+    def self.setup
+      if (!Dir.exist?(Makit::Directories::NUGET_PACKAGE_CACHE))
+        puts "  warning: Nuget package cache directory #{Makit::Directories::NUGET_PACKAGE_CACHE} not found".colorize(:red)
+        puts "  warning: Unable to proceed with protoc setup".colorize(:red)
+      else
+        Makit::NuGet::cache("Grpc.Tools", "2.66.0")
+        raise "Nuget package path #{Makit::Directories::NUGET_PACKAGE_CACHE} not found" if !Dir.exist?(Makit::Directories::NUGET_PACKAGE_CACHE)
+
+        # test if protoc is installed by running >protoc --version
+        which_protoc = Makit::Environment.which("protoc")
+        if (Makit::Environment.which("protoc").nil?)
+          puts "  protoc not found, installing...".colorize(:red)
+          "go version".run
+          "go install google.golang.org/protobuf/cmd/protoc-gen-go@latest".run
+          "go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest".run
+          "go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@latest".run
+        else
+          puts "  protoc found at #{which_protoc}".colorize(:green)
+        end
+        raise "protoc not found" if !Makit::Environment.which("protoc")
+
+        #"git clone https://github.com/googleapis/googleapis.git third_party".run unless File.directory?("third_party/google")
+        puts "  grpc_tools_path " + "#{Makit::Protoc::grpc_tools_path}".colorize(:green)
+        puts "  grpc_csharp_plugin_path " + "#{Makit::Protoc::grpc_csharp_plugin_path}".colorize(:green)
+      end
+    end
+
+    # get the latest version of the grpc.tools package
+    def self.get_latest_grpc_tools_version
+      Makit::NuGet::get_latest_version("Grpc.Tools")
+    end
+
+    #GRPC_CSHARP_PLUGIN_PATH = Makit::Protoc::find_plugin_path("grpc_csharp_plugin")
+    def self.find_plugin_path(plugin_name)
+      # search for a file matching the pattern *grpc_csharp_plugin* in the grpc.tools directory
+      # should match on Windows and Linux
+      if (Makit::Environment.is_windows?)
+        plugin_name = plugin_name + ".exe"
+      end
+
+      plugin_path = Dir.glob("#{Makit::Directories::GRPC_TOOLS_PATH}/**/#{plugin_name}").first
+
+      raise "Plugin path #{plugin_path} not found" if !File.exist?(plugin_path)
+      plugin_path
+    end
+
+    def self.get_proto_files_from_path(proto_source_dir)
+      proto_files = Array.new()
+      Dir.chdir(proto_source_dir) do
+        Dir.glob("**/*.proto").each do |proto|
+          proto_files << proto
+        end
+      end
+      proto_files
+    end
+
+    def self.generate_source_file(proto_filename, language, csharp_output_dir)
+      FileUtils.mkdir_p(csharp_output_dir) unless Dir.exist?(csharp_output_dir)
+      "protoc --#{language}_out=#{csharp_output_dir} #{proto_filename}".run
+    end
+
+    # language: charp, ruby, go, etc.
+    def self.generate_source_files(proto_source_dir, language, output_dir)
+      debug = false
+      puts "Generating source files for #{language} in #{proto_source_dir} to #{output_dir}" if debug
+      FileUtils.mkdir_p(output_dir) unless Dir.exist?(output_dir)
+
+      path_a = Pathname.new(proto_source_dir)
+      path_b = Pathname.new(output_dir)
+      output_relative_path = path_b.relative_path_from(path_a)
+      puts "output_relative_path: #{output_relative_path}" if debug
+
+      Dir.chdir(proto_source_dir) do
+        Dir.glob("**/*.proto").each do |proto|
+          puts "Generating #{proto}" if debug
+          if (language == "csharp")
+            namespace_dir = File.dirname(proto)
+            output_dir = "#{output_relative_path}/#{namespace_dir}"
+            puts "Generating #{proto} in #{output_dir}" if debug
+            FileUtils.mkdir_p("#{output_dir}") unless Dir.exist?("#{output_dir}")
+            "protoc --csharp_out=#{output_dir} #{proto}".run
+          else
+            "protoc --#{language}_out=#{output_relative_path} #{proto}".run
+          end
+        end
+      end
+    end
+  end
+end