cocoapods-cache-proxy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314ee2e85d24d3f0cdb7decd9b1507a810b715197d095ed9b8bb522a5e14d561
-  data.tar.gz: 74015ad447d10595a45bfa2fdd939c0eb9495acd67e90fff57e320acd193e915
+  metadata.gz: c2641c3f7994f3e378c9a6090965052d64af6bef57404fe1cd87dfb99758e114
+  data.tar.gz: afa86ca8923a5f2484ef41cb139935481993aef5fe4cc1cb160b2f583902f208
 SHA512:
-  metadata.gz: '049e7d8f29245475de4808681557ca09dc94b19c2e1fd1dc0d1febd6f846aadf9c9640f64c79cc12a87928b12fcdd197c0f57891ab43be034e337e4e6a84eec3'
-  data.tar.gz: c089b4c51f24d2e6e4b830e9058394b117008c931d11010890708193c682b428f11ef9a7fa441dcde51817323b1df5b0a1c0687deee2d8199a8f00a6cc67ea15
+  metadata.gz: 90c4d464bee0db56bcfefc35bda43837613cdb9e07bf3775dc343be778d0038e136c4f86238f3b4415f2cb01a2906b77daa3509e3545f6fbe84fd8c59115d1a3
+  data.tar.gz: ff4e33e69d73a2f0fd4fe03ae7f2fa8f0df9904be5d0e743f0f8add1bd33bbf01af28fdf18e0f5b56da724d8b2fe13ea40595e993f67ca6d612b03670ea27504

data/lib/cocoapods-cache-proxy/command/cache_proxy.rb

@@ -6,16 +6,18 @@ module Pod
       class Proxy < Cache
       
         require 'cocoapods-cache-proxy/command/cache_proxy/add'
+        require 'cocoapods-cache-proxy/command/cache_proxy/update'
         require 'cocoapods-cache-proxy/command/cache_proxy/remove'
-        # require 'cocoapods-cache-proxy/command/cache_proxy/update'
         require 'cocoapods-cache-proxy/command/cache_proxy/list'
+
+        require 'cocoapods-cache-proxy/command/cache_proxy/auth/auth'
   
         self.abstract_command = true
         self.version = CocoapodsCacheProxy::VERSION
-        self.description = '代理缓存服务'\
+        self.description = '缓存代理服务'\
                             "\n v#{CocoapodsCacheProxy::VERSION}\n"
         self.summary = <<-SUMMARY
-          代理缓存
+          缓存代理服务
         SUMMARY
   
         self.default_subcommand = 'list'

data/lib/cocoapods-cache-proxy/command/cache_proxy/add.rb

@@ -3,7 +3,7 @@ require 'cocoapods-cache-proxy/helper/helper'
 module Pod
     class Command
         class Cache < Command
-            class Proxy
+            class Proxy < Cache
                 class Add < Proxy
                     self.summary = '添加缓存代理'
     
@@ -14,8 +14,8 @@ module Pod
                     self.arguments = [
                         CLAide::Argument.new('NAME', true),
                         CLAide::Argument.new('URL', true),
-                        CLAide::Argument.new('USER', false),
-                        CLAide::Argument.new('PASSWORD', false)
+                        CLAide::Argument.new('USER', true),
+                        CLAide::Argument.new('PASSWORD', true)
                     ]
     
                     def initialize(argv)
@@ -34,10 +34,10 @@ module Pod
                     end
     
                     def run
-                        raise Pod::Informative.exception "`#{@name}` 已经存在" if CPSH.check_cache_proxy_source_conf_exists(@name)
-                        raise Pod::Informative.exception "官方源不存在, 请先添加官方源" unless Pod::Config.instance.sources_manager.master_repo_functional?
+                        raise Pod::Informative.exception "`#{@name}` 已经存在" if CPSH.check_source_conf_exists(@name)
+                        #raise Pod::Informative.exception "官方源不存在, 请先添加官方源" unless Pod::Config.instance.sources_manager.master_repo_functional?
     
-                        UI.section("Add proxy server config `#{@url}` into local spec repo `#{@name}`") do
+                        UI.section("Add proxy server config `#{@url}` into local spec repo `#{@name}`".green) do
                             CPSH.init_cache_proxy_source(@name, @url, @user, @password)
                         end
                     end

data/lib/cocoapods-cache-proxy/command/cache_proxy/auth/add.rb

@@ -0,0 +1,45 @@
+require 'cocoapods-cache-proxy/helper/helper'
+
+module Pod
+  class Command
+    class Cache < Command
+      class Proxy < Cache
+        class Auth < Proxy
+          class Add < Auth
+            self.summary = '添加缓存代理授权配置'
+
+            self.description = <<-DESC
+                    添加缓存代理授权配置
+            DESC
+
+            self.arguments = [
+                CLAide::Argument.new('HOST', true),
+                CLAide::Argument.new('TOKEN', true),
+            ]
+
+            def initialize(argv)
+              init
+              @host, @token = argv.shift_argument, argv.shift_argument
+              @silent = argv.flag?('silent', false)
+              super
+            end
+
+            def validate!
+              super
+              help! 'This command requires both a auth host.' unless @host
+              help! 'This command requires both a auth token.' unless @token
+            end
+
+            def run
+              raise Pod::Informative.exception "`#{@host}` 已经存在" if CPSH.check_auth_conf_exists(@host)
+
+              UI.section("Add proxy auth config `#{@host}`".green) do
+                CPSH.init_cache_proxy_auth(@host, @token)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-cache-proxy/command/cache_proxy/auth/auth.rb

