makit 0.0.68 → 0.0.70

data/lib/makit/environment.rb

@@ -1,127 +1,127 @@
-# frozen_string_literal: true
-
-require "sorted_set"
-require_relative "directory"
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for working with the system Environment.
-  #
-  class Environment
-    def self.which(name)
-      return name if File.exist?(name)
-
-      ["", ".exe", ".bat", ".cmd"].each do |ext|
-        aname = name + ext
-        return aname if File.exist?(aname)
-
-        ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
-          apath = "#{path.gsub("\\", "/")}/#{aname}".gsub("//", "/")
-          return apath if File.exist?(apath)
-        end
-      end
-      ""
-    end
-
-    def self.constants_hash
-      constants = {}
-      # collect all constants that are all uppercase
-      Object.constants.each { |c| constants[c] = Object.const_get(c) if c == c.upcase } #	puts "#{c} = #{Object.const_get(c)}" }
-      #Object.constants.each { |c| constants[c] = Object.const_get(c)}#	puts "#{c} = #{Object.const_get(c)}" }
-      constants
-    end
-
-    def self.rake_file_name
-      caller_locations.each do |location|
-        return location.absolute_path if location.absolute_path&.end_with?("Rakefile")
-      end
-      nil
-    end
-
-    def self.gem_data_directory
-      gem_data_directory = File.join(Dir.home, ".makit")
-    end
-
-    def self.project_root_directory
-      if !Makit::Environment.rake_file_name.nil?
-        File.dirname(Makit::Environment.rake_file_name)
-      else
-        Makit::Directory.find_directory_with_pattern(File.dirname(__FILE__), "Rakefile")
-        # lass Directory
-        #  def self.find_directory_with_pattern(starting_directory, pattern)
-        # nil
-      end
-    end
-
-    def self.get_relative_directory(url)
-      url = url.gsub("https://", "").gsub("http://", "")
-      url = url.gsub("gitlab.com", "gitlab")
-      url
-    end
-
-    def self.get_code_root
-      # user home directory  + "code"
-      code_root = File.join(Dir.home, "code")
-    end
-
-    def self.get_work_directory(url)
-      raise "invalid url" if !url.include? "https://"
-      url = url.gsub("https://", "").gsub("http://", "")
-      #url = url.gsub("gitlab.com","gitlab")
-      url
-    end
-
-    def self.is_windows?
-      RbConfig::CONFIG["host_os"] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-    end
-
-    def self.is_mac?
-      RbConfig::CONFIG["host_os"] =~ /darwin/
-    end
-
-    def self.get_os
-      case RbConfig::CONFIG["host_os"]
-      when /linux/
-        "Linux"
-      when /darwin/
-        "macOS"
-      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-        "Windows"
-      else
-        "Unknown"
-      end
-    end
-
-    def self.get_runtime_identifier()
-      os = RbConfig::CONFIG["host_os"]
-      cpu = RbConfig::CONFIG["host_cpu"]
-
-      case os
-      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-        os_rid = "win"
-      when /darwin|mac os/
-        os_rid = "osx"
-      when /linux/
-        os_rid = "linux"
-      when /solaris|bsd/
-        os_rid = "unix"
-      else
-        raise "Unknown operating system: host_os=#{os}"
-      end
-
-      case cpu
-      when /x86_64|amd64|x64/
-        arch_rid = "x64"
-      when /i686|i386/
-        arch_rid = "x86"
-        #when /arm/
-        #  arch_rid = "arm"
-      when /aarch64|arm64/
-        arch_rid = "arm64"
-      else
-        raise "Unknown architecture: host_cpu=#{cpu}"
-      end
-
-      "#{os_rid}-#{arch_rid}"
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "sorted_set"
+require_relative "directory"
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for working with the system Environment.
+  #
+  class Environment
+    def self.which(name)
+      return name if File.exist?(name)
+
+      ["", ".exe", ".bat", ".cmd"].each do |ext|
+        aname = name + ext
+        return aname if File.exist?(aname)
+
+        ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+          apath = "#{path.gsub("\\", "/")}/#{aname}".gsub("//", "/")
+          return apath if File.exist?(apath)
+        end
+      end
+      ""
+    end
+
+    def self.constants_hash
+      constants = {}
+      # collect all constants that are all uppercase
+      Object.constants.each { |c| constants[c] = Object.const_get(c) if c == c.upcase } #	puts "#{c} = #{Object.const_get(c)}" }
+      #Object.constants.each { |c| constants[c] = Object.const_get(c)}#	puts "#{c} = #{Object.const_get(c)}" }
+      constants
+    end
+
+    def self.rake_file_name
+      caller_locations.each do |location|
+        return location.absolute_path if location.absolute_path&.end_with?("Rakefile")
+      end
+      nil
+    end
+
+    def self.gem_data_directory
+      gem_data_directory = File.join(Dir.home, ".makit")
+    end
+
+    def self.project_root_directory
+      if !Makit::Environment.rake_file_name.nil?
+        File.dirname(Makit::Environment.rake_file_name)
+      else
+        Makit::Directory.find_directory_with_pattern(File.dirname(__FILE__), "Rakefile")
+        # lass Directory
+        #  def self.find_directory_with_pattern(starting_directory, pattern)
+        # nil
+      end
+    end
+
+    def self.get_relative_directory(url)
+      url = url.gsub("https://", "").gsub("http://", "")
+      url = url.gsub("gitlab.com", "gitlab")
+      url
+    end
+
+    def self.get_code_root
+      # user home directory  + "code"
+      code_root = File.join(Dir.home, "code")
+    end
+
+    def self.get_work_directory(url)
+      raise "invalid url" if !url.include? "https://"
+      url = url.gsub("https://", "").gsub("http://", "")
+      #url = url.gsub("gitlab.com","gitlab")
+      url
+    end
+
+    def self.is_windows?
+      RbConfig::CONFIG["host_os"] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+    end
+
+    def self.is_mac?
+      RbConfig::CONFIG["host_os"] =~ /darwin/
+    end
+
+    def self.get_os
+      case RbConfig::CONFIG["host_os"]
+      when /linux/
+        "Linux"
+      when /darwin/
+        "macOS"
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        "Windows"
+      else
+        "Unknown"
+      end
+    end
+
+    def self.get_runtime_identifier()
+      os = RbConfig::CONFIG["host_os"]
+      cpu = RbConfig::CONFIG["host_cpu"]
+
+      case os
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        os_rid = "win"
+      when /darwin|mac os/
+        os_rid = "osx"
+      when /linux/
+        os_rid = "linux"
+      when /solaris|bsd/
+        os_rid = "unix"
+      else
+        raise "Unknown operating system: host_os=#{os}"
+      end
+
+      case cpu
+      when /x86_64|amd64|x64/
+        arch_rid = "x64"
+      when /i686|i386/
+        arch_rid = "x86"
+        #when /arm/
+        #  arch_rid = "arm"
+      when /aarch64|arm64/
+        arch_rid = "arm64"
+      else
+        raise "Unknown architecture: host_cpu=#{cpu}"
+      end
+
+      "#{os_rid}-#{arch_rid}"
+    end
+  end
+end

