cocoapods-bin 0.1.24 → 0.1.25

data/lib/cocoapods-bin/native/analyzer.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'parallel'
 require 'cocoapods'
 
 module Pod
   class Installer
     class Analyzer
-
       # > 1.6.0
       # all_specs[dep.name] 为 nil 会崩溃
       # 主要原因是 all_specs 分析错误
@@ -29,13 +30,13 @@ module Pod
       # > 1.5.3 版本
       # rewrite update_repositories
       #
-      alias_method :old_update_repositories, :update_repositories
+      alias old_update_repositories update_repositories
       def update_repositories
         if installation_options.update_source_with_multi_processes
           # 并发更新私有源
           # 这里多线程会导致 pod update 额外输出 --verbose 的内容
           # 不知道为什么？
-          Parallel.each(sources.uniq { |s| s.url }, in_processes: 4) do |source|
+          Parallel.each(sources.uniq(&:url), in_processes: 4) do |source|
             if source.git?
               config.sources_manager.update(source.name, true)
             else
@@ -43,10 +44,10 @@ module Pod
             end
           end
           @specs_updated = true
-        else 
+        else
           old_update_repositories
         end
       end
     end
   end
-end
+end

data/lib/cocoapods-bin/native/installation_options.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 require 'cocoapods'
 
 module Pod
   class Installer
     class InstallationOptions
-      def self.env_option(key, default = true) 
+      def self.env_option(key, default = true)
         option key, ENV[key.to_s].nil? ? default : ENV[key.to_s] == 'true'
       end
 
-    	# 不同 source 存在相同 spec 名时，默认不警告
-    	defaults.delete('warn_for_multiple_pod_sources')
-    	env_option :warn_for_multiple_pod_sources, false
+      # 不同 source 存在相同 spec 名时，默认不警告
+      defaults.delete('warn_for_multiple_pod_sources')
+      env_option :warn_for_multiple_pod_sources, false
 
-    	# 是否警告不安全 source （如 http ）
-    	env_option :warn_for_unsecure_source, false
+      # 是否警告不安全 source （如 http ）
+      env_option :warn_for_unsecure_source, false
 
-    	# 是否多线程执行 install_pod_sources 
-    	env_option :install_with_multi_threads, true
+      # 是否多线程执行 install_pod_sources
+      env_option :install_with_multi_threads, true
 
-    	# 是否多进程执行 update_repositories
-    	env_option :update_source_with_multi_processes, true
+      # 是否多进程执行 update_repositories
+      env_option :update_source_with_multi_processes, true
     end
   end
-end
+end

data/lib/cocoapods-bin/native/installer.rb

@@ -1,37 +1,38 @@
+# frozen_string_literal: true
+
 require 'parallel'
 require 'cocoapods'
 require 'cocoapods-bin/native/pod_source_installer'
 
 module Pod
-	class Installer
-		alias_method :old_create_pod_installer, :create_pod_installer
-		def create_pod_installer(pod_name)
-			installer = old_create_pod_installer(pod_name)
-			installer.installation_options = installation_options
-			installer
-		end
+  class Installer
+    alias old_create_pod_installer create_pod_installer
+    def create_pod_installer(pod_name)
+      installer = old_create_pod_installer(pod_name)
+      installer.installation_options = installation_options
+      installer
+    end
 
-		alias_method :old_install_pod_sources, :install_pod_sources
+    alias old_install_pod_sources install_pod_sources
     def install_pod_sources
-    	if installation_options.install_with_multi_threads
-	  		if Pod.match_version?('~> 1.4.0')
-	  			install_pod_sources_for_version_in_1_4_0
-	  		elsif Pod.match_version?('~> 1.5')
-  				install_pod_sources_for_version_above_1_5_0
-  			else 
-  				old_install_pod_sources
-	  		end     
+      if installation_options.install_with_multi_threads
+        if Pod.match_version?('~> 1.4.0')
+          install_pod_sources_for_version_in_1_4_0
+        elsif Pod.match_version?('~> 1.5')
+          install_pod_sources_for_version_above_1_5_0
+        else
+          old_install_pod_sources
+        end
       else
