makit 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0558227c98ae70bbcb9f96561aa27ab4ebad67847c1b587146cf6d080b428b
-  data.tar.gz: a3ac7e680571b70db90582d61b188d3da6e1c4091bd217406e720ad14930b28b
+  metadata.gz: 59e3040750721c32917be211bd138bb66fe39606b7104c461db28afd7db3b0e6
+  data.tar.gz: ef979b03839b0237baf973a2bbd74842c9d62c04a49a218915054727ee5f44b3
 SHA512:
-  metadata.gz: adba8a093efe78e64ce407d77b7d4f475ab0cd87c7d0d92138712e29b3305c2a316f4a7e8321210ef8b3c8742323bda0b33ed149de674fd069373b3cc2986998
-  data.tar.gz: 908c8e3c8014dc75a0cda1fde331d56291908bef292133ddc472f491156e7409e7cc0958ea3656a736ba10234ff0307b53448856c3676b5c9e7fe7cd2233ed15
+  metadata.gz: aa2a0a557088dbe73ef772a2d2f8a7e8314ec472241a9f6340aadd09589c34cc968202cc64d93878491106530d4e9b29748e45801a81547182001aaa42257149
+  data.tar.gz: 4d6e68cee15e15d53b72453806af12924c0553b1b096183bbcb7c2081669568c3ce5696b1098ab2632ac8f30d198646473b913275b47cbb4edde558a542fc29b

data/lib/generated/makit/v1/makit.v1_pb.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: makit/v1/makit.v1.proto
+
+require 'google/protobuf'
+
+require 'google/protobuf/timestamp_pb'
+require 'google/protobuf/duration_pb'
+
+
+descriptor_data = "\n\x17makit/v1/makit.v1.proto\x12\x08makit.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\"\x92\x02\n\rDotNetProject\x12\x10\n\x08template\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06output\x18\x03 \x01(\t\x12\x10\n\x08packages\x18\x04 \x03(\t\x12\x12\n\nreferences\x18\x05 \x03(\t\x12\n\n\x02os\x18\x06 \x01(\t\x12\x10\n\x08\x63ommands\x18\x07 \x03(\t\x12-\n\nbuild_args\x18\x08 \x03(\x0b\x32\x19.makit.v1.DotNetBuildArgs\x12\x31\n\x0cpublish_args\x18\t \x03(\x0b\x32\x1b.makit.v1.DotNetPublishArgs\x12+\n\ttest_args\x18\n \x03(\x0b\x32\x18.makit.v1.DotNetTestArgs\"8\n\x0f\x44otNetBuildArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\":\n\x11\x44otNetPublishArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\"7\n\x0e\x44otNetTestArgs\x12\x15\n\rconfiguration\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\"\xa8\x01\n\x07Project\x12\x16\n\x0egit_remote_url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\tartifacts\x18\x03 \x03(\t\x12\x32\n\x10\x63ommand_requests\x18\x04 \x03(\x0b\x32\x18.makit.v1.CommandRequest\x12\x30\n\x0f\x64otnet_projects\x18\x05 \x03(\x0b\x32\x17.makit.v1.DotNetProject\"\xa5\x01\n\x0e\x43ommandRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\targuments\x18\x02 \x03(\t\x12+\n\x07timeout\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x11\n\tdirectory\x18\x04 \x01(\t\x12\x0c\n\x04task\x18\x05 \x01(\t\x12\r\n\x05input\x18\x06 \x01(\x0c\x12\x15\n\rexit_on_error\x18\x07 \x01(\x08\"\x91\x02\n\x07\x43ommand\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\targuments\x18\x03 \x03(\t\x12\x11\n\texit_code\x18\x04 \x01(\x05\x12\r\n\x05input\x18\x05 \x01(\x0c\x12\x0e\n\x06output\x18\x06 \x01(\x0c\x12\r\n\x05\x65rror\x18\x07 \x01(\x0c\x12.\n\nstarted_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12+\n\x08\x64uration\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0c\n\x04user\x18\n \x01(\t\x12\x0e\n\x06\x64\x65vice\x18\x0b \x01(\t\x12\n\n\x02os\x18\x0c \x01(\t\x12\x11\n\tdirectory\x18\r \x01(\t\"I\n\rConfiguration\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\x08\x63ommands\x18\x02 \x03(\x0b\x32\x18.makit.v1.CommandRequest\"3\n\rGitRepository\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x15\n\rrelative_path\x18\x02 \x01(\t\"h\n\x0bGitLogEntry\x12\x0e\n\x06\x63ommit\x18\x01 \x01(\t\x12\x0e\n\x06\x61uthor\x18\x02 \x01(\t\x12(\n\x04\x64\x61te\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07message\x18\x04 \x01(\t\"\xc8\x01\n\nMakeResult\x12\x12\n\nrepository\x18\x01 \x01(\t\x12\x0e\n\x06\x63ommit\x18\x02 \x01(\t\x12\x0e\n\x06\x62ranch\x18\x03 \x01(\t\x12\x0b\n\x03tag\x18\x04 \x01(\t\x12\x0e\n\x06\x64\x65vice\x18\x05 \x01(\t\x12\x1a\n\x12runtime_identifier\x18\x06 \x01(\t\x12#\n\x08\x63ommands\x18\x07 \x03(\x0b\x32\x11.makit.v1.Command\x12\x14\n\x0cinitial_size\x18\x08 \x01(\x05\x12\x12\n\nfinal_size\x18\t \x01(\x05\"?\n\rDotNetNewArgs\x12\x10\n\x08template\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0e\n\x06output\x18\x03 \x01(\t\"^\n\rManifestEntry\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x31\n\rlast_modified\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0c\n\x04size\x18\x03 \x01(\x03**\n\x08Language\x12\x08\n\x04RUBY\x10\x00\x12\n\n\x06\x43SHARP\x10\x01\x12\x08\n\x04RUST\x10\x02*,\n\x0bPackageType\x12\x07\n\x03GEM\x10\x00\x12\t\n\x05NUGET\x10\x01\x12\t\n\x05\x43RATE\x10\x03\x32H\n\x0e\x43ommandService\x12\x36\n\x07\x45xecute\x12\x18.makit.v1.CommandRequest\x1a\x11.makit.v1.Commandb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+pool.add_serialized_file(descriptor_data)
+
+module Makit
+  module V1
+    DotNetProject = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetProject").msgclass
+    DotNetBuildArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetBuildArgs").msgclass
+    DotNetPublishArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetPublishArgs").msgclass
+    DotNetTestArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetTestArgs").msgclass
+    Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Project").msgclass
+    CommandRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.CommandRequest").msgclass
+    Command = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Command").msgclass
+    Configuration = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Configuration").msgclass
+    GitRepository = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.GitRepository").msgclass
+    GitLogEntry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.GitLogEntry").msgclass
+    MakeResult = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.MakeResult").msgclass
+    DotNetNewArgs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.DotNetNewArgs").msgclass
+    ManifestEntry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.ManifestEntry").msgclass
+    Language = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Language").enummodule
+    PackageType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.PackageType").enummodule
+  end
+end

