cocoapods-git-private-repo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ad4c9635626572cb5461ff9fdaacdb5d4150d1c5e21e16d6ae5578808272ae
-  data.tar.gz: acea8c50b5467f995435f869720462bdb84644c120fa21d3052956b605148593
+  metadata.gz: 3f0407365e723398f091ede37a3f5895cd17748fa1f3b71111860799a33b491b
+  data.tar.gz: 0a5b341a278b0f79bc7f753c3e022521e107fd8621d94ac8986c06762c173ed0
 SHA512:
-  metadata.gz: d8d1b3895726ea6d9a07ed63194c34813627f68136c252731d8e6d0f1045db49134176c8d2c4b08794773c6b5034c0db18339fb9400ff06ed6c2b4bdea21756e
-  data.tar.gz: 4d311f1b67b101ee3266d1182bc3a5cb6b713e24fcc1fa6bbbf2309300635c2ed588c3307d0c77c6355575f6d3ff0379bdc35ccc11d6adfbb66cfc002309a68f
+  metadata.gz: 8204b5770defacd3e49718c45a6f4c58e71398340065cde8cacf9ce540ece4a18ce8e09fc5bed128963db0ffd626e59dcae56b6e201b7bf8093df22bb1209715
+  data.tar.gz: 26d7ba9d5c55322aedd894b5ea0c4659680823780d486fbbbfb9a1e15da2c3c5d591bac202c811008be48f959fe8feab8582f9158dcb466c851b7bb134b121b6

data/lib/cocoapods-git-private-repo/cocoapods_sources_manager.rb

@@ -0,0 +1,67 @@
+require 'cocoapods-core/source'
+require 'json'
+
+module Pod
+  module GitPrivateRepoSourceExtension
+    def repo_git(args, include_error: false)      
+      # Check for private key in configuration
+      if private_key_path = find_private_key_for_repo        
+        # Build git command with SSH key
+        command = "GIT_SSH_COMMAND='ssh -i #{private_key_path} -o IdentitiesOnly=yes' git -C \"#{repo}\" " << args.join(' ')
+        command << ' 2>&1' if include_error
+
+        (`#{command}` || '').strip
+      else
+        # Use original implementation if no private key is found
+        super(args, include_error: include_error)
+      end
+    end
+    
+    def update_git_repo(show_output = false)      
+      # If we have a private key, use our custom implementation
+      if private_key_path = find_private_key_for_repo        
+        command = ['pull']
+        command << '--progress' if show_output
+        repo_git(command)
+      else
+        # Use original implementation if no private key is found
+        super(show_output)
+      end
+    end
+    
+    private
+    
+    def find_private_key_for_repo
+      # Check if a JSON configuration file exists with private key mappings
+      json_config_path = 'keys.json'
+      return nil unless File.exist?(json_config_path)
+      
+      private_key_configs = JSON.parse(File.read(json_config_path))
+      
+      # Find a matching repo URL in the configuration
+      if private_key_configs.is_a?(Array)
+        # Directly get git remote url from repo to avoid recursion
+        repo_url = get_git_remote_url(repo)
+        return nil unless repo_url
+        
+        matching_config = private_key_configs.find { |config| config["url"] == repo_url }
+        return matching_config["key_path"] if matching_config && matching_config["key_path"]
+      end
+      
+      nil
+    end
+    
+    # Safely get the git remote URL directly without using Source#url
+    def get_git_remote_url(repo_path)
+      return nil unless repo_path
+      
+      # Use git directly to get URL from the repo config
+      url_command = "git -C \"#{repo_path}\" config --get remote.origin.url"
+      remote_url = `#{url_command}`.strip
+      return remote_url unless remote_url.empty?
+    end
+  end
+  
+  # Prepend the module to Source to override methods
+  Source.prepend(GitPrivateRepoSourceExtension)
+end

data/lib/cocoapods-git-private-repo/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsGitPrivateRepo
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/cocoapods_plugin.rb

@@ -1 +1,2 @@
-require 'cocoapods-git-private-repo/cocoapods-downloader'
+require 'cocoapods-git-private-repo/cocoapods_downloader'
+require 'cocoapods-git-private-repo/cocoapods_sources_manager'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-git-private-repo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nonthawat Srichad
@@ -53,7 +53,8 @@ files:
 - Rakefile
 - cocoapods-git-private-repo.gemspec
 - lib/cocoapods-git-private-repo.rb
-- lib/cocoapods-git-private-repo/cocoapods-downloader.rb
+- lib/cocoapods-git-private-repo/cocoapods_downloader.rb
+- lib/cocoapods-git-private-repo/cocoapods_sources_manager.rb
 - lib/cocoapods-git-private-repo/gem_version.rb
 - lib/cocoapods-git-private-repo/git_private_repo_downloader.rb
 - lib/cocoapods_plugin.rb