makit 0.0.83 → 0.0.85

data/lib/makit/tasks.rb

@@ -1,144 +1,158 @@
-# frozen_string_literal: true
-require "digest"
-require "rake/clean"
-#require "sqlite3"
-
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for managing persistent data for the makit gem
-  class Tasks
-    def self.run_default_commands(task_name)
-      Makit::LOGGER.debug("Running default commands for task: #{task_name}")
-    end
-  end
-end
-
-desc "Remove any temporary products."
-task :clean do
-  Makit::SHOW.task(:clean)
-  Makit::RUNNER.run(Makit::RUNNER.parse_command_request("git clean -dXf"))
-end
-
-desc "Integrate changes into the git repository."
-task :integrate do
-  Makit::TaskInfo.track(:integrate) do
-    unstaged_files = Makit::Git.unstaged_files
-    untracked_files = Makit::Git.untracked_files
-    if unstaged_files.length > 0 || untracked_files.length > 0
-      Makit::Git.integrate
-    else
-      puts "  No unstaged or untracked files found".colorize(:grey)
-    end
-  end
-end
-
-#
-# Tag task
-#
-desc "tag the current version"
-task :tag do
-  Makit::TaskInfo.track(:tag) do
-    # check if the variable VERSION is defined
-    if !defined?(VERSION)
-      puts "  VERSION is not defined".colorize(:red)
-      return
-    end
-
-    Makit::Git.tag(VERSION)
-  end
-end
-
-desc "Sync changes with the git repository."
-task :sync => [:integrate, :pull_incoming] do
-  Makit::TaskInfo.track(:sync) do
-    #Makit::SHOW.task(:sync)
-    Makit::Git.sync
-  end
-end
-
-task :pull do
-  Makit::SHOW.task(:pull)
-  Makit::Git.pull
-end
-
-desc "pull changes from the remote branch, preferring incoming changes for conflicts"
-task :pull_incoming do
-  Makit::TaskInfo.track(:pull_incoming) do
-    #Makit::SHOW.task(:pull_incoming)
-    puts "  git branch is ".colorize(:grey) + "#{Makit::Git.branch}".colorize(:green)
-    "git pull origin #{Makit::Git.branch} -X theirs".try
-  end
-end
-
-desc "Format source code."
-task :format do
-  Makit::SHOW.task(:format)
-  Makit::RUNNER.try("rufo .") if File.exist?("Gemfile") || File.exist?("Rakefile")
-end
-
-#
-# Update docs task
-#
-desc "update the docs for the project"
-task :update_docs do
-  Makit::TaskInfo.track(:update_docs) do
-    mod_time = Makit::GIT_FILE_INFOS.select {
-      |file|
-      file.name.include?("src/" || file.name.include?("test/") || file.name.include?("artifacts/"))
-    }.first.mtime
-    if (Makit::Git.untracked_files.length > 0 ||
-        Makit::Git.unstaged_files.length > 0)
-      File.delete("docs/Rake.md") if File.exist?("docs/Rake.md")
-      File.delete("docs/Files.md") if File.exist?("docs/Files.md")
-    end
-
-    Makit::Docs::Rake.generate if File.exist?("docs/Rake.md")
-    Makit::Docs::Files.generate if File.exist?("docs/Files.md")
-    Makit::DotNet.generate_docs
-  end
-end
-
-desc "Update dependencies."
-task :update do
-  Makit::SHOW.task(:update)
-  yesterday = Time.now - 24 * 60 * 60
-  system("bundle update") if File.exist?("Gemfile")
-  # glob all *.csproj files
-  Dir.glob("**/*.csproj").each do |file|
-    "dotnet format #{file}".cache_try(yesterday)
-  end
-end
-
-# Register the at_exit hook for cleanup
-at_exit do
-  #puts "at_exit in tasks.rb...."
-
-  puts " "
-
-  if (Makit::Docs::Rake.get_top_task_name == "default")
-    # let define some properties
-    properties = {
-      "version" => (defined?(VERSION) ? VERSION : ""),
-      "branch" => Makit::Git.branch,
-      "user" => ENV["USER"],
-      "machine" => ENV["COMPUTERNAME"],
-      "os" => ENV["OS"],
-      "largest src" => (tracked = Makit::Git.get_file_infos).empty? ? "none" : tracked.max_by(&:size).name,
-      "largest src size" => (tracked = Makit::Git.get_file_infos).empty? ? "0 bytes" : Makit::Humanize.get_humanized_size(tracked.max_by(&:size).size),
-      "largest artifact" => (untracked = Makit::Git.get_untracked_file_infos).empty? ? "none" : untracked.max_by(&:size).name,
-      "largest artifact size" => (untracked = Makit::Git.get_untracked_file_infos).empty? ? "0 bytes" : Makit::Humanize.get_humanized_size(untracked.max_by(&:size).size),
-      "slowest task" => Makit::TaskInfo.slowest_task_name,
-    }
-
-    # display the properties as a table, right justify the key to 20 characters
-    properties.each do |key, value|
-      puts "  #{key.ljust(25)} ".colorize(:grey) + "#{value}".colorize(:green)
-    end
-    puts " "
-  end
-
-  # display the duration
-
-  duration = Time.now - Makit::STARTTIME
-  puts "  rake #{Makit::Docs::Rake.get_top_task_name}".colorize(:green) + " on branch ".colorize(:grey) + "#{Makit::Git.branch}".colorize(:green) + " completed in ".colorize(:grey) + Makit::Humanize.get_humanized_duration(duration).colorize(:green)
-end
+# frozen_string_literal: true
+require "digest"
+require "rake/clean"
+#require "sqlite3"
+
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for managing persistent data for the makit gem
+  class Tasks
+    def self.run_default_commands(task_name)
+      Makit::LOGGER.debug("Running default commands for task: #{task_name}")
+    end
+  end
+end
+
+desc "Remove any temporary products."
+task :clean do
+  Makit::SHOW.task(:clean)
+  Makit::RUNNER.run(Makit::RUNNER.parse_command_request("git clean -dXf"))
+end
+
+desc "Integrate changes into the git repository."
+task :integrate do
+  Makit::TaskInfo.track(:integrate) do
+    unstaged_files = Makit::Git.unstaged_files
+    untracked_files = Makit::Git.untracked_files
+    if unstaged_files.length > 0 || untracked_files.length > 0
+      Makit::Git.integrate
+    else
+      puts "  No unstaged or untracked files found".colorize(:grey)
+    end
+  end
+end
+
+#
+# Tag task
+#
+desc "tag the current version"
+task :tag do
+  Makit::TaskInfo.track(:tag) do
+    # check if the variable VERSION is defined
+    if !defined?(VERSION)
+      puts "  VERSION is not defined".colorize(:red)
+      return
+    end
+
+    Makit::Git.tag(VERSION)
+  end
+end
+
+desc "Sync changes with the git repository."
+task :sync => [:integrate, :pull_incoming] do
+  Makit::TaskInfo.track(:sync) do
+    #Makit::SHOW.task(:sync)
+    Makit::Git.sync
+  end
+end
+
+task :pull do
+  Makit::SHOW.task(:pull)
+  Makit::Git.pull
+end
+
+desc "pull changes from the remote branch, preferring incoming changes for conflicts"
+task :pull_incoming do
+  Makit::TaskInfo.track(:pull_incoming) do
+    #Makit::SHOW.task(:pull_incoming)
+    puts "  git branch is ".colorize(:grey) + "#{Makit::Git.branch}".colorize(:green)
+    "git pull origin #{Makit::Git.branch} -X theirs".try
+  end
+end
+
+desc "Format source code."
+task :format do
+  Makit::SHOW.task(:format)
+  Makit::RUNNER.try("rufo .") if File.exist?("Gemfile") || File.exist?("Rakefile")
+end
+
+#
+# Update docs task
+#
+desc "update the docs for the project"
+task :update_docs do
+  Makit::TaskInfo.track(:update_docs) do
+    mod_time = Makit::GIT_FILE_INFOS.select {
+      |file|
+      file.name.include?("src/" || file.name.include?("test/") || file.name.include?("artifacts/"))
+    }.first.mtime
+    if (Makit::Git.untracked_files.length > 0 ||
+        Makit::Git.unstaged_files.length > 0)
+      File.delete("docs/Rake.md") if File.exist?("docs/Rake.md")
+      File.delete("docs/Files.md") if File.exist?("docs/Files.md")
+    end
+
+    Makit::Docs::Rake.generate if File.exist?("docs/Rake.md")
+    Makit::Docs::Files.generate if File.exist?("docs/Files.md")
+    Makit::DotNet.generate_docs
+  end
+end
+
+desc "Update dependencies."
+task :update do
+  Makit::SHOW.task(:update)
+  yesterday = Time.now - 24 * 60 * 60
+  system("bundle update") if File.exist?("Gemfile")
+  # glob all *.csproj files
+  Dir.glob("**/*.csproj").each do |file|
+    #"dotnet format #{file}".cache_try(yesterday)
+  end
+end
+
+task :update do
+  Makit::SHOW.task :update
+  "rufo .".try
+  "dotnet format".run
+  "dotnet tool install --global dotnet-outdated-tool".run
+  "dotnet outdated --upgrade:Auto .".run
+end
+
+task :update_nuget_packages do
+  Makit::SHOW.task :update_nuget_packages
+  "dotnet tool install --global dotnet-outdated-tool".run
+  "dotnet outdated --upgrade:Auto .".run
+end
+
+# Register the at_exit hook for cleanup
+at_exit do
+  #puts "at_exit in tasks.rb...."
+
+  puts " "
+
+  if (Makit::Docs::Rake.get_top_task_name == "default")
+    # let define some properties
+    properties = {
+      "version" => (defined?(VERSION) ? VERSION : ""),
+      "branch" => Makit::Git.branch,
+      "user" => ENV["USER"],
+      "machine" => ENV["COMPUTERNAME"],
+      "os" => ENV["OS"],
+      "largest src" => (tracked = Makit::Git.get_file_infos).empty? ? "none" : tracked.max_by(&:size).name,
+      "largest src size" => (tracked = Makit::Git.get_file_infos).empty? ? "0 bytes" : Makit::Humanize.get_humanized_size(tracked.max_by(&:size).size),
+      "largest artifact" => (untracked = Makit::Git.get_untracked_file_infos).empty? ? "none" : untracked.max_by(&:size).name,
+      "largest artifact size" => (untracked = Makit::Git.get_untracked_file_infos).empty? ? "0 bytes" : Makit::Humanize.get_humanized_size(untracked.max_by(&:size).size),
+      "slowest task" => Makit::TaskInfo.slowest_task_name,
+    }
+
+    # display the properties as a table, right justify the key to 20 characters
+    properties.each do |key, value|
+      puts "  #{key.ljust(25)} ".colorize(:grey) + "#{value}".colorize(:green)
+    end
+    puts " "
+  end
+
+  # display the duration
+
+  duration = Time.now - Makit::STARTTIME
+  puts "  rake #{Makit::Docs::Rake.get_top_task_name}".colorize(:green) + " on branch ".colorize(:grey) + "#{Makit::Git.branch}".colorize(:green) + " completed in ".colorize(:grey) + Makit::Humanize.get_humanized_duration(duration).colorize(:green)
+end

