makit 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6907ebf24a2329adf0bba41970b506e5b1a21d0459c82a0c44aa721946015c42
-  data.tar.gz: 36276973efd109200ea9448bbf9a072d3f43f4c983d28b71f520442f0dcb9b96
+  metadata.gz: d20004d1c96605bb23375807ee5541a266909981ad0c81893c719a2c7574c5fb
+  data.tar.gz: 467f47e68f11b74a165d2a26c21c69edfc75fc37a6dc183ae6045005717afeec
 SHA512:
-  metadata.gz: fecfe917f1dd787788af641b4b15a63a7f94dfe44b6efa0f008c1a8f90db5e1f61dc580a9a4fdb558f940c7b858138049e7912af094433a3c2b58aa49d884a2d
-  data.tar.gz: eade8504dd9d374edf17095af9a74dd10341c6092e861c1208a135f8973d5a6a9adf302245383d2849362c7397cf496d99dfd8612f0a5bd539f7a8badf14104f
+  metadata.gz: 91c8cbbf9bf948fb47f7acbb7edde9048ba630c29ac6c28c799cca4fbda8c5cf2dc0e18b0368b9085bc238ce76a9c545deb7fa83c3dbd846a4c0b4c7cecceea0
+  data.tar.gz: e4f4153782e42b0d0af6bcfff17694a05ec20c41978ee272860ea0519bcb989b5a8947beb2ea34aef432dce377212b258c80d2c1aa5b98e387b83304e190a300

data/lib/makit/command_runner.rb

@@ -3,6 +3,7 @@ require "open3"
 require "socket"
 require "etc"
 require "logger"
+require_relative "mp/command_request.mp"
 
 # This module provides classes for the Makit gem.
 module Makit
@@ -10,21 +11,18 @@ module Makit
   #
   class CommandRunner
     attr_accessor :show_output_on_success, :log_to_artifacts, :commands
+    attr_accessor :debug
 
     def initialize
       @show_output_on_success = false
-      @log_to_artifacts = true
+      @log_to_artifacts = false
       @commands = []
+      @debug = false
     end
 
     def get_cache_filename(command)
-      # test if the command_request is a Makit::V1::CommandRequest
-      #if command_request.is_a? Makit::V1::CommandRequest || command_request.is_a? Makit::V1::Command
-      # also replacing any path delimiters with an underscore
-      int_hash = Digest::SHA256.hexdigest("{command.name}.#{command.arguments.join(" ")}")
-      # int_hash
-      #int_hash = command_request.to_hash
-      hash_string = "#{int_hash}"[0, 8]
+      int_hash = Digest::SHA256.hexdigest("#{command.name}.#{command.arguments.join(" ")}")
+      hash_string = "#{int_hash}"
       cache_filename = Makit::Directories::PROJECT_ARTIFACTS +
                        "/commands/cache/#{hash_string}.pb"
       # create the directory if it does not already exist
@@ -37,29 +35,35 @@ module Makit
     # otherwise run the command and save the result to a cache file
     # then return the result
     def cache_run(command_request, timestamp)
-      # combine the command name and arguments into a single string
-      # and use it to create a cache filename, making sure it is a valid filename,
-      # by replacing all characters that are not valid in a filename with an underscore
-      # also replacing any path delimiters with an underscore
-      int_hash = command_request.to_hash
-      hash_string = "#{int_hash}"[0, 8]
-      cache_filename = Makit::Directories::PROJECT_ARTIFACTS +
-                       "/commands/#{hash_string}.pb"
-      #puts "cache_filename: #{cache_filename}"
+      raise "Invalid command_request" unless command_request.is_a? Makit::V1::CommandRequest
+      cache_filename = get_cache_filename(command_request)
 