data/lib/generated/makit/v1/web/link_pb.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: makit/v1/web/link.proto
+
+require 'google/protobuf'
+
+require 'google/protobuf/timestamp_pb'
+require 'google/protobuf/duration_pb'
+
+
+descriptor_data = "\n\x17makit/v1/web/link.proto\x12\x08makit.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/duration.proto\"6\n\x04Link\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\tb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+pool.add_serialized_file(descriptor_data)
+
+module Makit
+  module V1
+    Link = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("makit.v1.Link").msgclass
+  end
+end

data/lib/makit/command_runner.rb

@@ -11,13 +11,14 @@ module Makit
   #
   class CommandRunner
     attr_accessor :show_output_on_success, :log_to_artifacts, :commands
-    attr_accessor :debug
+    attr_accessor :debug, :default_modified
 
     def initialize
       @show_output_on_success = false
       @log_to_artifacts = false
       @commands = []
       @debug = false
+      @default_modified = Makit::Git::get_file_infos.first.mtime # Makit::GIT_FILE_INFOS.first.mtime
     end
 
     def get_cache_filename(command)
@@ -30,6 +31,10 @@ module Makit
       cache_filename
     end
 
+    def cache_run(command_request)
+      cache_run(command_request, @default_modified)
+    end
+
     # if there is a matching cached command result, that then the specified timestamp,
     # then return the cached result
     # otherwise run the command and save the result to a cache file
@@ -38,6 +43,11 @@ module Makit
       raise "Invalid command_request" unless command_request.is_a? Makit::V1::CommandRequest
       cache_filename = get_cache_filename(command_request)
 