-	    	old_install_pod_sources
-	    end
+        old_install_pod_sources
+        end
     end
 
-
-		# rewrite install_pod_sources
-		def install_pod_sources_for_version_in_1_4_0
-			@installed_specs = []
+    # rewrite install_pod_sources
+    def install_pod_sources_for_version_in_1_4_0
+      @installed_specs = []
       pods_to_install = sandbox_state.added | sandbox_state.changed
-      title_options = { :verbose_prefix => '-> '.green }
+      title_options = { verbose_prefix: '-> '.green }
       Parallel.each(root_specs.sort_by(&:name), in_threads: 4) do |spec|
         if pods_to_install.include?(spec.name)
           if sandbox_state.changed.include?(spec.name) && sandbox.manifest
@@ -49,12 +50,12 @@ module Pod
           end
         end
       end
-		end
+    end
 
-		def install_pod_sources_for_version_above_1_5_0
-			@installed_specs = []
+    def install_pod_sources_for_version_above_1_5_0
+      @installed_specs = []
       pods_to_install = sandbox_state.added | sandbox_state.changed
-      title_options = { :verbose_prefix => '-> '.green }
+      title_options = { verbose_prefix: '-> '.green }
       # 多进程下载，多线程时 log 会显著交叉，多进程好点，但是多进程需要利用文件锁对 cache 进行保护
       # in_processes: 10
       Parallel.each(root_specs.sort_by(&:name), in_threads: 4) do |spec|
@@ -63,14 +64,22 @@ module Pod
             current_version = spec.version
             previous_version = sandbox.manifest.version(spec.name)
             has_changed_version = current_version != previous_version
-            current_repo = analysis_result.specs_by_source.detect { |key, values| break key if values.map(&:name).include?(spec.name) }
+            current_repo = analysis_result.specs_by_source.detect do |key, values|
+              break key if values.map(&:name).include?(spec.name)
+            end
             current_repo &&= current_repo.url || current_repo.name
             previous_spec_repo = sandbox.manifest.spec_repo(spec.name)
             has_changed_repo = !previous_spec_repo.nil? && current_repo && (current_repo != previous_spec_repo)
             title = "Installing #{spec.name} #{spec.version}"
-            title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if has_changed_version && has_changed_repo
-            title << " (was #{previous_version})" if has_changed_version && !has_changed_repo
-            title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if !has_changed_version && has_changed_repo
+            if has_changed_version && has_changed_repo
+              title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)"
+              end
+            if has_changed_version && !has_changed_repo
+              title << " (was #{previous_version})"
+              end
+            if !has_changed_version && has_changed_repo
+              title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)"
+              end
           else
             title = "Installing #{spec}"
           end
@@ -83,26 +92,24 @@ module Pod
           end
         end
       end
-		end
-
-	end
+    end
+  end
 
   module Downloader
     class Cache
-    	# 多线程锁
-    	@@lock = Mutex.new
-
-    	# 后面如果要切到进程的话，可以在 cache root 里面新建一个文件
-    	# 利用这个文件 lock
-    	# https://stackoverflow.com/questions/23748648/using-fileflock-as-ruby-global-lock-mutex-for-processes
+      # 多线程锁
+      @@lock = Mutex.new
 
-    	# rmtree 在多进程情况下可能  Directory not empty @ dir_s_rmdir 错误
-    	# old_ensure_matching_version 会移除不是同一个 CocoaPods 版本的组件缓存
-    	alias_method :old_ensure_matching_version, :ensure_matching_version
-    	def ensure_matching_version
-    		@@lock.synchronize { old_ensure_matching_version }
-    	end
+      # 后面如果要切到进程的话，可以在 cache root 里面新建一个文件
+      # 利用这个文件 lock
+      # https://stackoverflow.com/questions/23748648/using-fileflock-as-ruby-global-lock-mutex-for-processes
 