data/lib/makit/tree.rb

@@ -1,37 +1,37 @@
-# frozen_string_literal: true
-
-# This module provides classes for the Makit gem.
-module Makit
-  class Tree
-    def get_source_tree
-      files = `git ls-files`.split("\n")
-      tree = {}
-
-      # Build a nested hash representing the file structure
-      files.each do |file|
-        parts = file.split("/")
-        current = tree
-
-        parts.each_with_index do |part, index|
-          current[part] ||= (index == parts.length - 1 ? nil : {})
-          current = current[part] unless current[part].nil?
-        end
-      end
-
-      generate_tree_string(tree)
-    end
-
-    def generate_tree_string(tree, indent = "")
-      result = ""
-      tree.each do |key, value|
-        if value.is_a?(Hash)
-          result << "#{indent}#{key}/\n"
-          result << generate_tree_string(value, "#{indent}  ")
-        else
-          result << "#{indent}#{key}\n"
-        end
-      end
-      result
-    end
-  end
-end
+# frozen_string_literal: true
+
+# This module provides classes for the Makit gem.
+module Makit
+  class Tree
+    def get_source_tree
+      files = `git ls-files`.split("\n")
+      tree = {}
+
+      # Build a nested hash representing the file structure
+      files.each do |file|
+        parts = file.split("/")
+        current = tree
+
+        parts.each_with_index do |part, index|
+          current[part] ||= (index == parts.length - 1 ? nil : {})
+          current = current[part] unless current[part].nil?
+        end
+      end
+
+      generate_tree_string(tree)
+    end
+
+    def generate_tree_string(tree, indent = "")
+      result = ""
+      tree.each do |key, value|
+        if value.is_a?(Hash)
+          result << "#{indent}#{key}/\n"
+          result << generate_tree_string(value, "#{indent}  ")
+        else
+          result << "#{indent}#{key}\n"
+        end
+      end
+      result
+    end
+  end
+end

