makit 0.0.147 → 0.0.153

data/lib/makit/git/repository.rb

@@ -1,256 +1,90 @@
 # frozen_string_literal: true
 
-# Only load gRPC service implementation if generated files exist
-if File.exist?(File.join(__dir__, "..", "generated", "makit", "v1", "git", "git_repository_service_services_pb.rb"))
-  require_relative "../v1/git/git_repository_service_impl"
-end
+# Load gRPC service implementation
+require_relative "../v1/git/git_repository_service_impl"
 
 # This module provides classes for the Makit gem.
 module Makit
   class Git
     # This class provides methods for querying git repository state and metadata.
-    # Now delegates to gRPC service implementation for better scalability and consistency.
+    # Refactored to use protobuf messages exclusively.
     class Repository
-      # Check if gRPC service is available
-      @grpc_available = defined?(Makit::V1::Git::GitRepositoryServiceImpl)
-      
       # Get current repository state via gRPC service
       def self.get_repository_state
-        if @grpc_available
-          service = Makit::V1::Git::GitRepositoryServiceImpl.new
-          request = Makit::V1::Git::GetRepositoryStateRequest.new
-          service.get_repository_state(request, nil)
-        else
-          # Fallback implementation
-          create_fallback_repository_state
-        end
+        service = Makit::V1::Git::GitRepositoryServiceImpl.new
+        request = Makit::V1::Git::GetRepositoryStateRequest.new
+        service.get_repository_state(request, nil)
       end
 
       # Delegate all static methods to gRPC service
       def self.git_repo?
-        if @grpc_available
-          get_repository_state.is_git_repo
-        else
-          Dir.exist?(".git")
-        end
+        get_repository_state.is_git_repo
       end
 
       def self.ci?
-        if @grpc_available
-          get_repository_state.is_ci
-        else
-          ENV["CI"] == "true"
-        end
+        get_repository_state.is_ci
       end
 
       def self.detached
-        if @grpc_available
-          get_repository_state.is_detached
-        else
-          `git status`.include?("detached") rescue false
-        end
+        get_repository_state.is_detached
       end
 
       def self.read_only?
-        if @grpc_available
-          get_repository_state.is_read_only
-        else
-          !git_repo? || detached
-        end
+        get_repository_state.is_read_only
       end
 
       def self.clean?
-        if @grpc_available
-          get_repository_state.is_clean
-        else
-          `git status --porcelain`.empty? rescue true
-        end
+        get_repository_state.is_clean
       end
 
       def self.unstaged_files
-        if @grpc_available
-          get_repository_state.unstaged_files.to_a
-        else
-          `git status --porcelain`.split("\n") rescue []
-        end
+        get_repository_state.unstaged_files.to_a
       end
 
       def self.untracked_files
-        if @grpc_available
-          get_repository_state.untracked_files.to_a
-        else
-          `git ls-files --others --exclude-standard`.split("\n") rescue []
-        end
+        get_repository_state.untracked_files.to_a
       end
 
       def self.get_file_infos
-        if @grpc_available
-          proto_file_infos = get_repository_state.tracked_file_infos
-          convert_file_infos_from_proto(proto_file_infos)
-        else
-          # Fallback implementation
-          file_list = `git ls-files`.split("\n") rescue []
-          file_list.map do |file|
-            Makit::FileInfo.new(
-              name: file,
-              mtime: File.mtime(file),
-              size: File.size(file)
-            )
-          rescue StandardError
-            nil
-          end.compact.sort_by(&:mtime).reverse
-        end
+        proto_file_infos = get_repository_state.tracked_file_infos
+        convert_file_infos_from_proto(proto_file_infos)
       end
 
       def self.get_untracked_file_infos
-        if @grpc_available
-          proto_file_infos = get_repository_state.untracked_file_infos
-          convert_file_infos_from_proto(proto_file_infos)
-        else
-          # Fallback implementation
-          file_list = `git ls-files --others --exclude-standard`.split("\n") rescue []
-          file_list.map do |file|
-            Makit::FileInfo.new(
-              name: file,
-              mtime: File.mtime(file),
-              size: File.size(file)
-            )
-          rescue StandardError
-            nil
-          end.compact.sort_by(&:mtime).reverse
-        end
+        proto_file_infos = get_repository_state.untracked_file_infos
+        convert_file_infos_from_proto(proto_file_infos)
       end
 
       def self.branch
-        if @grpc_available
-          get_repository_state.branch
-        else
-          `git branch --show-current`.strip rescue ""
-        end
+        get_repository_state.branch
       end
 
       def self.commitsha