+      # Check if timestamp is a valid Time object
+      unless timestamp.is_a?(Time)
+        raise ArgumentError, "timestamp must be a Time object, got #{timestamp.class}"
+      end
+
       if debug
         puts "  timestamp: #{Makit::Humanize.get_humanized_timestamp(timestamp)}"
         puts "  command.name: #{command_request.name}"

data/lib/makit/mp/string_mp.rb

@@ -35,6 +35,11 @@ class String
     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)

data/lib/makit/protoc.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "pathname"
 
 # This module provides classes for the Makit gem.
 module Makit
@@ -74,14 +75,30 @@ module Makit
     end
 
     # language: charp, ruby, go, etc.
-    def self.generate_source_files(proto_source_dir, language, csharp_output_dir)
-      proto_files = get_proto_files_from_path(proto_source_dir)
-      proto_files.each { |proto|
-        namespace_dir = File.dirname(proto)
-        puts "Generating #{proto} in #{namespace_dir}"
-        FileUtils.mkdir_p("#{csharp_output_dir}/#{namespace_dir}") unless Dir.exist?("#{csharp_output_dir}/#{namespace_dir}")
-        "protoc --#{language}_out=#{csharp_output_dir}/#{namespace_dir} protos/#{proto}".run
-      }
+    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/show.rb

@@ -12,7 +12,7 @@ module Makit
       elsif File.directory?(path)
         puts "#{path} modified ".colorize(:grey) + "#{Makit::Humanize.get_humanized_timestamp(Makit::Directory.modified(path))}".colorize(:cyan)
       else
-        put "#{path} does not exist"
+        puts "#{path} does not exist"
       end
     end
 
@@ -26,14 +26,18 @@ module Makit
         age = (Time.now -modified).to_f
         puts "#{path} age is ".colorize(:grey) + "#{Makit::Humanize.get_humanized_duration(age)}".colorize(:cyan)
       else
-        put "#{path} does not exist"
+        puts "#{path} does not exist"
       end
     end
 
     def file(path)
-      modified = File.mtime(path)
-      age = (Time.now - modified).to_f
-      puts "#{file_symbol} #{path} ".colorize(:grey) + "#{Makit::Humanize.get_humanized_size(File.size(path))} ".colorize(:cyan) + "#{Makit::Humanize.get_humanized_duration(age)}".colorize(:cyan)
+      if File.file?(path)
+        modified = File.mtime(path)
+        age = (Time.now - modified).to_f
+        puts "#{file_symbol} #{path} ".colorize(:grey) + "#{Makit::Humanize.get_humanized_size(File.size(path))} ".colorize(:cyan) + "#{Makit::Humanize.get_humanized_duration(age)}".colorize(:cyan)
+      else
+        puts "#{path} does not exist"
+      end
     end
 
     def file_symbol
@@ -52,7 +56,7 @@ module Makit
       elsif File.directory?(path)
         puts "#{path} size is ".colorize(:grey) + "#{Makit::Humanize.get_humanized_size(Makit::Directory.get_size(path))}".colorize(:cyan)
       else
-        put "#{path} does not exist"
+        puts "#{path} does not exist"
       end
     end
 

data/lib/makit/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Makit
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
 
   class Version
     # given an array of version strings, return the highest version

data/lib/makit.rb

@@ -4,8 +4,21 @@ require "rake/clean"
 require "logger"
 require "json"
 require "yaml"
+require "google/protobuf"
 
-%w[makit makit/v1 makit/cli makit/content makit/mp].each do |dir|
+#%w[generated/makit].each do |dir|
+#  Dir[File.join(__dir__, dir, "*.rb")].each do |file|
+#    require_relative file
+#  end
+#end
+if (File.exist?("protos/makit/makit.v1.proto.rb"))
+  require_relative "generated/makit/makit.v1_pb"
+else
+  require_relative "makit/v1/makit.v1_pb"
+end
+
+#%w[makit makit/v1 makit/cli makit/content makit/mp].each do |dir|
+%w[makit makit/cli makit/content makit/mp].each do |dir|
   Dir[File.join(__dir__, dir, "*.rb")].each do |file|
     require_relative file
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Lou Parslow
@@ -143,6 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/generated/makit/v1/makit.v1_pb.rb
+- lib/generated/makit/v1/web/link_pb.rb
 - lib/makit.rb
 - lib/makit/apache.rb
 - lib/makit/cli/clean.rb