+      if debug
+        puts "  timestamp: #{Makit::Humanize.get_humanized_timestamp(timestamp)}"
+        puts "  command.name: #{command_request.name}"
+        puts "  command.arguments: #{command_request.arguments.join(" ")}"
+        puts "  cache_filename: #{cache_filename}"
+      end
       #cache_filename = Makit::Directories::PROJECT_ARTIFACTS + "/commands/#{command_request.name}.#{command_request.arguments.join("_")}.#{timestamp.seconds}.pb"
       if File.exist?(cache_filename)
+        cache_timestamp = File.mtime(cache_filename)
+        if debug
+          puts "  cache timestamp: #{Makit::Humanize.get_humanized_timestamp(cache_timestamp)}"
+        end
         #puts "cache file date: #{File.mtime(cache_filename)}"
         if (File.mtime(cache_filename) > timestamp)
-          puts "  found cached command (newer than #{timestamp})".colorize(:grey)
+
+          #puts "  found cached command (newer than #{timestamp})".colorize(:grey)
+          #puts "  cache_filename: #{cache_filename}"
           command = Makit::Serializer.open(cache_filename, Makit::V1::Command)
-          show_command(command)
+          show_cached_command(command)
           if command.exit_code != 0
             abort "cached command failed: #{command.name} #{command.arguments.join(" ")}"
           end
-          return command  #Makit::Serializer.open(cache_filename, Makit::V1::Command)
+          return command
         else
-          #puts "cache_filename exists, but is older than #{timestamp}"
+          puts "  cache_filename exists, but is older than #{timestamp}" if debug
+          File.delete(cache_filename)
         end
       end
 
@@ -86,6 +90,20 @@ module Makit
       end
     end
 
+    def show_cached_command(command)
+      if command.exit_code != 0
+        puts Makit::CommandRunner.get_command_summary(command) + " (exit code #{command.exit_code})".colorize(:default)
+        puts "  directory: #{command.directory}\n"
+        puts "  duration: #{command.duration.seconds} seconds\n"
+        puts Makit::Humanize::indent_string(command.output, 2) if command.output.length > 0
+        puts Makit::Humanize::indent_string(command.error, 2) if command.error.length > 0
+        #exit 1 if command.exit_on_error
+      else
+        puts Makit::CommandRunner.get_command_summary(command).strip_color_codes.colorize(:grey) + " (#{command.duration.seconds} seconds)".colorize(:grey)
+        puts Makit::Humanize::indent_string(command.output, 2).colorize(:default) if show_output_on_success
+      end
+    end
+
     # Run a command and return a Makit::V1::Command.
     def run(command_request)
       raise "Invalid command_request" unless command_request.is_a? Makit::V1::CommandRequest
@@ -95,33 +113,16 @@ module Makit
 
       log_to_artifacts(command) if @log_to_artifacts
       show_command(command)
-      #exit 1 if exit_on_error & command.exit_code != 1
-      #if command.exit_code != 0
-      #  puts Makit::CommandRunner.get_command_summary(command) + " (exit code #{command.exit_code})".colorize(:default)
-      #  puts "  directory: #{command.directory}\n"
-      #  puts "  duration: #{command.duration.seconds} seconds\n"
-      #  puts Makit::Humanize::indent_string(command.output, 2) if command.output.length > 0
-      #  puts Makit::Humanize::indent_string(command.error, 2) if command.error.length > 0
-      #  exit 1 if command_request.exit_on_error
-      #else
-      #  puts Makit::CommandRunner.get_command_summary(command) + " (#{command.duration.seconds} seconds)".colorize(:cyan)
-      #  puts Makit::Humanize::indent_string(command.output, 2).colorize(:default) if show_output_on_success
-      #end
-
+      if command.exit_code != 0
+        exit 1 if command_request.exit_on_error
+      end
       commands.push(command)
       command
     end
 
     def log_to_artifacts(command)
-      #dir = File.join(Makit::Directories::PROJECT_ARTIFACTS, "commands")
-      #FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
-      #filename_friendly_timestamp = Time.now.strftime("%Y.%m.%d_%H%M%S")
-      #log_filename = File.join(dir, "#{filename_friendly_timestamp}.json")
       log_filename = get_cache_filename(command)