+      # rmtree 在多进程情况下可能  Directory not empty @ dir_s_rmdir 错误
+      # old_ensure_matching_version 会移除不是同一个 CocoaPods 版本的组件缓存
+      alias old_ensure_matching_version ensure_matching_version
+      def ensure_matching_version
+        @@lock.synchronize { old_ensure_matching_version }
+      end
     end
   end
-end
+end

data/lib/cocoapods-bin/native/linter.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'cocoapods-bin/native/specification'
 
 module Pod
   class Specification
     class Linter
-    	# !@group Lint steps
+      # !@group Lint steps
 
       # Checks that the spec's root name matches the filename.
       #
@@ -21,4 +23,4 @@ module Pod
       end
     end
   end
-end
+end

data/lib/cocoapods-bin/native/path_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods-bin/native/specification'
 
 module Pod
@@ -12,12 +14,12 @@ module Pod
         if extension == '.podspec' || extension == '.json'
           path_with_ext = declared_path
         else
-        	# 默认先从 binary podspec 找起，因为 binary podspec 的 subspec 可能比 code podspec 多
-        	# 这里可能出现 code subspec 和 binary subspec 对应不上的情况，导致 lint 失败
-        	# 所以不要在 code podspec 同一目录下保留 binary podspec
-        	path_with_ext = Specification::VALID_EXTNAME
-        		.map { |extname| "#{declared_path}/#{name}#{extname}" }
-        		.find { |file| File.exist?(file) } || "#{declared_path}/#{name}.podspec"
+          # 默认先从 binary podspec 找起，因为 binary podspec 的 subspec 可能比 code podspec 多
+          # 这里可能出现 code subspec 和 binary subspec 对应不上的情况，导致 lint 失败
+          # 所以不要在 code podspec 同一目录下保留 binary podspec
+          path_with_ext = Specification::VALID_EXTNAME
+                          .map { |extname| "#{declared_path}/#{name}#{extname}" }
+                          .find { |file| File.exist?(file) } || "#{declared_path}/#{name}.podspec"
         end
 
         UI.message "获取的 podspec 路径为 `#{path_with_ext}`"
@@ -28,4 +30,4 @@ module Pod
       end
     end
   end
-end
+end

data/lib/cocoapods-bin/native/pod_source_installer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods-bin/native/installation_options'
 
 module Pod
@@ -5,11 +7,13 @@ module Pod
     class PodSourceInstaller
       attr_accessor :installation_options
 
-    	alias_method :old_verify_source_is_secure, :verify_source_is_secure
-    	def verify_source_is_secure(root_spec)
-    		# http source 默认不警告
-    		old_verify_source_is_secure(root_spec) if installation_options.warn_for_unsecure_source?
-    	end
+      alias old_verify_source_is_secure verify_source_is_secure
+      def verify_source_is_secure(root_spec)
+        # http source 默认不警告
+        if installation_options.warn_for_unsecure_source?
+          old_verify_source_is_secure(root_spec)
+    end
+      end
     end
   end
-end
+end

data/lib/cocoapods-bin/native/podfile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods'
 require 'cocoapods-bin/native/podfile_env'
 
@@ -27,15 +29,14 @@ module Pod
       end
     end
 
-    alias_method :old_plugins, :plugins 
+    alias old_plugins plugins
     def plugins
       if ENV[USE_PLUGINS]
-        env_plugins = ENV[USE_PLUGINS].split(',').reduce({}) do |result, name| 
-          result[name] = {} 
-          result
+        env_plugins = ENV[USE_PLUGINS].split(',').each_with_object({}) do |name, result|
+          result[name] = {}
         end
         env_plugins.merge!(old_plugins)
-      else 
+      else
         old_plugins
       end
     end
@@ -57,8 +58,11 @@ module Pod
     end
 
     private
+
     def valid_bin_plugin
