cocoapods-bin 0.1.1 → 0.1.2

data/lib/cocoapods-bin/gem_version.rb

@@ -1,9 +1,9 @@
 module CBin
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 
 module Pod
-	def self.match_version?(*version)
-		Gem::Dependency.new("", *version).match?('', Pod::VERSION) 
-	end
+  def self.match_version?(*version)
+    Gem::Dependency.new("", *version).match?('', Pod::VERSION) 
+  end
 end

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

@@ -2,111 +2,111 @@ require 'cocoapods'
 require 'cocoapods-bin/config/config'
 
 module CBin
-	class Specification
-		class Creator
-			attr_reader :code_spec
-			attr_reader :template_spec
-			attr_reader :spec
-
-			def initialize(code_spec, template_spec, platforms = 'ios') 
-				@code_spec = code_spec
-				@template_spec = template_spec
-				@platforms = Array(platforms)
-				validate!			
-			end
-
-			def validate!
-				raise Pod::Informative, "源码 podspec 不能为空 ."  unless code_spec
-				raise Pod::Informative, "不支持自动生成存在 subspec 的二进制 podspec , 需要提供模版文件 #{code_spec.name}.binary.podspec.template ."  if code_spec.subspecs.any? && template_spec.nil?
-			end
-
-			def create
-				spec = template_spec ? create_from_code_spec_and_template_spec : create_from_code_spec
-
-				Pod::UI.message "生成二进制 podspec 内容: "
-	      spec.to_pretty_json.split("\n").each do |text|
-	        Pod::UI.message text
-	      end
-
-	      spec
-			end
-
-			def write_spec_file(file = filename)
-				create unless spec
-
-				File.open(file, 'w+') do |f|
-	        f.write(spec.to_pretty_json)
-	      end
-
-	      @filename = file 
-			end
-
-			def clear_spec_file
-				File.delete(filename) if File.exist?(filename)
-			end
-
-			def filename 
-				@filename ||= "#{spec.name}.binary.podspec.json" 
-			end
-
-			private
-
-			def create_from_code_spec
-				@spec = code_spec.dup
-				# vendored_frameworks | resources | source | source_files | public_header_files
-				# license | resource_bundles
-
-				# Project Linkin
-				@spec.vendored_frameworks = "#{code_spec.root.name}.framework"
-
-				# Resources
-				extnames = []
-				extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
-				extnames += code_spec_consumer.resources.map { |r| File.basename(r) } if code_spec_consumer.resources.any?
-				@spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } } if extnames.any?
-
-				# Source Location
-				@spec.source = binary_source
-
-				# Source Code
-				@spec.source_files = framework_contents('Headers/*')
-				@spec.public_header_files = framework_contents('Headers/*')
-
-				# Unused for binary 
-				spec_hash = @spec.to_hash
-				# spec_hash.delete('license')
-				spec_hash.delete('resource_bundles')
-				spec_hash.delete('exclude_files')
-				spec_hash.delete('preserve_paths')
-
-				# Filter platforms
-				platforms = spec_hash['platforms']
-				selected_platforms = platforms.select { |k, v| @platforms.include?(k) } 
-				spec_hash['platforms'] = selected_platforms.empty? ? platforms : selected_platforms
-	 
-				@spec = Pod::Specification.from_hash(spec_hash)
-				@spec
-			end
-
-			def create_from_code_spec_and_template_spec
-				@spec = template_spec.dup
-
-				@spec.version = code_spec.version
-				@spec.source = binary_source
-	      @spec
-			end
-
-			def binary_source
-				{ http: CBin.config.binary_download_url % [code_spec.root.name, code_spec.version], type: CBin.config.download_file_type } 
-			end
-
-			def code_spec_consumer(platform = :ios)
-				code_spec.consumer(:ios)
-			end
-
-			def framework_contents(name)
-				["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
-			end
-		end
-	end
+  class Specification
+    class Creator
+      attr_reader :code_spec
+      attr_reader :template_spec
+      attr_reader :spec
+
+      def initialize(code_spec, template_spec, platforms = 'ios') 
+        @code_spec = code_spec
+        @template_spec = template_spec
+        @platforms = Array(platforms)
+        validate!     
+      end
+
+      def validate!
+        raise Pod::Informative, "源码 podspec 不能为空 ."  unless code_spec
+        raise Pod::Informative, "不支持自动生成存在 subspec 的二进制 podspec , 需要提供模版文件 #{code_spec.name}.binary.podspec.template ."  if code_spec.subspecs.any? && template_spec.nil?
+      end
+
+      def create
+        spec = template_spec ? create_from_code_spec_and_template_spec : create_from_code_spec
+
+        Pod::UI.message "生成二进制 podspec 内容: "
+        spec.to_pretty_json.split("\n").each do |text|
+          Pod::UI.message text
+        end
+
+        spec
+      end
+
+      def write_spec_file(file = filename)
+        create unless spec
+
+        File.open(file, 'w+') do |f|
+          f.write(spec.to_pretty_json)
+        end
+
+        @filename = file 
+      end
+
+      def clear_spec_file
+        File.delete(filename) if File.exist?(filename)
+      end
+
+      def filename 
+        @filename ||= "#{spec.name}.binary.podspec.json" 
+      end
+
+      private
+
+      def create_from_code_spec
+        @spec = code_spec.dup
+        # vendored_frameworks | resources | source | source_files | public_header_files
+        # license | resource_bundles
+
+        # Project Linkin
+        @spec.vendored_frameworks = "#{code_spec.root.name}.framework"
+
+        # Resources
+        extnames = []
+        extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
+        extnames += code_spec_consumer.resources.map { |r| File.basename(r) } if code_spec_consumer.resources.any?
+        @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } } if extnames.any?
+
+        # Source Location
+        @spec.source = binary_source
+
+        # Source Code
+        @spec.source_files = framework_contents('Headers/*')
+        @spec.public_header_files = framework_contents('Headers/*')
+
+        # Unused for binary 
+        spec_hash = @spec.to_hash
+        # spec_hash.delete('license')
+        spec_hash.delete('resource_bundles')
+        spec_hash.delete('exclude_files')
+        spec_hash.delete('preserve_paths')
+
+        # Filter platforms
+        platforms = spec_hash['platforms']
+        selected_platforms = platforms.select { |k, v| @platforms.include?(k) } 
+        spec_hash['platforms'] = selected_platforms.empty? ? platforms : selected_platforms
+   
+        @spec = Pod::Specification.from_hash(spec_hash)
+        @spec
+      end
+
+      def create_from_code_spec_and_template_spec
+        @spec = template_spec.dup
+
+        @spec.version = code_spec.version
+        @spec.source = binary_source
+        @spec
+      end
+
+      def binary_source
+        { http: CBin.config.binary_download_url % [code_spec.root.name, code_spec.version], type: CBin.config.download_file_type } 
+      end
+
+      def code_spec_consumer(platform = :ios)
+        code_spec.consumer(:ios)
+      end
+
+      def framework_contents(name)
+        ["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
+      end
+    end
+  end
 end

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

@@ -4,26 +4,26 @@ require 'cocoapods'
 module Pod
   class Installer
     class Analyzer
-    	# > 1.5.3 版本
-			# rewrite update_repositories
-			#
-			alias_method :old_update_repositories, :update_repositories
+      # > 1.5.3 版本
+      # rewrite update_repositories
+      #
+      alias_method :old_update_repositories, :update_repositories
       def update_repositories
-      	if installation_options.update_source_with_multi_processes
-	      	# 并发更新私有源
-	      	# 这里多线程会导致 pod update 额外输出 --verbose 的内容
-	      	# 不知道为什么？
-	      	Parallel.each(sources, in_processes: 4) do |source|
-	          if source.git?
-	            config.sources_manager.update(source.name, true)
-	          else
-	            UI.message "Skipping `#{source.name}` update because the repository is not a git source repository."
-	          end
-		      end
-		      @specs_updated = true
-      	else 
-      		old_update_repositories
-      	end
+        if installation_options.update_source_with_multi_processes
+          # 并发更新私有源
+          # 这里多线程会导致 pod update 额外输出 --verbose 的内容
+          # 不知道为什么？
+          Parallel.each(sources, in_processes: 4) do |source|
+            if source.git?
+              config.sources_manager.update(source.name, true)
+            else
+              UI.message "Skipping `#{source.name}` update because the repository is not a git source repository."
+            end
+          end
+          @specs_updated = true
+        else 
+          old_update_repositories
+        end
       end
     end
   end

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

@@ -1,67 +1,67 @@
 require 'cocoapods'
 
 module Pod
-	class Podfile
-		USE_BINARIES = 'use_binaries'.freeze
-		USE_SOURCE_PODS = 'use_source_pods'.freeze
-		USE_BINARIES_SELECTOR = 'use_binaries_selector'.freeze
-		# TREAT_DEVELOPMENTS_AS_NORMAL = 'treat_developments_as_normal'.freeze
+  class Podfile
+    USE_BINARIES = 'use_binaries'.freeze
+    USE_SOURCE_PODS = 'use_source_pods'.freeze
+    USE_BINARIES_SELECTOR = 'use_binaries_selector'.freeze
+    # TREAT_DEVELOPMENTS_AS_NORMAL = 'treat_developments_as_normal'.freeze
 
-		module DSL
-			def use_binaries!(flag = true)
-				set_internal_hash_value(USE_BINARIES, flag)
-			end
+    module DSL
+      def use_binaries!(flag = true)
+        set_internal_hash_value(USE_BINARIES, flag)
+      end
 
-			def use_binaries_with_spec_selector!(&block)
-				raise Informative, '必须提供选择需要二进制组件的 block !' unless block_given?
+      def use_binaries_with_spec_selector!(&block)
+        raise Informative, '必须提供选择需要二进制组件的 block !' unless block_given?
 
-				set_internal_hash_value(USE_BINARIES_SELECTOR, block)
-			end
+        set_internal_hash_value(USE_BINARIES_SELECTOR, block)
+      end
 
-			def set_use_source_pods(pods)
-				hash_pods_use_source = get_internal_hash_value(USE_SOURCE_PODS) || []
-				hash_pods_use_source += Array(pods)
-				set_internal_hash_value(USE_SOURCE_PODS, hash_pods_use_source)
-			end
-		end
+      def set_use_source_pods(pods)
+        hash_pods_use_source = get_internal_hash_value(USE_SOURCE_PODS) || []
+        hash_pods_use_source += Array(pods)
+        set_internal_hash_value(USE_SOURCE_PODS, hash_pods_use_source)
+      end
+    end
 
-		module ENVExecutor
-			def execute_with_use_binaries(use_binaries, &block)
-				execute_with_key(USE_BINARIES, -> { use_binaries ? 'true' : 'false' }, &block)
-			end
+    module ENVExecutor
+      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)
-				origin_value = ENV[key]
-	      ENV[key] = value_returner.call
+      def execute_with_key(key, value_returner, &block)
+        origin_value = ENV[key]
+        ENV[key] = value_returner.call
 