@@ -0,0 +1,32 @@
+require 'cocoapods-cache-proxy/gem_version'
+require 'cocoapods-cache-proxy/command/cache_proxy'
+
+module Pod
+  class Command
+    class Cache < Command
+      class Proxy < Cache
+        class Auth < Proxy
+
+          require 'cocoapods-cache-proxy/command/cache_proxy/auth/add'
+          require 'cocoapods-cache-proxy/command/cache_proxy/auth/update'
+          require 'cocoapods-cache-proxy/command/cache_proxy/auth/remove'
+          require 'cocoapods-cache-proxy/command/cache_proxy/auth/list'
+
+          self.abstract_command = true
+          self.version = CocoapodsCacheProxy::VERSION
+          self.description = '缓存代理授权配置'\
+                            "\n v#{CocoapodsCacheProxy::VERSION}\n"
+          self.summary = <<-SUMMARY
+          缓存代理授权配置
+          SUMMARY
+
+          self.default_subcommand = 'list'
+
+          def init
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-cache-proxy/command/cache_proxy/auth/list.rb

@@ -0,0 +1,54 @@
+require 'cocoapods-cache-proxy/helper/helper'
+require 'cocoapods-cache-proxy/native/cache_proxy_auth'
+
+module Pod
+  class Command
+    class Cache < Command
+      class Proxy < Cache
+        class Auth < Proxy
+          class List < Auth
+            self.summary = '列出缓存代理授权配置'
+
+            self.description = <<-DESC
+                    列出缓存代理授权配置
+            DESC
+
+            def initialize(argv)
+              init
+              @silent = argv.flag?('silent', false)
+              super
+            end
+
+            def validate!
+              super
+            end
+
+            def run
+              auths = CPSH.get_all_auths
+              print_auths(auths)
+            end
+
+            def print_auth(auth)
+              if auth.is_a?(Pod::CacheProxyAuth)
+                UI.puts "- Host:  #{auth.host}"
+                UI.puts "- Token: #{auth.token}"
+              end
+            end
+
+            def print_auths(auths)
+              auths.each_with_index do |auth, index|
+                if auth.is_a?(Pod::CacheProxyAuth)
+                  UI.title "auth config: #{index + 1}" do
+                    UI.puts "- Host:  #{auth.host}"
+                    UI.puts "- Token: #{auth.token}"
+                  end
+                end
+              end
+              UI.puts "\n"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-cache-proxy/command/cache_proxy/auth/remove.rb

@@ -0,0 +1,43 @@
+require 'cocoapods-cache-proxy/helper/helper'
+
+module Pod
+  class Command
+    class Cache < Command
+      class Proxy < Cache
+        class Auth < Proxy
+          class Remove < Auth
+            self.summary = '移除缓存代理授权配置'
+
+            self.description = <<-DESC
+                    移除缓存代理授权配置
+            DESC
+
+            self.arguments = [
+                CLAide::Argument.new('HOST', true),
+            ]
+
+            def initialize(argv)
+              init
+              @host = argv.shift_argument
+              @silent = argv.flag?('silent', false)
+              super
+            end
+
+            def validate!
+              super
+              help! 'This command requires both a auth host.' unless @host
+            end
+
+            def run
+              raise Pod::Informative.exception "`#{@host}` 不存在" unless CPSH.check_auth_conf_exists(@host)
+
+              UI.section("remove cache proxy auth `#{@host}`".green) do
+                CPSH.remove_cache_proxy_auth(@host)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-cache-proxy/command/cache_proxy/auth/update.rb

@@ -0,0 +1,45 @@
+require 'cocoapods-cache-proxy/helper/helper'
+
+module Pod
+  class Command
+    class Cache < Command
+      class Proxy < Cache
+        class Auth < Proxy
+          class Update < Auth
+            self.summary = '更新缓存代理授权配置'
+
+            self.description = <<-DESC
+                    更新缓存代理授权配置
+            DESC
+
+            self.arguments = [
+                CLAide::Argument.new('HOST', true),
+                CLAide::Argument.new('TOKEN', true),
+            ]
+
+            def initialize(argv)
+              init
+              @host, @token = argv.shift_argument, argv.shift_argument
+              @silent = argv.flag?('silent', false)
+              super
+            end
+
+            def validate!
+              super
+              help! 'This command requires both a auth host.' unless @host
+              help! 'This command requires both a auth token.' unless @token
+            end
+
+            def run
+              raise Pod::Informative.exception "`#{@host}` 不存在" unless CPSH.check_auth_conf_exists(@host)
+
+              UI.section("Update proxy auth config `#{@host}`".green) do
+                CPSH.init_cache_proxy_auth(@host, @token)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-cache-proxy/command/cache_proxy/list.rb

@@ -4,7 +4,7 @@ require 'cocoapods-cache-proxy/native/cache_proxy_source'
 module Pod
     class Command
         class Cache < Command