-      raise Pod::Informative, 'You should add `plugin \'cocoapods-bin\'` before using its DSL' unless plugins.keys.include?('cocoapods-bin')
+      unless plugins.keys.include?('cocoapods-bin')
+        raise Pod::Informative, 'You should add `plugin \'cocoapods-bin\'` before using its DSL'
+      end
     end
 
     # set_hash_value 有 key 限制
@@ -72,4 +76,4 @@ module Pod
       internal_hash.fetch(key, default)
     end
   end
-end
+end

data/lib/cocoapods-bin/native/podfile_env.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 module Pod
   class Podfile
-    USE_BINARIES = 'use_binaries'.freeze
-    USE_SOURCE_PODS = 'use_source_pods'.freeze
-    USE_BINARIES_SELECTOR = 'use_binaries_selector'.freeze
-    ALLOW_PRERELEASE = 'allow_prerelease'.freeze
-    USE_PLUGINS = 'use_plugins'.freeze
+    USE_BINARIES = 'use_binaries'
+    USE_SOURCE_PODS = 'use_source_pods'
+    USE_BINARIES_SELECTOR = 'use_binaries_selector'
+    ALLOW_PRERELEASE = 'allow_prerelease'
+    USE_PLUGINS = 'use_plugins'
 
     module ENVExecutor
       def execute_with_bin_plugin(&block)
-        execute_with_key(USE_PLUGINS, -> {'cocoapods-bin'}, &block)
+        execute_with_key(USE_PLUGINS, -> { 'cocoapods-bin' }, &block)
       end
 
       def execute_with_allow_prerelease(allow_prerelease, &block)
         execute_with_key(ALLOW_PRERELEASE, -> { allow_prerelease ? 'true' : 'false' }, &block)
       end
-      
+
       def execute_with_use_binaries(use_binaries, &block)
         execute_with_key(USE_BINARIES, -> { use_binaries ? 'true' : 'false' }, &block)
       end
 
-      def execute_with_key(key, value_returner, &block)
+      def execute_with_key(key, value_returner)
         origin_value = ENV[key]
         ENV[key] = value_returner.call
 
@@ -31,4 +33,4 @@ module Pod
 
     extend ENVExecutor
   end
-end
+end

data/lib/cocoapods-bin/native/podspec_finder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods-bin/native/specification'
 
 module Pod
@@ -5,6 +7,7 @@ module Pod
     class PodspecFinder
       def podspecs
         return @specs_by_name if @specs_by_name
+
         @specs_by_name = {}
         spec_files = Pathname.glob(root + '{,*}.podspec{,.json}')
         # pod 指向分支时，如果目标组件有 subspec ，并且有 template spec ，request 之后使用的 spec 不应该为 template spec

data/lib/cocoapods-bin/native/resolver.rb

@@ -1,13 +1,15 @@
-require "parallel"
-require "cocoapods"
-require "cocoapods-bin/native/podfile"
-require "cocoapods-bin/native/sources_manager"
-require "cocoapods-bin/native/installation_options"
-require "cocoapods-bin/gem_version"
+# frozen_string_literal: true
+
+require 'parallel'
+require 'cocoapods'
+require 'cocoapods-bin/native/podfile'
+require 'cocoapods-bin/native/sources_manager'
+require 'cocoapods-bin/native/installation_options'
+require 'cocoapods-bin/gem_version'
 
 module Pod
   class Resolver
-    if Pod.match_version?("~> 1.6")
+    if Pod.match_version?('~> 1.6')
       # 其实不用到 resolver_specs_by_target 再改 spec
       # 在这个方法里面，通过修改 dependency 的 source 应该也可以
       # 就是有一点，如果改了之后，对应的 source 没有符合 dependency 的版本
@@ -16,7 +18,7 @@ module Pod
       #
       def aggregate_for_dependency(dependency)
         sources_manager = Config.instance.sources_manager