data/lib/makit/v1/makit.v1_services_pb.rb

@@ -1,25 +1,25 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# Source: lib/makit/v1/makit.v1.proto for package 'makit.v1'
-
-require "grpc"
-require_relative "makit.v1_pb"
-
-module Makit
-  module V1
-    module CommandService
-      # Service to execute commands on devices.
-      class Service
-        include ::GRPC::GenericService
-
-        self.marshal_class_method = :encode
-        self.unmarshal_class_method = :decode
-        self.service_name = "makit.v1.CommandService"
-
-        # Execute a command on a device.
-        rpc :Execute, ::Makit::V1::CommandRequest, ::Makit::V1::Command
-      end
-
-      Stub = Service.rpc_stub_class
-    end
-  end
-end
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: lib/makit/v1/makit.v1.proto for package 'makit.v1'
+
+require "grpc"
+require_relative "makit.v1_pb"
+
+module Makit
+  module V1
+    module CommandService
+      # Service to execute commands on devices.
+      class Service
+        include ::GRPC::GenericService
+
+        self.marshal_class_method = :encode
+        self.unmarshal_class_method = :decode
+        self.service_name = "makit.v1.CommandService"
+
+        # Execute a command on a device.
+        rpc :Execute, ::Makit::V1::CommandRequest, ::Makit::V1::Command
+      end
+
+      Stub = Service.rpc_stub_class
+    end
+  end
+end