-            class Proxy
+            class Proxy < Cache
                 class List < Proxy
                     self.summary = '列出缓存代理'
     
@@ -23,14 +23,14 @@ module Pod
                     end
     
                     def run
-                        sources = CPSH.get_all_cache_proxy_source_conf()
+                        sources = CPSH.get_all_sources
                         print_sources(sources)
                     end
     
                     def print_source(source)
                         if source.is_a?(Pod::CacheProxySource)
                             UI.puts "- URL:  #{source.baseURL}"
-                            UI.puts "- Path: #{CPSH.get_cache_proxy_source_root_dir(source.name)}"
+                            UI.puts "- Path: #{CPSH.get_source_root_dir(source.name)}"
                         end
                     end
     
@@ -39,7 +39,7 @@ module Pod
                             if source.is_a?(Pod::CacheProxySource)
                                 UI.title source.name do
                                     UI.puts "- URL:  #{source.baseURL}"
-                                    UI.puts "- Path: #{CPSH.get_cache_proxy_source_root_dir(source.name)}"
+                                    UI.puts "- Path: #{CPSH.get_source_root_dir(source.name)}"
                                 end
                             end
                         end

data/lib/cocoapods-cache-proxy/command/cache_proxy/remove.rb

@@ -3,7 +3,7 @@ require 'cocoapods-cache-proxy/helper/helper'
 module Pod
     class Command
         class Cache < Command
-            class Proxy
+            class Proxy < Cache
                 class Remove < Proxy
                     self.summary = '移除缓存代理'
     
@@ -24,15 +24,13 @@ module Pod
     
                     def validate!
                         super
-                        unless @name
-                            help! 'This command requires both a repo name.'
-                        end
+                        help! 'This command requires both a repo name.' unless @name
                     end
     
                     def run
-                        raise Pod::Informative.exception "`#{@name}` 不存在" unless CPSH.check_cache_proxy_source_conf_exists(@name)
+                        raise Pod::Informative.exception "`#{@name}` 不存在" unless CPSH.check_source_conf_exists(@name)
     
-                        UI.section("remove cache proxy repo `#{@name}`") do
+                        UI.section("Remove cache proxy repo `#{@name}`".green) do
                             CPSH.remove_cache_proxy_source(@name)
                         end
                     end

data/lib/cocoapods-cache-proxy/command/cache_proxy/update.rb

@@ -3,7 +3,7 @@ require 'cocoapods-cache-proxy/helper/helper'
 module Pod
     class Command
         class Cache < Command
-            class Proxy
+            class Proxy < Cache
                 class Update < Proxy
                     self.summary = '更新缓存代理'
     
@@ -14,8 +14,8 @@ module Pod
                     self.arguments = [
                         CLAide::Argument.new('NAME', true),
                         CLAide::Argument.new('URL', true),
-                        CLAide::Argument.new('USER', false),
-                        CLAide::Argument.new('PASSWORD', false)
+                        CLAide::Argument.new('USER', true),
+                        CLAide::Argument.new('PASSWORD', true)
                     ]
     
                     def initialize(argv)
@@ -34,9 +34,9 @@ module Pod
                     end
     
                     def run
-                        raise Pod::Informative.exception "`#{@name}` 不存在" unless CPSH.check_cache_proxy_source_conf_exists(@name)
+                        raise Pod::Informative.exception "`#{@name}` 不存在" unless CPSH.check_source_conf_exists(@name)
     
-                        UI.section("update cache proxy repo `#{@name}`") do
+                        UI.section("Update cache proxy repo `#{@name}`".green) do
                             CPSH.init_cache_proxy_source(@name, @url, @user, @password)
                         end
                     end

data/lib/cocoapods-cache-proxy/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsCacheProxy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2".freeze
 end
 
 module Pod

data/lib/cocoapods-cache-proxy/helper/cache_proxy_source_helper.rb

@@ -6,33 +6,91 @@ require 'yaml'
 require 'uri'
 require 'pathname'
 require 'cocoapods-cache-proxy/native/cache_proxy_source'
+require 'cocoapods-cache-proxy/native/cache_proxy_auth'
 
 module Pod
     class CacheProxySource
         class CacheProxySourceHelper
 
-            def self.get_cache_proxy_root_dir()
+            # @return [String]
+            def self.get_cache_proxy_root_dir
                 "#{Pod::Config.instance.home_dir}/cache-proxy"
             end
 
-            def self.get_cache_proxy_source_root_dir(source_name)
+            # @param [String] source_name
+            # @return [String]
+            def self.get_source_root_dir(source_name)
                 "#{Pod::Config.instance.home_dir}/cache-proxy/#{source_name}"
             end
 