-        if dependency && dependency.podspec_repo
+        if dependency&.podspec_repo
           sources_manager.aggregate_for_dependency(dependency)
           # 采用 lock 中的 source ，会导致插件对 source 的先后调整失效
           # elsif (locked_vertex = @locked_dependencies.vertex_named(dependency.name)) && (locked_dependency = locked_vertex.payload) && locked_dependency.podspec_repo
@@ -27,48 +29,59 @@ module Pod
       end
     end
 
-    if Pod.match_version?("~> 1.4")
+    if Pod.match_version?('~> 1.4')
       def specifications_for_dependency(dependency, additional_requirements_frozen = [])
         additional_requirements = additional_requirements_frozen.dup
         additional_requirements.compact!
         requirement = Requirement.new(dependency.requirement.as_list + additional_requirements.flat_map(&:as_list))
-        requirement = Requirement.new(dependency.requirement.as_list.map { |r| r + ".a" } + additional_requirements.flat_map(&:as_list)) if podfile.allow_prerelease? && !requirement.prerelease?
-
-        if Pod.match_version?("~> 1.7")
-          options = podfile.installation_options
-        else
-          options = installation_options
+        if podfile.allow_prerelease? && !requirement.prerelease?
+          requirement = Requirement.new(dependency.requirement.as_list.map { |r| r + '.a' } + additional_requirements.flat_map(&:as_list))
         end
 
-        if Pod.match_version?("~> 1.8")
-          specifications = find_cached_set(dependency).
-            all_specifications(options.warn_for_multiple_pod_sources, requirement)
+        options = if Pod.match_version?('~> 1.7')
+                    podfile.installation_options
+                  else
+                    installation_options
+                  end
+
+        if Pod.match_version?('~> 1.8')
+          specifications = find_cached_set(dependency)
+                           .all_specifications(options.warn_for_multiple_pod_sources, requirement)
         else
-          specifications = find_cached_set(dependency).
-            all_specifications(options.warn_for_multiple_pod_sources)
+          specifications = find_cached_set(dependency)
+                           .all_specifications(options.warn_for_multiple_pod_sources)
         end
 
-        specifications.
-          map { |s| s.subspec_by_name(dependency.name, false, true) }.
-          compact
+        specifications
+          .map { |s| s.subspec_by_name(dependency.name, false, true) }
+          .compact
       end
     end
 
-    if Pod.match_version?("~> 1.6")
-      alias_method :old_valid_possibility_version_for_root_name?, :valid_possibility_version_for_root_name?
+    if Pod.match_version?('~> 1.6')
+      alias old_valid_possibility_version_for_root_name? valid_possibility_version_for_root_name?
 
       def valid_possibility_version_for_root_name?(requirement, activated, spec)
         return true if podfile.allow_prerelease?
+
         old_valid_possibility_version_for_root_name?(requirement, activated, spec)
       end
-    elsif Pod.match_version?("~> 1.4")
+    elsif Pod.match_version?('~> 1.4')
       def requirement_satisfied_by?(requirement, activated, spec)
         version = spec.version
         return false unless requirement.requirement.satisfied_by?(version)
+
         shared_possibility_versions, prerelease_requirement = possibility_versions_for_root_name(requirement, activated)
-        return false if !shared_possibility_versions.empty? && !shared_possibility_versions.include?(version)
-        return false if !podfile.allow_prerelease? && version.prerelease? && !prerelease_requirement
-        return false unless spec_is_platform_compatible?(activated, requirement, spec)
+        if !shared_possibility_versions.empty? && !shared_possibility_versions.include?(version)
+          return false
+        end
+        if !podfile.allow_prerelease? && version.prerelease? && !prerelease_requirement
+          return false
+        end
+        unless spec_is_platform_compatible?(activated, requirement, spec)
+          return false
+        end
+
         true
       end
     end
@@ -76,10 +89,10 @@ module Pod
     # >= 1.4.0 才有 resolver_specs_by_target 以及 ResolverSpecification
     # >= 1.5.0 ResolverSpecification 才有 source，供 install 或者其他操作时，输入 source 变更
     #