-	      yield if block_given?
+        yield if block_given?
 
-	      ENV[key] = origin_value
-			end
-		end
+        ENV[key] = origin_value
+      end
+    end
 
-		extend ENVExecutor
+    extend ENVExecutor
 
-		def use_binaries_selector
-			get_internal_hash_value(USE_BINARIES_SELECTOR, nil)
-		end
+    def use_binaries_selector
+      get_internal_hash_value(USE_BINARIES_SELECTOR, nil)
+    end
 
-		def use_binaries?
-			get_internal_hash_value(USE_BINARIES, false) || ENV[USE_BINARIES] == 'true'
-		end
+    def use_binaries?
+      get_internal_hash_value(USE_BINARIES, false) || ENV[USE_BINARIES] == 'true'
+    end
 
-		def use_source_pods
-			get_internal_hash_value(USE_SOURCE_PODS, []) + String(ENV[USE_SOURCE_PODS]).split('|').uniq
-		end
+    def use_source_pods
+      get_internal_hash_value(USE_SOURCE_PODS, []) + String(ENV[USE_SOURCE_PODS]).split('|').uniq
+    end
 
-		private
-		# set_hash_value 有 key 限制
-		def set_internal_hash_value(key, value)
-			internal_hash[key] = value
-		end
+    private
+    # set_hash_value 有 key 限制
+    def set_internal_hash_value(key, value)
+      internal_hash[key] = value
+    end
 