-        if @grpc_available
-          get_repository_state.commit_sha
-        else
-          `git rev-parse HEAD`.strip rescue ""
-        end
+        get_repository_state.commit_sha
       end
 
       def self.commitmsg
-        if @grpc_available
-          get_repository_state.commit_message
-        else
-          `git log -1 --pretty=%B`.strip rescue ""
-        end
+        get_repository_state.commit_message
       end
 
       def self.commitdate
-        if @grpc_available
-          get_repository_state.commit_date
-        else
-          `git log -1 --pretty=%cd`.strip rescue ""
-        end
+        get_repository_state.commit_date
       end
 
       def self.commitauthor
-        if @grpc_available
-          get_repository_state.commit_author
-        else
-          `git log -1 --pretty=%an`.strip rescue ""
-        end
+        get_repository_state.commit_author
       end
 
       def self.commitemail
-        if @grpc_available
-          get_repository_state.commit_email
-        else
-          `git log -1 --pretty=%ae`.strip rescue ""
-        end
+        get_repository_state.commit_email
       end
 
       def self.get_remote_url
-        if @grpc_available
-          get_repository_state.remote_url
-        else
-          `git remote get-url origin`.strip rescue ""
-        end
+        get_repository_state.remote_url
       end
 
       private
 
-      # Create a fallback repository state object
-      def self.create_fallback_repository_state
-        # Create a simple object that mimics the protobuf model interface
-        state = Object.new
-        
-        def state.is_git_repo
-          @is_git_repo ||= Dir.exist?(".git")
-        end
-        
-        def state.is_ci
-          @is_ci ||= ENV["CI"] == "true"
-        end
-        
-        def state.is_detached
-          @is_detached ||= `git status`.include?("detached") rescue false
-        end
-        
-        def state.is_read_only
-          @is_read_only ||= !is_git_repo || is_detached
-        end
-        
-        def state.is_clean
-          @is_clean ||= `git status --porcelain`.empty? rescue true
-        end
-        
-        def state.unstaged_files
-          @unstaged_files ||= `git status --porcelain`.split("\n") rescue []
-        end
-        
-        def state.untracked_files
-          @untracked_files ||= `git ls-files --others --exclude-standard`.split("\n") rescue []
-        end
-        
-        def state.tracked_file_infos
-          @tracked_file_infos ||= []
-        end
-        
-        def state.untracked_file_infos
-          @untracked_file_infos ||= []
-        end
-        
-        def state.branch
-          @branch ||= `git branch --show-current`.strip rescue ""
-        end
-        
-        def state.commit_sha
-          @commit_sha ||= `git rev-parse HEAD`.strip rescue ""
-        end
-        
-        def state.commit_message
-          @commit_message ||= `git log -1 --pretty=%B`.strip rescue ""
-        end
-        
-        def state.commit_date
-          @commit_date ||= `git log -1 --pretty=%cd`.strip rescue ""
-        end
-        
-        def state.commit_author
-          @commit_author ||= `git log -1 --pretty=%an`.strip rescue ""
-        end
-        
-        def state.commit_email
-          @commit_email ||= `git log -1 --pretty=%ae`.strip rescue ""
-        end
-        
-        def state.remote_url
-          @remote_url ||= `git remote get-url origin`.strip rescue ""
-        end
-        
-        state
-      end
-
       # Convert protobuf FileInfo objects to Ruby FileInfo objects
       def self.convert_file_infos_from_proto(proto_file_infos)
         proto_file_infos.map do |proto_file_info|

data/lib/makit/gitlab/pipeline.rb

@@ -31,10 +31,10 @@ module Makit
 
       # Convert pipeline to YAML
       def to_yaml(pretty_format = true)
-        if defined?(Gitlab::Pipeline::PipelineService) && @grpc_available
+        if defined?(Makit::V1::Gitlab::Ci::PipelineService) && @grpc_available
           # Use gRPC service if available
           service = PipelineServiceImpl.new