-    if Pod.match_version?("~> 1.4")
+    if Pod.match_version?('~> 1.4')
       old_resolver_specs_by_target = instance_method(:resolver_specs_by_target)
       define_method(:resolver_specs_by_target) do
-        specs_by_target = old_resolver_specs_by_target.bind(self).call()
+        specs_by_target = old_resolver_specs_by_target.bind(self).call
 
         sources_manager = Config.instance.sources_manager
         use_source_pods = podfile.use_source_pods
@@ -90,7 +103,7 @@ module Pod
           use_binary_rspecs = if podfile.use_binaries? || podfile.use_binaries_selector
                                 rspecs.select do |rspec|
                                   ([rspec.name, rspec.root.name] & use_source_pods).empty? &&
-                                  (podfile.use_binaries_selector.nil? || podfile.use_binaries_selector.call(rspec.spec))
+                                    (podfile.use_binaries_selector.nil? || podfile.use_binaries_selector.call(rspec.spec))
                                 end
                               else
                                 []
@@ -102,7 +115,9 @@ module Pod
             # next rspec if rspec.spec.subspec? || rspec.spec.subspecs.any?
 
             # developments 组件采用默认输入的 spec (development pods 的 source 为 nil)
-            next rspec unless rspec.spec.respond_to?(:spec_source) && rspec.spec.spec_source
+            unless rspec.spec.respond_to?(:spec_source) && rspec.spec.spec_source
+              next rspec
+            end
 
             # 采用二进制依赖并且不为开发组件
             use_binary = use_binary_rspecs.include?(rspec)
@@ -117,25 +132,27 @@ module Pod
               specification = source.specification(rspec.root.name, spec_version)
 
               # 组件是 subspec
-              specification = specification.subspec_by_name(rspec.name, false, true) if rspec.spec.subspec?
+              if rspec.spec.subspec?
+                specification = specification.subspec_by_name(rspec.name, false, true)
+              end
               # 这里可能出现分析依赖的 source 和切换后的 source 对应 specification 的 subspec 对应不上
               # 造成 subspec_by_name 返回 nil，这个是正常现象
               next unless specification
 
-              if Pod.match_version?("~> 1.7")
-                used_by_only = rspec.used_by_non_library_targets_only
-              else
-                used_by_only = rspec.used_by_tests_only
-              end
+              used_by_only = if Pod.match_version?('~> 1.7')
+                               rspec.used_by_non_library_targets_only
+                             else
+                               rspec.used_by_tests_only
+                             end
               # used_by_only = rspec.respond_to?(:used_by_tests_only) ? rspec.used_by_tests_only : rspec.used_by_non_library_targets_only
               # 组装新的 rspec ，替换原 rspec
-              rspec = if Pod.match_version?("~> 1.4.0")
+              rspec = if Pod.match_version?('~> 1.4.0')
                         ResolverSpecification.new(specification, used_by_only)
                       else
                         ResolverSpecification.new(specification, used_by_only, source)
                       end
               rspec
-            rescue Pod::StandardError => error
+            rescue Pod::StandardError => e
               # 没有从新的 source 找到对应版本组件，直接返回原 rspec
               missing_binary_specs << rspec.spec if use_binary
               rspec
@@ -145,16 +162,18 @@ module Pod
           end.compact
         end
 
-        missing_binary_specs.uniq.each do |spec|
-          UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖."
-        end if missing_binary_specs.any?
+        if missing_binary_specs.any?
+          missing_binary_specs.uniq.each do |spec|
+            UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖."
+          end
+        end
 
         specs_by_target
       end
     end
   end
 
-  if Pod.match_version?("~> 1.4.0")
+  if Pod.match_version?('~> 1.4.0')
     # 1.4.0 没有 spec_source
     class Specification
       class Set
@@ -170,6 +189,7 @@ module Pod
 
           def respond_to?(method, include_all = false)
             return super unless method == :spec_source
+
             true
           end
         end