data/lib/makit/version.rb

@@ -1,65 +1,64 @@
-# frozen_string_literal: true
-
-module Makit
-  VERSION = "0.0.83"
-
-  class Version
-    # given an array of version strings, return the highest version
-    def self.get_highest_version(versions)
-      versions.sort { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last
-    end
-
-    # example content from .gitlab-ci.yml
-    #variables:
-    #  VERSION: "0.0.26" # Define the version here
-
-    def self.get_version_from_file(path)
-      if (!File.exist?(path))
-        raise "file #{path}does not exist"
-      end
-
-      extension = File.extname(path)
-      #switch = extension.downcase
-      #case switch
-      #if extension == ".csproj"
-      switch = extension.downcase
-      case switch
-      when ".csproj"
-        Makit::Version.detect_from_file(path, /<Version>([-\w\d.]+)</)
-      when ".wxs"
-        Makit::Version.detect_from_file(path, / Version="([\d\.]+)"/)
-      when ".yml"
-        Makit::Version.detect_from_file(path, /VERSION:\s*["']?([\d\.]+)["']?/)
-      else
-        raise "unrecognized file type"
-      end
-    end
-
-    def self.detect_from_file(filename, regex)
-      if File.exist?(filename)
-        match = IO.read(filename).match(regex)
-        match.captures[0] if !match.nil? && match.captures.length.positive?
-      else
-        raise "unable to find version in #{filename}"
-      end
-    end
-
-    def self.set_version_in_file(filename, version)
-      text = IO.read(filename)
-      new_text = text
-      new_text = text.gsub(/VERSION:\s?['|"]([.\d]+)['|"]/, "VERSION: \"#{version}\"") if filename.include?(".yml")
-      new_text = text.gsub(/version\s?=\s?['|"]([.\d]+)['|"]/, "version='#{version}'") if filename.include?(".gemspec")
-      new_text = text.gsub(/<Version>([-\w\d.]+)</, "<Version>#{version}<") if filename.include?(".csproj")
-      new_text = text.gsub(/<version>([-\w\d.]+)</, "<version>#{version}<") if filename.include?(".nuspec")
-      new_text = text.gsub(/ Version="([\d\.]+)"/, " Version=\"#{version}\"") if filename.include?(".wxs")
-      new_text = text.gsub(/version\s+=\s+['"]([\w.]+)['"]/, "version=\"#{version}\"") if filename.include?(".toml")
-      File.open(filename, "w") { |f| f.write(new_text) } if new_text != text
-    end
-
-    def self.set_version_in_files(glob_pattern, version)
-      Dir.glob(glob_pattern).each do |filename|
-        set_version_in_file(filename, version)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Makit
+  VERSION = "0.0.85"
+
+  class Version
+    # given an array of version strings, return the highest version
+    def self.get_highest_version(versions)
+      versions.sort { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last
+    end
+
+    # example content from .gitlab-ci.yml
+    #variables:
+    #  VERSION: "0.0.26" # Define the version here
+
+    def self.get_version_from_file(path)
+      if (!File.exist?(path))
+        raise "file #{path}does not exist"
+      end
+
+      extension = File.extname(path)
+      #switch = extension.downcase
+      #case switch
+      #if extension == ".csproj"
+      case switch
+      when ".csproj"
+        Makit::Version.detect_from_file(path, /<Version>([-\w\d.]+)</)
+      when ".wxs"
+        Makit::Version.detect_from_file(path, / Version="([\d\.]+)"/)
+      when ".yml"
+        Makit::Version.detect_from_file(path, /VERSION:\s*["']?([\d\.]+)["']?/)
+      else
+        raise "unrecognized file type"
+      end
+    end
+
+    def self.detect_from_file(filename, regex)
+      if File.exist?(filename)
+        match = IO.read(filename).match(regex)
+        match.captures[0] if !match.nil? && match.captures.length.positive?
+      else
+        raise "unable to find version in #{filename}"
+      end
+    end
+
+    def self.set_version_in_file(filename, version)
+      text = IO.read(filename)
+      new_text = text
+      new_text = text.gsub(/VERSION:\s?['|"]([.\d]+)['|"]/, "VERSION: \"#{version}\"") if filename.include?(".yml")
+      new_text = text.gsub(/version\s?=\s?['|"]([.\d]+)['|"]/, "version='#{version}'") if filename.include?(".gemspec")
+      new_text = text.gsub(/<Version>([-\w\d.]+)</, "<Version>#{version}<") if filename.include?(".csproj")
+      new_text = text.gsub(/<version>([-\w\d.]+)</, "<version>#{version}<") if filename.include?(".nuspec")
+      new_text = text.gsub(/ Version="([\d\.]+)"/, " Version=\"#{version}\"") if filename.include?(".wxs")
+      new_text = text.gsub(/version\s+=\s+['"]([\w.]+)['"]/, "version=\"#{version}\"") if filename.include?(".toml")
+      File.open(filename, "w") { |f| f.write(new_text) } if new_text != text
+    end
+
+    def self.set_version_in_files(glob_pattern, version)
+      Dir.glob(glob_pattern).each do |filename|
+        set_version_in_file(filename, version)
+      end
+    end
+  end
+end