makit 0.0.99 → 0.0.112

data/lib/makit/git/repository.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# This module provides classes for the Makit gem.
+module Makit
+  class Git
+    # This class provides methods for querying git repository state and metadata.
+    class Repository
+      def self.git_repo?
+        Dir.exist? ".git"
+      end
+
+      def self.ci?
+        ENV["CI"] == "true"
+      end
+
+      def self.detached
+        `git status`.include?("detached")
+      end
+
+      def self.read_only?
+        !git_repo? || detached
+      end
+
+      def self.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.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|
+          file_infos << FileInfo.new(name: file, mtime: File.mtime(file), size: File.size(file))
+        rescue StandardError
+          next
+        end
+        file_infos.sort_by!(&:mtime).reverse!
+        file_infos
+      end
+
+      def self.get_untracked_file_infos
+        file_infos = []
+        file_list = `git ls-files --others --exclude-standard`.split("\n")
+        file_list.each do |file|
+          file_infos << FileInfo.new(name: file, mtime: File.mtime(file), size: File.size(file))
+        rescue StandardError
+          next
+        end
+        file_infos.sort_by!(&: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
+    end
+  end
+end

data/lib/makit/git.rb

@@ -1,145 +1,98 @@
-# 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
+# frozen_string_literal: true
+
+require_relative "git/repository"
+require_relative "git/cli"
+
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provides a unified interface for git operations.
+  # Methods have been organized into Repository (state/metadata) and CLI (commands) classes.
+  #
+  class Git
+    # Delegate repository state and metadata methods to Repository class
+    def self.git_repo?
+      Repository.git_repo?
+    end
+
+    def self.ci?
+      Repository.ci?
+    end
+
+    def self.detached
+      Repository.detached
+    end
+
+    def self.read_only?
+      Repository.read_only?
+    end
+
+    def self.clean?
+      Repository.clean?
+    end
+
+    def self.unstaged_files
+      Repository.unstaged_files
+    end
+
+    def self.untracked_files
+      Repository.untracked_files
+    end
+
+    def self.get_file_infos
+      Repository.get_file_infos
+    end
+
+    def self.get_untracked_file_infos
+      Repository.get_untracked_file_infos
+    end
+
+    def self.branch
+      Repository.branch
+    end
+
+    def self.commitsha
+      Repository.commitsha
+    end
+
+    def self.commitmsg
+      Repository.commitmsg
+    end
+
+    def self.commitdate
+      Repository.commitdate
+    end
+
+    def self.commitauthor
+      Repository.commitauthor
+    end
+
+    def self.commitemail
+      Repository.commitemail
+    end
+
+    def self.get_remote_url
+      Repository.get_remote_url
+    end
+
+    # Delegate command execution methods to CLI class
+    def self.integrate
+      CLI.integrate
+    end
+
+    def self.sync
+      CLI.sync
+    end
+
+    def self.pull
+      CLI.pull
+    end
+
+    def self.zip_source_files(zipfilename)
+      CLI.zip_source_files(zipfilename)
+    end
+
+    def self.tag(version)
+      CLI.tag(version)
+    end
+  end
+end

data/lib/makit/gitlab_runner.rb

@@ -1,60 +1,59 @@
-# frozen_string_literal: true
-
-require "yaml"
-require "fileutils"
-
-# This module provides classes for the Makit gem.
-module Makit
-  # This class provide methods for working with Directories/
-  #
-  # Example:
-  #
-  #   Makit::Directory.find_directory_with_pattern("/home/user", "*.rb")
-  #
-  class GitLabRunner
-
-    # Parse the .gitlab-ci.yml file
-    def parse_gitlab_ci_file(file_path)
-      YAML.load_file(file_path)
-    end
-
-    # Extract the script for a specified job
-    def extract_script(ci_config, job_name)
-      job = ci_config[job_name]
-      job ? job["script"] : nil
-    end
-
-    # Write the script to a temporary file
-    def write_script_to_file(script, file_path)
-      File.open(file_path, "w") do |file|
-        script.each { |line| file.puts(line) }
-      end
-    end
-
-    # Run the script in a Docker container
-    def run_script_in_docker(image, script_file)
-      system("docker run --rm -v #{Dir.pwd}:/workspace -w /workspace #{image} /bin/sh #{script_file}")
-    end
-
-    # Main function to execute the process
-    def run_job(ci_file_path, job_name, docker_image)
-      ci_config = parse_gitlab_ci_file(ci_file_path)
-      script = extract_script(ci_config, job_name)
-
-      unless script
-        puts "Job '#{job_name}' not found in #{ci_file_path}"
-        return
-      end
-
-      script_file = "temp_script.sh"
-      write_script_to_file(script, script_file)
-      FileUtils.chmod("+x", script_file)
-
-      puts "Running script in Docker container..."
-      run_script_in_docker(docker_image, script_file)
-
-      # Clean up the temporary script file
-      FileUtils.rm(script_file)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "yaml"
+require "fileutils"
+
+# This module provides classes for the Makit gem.
+module Makit
+  # This class provide methods for working with Directories/
+  #
+  # Example:
+  #
+  #   Makit::Directory.find_directory_with_pattern("/home/user", "*.rb")
+  #
+  class GitLabRunner
+    # Parse the .gitlab-ci.yml file
+    def parse_gitlab_ci_file(file_path)
+      YAML.load_file(file_path)
+    end
+
+    # Extract the script for a specified job
+    def extract_script(ci_config, job_name)
+      job = ci_config[job_name]
+      job ? job["script"] : nil
+    end
+
+    # Write the script to a temporary file
+    def write_script_to_file(script, file_path)
+      File.open(file_path, "w") do |file|
+        script.each { |line| file.puts(line) }
+      end
+    end
+
+    # Run the script in a Docker container
+    def run_script_in_docker(image, script_file)
+      system("docker run --rm -v #{Dir.pwd}:/workspace -w /workspace #{image} /bin/sh #{script_file}")
+    end
+
+    # Main function to execute the process
+    def run_job(ci_file_path, job_name, docker_image)
+      ci_config = parse_gitlab_ci_file(ci_file_path)
+      script = extract_script(ci_config, job_name)
+
+      unless script
+        puts "Job '#{job_name}' not found in #{ci_file_path}"
+        return
+      end
+
+      script_file = "temp_script.sh"
+      write_script_to_file(script, script_file)
+      FileUtils.chmod("+x", script_file)
+
+      puts "Running script in Docker container..."
+      run_script_in_docker(docker_image, script_file)
+
+      # Clean up the temporary script file
+      FileUtils.rm(script_file)
+    end
+  end
+end