-            def self.get_cache_proxy_source_conf_file_name()
+
+            # @return [String]
+            def self.get_auth_root_dir
+                "#{Pod::Config.instance.home_dir}/cache-proxy-auth"
+            end
+
+
+            # @return [String]
+            def self.get_auth_conf_file_name
+                ".auth_conf.yml"
+            end
+
+
+            # @param [String] host
+            # @return [String]
+            def self.get_auth_conf_path(host)
+                uri = URI.parse(host)
+                "#{get_auth_root_dir}/#{uri.host}/#{get_auth_conf_file_name}"
+            end
+
+            # @param [String] host
+            # @return [TrueClass, FalseClass]
+            def self.check_auth_conf_exists(host)
+                File.exist?(get_auth_conf_path(host))
+            end
+
+            # @param [String] host
+            # @return [Hash]
+            def self.load_auth_conf_host(host)
+                path = get_auth_conf_path(host)
+                if File.exist?(path)
+                    YAML.load_file(path)
+                else
+                    nil
+                end
+            end
+
+            # @param [String] path
+            # @return [Hash]
+            def self.load_auth_conf_path(path)
+                if File.exist?(path)
+                    YAML.load_file(path)
+                else
+                    nil
+                end
+            end
+
+            # @@return [String]
+            def self.get_source_conf_file_name
                 ".cache_proxy_conf.yml"
             end
 
-            def self.get_cache_proxy_source_conf_path(source_name)
-                "#{get_cache_proxy_source_root_dir(source_name)}/#{get_cache_proxy_source_conf_file_name()}"
+            # @param [String] source_name
+            # @return [String]
+            def self.get_source_conf_path(source_name)
+                "#{get_source_root_dir(source_name)}/#{get_source_conf_file_name}"
             end
 
-            def self.check_cache_proxy_source_conf_exists(source_name)
-                File.exist?(get_cache_proxy_source_conf_path(source_name))
+            # @param [String] source_name
+            # @return [Void]
+            def self.check_source_conf_exists(source_name)
+                File.exist?(get_source_conf_path(source_name))
             end
 
-            def self.load_conf(source_name)
-                path = get_cache_proxy_source_conf_path(source_name)
+            # @param [String] source_name
+            # @return [Hash]
+            def self.load_source_conf(source_name)
+                path = get_source_conf_path(source_name)
                 if File.exist?(path)
                     YAML.load_file(path)
                 else
@@ -40,8 +98,90 @@ module Pod
                 end
             end
 