-      # serialize to protobuf json
-      json = command.to_json
-      pretty_json = JSON.pretty_generate(JSON.parse(json))
-      File.write(log_filename, pretty_json)
+      Makit::Serializer.save_as(log_filename, command)
     end
 
     # Run a command and return a Makit::V1::Command.

data/lib/makit/directory.rb

@@ -91,10 +91,13 @@ module Makit
     end
 
     def self.get_git_tracked_files(directory_path)
-      output, status = Open3.capture2("git ls-files", chdir: directory_path)
-      raise "Failed to list git-tracked files" unless status.success?
+      #raise "do not use this method"
+      #output, status = Open3.capture2("git ls-files directory", chdir: directory_path)
+      #raise "Failed to list git-tracked files" unless status.success?
+      #command = "git ls-files #{directory_path}".run
 
-      output.split("\n")
+      #command.output.split("\n")
+      `git ls-files #{directory_path}`.split("\n")
     end
 
     def self.get_newest_git_file(directory_path)
@@ -110,7 +113,6 @@ module Makit
       newest_file.nil? ? Time.now : File.mtime(newest_file)
     end
 
-
     # Normalize the path by removing any leading or trailing slashes
     # and replacing any backslashes with forward slashes
     def self.normalize(path)

data/lib/makit/fileinfo.rb

@@ -0,0 +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

data/lib/makit/git.rb

@@ -39,6 +39,20 @@ module Makit
       "git archive --format zip --output #{zipfilename} HEAD".run
     end
 
+    def self.get_file_infos()
+      file_infos = []
+      command = `git ls-files`
+      command.split("\n").map do |path|
+        begin
+          file_infos << FileInfo.new(name: path, mtime: File.mtime(path), size: File.size(path))
+        rescue
+          next
+        end
+      end
+      file_infos.sort_by! { |info| info.mtime }.reverse!
+      file_infos
+    end
+
     def self.branch
       `git branch --show-current`.strip
     end

data/lib/makit/humanize.rb

@@ -14,6 +14,11 @@ module Makit
       format("%.#{precision}f %s", size, units[exp])
     end
 
+    def self.get_humanized_timestamp(timestamp)
+      return timestamp.strftime("%Y-%m-%d %I:%M:%S %p") if timestamp.respond_to?(:strftime)
+      timestamp.strftime("%Y-%m-%d %H:%M:%S")
+    end
+
     def self.get_make_result_summary(make_result)
       summary = "Make Result\n"
       summary += "  Repository: #{make_result.repository}\n"
@@ -88,19 +93,19 @@ module Makit
 
     def self.get_humanized_duration(seconds)
       minutes = (seconds / 60).to_i
-  seconds = (seconds % 60).to_i
-  hours = (minutes / 60).to_i
-  minutes = minutes % 60
-  days = (hours / 24).to_i
-  hours = hours % 24
+      seconds = (seconds % 60).to_i
+      hours = (minutes / 60).to_i
+      minutes = minutes % 60
+      days = (hours / 24).to_i
+      hours = hours % 24
 
-  parts = []
-  parts << "#{days} days" if days > 0
-  parts << "#{hours} hours" if hours > 0
-  parts << "#{minutes} minutes" if minutes > 0
-  parts << "#{seconds} seconds" if seconds > 0
+      parts = []
+      parts << "#{days} days" if days > 0
+      parts << "#{hours} hours" if hours > 0
+      parts << "#{minutes} minutes" if minutes > 0
+      parts << "#{seconds} seconds" if seconds > 0
 
-  parts.join(", ")
+      parts.join(", ")
     end
   end
 end

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

@@ -1,13 +1,16 @@
-# 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
-    end
-  end
-end # module Makit
+# 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 # module Makit

data/lib/makit/mp/project_mp.rb

@@ -150,7 +150,7 @@ module Makit
           #Makit::DotNet.new_solution(self.name)
           Makit::DotNet.sln_add_projects(self.name)
         else