data/lib/makit/fileinfo.rb

@@ -1,16 +1,26 @@
-# 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
+# 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
+
+    def self.get_file_infos(filenames)
+      filenames.map do |filename|
+        begin
+          FileInfo.new(name: filename, mtime: File.mtime(filename), size: File.size(filename))
+        rescue
+          next
+        end
+      end
+    end
+  end
+end

data/lib/makit/files.rb

@@ -1,47 +1,47 @@
-# frozen_string_literal: true
-
-require_relative "directory"
-require_relative "environment"
-require_relative "protoc"
-require_relative "nuget"
-require_relative "version"
-require "rake"
-
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for working with the system Environment.
-  #
-  module Files
-    if (Makit::Directories::PROJECT_ROOT != nil)
-      Dir.chdir(Makit::Directories::PROJECT_ROOT) do
-        CSPROJ = Dir.glob("**/*.csproj")
-      end
-    else
-      CSPROJ = Array.new
-    end
-
-    # show all the files constants in a nicely formatted table format with the name of the constant and the value
-    def self.show
-      # Array of constant names (symbols)
-      constant_names = [:CSPROJ]
-
-      # Find the length of the longest constant name and add 1
-      max_length = constant_names.map(&:to_s).max_by(&:length).length + 1
-
-      # Iterate through each constant name
-      constant_names.each do |constant_name|
-        begin
-          constant_value = const_get(constant_name)  # Fetch the value of the constant
-          if (constant_value != nil && File.exist?(constant_value))
-            constant_value = constant_value.colorize(:green)
-          end
-          # Print the constant name right justified to the max_length
-          puts "#{constant_name.to_s.rjust(max_length)} = #{constant_value}"
-        rescue NameError
-          # Handle the case where the constant is not defined
-          puts "#{constant_name.to_s.rjust(max_length)} = [Constant not defined]"
-        end
-      end
-    end
-  end # module Files
-end # module Makit
+# frozen_string_literal: true
+
+require_relative "directory"
+require_relative "environment"
+require_relative "protoc"
+require_relative "nuget"
+require_relative "version"
+require "rake"
+
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for working with the system Environment.
+  #
+  module Files
+    if (Makit::Directories::PROJECT_ROOT != nil)
+      Dir.chdir(Makit::Directories::PROJECT_ROOT) do
+        CSPROJ = Dir.glob("**/*.csproj")
+      end
+    else
+      CSPROJ = Array.new
+    end
+
+    # show all the files constants in a nicely formatted table format with the name of the constant and the value
+    def self.show
+      # Array of constant names (symbols)
+      constant_names = [:CSPROJ]
+
+      # Find the length of the longest constant name and add 1
+      max_length = constant_names.map(&:to_s).max_by(&:length).length + 1
+
+      # Iterate through each constant name
+      constant_names.each do |constant_name|
+        begin
+          constant_value = const_get(constant_name)  # Fetch the value of the constant
+          if (constant_value != nil && File.exist?(constant_value))
+            constant_value = constant_value.colorize(:green)
+          end
+          # Print the constant name right justified to the max_length
+          puts "#{constant_name.to_s.rjust(max_length)} = #{constant_value}"
+        rescue NameError
+          # Handle the case where the constant is not defined
+          puts "#{constant_name.to_s.rjust(max_length)} = [Constant not defined]"
+        end
+      end
+    end
+  end # module Files
+end # module Makit