-          request = Gitlab::Pipeline::ToYamlRequest.new(
+          request = Makit::V1::Gitlab::Ci::ToYamlRequest.new(
             pipeline: @pipeline_data,
             pretty_format: pretty_format,
             indent_size: 2
@@ -49,10 +49,10 @@ module Makit
 
       # Validate pipeline
       def validate
-        if defined?(Gitlab::Pipeline::PipelineService) && @grpc_available
+        if defined?(Makit::V1::Gitlab::Ci::PipelineService) && @grpc_available
           # Use gRPC service if available
           service = PipelineServiceImpl.new
-          request = Gitlab::Pipeline::ValidatePipelineRequest.new(
+          request = Makit::V1::Gitlab::Ci::ValidatePipelineRequest.new(
             pipeline: @pipeline_data,
             check_gitlab_compatibility: true
           )
@@ -71,10 +71,10 @@ module Makit
 
       # Get pipeline statistics
       def stats
-        if defined?(Gitlab::Pipeline::PipelineService) && @grpc_available
+        if defined?(Makit::V1::Gitlab::Ci::PipelineService) && @grpc_available
           # Use gRPC service if available
           service = PipelineServiceImpl.new
-          request = Gitlab::Pipeline::GetPipelineStatsRequest.new(pipeline: @pipeline_data)
+          request = Makit::V1::Gitlab::Ci::GetPipelineStatsRequest.new(pipeline: @pipeline_data)
           response = service.get_pipeline_stats(request, nil)
           {
             total_jobs: response.total_jobs,
@@ -93,10 +93,10 @@ module Makit
 
       # Compare with another pipeline
       def compare(other_pipeline)
-        if defined?(Gitlab::Pipeline::PipelineService) && @grpc_available
+        if defined?(Makit::V1::Gitlab::Ci::PipelineService) && @grpc_available
           # Use gRPC service if available
           service = PipelineServiceImpl.new
-          request = Gitlab::Pipeline::ComparePipelinesRequest.new(
+          request = Makit::V1::Gitlab::Ci::ComparePipelinesRequest.new(
             pipeline1: @pipeline_data,
             pipeline2: other_pipeline.pipeline_data
           )
@@ -118,10 +118,10 @@ module Makit
 
       # Merge with another pipeline
       def merge(other_pipeline, preserve_base = true)
-        if defined?(Gitlab::Pipeline::PipelineService) && @grpc_available
+        if defined?(Makit::V1::Gitlab::Ci::PipelineService) && @grpc_available
           # Use gRPC service if available
           service = PipelineServiceImpl.new
-          request = Gitlab::Pipeline::MergePipelinesRequest.new(
+          request = Makit::V1::Gitlab::Ci::MergePipelinesRequest.new(
             base_pipeline: @pipeline_data,
             override_pipeline: other_pipeline.pipeline_data,
             preserve_base: preserve_base
@@ -160,7 +160,7 @@ module Makit
         existing_stage = @pipeline_data.stages.find { |s| s.name == name }
         unless existing_stage
           if @grpc_available
-            stage = Gitlab::Pipeline::Stage.new
+            stage = Makit::V1::Gitlab::Ci::Stage.new
             stage.name = name
             @pipeline_data.stages << stage
           else
@@ -224,13 +224,13 @@ module Makit
       private
 
       def initialize_grpc_availability
-        @grpc_available = defined?(Gitlab::Pipeline::PipelineService)
+        @grpc_available = defined?(Makit::V1::Gitlab::Ci::PipelineService)
       end
 
       def execute_pipeline_grpc(variables, working_directory, podman_executable, dry_run)
         service = Makit::Gitlab::PipelineServiceImpl.new
         
-        request = Gitlab::Pipeline::ExecutePipelineRequest.new(
+        request = Makit::V1::Gitlab::Ci::ExecutePipelineRequest.new(
           pipeline: @pipeline_data,
           variables: variables,
           working_directory: working_directory,
@@ -261,7 +261,7 @@ module Makit
         if @grpc_available
           # Use gRPC service if available
           service = PipelineServiceImpl.new
-          request = Gitlab::Pipeline::ParseYamlRequest.new(
+          request = Makit::V1::Gitlab::Ci::ParseYamlRequest.new(
             yaml_content: yaml_content,
             strict_mode: true
           )
@@ -277,7 +277,7 @@ module Makit
         initialize_grpc_availability
         
         if @grpc_available
-          Gitlab::Pipeline::Pipeline.new
+          Makit::V1::Gitlab::Ci::Pipeline.new
         else
           create_empty_pipeline_fallback
         end
@@ -549,7 +549,7 @@ module Makit
       def convert_hash_to_job(job_data)
         if @grpc_available
           # Use protobuf Job
-          job = Gitlab::Pipeline::Job.new
+          job = Makit::V1::Gitlab::Ci::Job.new
           job.stage = job_data["stage"] || ""
           job.image = job_data["image"] || ""
           job.coverage = job_data["coverage"] || ""