makit 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a87da93549378cea2c13dbd6d1dcc4a1fc5b8eb79969c456a97c44c8f90a9bc4
-  data.tar.gz: eccf1b3e8176bea2f0d0888855f24e733cee65a3bc7b82a50bacbfc8c26d9601
+  metadata.gz: d5ccf5a0952c59f63f6df2e59d7238fb85c8b67c1f8b7473727737800de77e88
+  data.tar.gz: b5aa85780eca251aa9fd4ee65e8242c59fdc1b0f6e4e74f5101654421f1bd689
 SHA512:
-  metadata.gz: e734aa176bad0e765ef142444eea81908398fb0e716a0f40765c3aec4812b424f30cab5d567f9c14d52ef875869fcecacc434f0d7cfeeb8d6f1ca7fe6487c308
-  data.tar.gz: f5fa4d9a6a04cda52f591d2cfb4fd8300fadcfe1a3af9cb77466474c6ee3c9c0a0f7e7134a5f965c020217881f96d5abda72d78ee403407dcd5ea9a0b652fc6b
+  metadata.gz: 1b7b163e38a8e6292ab70d8152bacfc006b7b6d976e2be70e2a87a41c5fbbbd0fb76d66c5c470656590a13588e79034b3cc7d7be5ab02266b50d21a885499099
+  data.tar.gz: bd82445d0365a5c6dfd1c5b9bbb6ba8b9980b5fad794c909c173b7e6b6a8cdf27283cb3a2af7b11636fa883ede91bc58693a68585061b0a88d7538f13200b634

data/lib/makit/command_runner.rb

@@ -13,10 +13,24 @@ module Makit
 
     def initialize
       @show_output_on_success = false
-      @log_to_artifacts = false
+      @log_to_artifacts = true
       @commands = []
     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]
+      cache_filename = Makit::Directories::PROJECT_ARTIFACTS +
+                       "/commands/cache/#{hash_string}.pb"
+                      # create the directory if it does not already exist
+      FileUtils.mkdir_p(File.dirname(cache_filename))
+      cache_filename
+    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
@@ -26,15 +40,16 @@ module Makit
       # 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/#{command_request.to_hash}.pb"
+                       "/commands/#{hash_string}.pb"
       puts "cache_filename: #{cache_filename}"
 
-     
       #cache_filename = Makit::Directories::PROJECT_ARTIFACTS + "/commands/#{command_request.name}.#{command_request.arguments.join("_")}.#{timestamp.seconds}.pb"
-      if File.exist?(cache_filename) 
+      if File.exist?(cache_filename)
         puts "cache file date: #{File.mtime(cache_filename)}"
-        if(File.mtime(cache_filename) > timestamp)
+        if (File.mtime(cache_filename) > timestamp)
           puts "cache_filename exists and is newer than #{timestamp}"
           return Makit::Serializer.open(cache_filename, Makit::V1::Command)
         else
@@ -42,15 +57,12 @@ module Makit
         end
       end
 
-
-        
-        command = run(command_request)
-        # make sure the cache directory exists
-        FileUtils.mkdir_p(File.dirname(cache_filename))
-        puts "saving command to cache_filename"
-        Makit::Serializer.save_as(cache_filename, command)
-        command
-      
+      command = run(command_request)
+      # make sure the cache directory exists
+      FileUtils.mkdir_p(File.dirname(cache_filename))
+      puts "saving command to cache_filename"
+      Makit::Serializer.save_as(cache_filename, command)
+      command
     end
 
     # Run a command and return a Makit::V1::Command.
@@ -78,10 +90,11 @@ module Makit
     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")
+      #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))
@@ -270,5 +283,36 @@ module Makit
 
       summary
     end