data/lib/makit/git.rb

@@ -1,96 +1,145 @@
-# 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 Git
-    def self.is_git_repo
-      Dir.exist? ".git"
-    end
-
-    def self.detached
-      `git status`.include?("detached")
-    end
-
-    def self.is_read_only
-      !is_git_repo || detached
-    end
-
-    def self.is_clean
-      `git status --porcelain`.empty?
-    end
-
-    def self.integrate
-      if is_git_repo && !detached
-        "git add .".run
-        "git commit -m \"integrate\"".run unless is_clean
-      end
-    end
-
-    def self.sync
-      if is_git_repo && !detached
-        "git pull".try
-        "git push origin".try
-        "git push origin --tags".try
-      end
-    end
-
-    def self.pull
-      if is_git_repo && !detached
-        "git pull".try
-      end
-    end
-
-    def self.zip_source_files(zipfilename)
-      "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
-
-    def self.commitsha
-      `git rev-parse HEAD`.strip
-    end
-
-    def self.commitmsg
-      `git log -1 --pretty=%B`.strip
-    end
-
-    def self.commitdate
-      `git log -1 --pretty=%cd`.strip
-    end
-
-    def self.commitauthor
-      `git log -1 --pretty=%an`.strip
-    end
-
-    def self.commitemail
-      `git log -1 --pretty=%ae`.strip
-    end
-
-    def self.tag(version)
-      # check if a tag for the current version already exists
-      if (`git tag -l v#{version}`.strip.length > 0)
-        puts "  tag v#{version} already exists".colorize(:red)
-      else
-        "git tag -a v#{version} -m \"version #{version}\"".run
-      end
-    end
-  end
-end
+# 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 Git
+    def self.is_git_repo
+      Dir.exist? ".git"
+    end
+
+    def self.is_ci
+      ENV["CI"] == "true"
+    end
+
+    def self.detached
+      `git status`.include?("detached")
+    end
+
+    def self.is_read_only
+      !is_git_repo || detached
+    end
+
+    def self.is_clean
+      `git status --porcelain`.empty?
+    end
+
+    def self.unstaged_files
+      `git status --porcelain`.split("\n")
+    end
+
+    def self.untracked_files
+      `git ls-files --others --exclude-standard`.split("\n")
+    end
+
+    def self.integrate
+      if is_git_repo && !detached
+        ## check for unstaged or untracked files
+        unstaged_files = `git status --porcelain`.split("\n")
+        untracked_files = `git ls-files --others --exclude-standard`.split("\n")
+        if unstaged_files.length > 0 || untracked_files.length > 0
+          "git add .".run
+          "git commit -m \"integrate\"".run unless is_clean
+        end
+      end
+    end
+
+    def self.sync
+      if is_git_repo && !detached
+        "git pull".try
+        "git push origin".try
+        "git push origin --tags".try
+      end
+    end
+
+    def self.pull
+      if is_git_repo && !detached
+        "git pull".try
+      end
+    end
+
+    def self.zip_source_files(zipfilename)
+      "git archive --format zip --output #{zipfilename} HEAD".run
+    end
+
+    def self.get_file_infos
+      file_infos = []
+      file_list = `git ls-files`.split("\n")
+      # iterate over the filelist and get the file infos
+      file_list.each do |file|
+        begin
+          file_infos << FileInfo.new(name: file, mtime: File.mtime(file), size: File.size(file))
+        rescue
+          next
+        end
+      end
+      file_infos.sort_by! { |info| info.mtime }.reverse!
+      file_infos
+    end
+
+    def self.get_untracked_file_infos
+      #Makit::FileInfo::get_file_infos(`git ls-files --others --exclude=standard`.split("\n")).sort_by! { |info| info.mtime }.reverse!
+      file_infos = []
+      file_list = `git ls-files --others --exclude=standard`.split("\n")
+      file_list.each do |file|
+        begin
+          file_infos << FileInfo.new(name: file, mtime: File.mtime(file), size: File.size(file))
+        rescue
+          next
+        end
+      end
+      file_infos.sort_by! { |info| info.mtime }.reverse!
+      file_infos
+      #    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
+
+    def self.commitsha
+      `git rev-parse HEAD`.strip
+    end
+
+    def self.commitmsg
+      `git log -1 --pretty=%B`.strip
+    end
+
+    def self.commitdate
+      `git log -1 --pretty=%cd`.strip
+    end
+
+    def self.commitauthor
+      `git log -1 --pretty=%an`.strip
+    end
+
+    def self.commitemail
+      `git log -1 --pretty=%ae`.strip
+    end
+
+    def self.get_remote_url
+      `git remote get-url origin`.strip
+    end
+
+    def self.tag(version)
+      # only tag if the repo is not read only
+      if is_read_only
+        puts "  cannot tag a read only repo".colorize(:red)
+        return
+      end
+      # check if a tag for the current version already exists
+      if (`git tag -l v#{version}`.strip.length > 0)
+        puts "  tag v#{version} already exists".colorize(:red)
+      else
+        "git tag -a v#{version} -m \"version #{version}\"".run
+      end
+    end
+  end
+end