makit 0.0.35 → 0.0.37

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

data/lib/makit/serializer.rb

@@ -1,115 +1,115 @@
-# frozen_string_literal: true
-require "google/protobuf"
-# This module provides classes for the Makit gem.
-module Makit
-  module Proto3Formats
-    JSON = 0,
-           PRETTY_JSON = 1,
-           YAML = 2,
-    BINARY = 3
-  end
-
-  # This class provide methods for serializing and deserializing objects.
-  #
-  class Serializer
-    attr_accessor :format_map
-
-    def self.save_as(filename, object)
-      extension = File.extname(filename)
-      case extension
-      when ".json"
-        File.write(filename, Makit::Serializer.new(Makit::Proto3Formats::PRETTY_JSON).serialize(object))
-      when ".yml"
-        File.write(filename, Makit::Serializer.new(Makit::Proto3Formats::YAML).serialize(object))
-      when ".pb"
-        File.open(filename, "wb") do |file|
-          file.write(Makit::Serializer.new(Makit::Proto3Formats::BINARY).serialize(object))
-        end
-
-        #File.write(filename, Makit::Serializer.new(Makit::Proto3Formats::BINARY).serialize(object))
-      else
-        raise "unsupported file extension: #{extension}"
-      end
-    end
-
-    def self.open(filename, type)
-      extension = File.extname(filename)
-      case extension
-      when ".json"
-        Makit::Serializer.new(Makit::Proto3Formats::PRETTY_JSON).deserialize(type, File.read(filename))
-      when ".yml"
-        Makit::Serializer.new(Makit::Proto3Formats::YAML).deserialize(type, File.read(filename))
-      when ".pb"
-        data = File.open(filename, "rb") { |file| file.read }
-        Makit::Serializer.new(Makit::Proto3Formats::BINARY).deserialize(type, data)
-      else
-        raise "unsupported file extension: #{extension}"
-      end
-    end
-
-    def initialize(proto3_format = Proto3Formats::PRETTY_JSON)
-      @format_maps = {
-        ::Google::Protobuf::MessageExts => proto3_format,
-      }
-    end
-
-    # Serialize an object to a byte[] or a string
-    def serialize(object)
-      raise "Object is nil" if object.nil?
-      raise "object is not of type ::Google::Protobuf::MessageExts" if !object.is_a? ::Google::Protobuf::MessageExts
-
-      case @format_maps[::Google::Protobuf::MessageExts]
-      when Proto3Formats::JSON
-        #puts "Serializing to protobuf json format"
-        object.to_json
-      when Proto3Formats::PRETTY_JSON
-        #puts "Serializing to protobuf pretty json format"
-        json = object.to_json
-        pretty_json = JSON.pretty_generate(JSON.parse(json))
-        pretty_json
-      when Proto3Formats::YAML
-        #puts "Serializing to protobuf yaml format"
-        data = JSON.parse(object.to_json)
-        data.to_yaml.sub(/^---\n/, "")
-      when Proto3Formats::BINARY
-        #puts "Serializing to protobuf binary format"
-        serialized_object = object.to_proto
-      else
-        raise "Unknown serialization format"
-      end
-    end
-
-    # Deserialize a byte[] or a string to an object
-    def deserialize(type, data)
-      raise "data is nil" if data.nil?
-      case @format_maps[::Google::Protobuf::MessageExts]
-      when Proto3Formats::JSON
-        raise "data is not of type string" if !data.is_a? String
-        json = data
-        #puts "Deserializing from protobuf json format into type #{type}"
-        # use the from_json method to deserialize the object
-        type.decode_json(json)
-      when Proto3Formats::PRETTY_JSON
-        raise "data is not of type string" if !data.is_a? String
-        json = data
-        #puts "Deserializing from protobuf pretty json format into type #{type}"
-        # use the from_json method to deserialize the object
-        type.decode_json(json)
-      when Proto3Formats::YAML
-        raise "data is not of type string" if !data.is_a? String
-        yaml = data
-        # convert yaml to json
-        json = JSON.pretty_generate(YAML.safe_load(yaml))
-        #puts "Deserializing from protobuf yaml format into type #{type}"
-        type.decode_json(json)
-      when Proto3Formats::BINARY
-        #raise "data is not of type byte[]" if !data.is_a? Array
-        bytes = data
-        #puts "Deserializing from protobuf binary format into type #{type}"
-        type.decode(bytes)
-      else
-        raise "Unknown serialization format"
-      end
-    end
-  end # class Storage
-end # module Makit
+# frozen_string_literal: true
+require "google/protobuf"
+# This module provides classes for the Makit gem.
+module Makit
+  module Proto3Formats
+    JSON = 0,
+           PRETTY_JSON = 1,
+           YAML = 2,
+    BINARY = 3
+  end
+
+  # This class provide methods for serializing and deserializing objects.
+  #
+  class Serializer
+    attr_accessor :format_map
+
+    def self.save_as(filename, object)
+      extension = File.extname(filename)
+      case extension
+      when ".json"
+        File.write(filename, Makit::Serializer.new(Makit::Proto3Formats::PRETTY_JSON).serialize(object))
+      when ".yml"
+        File.write(filename, Makit::Serializer.new(Makit::Proto3Formats::YAML).serialize(object))
+      when ".pb"
+        File.open(filename, "wb") do |file|
+          file.write(Makit::Serializer.new(Makit::Proto3Formats::BINARY).serialize(object))
+        end
+
+        #File.write(filename, Makit::Serializer.new(Makit::Proto3Formats::BINARY).serialize(object))
+      else
+        raise "unsupported file extension: #{extension}"
+      end
+    end
+
+    def self.open(filename, type)
+      extension = File.extname(filename)
+      case extension
+      when ".json"
+        Makit::Serializer.new(Makit::Proto3Formats::PRETTY_JSON).deserialize(type, File.read(filename))
+      when ".yml"
+        Makit::Serializer.new(Makit::Proto3Formats::YAML).deserialize(type, File.read(filename))
+      when ".pb"
+        data = File.open(filename, "rb") { |file| file.read }
+        Makit::Serializer.new(Makit::Proto3Formats::BINARY).deserialize(type, data)
+      else
+        raise "unsupported file extension: #{extension}"
+      end
+    end
+
+    def initialize(proto3_format = Proto3Formats::PRETTY_JSON)
+      @format_maps = {
+        ::Google::Protobuf::MessageExts => proto3_format,
+      }
+    end
+
+    # Serialize an object to a byte[] or a string
+    def serialize(object)
+      raise "Object is nil" if object.nil?
+      raise "object is not of type ::Google::Protobuf::MessageExts" if !object.is_a? ::Google::Protobuf::MessageExts
+
+      case @format_maps[::Google::Protobuf::MessageExts]
+      when Proto3Formats::JSON
+        #puts "Serializing to protobuf json format"
+        object.to_json
+      when Proto3Formats::PRETTY_JSON
+        #puts "Serializing to protobuf pretty json format"
+        json = object.to_json
+        pretty_json = JSON.pretty_generate(JSON.parse(json))
+        pretty_json
+      when Proto3Formats::YAML
+        #puts "Serializing to protobuf yaml format"
+        data = JSON.parse(object.to_json)
+        data.to_yaml.sub(/^---\n/, "")
+      when Proto3Formats::BINARY
+        #puts "Serializing to protobuf binary format"
+        serialized_object = object.to_proto
+      else
+        raise "Unknown serialization format"
+      end
+    end
+
+    # Deserialize a byte[] or a string to an object
+    def deserialize(type, data)
+      raise "data is nil" if data.nil?
+      case @format_maps[::Google::Protobuf::MessageExts]
+      when Proto3Formats::JSON
+        raise "data is not of type string" if !data.is_a? String
+        json = data
+        #puts "Deserializing from protobuf json format into type #{type}"
+        # use the from_json method to deserialize the object
+        type.decode_json(json)
+      when Proto3Formats::PRETTY_JSON
+        raise "data is not of type string" if !data.is_a? String
+        json = data
+        #puts "Deserializing from protobuf pretty json format into type #{type}"
+        # use the from_json method to deserialize the object
+        type.decode_json(json)
+      when Proto3Formats::YAML
+        raise "data is not of type string" if !data.is_a? String
+        yaml = data
+        # convert yaml to json
+        json = JSON.pretty_generate(YAML.safe_load(yaml))
+        #puts "Deserializing from protobuf yaml format into type #{type}"
+        type.decode_json(json)
+      when Proto3Formats::BINARY
+        #raise "data is not of type byte[]" if !data.is_a? Array
+        bytes = data
+        #puts "Deserializing from protobuf binary format into type #{type}"
+        type.decode(bytes)
+      else
+        raise "Unknown serialization format"
+      end
+    end
+  end # class Storage
+end # module Makit