cocoapods-bin 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c61e80ad6ee0b296f902e6cb9cbc70806d9c3fc
-  data.tar.gz: 7100524ad9e0044a0632cfebf8a4a283450fa2ad
+  metadata.gz: f1cb6338b68aa2761f9caf57f4acd33cb9c7eb41
+  data.tar.gz: e142ad3877f18be5337a13e234aba93d6a15ef36
 SHA512:
-  metadata.gz: 128658358ab32e621c139b269185d0d064edd3bd71bdd7458e5510b9c39b692eb0b5d87769dacfb77ce77e48749a9cffa6af7b7d35ce01d0c350db626672c6cb
-  data.tar.gz: a848f928901ff31055487f76b35152f89f934eff842c2e1776a8f0a2c961dba23451adeafccdb4c4848485c4abec6f9e4849b5faf3c9faf1bd9d350cad2b90fc
+  metadata.gz: 369ead0b474adce9f6cbb5126427b23436017ade6acbc3b9ec1c9b3ac07984a42838c2ece49371d466d5ee89c6e7414fe31759d8146a147df88b0f03c7eb8ee6
+  data.tar.gz: 010c1a8268188a6159a9e0c1de511a910ec11f67f2d457ed30a006f8144c24e889a24d28d68da8ae8957b7ff493dc5cf35c660d4ce25afdcb4cb60bdc34d4ff3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-bin (0.0.4)
+    cocoapods-bin (0.0.5)
       cocoapods (~> 1.4)
       parallel
 

data/lib/cocoapods-bin/command/bin/search.rb

@@ -38,7 +38,8 @@ module Pod
 
 	        source = @code ? code_source : binary_source
 
-					sets = source.search_by_name(query_regex)
+	        aggregate = Pod::Source::Aggregate.new([source])
+					sets = aggregate.search_by_name(query_regex, true)
 
 					if(@use_pager)
 	          UI.with_pager { print_sets(sets) }

data/lib/cocoapods-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
 
 module Pod

data/lib/cocoapods-bin/helpers/spec_files_helper.rb

@@ -10,12 +10,16 @@ module CBin
       @binary_spec_files ||= Pathname.glob('*.binary.podspec{,.json}')
     end
 
+    def binary_template_spec_files
+      @binary_spec_template_files ||= Pathname.glob('*.binary-template.podspec{,.json}')
+    end 
+
     def binary_template_spec_file
-      @binary_spec_template_file ||= Pathname.glob('*.binary-template.podspec{,.json}').first
+      @binary_spec_template_file ||= binary_template_spec_files.first
     end 
 
     def code_spec_files
-      @code_spec_files ||= spec_files - binary_spec_files
+      @code_spec_files ||= spec_files - binary_spec_files - binary_template_spec_files
     end
 
     def code_spec 

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

@@ -9,7 +9,7 @@ module Pod
 			#
 			alias_method :old_update_repositories, :update_repositories
       def update_repositories
-      	if installation_options.update_source_with_multi_processes
+      	if installation_options.update_source_with_multi_threads
 	      	# 并发更新私有源
 	      	Parallel.each(sources, in_threads: 4) do |source|
 	          if source.git?

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

@@ -15,10 +15,10 @@ module Pod
     	env_option :warn_for_unsecure_source, false
 
     	# 是否多进程执行 install_pod_sources 
-    	env_option :install_with_multi_processes, true
+    	env_option :install_with_multi_threads, true
 
     	# 是否多进程执行 update_repositories
-    	env_option :update_source_with_multi_processes, true
+    	env_option :update_source_with_multi_threads, true
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Pod
 
 		alias_method :old_install_pod_sources, :install_pod_sources
     def install_pod_sources
-    	if installation_options.install_with_multi_processes
+    	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')

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

@@ -1,3 +1,4 @@
+require 'cocoapods-bin/native/specification'
 
 module Pod
   class Specification
@@ -10,13 +11,7 @@ module Pod
       #
       def validate_root_name
         if spec.root.name && file
-          acceptable_names = [
-            spec.root.name + '.podspec',
-            spec.root.name + '.podspec.json',
-            # 支持 binary 后缀
-            spec.root.name + '.binary.podspec',
-            spec.root.name + '.binary.podspec.json'
-          ]
+          acceptable_names = Specification::VALID_EXTNAME.map { |extname| "#{spec.root.name}#{extname}" }
           names_match = acceptable_names.include?(file.basename.to_s)
           unless names_match
             results.add_error('name', 'The name of the spec should match the ' \

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

@@ -0,0 +1,31 @@
+require 'cocoapods-bin/native/specification'
+
+module Pod
+  module ExternalSources
+    # Provides support for fetching a specification file from a path local to
+    # the machine running the installation.
+    #
+    class PathSource < AbstractExternalSource
+      def normalized_podspec_path(declared_path)
+        extension = File.extname(declared_path)
+
+        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"
+        end
+
+        UI.message "获取的 podspec 路径为 `#{path_with_ext}`"
+
+        podfile_dir = File.dirname(podfile_path || '')
+
+        File.expand_path(path_with_ext, podfile_dir)
+      end
+    end
+  end
+end

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

@@ -17,13 +17,10 @@ module Pod
       raise ArgumentError, 'No version' unless version
       path = pod_path(name) + version.to_s
 
-      specification_path =[
-        "#{name}.podspec.json", 
-        "#{name}.podspec", 
-        # 支持 binary 后缀
-        "#{name}.binary.podspec", 
-        "#{name}.binary.podspec.json"
-        ].map { |file| path + file }.find { |path| path.exist? }
+      specification_path = Specification::VALID_EXTNAME
+        .map { |extname| "#{name}#{extname}" }
+        .map { |file| path + file }
+        .find { |path| path.exist? }
 
       unless specification_path
         raise StandardError, "Unable to find the specification #{name} " \

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

@@ -0,0 +1,5 @@
+module Pod
+	class Specification
+		VALID_EXTNAME = %w[.binary.podspec.json .binary.podspec .podspec.json .podspec]
+	end
+end

data/lib/cocoapods-bin/native.rb

@@ -1,6 +1,8 @@
 require 'cocoapods'
 
 if Pod.match_version?('~> 1.4')
+	require 'cocoapods-bin/native/specification'
+	require 'cocoapods-bin/native/path_source'
 	require 'cocoapods-bin/native/analyzer'
 	require 'cocoapods-bin/native/installer'
 	require 'cocoapods-bin/native/pod_source_installer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - tripleCC
@@ -108,12 +108,14 @@ files:
 - lib/cocoapods-bin/native/installation_options.rb
 - lib/cocoapods-bin/native/installer.rb
 - lib/cocoapods-bin/native/linter.rb
+- lib/cocoapods-bin/native/path_source.rb
 - lib/cocoapods-bin/native/pod_source_installer.rb
 - lib/cocoapods-bin/native/podfile.rb
 - lib/cocoapods-bin/native/resolver.rb
 - lib/cocoapods-bin/native/source.rb
 - lib/cocoapods-bin/native/source_provider_hook.rb
 - lib/cocoapods-bin/native/sources_manager.rb
+- lib/cocoapods-bin/native/specification.rb
 - lib/cocoapods-bin/native/validator.rb
 - lib/cocoapods_plugin.rb
 - spec/command/bin_spec.rb