-          puts "  no dotnet projects found".colorize(:yellow)
+          #puts "  no dotnet projects found".colorize(:yellow)
         end
       end
 
@@ -179,7 +179,6 @@ module Makit
               #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")

data/lib/makit/mp/string_mp.rb

@@ -35,25 +35,14 @@ class String
     end
   end
 
-  def cache_run(args = nil, timestamp = nil)
-
+  def cache_run(timestamp = nil)
     if timestamp.nil?
-      timestamp = Makit::Directory.get_newest_git_file_timestamp(Makit::Directories::PROJECT_ROOT)
+      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
-    if args.nil?
-      command = self
-      Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command), timestamp)
-    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.cache_run(request, timestamp)
-    end
+
+    command = self
+    Makit::RUNNER.cache_run(Makit::RUNNER::parse_command_request(command), timestamp)
   end
 
   # Read a value from a JSON file

data/lib/makit/tasks.rb

@@ -3,19 +3,7 @@ require "digest"
 require "rake/clean"
 #require "sqlite3"
 
-# Register the at_exit hook for cleanup
-at_exit do
-  puts "Performing cleanup for Makit..."
-  # Add your cleanup code here
-  # For example, close files, remove temporary files, etc.
-  # store current state of Makit::PROJECT to a file
-  #json_filename = File.join(Makit::Directories::PROJECT_ROOT, ".makit.project.json")
-  #puts "Saving project state to #{json_filename}"
-  #Makit::PROJECT.save_as(json_filename)
-  #yml_filename = File.join(Makit::Directories::PROJECT_ROOT, ".makit.project.yml")
-  #puts "Saving project state to #{yml_filename}"
-  # Makit::PROJECT.save_as(yml_filename)
-end
+
 
 # This module provides classes for the Makit gem.
 module Makit
@@ -63,5 +51,7 @@ end
 
 # Register the at_exit hook for cleanup
 at_exit do
-  puts "at_exit in tasks.rb...."
+  #puts "at_exit in tasks.rb...."
+  duration = Time.now - Makit::STARTTIME
+  puts "  completed in ".colorize(:grey) + Makit::Humanize.get_humanized_duration(duration).colorize(:green)
 end

data/lib/makit/version.rb

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

data/lib/makit.rb

@@ -15,19 +15,19 @@ module Makit
   class Error < StandardError; end
 
   # Constants
-if File.exist? ".makit.project.json"
-  PROJECT = Makit::Serializer.open(".makit.project.json", Makit::V1::Project)
-else
-  if File.exist? ".makit.project.yml"
-      PROJECT = Makit::Serializer.open(".makit.project.yml", Makit::V1::Project)
+  if File.exist? ".makit.project.json"
+    PROJECT = Makit::Serializer.open(".makit.project.json", Makit::V1::Project)
   else
-    PROJECT = Makit::V1::Project.new
-    PROJECT.set_default_values
+    if File.exist? ".makit.project.yml"
+      PROJECT = Makit::Serializer.open(".makit.project.yml", Makit::V1::Project)
+    else
+      PROJECT = Makit::V1::Project.new
+      PROJECT.set_default_values
+    end
   end
-end
-
 
   STARTTIME = Time.now
+
   IS_GIT_REPO = Dir.exist? ".git"
   DETACHED = `git status`.include?("detached")
   IS_READ_ONLY = !IS_GIT_REPO || DETACHED
@@ -40,6 +40,7 @@ end
   ENV["COMMIT_BRANCH"] = Makit::Git::branch
 
   RUNNER = CommandRunner.new
+  GIT_FILE_INFOS = Makit::Git::get_file_infos
   #RUNNER.log_to_artifacts = true
   # Variables
   log_level = Logger::INFO

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -166,6 +166,7 @@ files:
 - lib/makit/directory.rb
 - lib/makit/dotnet.rb
 - lib/makit/environment.rb
+- lib/makit/fileinfo.rb
 - lib/makit/files.rb
 - lib/makit/git.rb
 - lib/makit/gitlab_runner.rb