-            def self.create_cache_proxy_source_conf(source_name, url, user, password)
-                path = get_cache_proxy_source_conf_path(source_name)
+            # @param [String] host
+            # @param [String] token
+            # @return [Void]
+            def self.save_cache_proxy_auth_conf(host, token)
+                path = get_auth_conf_path(host)
+                auth = {
+                    'host' => host,
+                    'token' => token,
+                }
+
+                conf = File.new(path, "wb")
+                conf << auth.to_yaml
+                conf.close
+            end
+
+            # @param [String] host
+            # @param [String] token
+            # @return [Void]
+            def self.init_cache_proxy_auth(host, token)
+                begin
+
+                    show_output = Pod::Config.instance.verbose?
+                    pn = Pathname(get_auth_conf_path(host))
+
+                    FileUtils.mkdir_p(pn.parent) unless Dir.exist?(pn.parent)
+
+                    Pod::UI.message "Generating auth conf .....".yellow if show_output
+                    save_cache_proxy_auth_conf(host, token)
+                    Pod::UI.message "Successfully added auth #{host} ".green if show_output
+
+                rescue Exception => e
+                    Pod::UI.message "发生异常,清理文件 .....".yellow if show_output
+                    pn = Pathname(get_auth_conf_path(host))
+                    FileUtils.rm_rf(pn.parent) if Dir.exist?(pn.parent)
+                    Pod::UI.message e.message.yellow if show_output
+                    Pod::UI.message e.backtrace.inspect.yellow if show_output
+                    raise e
+                end
+            end
+
+            # @param [String] host
+            # @return [Void]
+            def self.remove_cache_proxy_auth(host)
+                show_output = Pod::Config.instance.verbose?
+                path = Pathname(get_auth_conf_path(host))
+                FileUtils.rm_rf(path.parent) if Dir.exist?(path.parent)
+
+                Pod::UI.message "Successfully remove auth #{host}".green if show_output
+            end
+
+            # @param [String] host
+            # @return [Pod::CacheProxyAuth]
+            def self.get_cache_proxy_auth_conf_host(host)
+                return nil unless (cnf = load_auth_conf_host(host))
+                Pod::CacheProxyAuth.new(cnf['host'], cnf['token'])
+            end
+
+            # @param [String] path
+            # @return [Pod::CacheProxyAuth]
+            def self.get_cache_proxy_auth_conf_path(path)
+                return nil unless (cnf = load_auth_conf_path(path))
+                Pod::CacheProxyAuth.new(cnf['host'], cnf['token'])
+            end
+
+            # @return [Array<Pod::CacheProxyAuth>]
+            def self.get_all_auths
+                return [] unless Dir.exist?(get_auth_root_dir)
+                list = []
+                Find.find(get_auth_root_dir) do |path|
+                    next unless File.file?(path) && path.end_with?(get_auth_conf_file_name)
+                    next unless (conf = get_cache_proxy_auth_conf_path(path))
+                    next if conf.host.blank? || conf.token.blank?
+                    list << conf
+                end
+                list
+            end
+
+            # @param [String] source_name
+            # @param [String] url
+            # @param [String] user
+            # @param [String] password
+            # @return [Void]
+            def self.save_cache_proxy_source_conf(source_name, url, user, password)
+                path = get_source_conf_path(source_name)
                 info = {
                     'name' => source_name,
                     'url' => url,
@@ -49,26 +189,31 @@ module Pod
 
                 info['user'] = user unless user.blank?
                 info['password'] = password unless password.blank?
-                
+
                 conf = File.new(path, "wb")
                 conf << info.to_yaml
                 conf.close
-                
+
             end
             
             
+            # @param [String] cache_source_name
+            # @param [String] cache_source_url
+            # @param [String] user
+            # @param [String] password
+            # @return [Void]
             def self.init_cache_proxy_source(cache_source_name, cache_source_url, user, password)
                 begin
                     show_output = Pod::Config.instance.verbose?
 
-                    cache_source_root_path = "#{get_cache_proxy_source_root_dir(cache_source_name)}"
+                    cache_source_root_path = "#{get_source_root_dir(cache_source_name)}"
                     
                     FileUtils.rm_rf(cache_source_root_path) if Dir.exist?(cache_source_root_path)
                     
                     FileUtils.mkdir_p(cache_source_root_path)
 
                     Pod::UI.message "Generating source conf .....".yellow if show_output
-                    create_cache_proxy_source_conf(cache_source_name, cache_source_url, user, password)
+                    save_cache_proxy_source_conf(cache_source_name, cache_source_url, user, password)
                     Pod::UI.message "Successfully added repo #{cache_source_name}".green if show_output
 
                 rescue Exception => e 
@@ -80,31 +225,36 @@ module Pod
                 end
             end
 
+            # @param [String] cache_source_name
+            # @return [Void]
             def self.remove_cache_proxy_source(cache_source_name)
                 show_output = Pod::Config.instance.verbose?
 
-                cache_source_root_path = "#{get_cache_proxy_source_root_dir(cache_source_name)}"    
+                cache_source_root_path = "#{get_source_root_dir(cache_source_name)}"
                 FileUtils.rm_rf(cache_source_root_path) if Dir.exist?(cache_source_root_path)
 
                 Pod::UI.message "Successfully remove repo #{cache_source_name}".green if show_output
             end
 
+            # @param [String] cache_source_name
+            # @return [Pod::CacheProxySource]
             def self.get_cache_proxy_source_conf(cache_source_name)
-                return nil unless (hash = load_conf(cache_source_name))
-                Pod::CacheProxySource.new(hash['name'], hash['url'], hash['user'], hash['password'])
+                return nil unless (cnf = load_source_conf(cache_source_name))
+                Pod::CacheProxySource.new(cnf['name'], cnf['url'], cnf['user'], cnf['password'])
             end
 
-            def self.get_all_cache_proxy_source_conf()
-                return [] unless Dir.exist?(get_cache_proxy_root_dir())
-                confs = []
-                Find.find(get_cache_proxy_root_dir()) do |path|
-                    next unless File.file?(path) && path.end_with?(".cache_proxy_conf.yml")
+            # @return [Array<Pod::CacheProxySource>]
+            def self.get_all_sources
+                return [] unless Dir.exist?(get_cache_proxy_root_dir)
+                list = []
+                Find.find(get_cache_proxy_root_dir) do |path|
+                    next unless File.file?(path) && path.end_with?(get_source_conf_file_name)
                     pn = Pathname.new(path)
                     source_name = pn.dirname.basename
                     next unless (conf = get_cache_proxy_source_conf(source_name))
-                    confs << conf
+                    list << conf
                 end
-                confs
+                list
             end
         end
     end

data/lib/cocoapods-cache-proxy/native/cache_proxy_auth.rb

@@ -0,0 +1,20 @@
+module Pod
+  class CacheProxyAuth
+
+    # @param [String] host
+    # @param [String] token
+    def initialize(host, token)
+      @host = host
+      @token = token
+    end
+
+    # @return [String]
+    def host
+      @host
+    end
+
+    def token
+      @token
+    end
+  end
+end

data/lib/cocoapods-cache-proxy/native/cache_proxy_source.rb

@@ -1,9 +1,15 @@
+require 'cocoapods-cache-proxy/helper/helper'
+require 'cocoapods-cache-proxy/native/cache_proxy_auth'
+require 'uri'
+
 module Pod
     class CacheProxySource
-        # @param [String] proxy_source The name of the repository
-        #
-        # @param [String] url see {#url}
-        #
+
+
+        # @param [String] name
+        # @param [String] baseURL
+        # @param [String] user
+        # @param [String] password
         def initialize(name, baseURL, user, password)
             @name = name
             @baseURL = baseURL
@@ -11,6 +17,8 @@ module Pod
             @password = password
         end
 
+
+        # @return [String]
         def name
             @name
         end
@@ -27,8 +35,28 @@ module Pod
             @password
         end
 
+        # @param [String] pod pod name
+        # @param [String] git repo address
+        # @param [String] tag repo tag
+        # @param [String] submodules need update submodules
+        # @return [String] full download url
         def build_proxy_source(pod, git, tag, submodules = false)
-            "#{@baseURL}/#{pod}?git=#{git}&tag=#{tag}&submodules=#{submodules}"
+            auth_cnf = CPSH.get_cache_proxy_auth_conf_host(git)
+            if auth_cnf.nil?
+                uri = URI.parse("#{@baseURL}/#{pod}?git=#{git}&tag=#{tag}&submodules=#{submodules}&cache_proxy=1")
+                uri.user = @user
+                uri.password = @password
+                uri.to_s
+            else
+                uri = URI.parse(git)
+                uri.user = "oauth2"
+                uri.password = auth_cnf.token
+                url = uri.to_s
+                uri = URI.parse("#{@baseURL}/#{pod}?git=#{url}&tag=#{tag}&submodules=#{submodules}&cache_proxy=1")
+                uri.user = @user
+                uri.password = @password
+                uri.to_s
+            end
         end
     end
 end

data/lib/cocoapods-cache-proxy/native/config.rb

@@ -5,16 +5,24 @@ module Pod
     class Config
         attr_reader :cache_proxy_source
 
+        # @param [String] name
+        # @return [Pod::CacheProxySource]
         def set_cache_proxy_source(name)
             return if name.blank?
             return unless (cnf = CPSH.get_cache_proxy_source_conf(name))
             @cache_proxy_source = cnf
         end
 
-        def cache_proxy_source()
+        # @return [Pod::CacheProxySource]
+        def cache_proxy_source
             @cache_proxy_source
         end
 
+        # @return [TrueClass, FalseClass]
+        def cache_proxy_source_available
+            !@cache_proxy_source.nil?
+        end
+
         # def remove_cache_proxy_source(name)
         #     return if name.blank? || @cache_proxy_source.nil? || @cache_proxy_source.empty?
         #     @cache_proxy_source.delete_if { |cnf| cnf.name == name }

data/lib/cocoapods-cache-proxy/native/downloader.rb

@@ -36,19 +36,10 @@ module Pod
       alias_method :orig_download_file, :download_file
 
       def download_file(full_filename)
-        Pod::UI.message "full_filename: #{full_filename}" if Pod::Config.instance.verbose?
-        
-        proxy_source = Pod::Config.instance.cache_proxy_source
         download_uri = URI(url)
-        proxy_source_uri = URI(proxy_source.baseURL)
-        
-        Pod::UI.message "url: #{download_uri.path}" if Pod::Config.instance.verbose?
-        Pod::UI.message "proxy_source baseURL: #{proxy_source.baseURL}" if Pod::Config.instance.verbose?
-        if download_uri.path.start_with?(proxy_source_uri.path) 
-            curl_options = []
-            curl_options.concat(["-u", "#{proxy_source.user}:#{proxy_source.password}"]) unless proxy_source.user.blank? && proxy_source.password.blank?
-            curl_options.concat(["-f", "-L", "-o", full_filename, url, "--create-dirs"])
-            Pod::UI.message "curl_options: #{curl_options.join(" ")}" if Pod::Config.instance.verbose?
+
+        if !download_uri.query.blank? && download_uri.query.include?("git=") && download_uri.query.include?("tag=") && download_uri.query.include?("cache_proxy=1")
+            curl_options = ["-f", "-L", "-o", full_filename, url, "--create-dirs"]
             curl! curl_options
         else
           orig_download_file(full_filename)

data/lib/cocoapods-cache-proxy/native/podfile_dsl.rb

@@ -3,9 +3,8 @@ require 'cocoapods-core'
 module Pod
     class Podfile
         module DSL
-            
+
             def ignore_cache_proxy_pods!(pods = [])
-                Pod::UI.puts "current_target_definition: #{current_target_definition}" if Pod::Config.instance.verbose?
                 current_target_definition.set_ignore_cache_proxy_pods(pods) if !pods.blank? && !current_target_definition.nil?
             end
         end
@@ -15,49 +14,122 @@ end
 
 module Pod
     class Podfile
+
+        class IgnorePodProxy
+            def self.keyword
+                :ignore_cache_proxy
+            end
+        end
+
+        class UsedPodProxySource
+            def self.keyword
+                :cache_proxy_source
+            end
+        end
+
         class TargetDefinition
             attr_reader :ignore_cache_proxy
+            attr_reader :cache_proxy_source
 
-            alias_method :orig_store_pod, :store_pod
-            def store_pod(name, *requirements)
-                Pod::UI.message "store_pod requirements: #{requirements}" if Pod::Config.instance.verbose?
-                parse_ignore_cache_proxy(name, requirements)
-                orig_store_pod(name, *requirements)
-            end
+            #alias_method :orig_store_pod, :store_pod
+            #def store_pod(name, *requirements)
+            #    Pod::UI.message "store_pod requirements: #{requirements}" if Pod::Config.instance.verbose?
+            #    #parse_ignore_cache_proxy(name, requirements)
+            #    options = requirements.last
+            #    if options.is_a?(Hash) and options.has_key?(:ignore_cache_proxy)
+            #        Pod::UI.message "ignore_cache_proxy name: #{name}"
+            #        options.delete(:ignore_cache_proxy)
+            #        requirements.pop if options.empty?
+            #    end
+            #    Pod::UI.message "store_pod 2 requirements: #{requirements}" if Pod::Config.instance.verbose?
+            #    orig_store_pod(name, *requirements)
+            #end
+
+            # ---- patch method ----
+            # We want modify `store_pod` method, but it's hard to insert a line in the
+            # implementation. So we patch a method called in `store_pod`.
+            alias_method :orig_parse_inhibit_warnings, :parse_inhibit_warnings
+            def parse_inhibit_warnings(name, requirements)
+                options = requirements.last
 
-            def parse_ignore_cache_proxy(name, requirements)
-                requirements.each do |options|
-                    next unless options.is_a?(Hash)
-                    Pod::UI.message "parse_ignore_cache_proxy: #{options}" if Pod::Config.instance.verbose?
-                    set_ignore_cache_proxy_pods([name]) if options.has_key?(:git)
+                if options.is_a?(Hash)
+                    if options.has_key?(Pod::Podfile::IgnorePodProxy.keyword)
+                        ignore = options[Pod::Podfile::IgnorePodProxy.keyword]
+                        options.delete(Pod::Podfile::IgnorePodProxy.keyword)
+                        set_ignore_cache_proxy_pods([name]) if ignore
+                    end
+
+                    if options.has_key?(Pod::Podfile::UsedPodProxySource.keyword)
+                        source_name = options[Pod::Podfile::UsedPodProxySource.keyword]
+                        options.delete(Pod::Podfile::UsedPodProxySource.keyword)
+                        unless source_name.blank?
+                            raise Pod::Informative.exception "cache proxy source: `#{source_name}` source does not exist." unless (source = CPSH.get_cache_proxy_source_conf(source_name))
+                            @cache_proxy_source = Hash.new if @cache_proxy_source.nil?
+                            @cache_proxy_source[name] = source
+                        end
+                    end
+                    requirements.pop if options.empty?
                 end
+                orig_parse_inhibit_warnings(name, requirements)
             end
 
+            # 参考 https://github.com/leavez/cocoapods-binary/blob/9f40c5df4149598b03b44c01d33b04e78ff38772/lib/cocoapods-binary/helper/podfile_options.rb#L52-L60
+            # ---- patch method ----
+            # We want modify `store_pod` method, but it's hard to insert a line in the
+            # implementation. So we patch a method called in `store_pod`.
+            #old_method = instance_method(:parse_inhibit_warnings)
+            #
+            #define_method(:parse_inhibit_warnings) do |name, requirements|
+            #    Pod::UI.message "parse_inhibit_warnings requirements: #{requirements}" if Pod::Config.instance.verbose?
+            #    options = requirements.last
+            #    if options.is_a?(Hash) and options.has_key?(:ignore_cache_proxy)
+            #        Pod::UI.message "ignore_cache_proxy name: #{name}"
+            #        options.delete(:ignore_cache_proxy)
+            #        requirements.pop if options.empty?
+            #        set_ignore_cache_proxy_pods([name])
+            #    end
+            #    Pod::UI.message "parse_inhibit_warnings requirements: #{requirements}" if Pod::Config.instance.verbose?
+            #    old_method.bind(self).(name, requirements)
+            #end
+
+            #def parse_ignore_cache_proxy(name, requirements)
+            #    requirements.each do |options|
+            #        next unless options.is_a?(Hash)
+            #        Pod::UI.message "parse_ignore_cache_proxy: #{options}" if Pod::Config.instance.verbose?
+            #        set_ignore_cache_proxy_pods([name]) if options.has_key?(:git)
+            #    end
+            #end
+
+            # @param [Array<String>] pods
             def set_ignore_cache_proxy_pods(pods)
                 return if pods.blank?
                 @ignore_cache_proxy = [] if @ignore_cache_proxy.nil?
                 pods.uniq.each do |pod|
                     @ignore_cache_proxy << pod unless @ignore_cache_proxy.include?(pod)
                 end
-                Pod::UI.message "set_ignore_cache_proxy_pods name: #{@ignore_cache_proxy}" if Pod::Config.instance.verbose?
             end
 
-            def get_ignore_cache_proxy_pods()
-                if @ignore_cache_proxy.nil?
-                    []
-                else
-                    @ignore_cache_proxy.uniq
-                end
+            # @return [Array<String>]
+            def get_ignore_cache_proxy_pods
+                @ignore_cache_proxy.nil? ? [] : @ignore_cache_proxy.uniq
             end
 
+            # @param [String] pod
+            # @return [TrueClass, FalseClass]
             def check_ignore_cache_proxy_pod(pod)
                 return false if pod.blank?
                 ignores = []
-                ignores.concat(get_ignore_cache_proxy_pods())
-                ignores.concat(root.get_ignore_cache_proxy_pods()) if !root?
-                ignores.concat(parent.get_ignore_cache_proxy_pods()) unless parent.nil?
-                Pod::UI.message "check_ignore_cache_proxy_pod #{name}: #{ignores} #{ignores.uniq.include?(pod)}" if Pod::Config.instance.verbose?
-                return ignores.uniq.include?(pod)
+                ignores.concat(get_ignore_cache_proxy_pods)
+                ignores.concat(root.get_ignore_cache_proxy_pods) unless root.nil?
+                ignores.concat(parent.get_ignore_cache_proxy_pods) unless parent.nil?
+                ignores.uniq.include?(pod)
+            end
+
+            # @param [String] pod
+            # @return [CacheProxySource]
+            def proxy_source_for_pod(pod)
+                return nil if @cache_proxy_source.blank?
+                @cache_proxy_source[pod]
             end
         end
     end

data/lib/cocoapods-cache-proxy/native/resolver.rb

@@ -7,31 +7,29 @@ module Pod
     class Resolver
 
         alias_method :orig_resolver_specs_by_target, :resolver_specs_by_target
-        def resolver_specs_by_target()
-            specs_by_target = orig_resolver_specs_by_target()
-            proxy_source = Pod::Config.instance.cache_proxy_source
-            return specs_by_target if proxy_source.nil?
+        def resolver_specs_by_target
+            specs_by_target = orig_resolver_specs_by_target
 
-            show_output = Pod::Config.instance.verbose?
-            specs_by_target.each do |target, rspecs|
-                rspecs.each do |spec|
+            return specs_by_target unless Pod::Config.instance.cache_proxy_source_available
+            root_proxy_source = Pod::Config.instance.cache_proxy_source
+
+            specs_by_target.each do |target, specs|
+                specs.each do |spec|
                     root_spec = spec.spec.root
                     source = root_spec.source
-                    UI.message "spec name: #{root_spec.name}" if show_output
-                    UI.message "spec source: #{source}" if show_output
-                    UI.message "spec version: #{root_spec.version}" if show_output
                     next unless !source.blank? && source.has_key?(:git) && source.has_key?(:tag)
-                    UI.message "ignore_cache_proxy_pod: #{target.name} #{root_spec.name}" if show_output; next if target.check_ignore_cache_proxy_pod(root_spec.name)
-                        
+                    next if target.check_ignore_cache_proxy_pod(root_spec.name)
+
                     git = source[:git]
                     tag = source[:tag]
                     submodules = source.has_key?(:submodules) ? source[:submodules] : false
-                    new_url = proxy_source.build_proxy_source(root_spec.name, git, tag, submodules)
+
+                    proxy_source = target.proxy_source_for_pod(root_spec.name)
+                    new_url = (proxy_source.nil? ? root_proxy_source : proxy_source).build_proxy_source(root_spec.name, git, tag, submodules)
                     source = {
                         :http => new_url,
                         :type => "tgz",
                     }
-                    UI.message "spec new source: #{source}" if show_output
                     root_spec.source = source
                 end
             end

data/lib/cocoapods_plugin.rb

@@ -1,3 +1,2 @@
 require 'cocoapods-cache-proxy/command'
-require 'hook'
-
+require 'hook'

data/lib/hook.rb

@@ -11,7 +11,7 @@ Pod::HooksManager.register('cocoapods-cache-proxy', :source_provider) do |contex
     Pod::UI.message 'cocoapods-cache-proxy received source_provider hook' if show_output
 
     return unless (proxy_name = options['proxy'])
-    raise Pod::Informative.exception "cache proxy source: `#{proxy_name}` does not exist." unless CPSH.check_cache_proxy_source_conf_exists(proxy_name)
+    raise Pod::Informative.exception "cache proxy source: `#{proxy_name}` source does not exist." unless CPSH.check_source_conf_exists(proxy_name)
     Pod::UI.message "proxy_name: #{proxy_name}" if show_output
     Pod::Config.instance.set_cache_proxy_source(proxy_name)
 end

metadata

@@ -1,72 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-cache-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - '0x1306a94'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cocoapods-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A short description of cocoapods-cache-proxy.
+        version: '12.0'
+description: Pod library source file cache proxy
 email:
 - 0x1306a94@gmail.com
 executables: []
@@ -77,12 +63,18 @@ files:
 - lib/cocoapods-cache-proxy/command.rb
 - lib/cocoapods-cache-proxy/command/cache_proxy.rb
 - lib/cocoapods-cache-proxy/command/cache_proxy/add.rb
+- lib/cocoapods-cache-proxy/command/cache_proxy/auth/add.rb
+- lib/cocoapods-cache-proxy/command/cache_proxy/auth/auth.rb
+- lib/cocoapods-cache-proxy/command/cache_proxy/auth/list.rb
+- lib/cocoapods-cache-proxy/command/cache_proxy/auth/remove.rb
+- lib/cocoapods-cache-proxy/command/cache_proxy/auth/update.rb
 - lib/cocoapods-cache-proxy/command/cache_proxy/list.rb
 - lib/cocoapods-cache-proxy/command/cache_proxy/remove.rb
 - lib/cocoapods-cache-proxy/command/cache_proxy/update.rb
 - lib/cocoapods-cache-proxy/gem_version.rb
 - lib/cocoapods-cache-proxy/helper/cache_proxy_source_helper.rb
 - lib/cocoapods-cache-proxy/helper/helper.rb
+- lib/cocoapods-cache-proxy/native/cache_proxy_auth.rb
 - lib/cocoapods-cache-proxy/native/cache_proxy_source.rb
 - lib/cocoapods-cache-proxy/native/config.rb
 - lib/cocoapods-cache-proxy/native/downloader.rb
@@ -115,5 +107,5 @@ rubyforge_project:
 rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
-summary: A longer description of cocoapods-cache-proxy.
+summary: Pod library source file cache proxy
 test_files: []