-		def get_internal_hash_value(key, default = nil)
-			internal_hash.fetch(key, default)
-		end
-	end
+    def get_internal_hash_value(key, default = nil)
+      internal_hash.fetch(key, default)
+    end
+  end
 end

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

@@ -6,100 +6,100 @@ require 'cocoapods-bin/native/installation_options'
 require 'cocoapods-bin/gem_version'
 
 module Pod
-	class Resolver
-		# >= 1.4.0 才有 resolver_specs_by_target 以及 ResolverSpecification
-		# >= 1.5.0 ResolverSpecification 才有 source，供 install 或者其他操作时，输入 source 变更
-		#	
-		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()
-
-				sources_manager = Config.instance.sources_manager
-				use_source_pods = podfile.use_source_pods
-
-				missing_binary_specs = []
-				specs_by_target.each do |target, rspecs|
-					# use_binaries 并且 use_source_pods 不包含
-					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))
-																end
-														  else
-															  []
-														  end
-
-					# Parallel.map(rspecs, in_threads: 8) do |rspec| 
-					specs_by_target[target] = rspecs.map do |rspec|
-						# 含有 subspecs 的组件暂不处理
-						# 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
-
-						# 采用二进制依赖并且不为开发组件 
-						use_binary = use_binary_rspecs.include?(rspec)
-						source = use_binary ? sources_manager.binary_source : sources_manager.code_source 
-
-						spec_version = rspec.spec.version
-						begin
-							# 从新 source 中获取 spec
-							specification = source.specification(rspec.root.name, spec_version)		
-
-							# 组件是 subspec
-							specification = specification.subspec_by_name(rspec.name, false, true) if rspec.spec.subspec?
-							# 这里可能出现分析依赖的 source 和切换后的 source 对应 specification 的 subspec 对应不上
-							# 造成 subspec_by_name 返回 nil，这个是正常现象
-							next unless specification
-
-							# 组装新的 rspec ，替换原 rspec
-							rspec = if Pod.match_version?('~> 1.4.0')
-												ResolverSpecification.new(specification, rspec.used_by_tests_only)
-											else
-												ResolverSpecification.new(specification, rspec.used_by_tests_only, source)
-											end
-							rspec
-						rescue Pod::StandardError => error 	
-							# 没有从新的 source 找到对应版本组件，直接返回原 rspec
-							missing_binary_specs << rspec.spec if use_binary
-							rspec
-						end
-
-						rspec 
-					end.compact
-				end
-
-				missing_binary_specs.uniq.each do |spec| 
-					UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." 
-				end if missing_binary_specs.any?
-
-				specs_by_target
-			end
-		end
-	end
-
-	if Pod.match_version?('~> 1.4.0')
-		# 1.4.0 没有 spec_source
-	  class Specification
-	    class Set
-	      class LazySpecification < BasicObject
-	        attr_reader :spec_source
-
-	        old_initialize = instance_method(:initialize)
-					define_method(:initialize) do |name, version, source|
-						old_initialize.bind(self).call(name, version, source)
-
-						@spec_source = source 
-					end
-
-					def respond_to?(method, include_all = false) 
-						return super unless method == :spec_source
-						true
-					end
-	      end
-	    end
-	  end
-	end
+  class Resolver
+    # >= 1.4.0 才有 resolver_specs_by_target 以及 ResolverSpecification
+    # >= 1.5.0 ResolverSpecification 才有 source，供 install 或者其他操作时，输入 source 变更
+    # 
+    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()
+
+        sources_manager = Config.instance.sources_manager
+        use_source_pods = podfile.use_source_pods
+
+        missing_binary_specs = []
+        specs_by_target.each do |target, rspecs|
+          # use_binaries 并且 use_source_pods 不包含
+          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))
+                                end
+                              else
+                                []
+                              end
+
+          # Parallel.map(rspecs, in_threads: 8) do |rspec| 
+          specs_by_target[target] = rspecs.map do |rspec|
+            # 含有 subspecs 的组件暂不处理
+            # 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
+
+            # 采用二进制依赖并且不为开发组件 
+            use_binary = use_binary_rspecs.include?(rspec)
+            source = use_binary ? sources_manager.binary_source : sources_manager.code_source 
+
+            spec_version = rspec.spec.version
+            begin
+              # 从新 source 中获取 spec
+              specification = source.specification(rspec.root.name, spec_version)   
+
+              # 组件是 subspec
+              specification = specification.subspec_by_name(rspec.name, false, true) if rspec.spec.subspec?
+              # 这里可能出现分析依赖的 source 和切换后的 source 对应 specification 的 subspec 对应不上
+              # 造成 subspec_by_name 返回 nil，这个是正常现象
+              next unless specification
+
+              # 组装新的 rspec ，替换原 rspec
+              rspec = if Pod.match_version?('~> 1.4.0')
+                        ResolverSpecification.new(specification, rspec.used_by_tests_only)
+                      else
+                        ResolverSpecification.new(specification, rspec.used_by_tests_only, source)
+                      end
+              rspec
+            rescue Pod::StandardError => error  
+              # 没有从新的 source 找到对应版本组件，直接返回原 rspec
+              missing_binary_specs << rspec.spec if use_binary
+              rspec
+            end
+
+            rspec 
+          end.compact
+        end
+
+        missing_binary_specs.uniq.each do |spec| 
+          UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." 
+        end if missing_binary_specs.any?
+
+        specs_by_target
+      end
+    end
+  end
+
+  if Pod.match_version?('~> 1.4.0')
+    # 1.4.0 没有 spec_source
+    class Specification
+      class Set
+        class LazySpecification < BasicObject
+          attr_reader :spec_source
+
+          old_initialize = instance_method(:initialize)
+          define_method(:initialize) do |name, version, source|
+            old_initialize.bind(self).call(name, version, source)
+
+            @spec_source = source 
+          end
+
+          def respond_to?(method, include_all = false) 
+            return super unless method == :spec_source
+            true
+          end
+        end
+      end
+    end
+  end
 end
 

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

@@ -1,11 +1,11 @@
 require 'cocoapods-bin/native/sources_manager'
 
 Pod::HooksManager.register('cocoapods-bin', :source_provider) do |context, _|
-	sources_manager = Pod::Config.instance.sources_manager
-	podfile = Pod::Config.instance.podfile
+  sources_manager = Pod::Config.instance.sources_manager
+  podfile = Pod::Config.instance.podfile
 
-	# 添加二进制私有源 && 源码私有源
-	added_sources = [sources_manager.code_source, sources_manager.binary_source]
-	added_sources.reverse! if podfile.use_binaries? || podfile.use_binaries_selector
-	added_sources.each { |source| context.add_source(source) }
+  # 添加二进制私有源 && 源码私有源
+  added_sources = [sources_manager.code_source, sources_manager.binary_source]
+  added_sources.reverse! if podfile.use_binaries? || podfile.use_binaries_selector
+  added_sources.each { |source| context.add_source(source) }
 end

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

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