+
+    def log_rake_commands
+      dir = File.join(Makit::Directories::PROJECT_ARTIFACTS, "commands")
+      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+
+      # open a text file to write to
+      File.open(File.join(dir, "rake.commands.txt"), "w") do |file|
+        #rake_commands = commands.select { |command| command.name == "rake" }
+        commands.each do |command|
+          file.puts " " + Makit::CommandRunner.get_command_summary(command).strip_color_codes
+          file.puts "   start time: #{command.started_at}"
+          file.puts command.output.strip_color_codes unless command.output.strip_color_codes.strip.length == 0
+          file.puts command.error.strip_color_codes unless command.error.strip_color_codes.strip.length == 0
+          file.puts " "
+        end
+      end
+    end
+    def log_slowest_commands
+      dir = File.join(Makit::Directories::PROJECT_ARTIFACTS, "commands")
+      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+
+      # open a text file to write to
+      File.open(File.join(dir, "slow.commands.txt"), "w") do |file|
+        Makit::RUNNER.commands.sort_by { |command| (command.duration.seconds + (command.duration.nanos / 1_000_000_000.0)) }.reverse.first(5).each do |command|
+          # Convert to float representation
+          duration_in_float = command.duration.seconds + (command.duration.nanos / 1_000_000_000.0)
+          #puts "  #{command.name} took #{duration_in_float} seconds"
+          file.puts " " + Makit::CommandRunner.get_command_summary(command).strip_color_codes + " (#{command.duration.seconds} seconds)"
+        end
+      end
+    end
   end   # class CommandRunner
 end # module Makit

data/lib/makit/directory.rb

@@ -138,11 +138,13 @@ module Makit
     def self.get_newest_file(path)
       newest_file = nil
       latest_date = nil
-      Find.find(path) do |file|
-        if File.file?(file)
-          date = File.mtime(file)
-          latest_date = date if latest_date.nil? || date > latest_date
-          newest_file = file if date == latest_date
+      if (Dir.exist?(path))
+        Find.find(path) do |file|
+          if File.file?(file)
+            date = File.mtime(file)
+            latest_date = date if latest_date.nil? || date > latest_date
+            newest_file = file if date == latest_date
+          end
         end
       end
       newest_file

data/lib/makit/dotnet.rb

@@ -10,7 +10,7 @@ module Makit
 
     def self.new_project(template, name, output)
       if Dir.exist? output
-        puts "  #{output}".colorize(:green) + " exists.".colorize(:grey)
+        #puts "  #{output}".colorize(:green) + " exists.".colorize(:grey)
         #puts "Directory #{output} already exists".colorize(:yellow)
       else
         "dotnet new #{template} --name #{name} --output #{output}".run
@@ -22,14 +22,14 @@ module Makit
       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)
+        #puts "  package ".colorize(:grey) + "#{package_name}".colorize(:yellow) + " is in ".colorize(:grey) + "#{project_path}".colorize(:yellow)
       end
     end
 
     def self.add_reference(project_path, reference_path)
       project_content = File.read(project_path)
       if (project_content.include?("<PackageReference Include=\"#{package}\""))
-        puts "  reference ".colorize(:grey) + "#{reference_path}".colorize(:yellow) + " is in ".colorize(:grey) + "#{project_path}".colorize(:yellow)
+        #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
@@ -38,7 +38,7 @@ module Makit
     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)
+        #puts "  #{name}.sln".colorize(:green) + " exists".colorize(:grey)
       else
         "dotnet new sln --name #{name}".run
       end

data/lib/makit/mp/project_mp.rb

@@ -114,7 +114,7 @@ module Makit
             puts "  Creating solution file: " + "#{self.name}.sln".colorize(:green)
             "dotnet new sln -n #{self.name}".run unless File.exist?("#{self.name}.sln")
           else
-            puts "  Solution file already exists: " + "#{self.name}.sln".colorize(:yellow)
+            #puts "  Solution file already exists: " + "#{self.name}.sln".colorize(:yellow)
           end
           self.dotnet_projects.each do |project|
             add_project = true

data/lib/makit/mp/string_mp.rb

@@ -74,6 +74,12 @@ class String
   # 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

data/lib/makit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Lou Parslow