cocoapods-tdfire-binary 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93538d683f5a872ea846131cf45e346f5ca9d754
-  data.tar.gz: 33836f8a6b47157a0e0add735259aa32204b5cdc
+  metadata.gz: c4f9de30f1f300cf522c497fa292cfa432f88747
+  data.tar.gz: be89ce05a1e6ac3877dba51a3bb9cfb52fcd7180
 SHA512:
-  metadata.gz: 1b85fef5485aa1a420d921e5e1178e5ff0a9173ff0db2d4812e5d2bd5026108b20378bff6b15f8c2889ab5a053ffe0b6919827d7b5cc0f384c8646c716b36792
-  data.tar.gz: 8cea5c8e40aab3d44fd644713f9ea63f6a0992f6086f30780818ecaf153bc642f2c4459b97b3c92af22ded4b1b38538e44bfc908cfedfffd403e90eb5f5993a8
+  metadata.gz: a53412925b6e6bec7ea72778974cb56fa5b133a7a1d7653956621042260f1ca3e3ce0d9338836b8e1b66bc77864ab4ca73d58c6b48ace0088a64af1c8bcc8fa7
+  data.tar.gz: 9c4f615d3b377c3fff51706cb152496ad980b428fa21099c59007243b0f8955ccb84d240269d2defa5f61e8a0650ae8d3a2a7d8b4bffbcb7af203bda7d9bbaee

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cocoapods-tdfire-binary (1.0.6)
-      cocoapods (= 1.2.1)
+    cocoapods-tdfire-binary (1.0.7)
+      cocoapods (~> 1.2)
       cocoapods-packager (~> 1.5.0)
 
 GEM

data/README.md

@@ -58,6 +58,9 @@ use_frameworks!
 
 ### For podspec
 
+> 目前只支持 iOS 平台 （插件内部也会进行限制）
+
+
 ```
 ...
 

data/cocoapods-tdfire-binary.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 12.0'
 
-  spec.add_dependency 'cocoapods', '1.2.1'
-  spec.add_dependency 'cocoapods-packager', '~> 1.5.0'
+  spec.add_runtime_dependency 'cocoapods', '~> 1.2'
+  spec.add_runtime_dependency 'cocoapods-packager', '~> 1.5.0'
 end

data/lib/cocoapods-tdfire-binary.rb

@@ -1 +1,7 @@
 require 'cocoapods-tdfire-binary/gem_version'
+
+require 'cocoapods'
+require 'cocoapods-tdfire-binary/podfile_dsl'
+require 'cocoapods-tdfire-binary/specification_dsl'
+
+

data/lib/cocoapods-tdfire-binary/binary_specification_refactor.rb

@@ -1,36 +1,46 @@
 require 'cocoapods-tdfire-binary/binary_url_manager'
+require 'cocoapods-tdfire-binary/binary_state_store'
 
 module Pod
   class Specification
   	#--------------------------------------------------------------------#
   	# =>  获取自身以及子组件的属性合并值
   	#--------------------------------------------------------------------#
-  	def all_value_for_attribute(name)
-  		(Array(self) + Array(recursive_subspecs))
-      .map { |s| s.attributes_hash[name] }
-      .compact
-  	end
-
-  	def all_hash_value_for_attribute(name)
-  		all_value_for_attribute(name).reduce({}, :merge)
-  	end
-
-  	def all_array_value_for_attribute(name)
-  		all_value_for_attribute(name).flatten
-  	end
-
-  	def store_array_value_with_attribute_and_reference_spec(name, spec)
-  		temp = spec.all_array_value_for_attribute(name)
-  		temp += attributes_hash[name] unless attributes_hash[name].nil?
-  		store_attribute(name, temp) unless temp.empty?  
-  	end
-
-  	def store_hash_value_with_attribute_and_reference_spec(name, spec, &select)
-  		temp = spec.all_hash_value_for_attribute(name)
-  		temp.merge!(attributes_hash[name]) unless attributes_hash[name].nil?
-			temp.select! { |k, v| yield k if block_given? }
-  		store_attribute(name, temp) unless temp.empty?  
-  	end
+    # def all_value_for_attribute(name)
+  		# (Array(self) + Array(recursive_subspecs))
+    #   .map { |s| s.attributes_hash[name] }
+    #   .compact
+    # end
+    #
+    # def all_hash_value_for_attribute(name)
+  		# all_value_for_attribute(name).reduce({}, :merge)
+    # end
+    #
+    # def all_array_value_for_attribute(name)
+  		# all_value_for_attribute(name).flatten
+    # end
+    #
+    # def store_array_value_with_attribute_and_reference_spec(name, spec)
+  		# temp = spec.all_array_value_for_attribute(name)
+  		# temp += attributes_hash[name] unless attributes_hash[name].nil?
+  		# store_attribute(name, temp) unless temp.empty?
+    # end
+    #
+    # def store_hash_value_with_attribute_and_reference_spec(name, spec, &select)
+  		# temp = spec.all_hash_value_for_attribute(name)
+  		# temp.merge!(attributes_hash[name]) unless attributes_hash[name].nil?
+			# temp.select! { |k, v| yield k } if block_given?
+    #   store_attribute(name, temp) unless temp.empty?
+    # end
+
+    def tdfire_recursive_value(name, platform = :ios)
+      subspec_consumers = recursive_subspecs
+                              .select { |s| s.supported_on_platform?(platform) }
+                              .map { |s| s.consumer(platform) }
+                              .uniq
+      value = (Array(consumer(platform)) + subspec_consumers).map { |c| c.send(name) }.flatten
+      value
+    end
   	#--------------------------------------------------------------------#
   end
 end
@@ -44,13 +54,24 @@ module Pod
 				@target_spec = target_spec
 			end
 
+      def configure_source
+        # 在设置了 use_frameworks! 的情况下才会生效
+        set_use_static_framework
+
+        # cocoapods-package 打包时，只让 iOS 平台生效
+        set_platform_limitation(target_spec) if Pod::Tdfire::BinaryStateStore.limit_platform
+      end
+
 			#--------------------------------------------------------------------#
 			# 生成default subspec TdfireBinary ，并将源码依赖时的配置转移到此 subspec 上
-			def configure_binary_default_subspec_with_reference_spec(spec)
+			def configure_binary_default_subspec(spec)
+        # 限制二进制只支持 iOS 平台 （这里是 parent spec）
+        set_platform_limitation(spec)
+
 				default_subspec = "TdfireBinary"
 				target_spec.subspec default_subspec do |ss|
 					subspec_refactor = BinarySpecificationRefactor.new(ss)
-					subspec_refactor.configure_binary_with_reference_spec(spec)
+					subspec_refactor.configure_binary(spec)
 				end
 
 				# 创建源码依赖时的 subspec，并且设置所有的 subspec 依赖 default_subspec
@@ -68,44 +89,73 @@ module Pod
 
 			#--------------------------------------------------------------------#
 			# spec 是二进制依赖时的配置
-			def configure_binary_with_reference_spec(spec)
+			def configure_binary(spec)
+        # 限制二进制只支持 iOS 平台 （这里是 spec 或者 subpsec）
+        set_platform_limitation(spec)
+
 				# 组件 frameworks 的依赖
 				target_spec.vendored_frameworks = "#{target_spec.root.name}.framework"
 				# target_spec.source_files = "#{target_spec.root.name}.framework/Headers/*"
 				# target_spec.public_header_files = "#{target_spec.root.name}.framework/Headers/*"
 
-				# 保留对 frameworks lib 的依赖
-				%w[frameworks libraries weak_frameworks].each do |name|
-					target_spec.store_array_value_with_attribute_and_reference_spec(name, spec)
-				end
+        available_platforms(spec).each do |platform|
+          Pod::UI.section("Tdfire: copying configuration for platform #{platform}") do
+            target_platform = target_spec.send(platform.to_sym)
 
-				# 保留对其他组件的依赖
-				target_spec.store_hash_value_with_attribute_and_reference_spec('dependencies', spec) do |name|
-					# 去除对自身子组件的依赖
-					name.split('/').first != target_spec.root.name
-				end
+            # 保留对 frameworks lib 的依赖
+            %w[frameworks libraries weak_frameworks].each do |name|
+              value = spec.tdfire_recursive_value(name, platform )
+              target_platform.send("#{name}=", value) unless value.empty?
 
-				Pod::UI.message "Tdfire: dependencies for #{target_spec.name}: #{target_spec.dependencies.map(&:name).join(', ')}"
-			end
+              Pod::UI.message "Tdfire: #{name} for #{platform}: #{target_spec.tdfire_recursive_value(name, platform)}"
+            end
 
+            # 保留对其他组件的依赖
+            dependencies = spec.all_dependencies(platform) || []
+            target_dependencies = target_spec.all_dependencies(platform)
+            dependencies += target_dependencies unless target_dependencies.nil?
+
+            # 去除对自身子组件的依赖
+            dependencies
+                .select { |d| d.name.split('/').first != spec.root.name }
+                .each { |d| target_platform.send("dependency=", d.name, d.requirement.to_s) }
+
+            Pod::UI.message "Tdfire: dependencies for #{platform}: #{target_spec.all_dependencies.map(&:name).join(', ')}"
+          end
+        end
+      end
+
+      def set_platform_limitation(spec)
+        target_spec.platform = :ios, deployment_target(spec, :ios)
+      end
 			#--------------------------------------------------------------------#
 			# spec 是源码依赖时的配置
-			def set_preserve_paths_with_reference_spec(spec)
+			def set_preserve_paths(spec)
+        # 这里一般不会和上面那个方法一样，不同平台的配置还不一致，所以就不用 consumer 了
 				# 源码、资源文件
-				source_files = spec.all_array_value_for_attribute('source_files')
-				resources = spec.all_array_value_for_attribute('resources')
-				resource_bundles = spec.all_hash_value_for_attribute('resource_bundles')
-				source_preserve_paths = source_files + resources + resource_bundles.values.flatten
+        #
+        available_platforms(spec).each do |platform|
+          Pod::UI.section("Tdfire: set preserve paths for platform #{platform}") do
+            source_files = spec.tdfire_recursive_value('source_files', platform)
+            resources = spec.tdfire_recursive_value('resources', platform)
+            resource_bundles = spec.tdfire_recursive_value('resource_bundles', platform)
 
-				# 二进制文件
-				framework_preserve_paths = [framework_name]
-				preserve_paths = source_preserve_paths + framework_preserve_paths
+            source_preserve_paths = source_files + resources + resource_bundles.map(&:values).flatten
 
-				# 保留原有的 preserve_paths
-				preserve_paths += target_spec.attributes_hash['preserve_paths'] unless target_spec.attributes_hash['preserve_paths'].nil?
-				target_spec.preserve_paths = preserve_paths.uniq
+            # 二进制文件
+            framework_preserve_paths = [framework_name]
+            preserve_paths = source_preserve_paths + framework_preserve_paths
 
-				Pod::UI.message "Tdfire: preserve paths for #{target_spec.name}: #{preserve_paths.join(', ')}"
+            # 保留原有的 preserve_paths
+            target_preserve_paths = target_spec.tdfire_recursive_value('preserve_paths', platform)
+            preserve_paths += target_preserve_paths unless target_preserve_paths.empty?
+
+            target_platform = target_spec.send(platform.to_sym)
+            target_platform.send("preserve_paths=", preserve_paths)
+
+            Pod::UI.message "Tdfire: preserve paths for #{platform}: #{preserve_paths.join(', ')}"
+          end
+        end
 			end
 
 			#--------------------------------------------------------------------#
@@ -156,6 +206,18 @@ module Pod
 			#--------------------------------------------------------------------#
 			private
 
+      def deployment_target(spec, platform = :ios)
+        target_spec.deployment_target(platform) || spec.deployment_target(platform)
+      end
+
+      def available_platforms(spec)
+        # 平台信息没设置，表示支持所有平台
+        # 所以二进制默认支持所有平台，或者和源码时支持平台一致(平台设置在源码配置lambda外)
+        # 支持多平台用 deployment_target，单平台用 platform
+        #
+        target_spec.available_platforms || spec.available_platforms || [:ios]
+      end
+
 			def framework_name
 				"#{target_spec.root.name}.framework"
 			end

data/lib/cocoapods-tdfire-binary/binary_state_store.rb

@@ -11,12 +11,14 @@ module Pod
         attr_accessor :use_frameworks
         attr_accessor :use_source
         attr_accessor :lib_lint_binary_pod
+        attr_accessor :limit_platform
       end
 
       @use_source_pods = []
       @use_binary_pods = []
       @printed_pods = []
       @use_frameworks = false
+      @limit_platform = false
 
       def self.real_use_source_pods
         (@use_source_pods + unpublished_pods).uniq
@@ -60,6 +62,7 @@ module Pod
       FORCE_USE_SOURCE_KEY = 'tdfire_force_use_source'
       FORCE_USE_BINARY_KEY = 'tdfire_force_use_binary'
       USE_BINARY_KEY = 'tdfire_use_binary'
+      LIMIT_PLATFORM_KEY = 'tdfire_limit_platform'
       USE_SURE_VALUE = '1'
     end
   end

data/lib/cocoapods-tdfire-binary/command/assemble.rb

@@ -20,7 +20,7 @@ module Pod
         end
 
         def run
-          run_command Package
+          run_command Package, ['--clean']
           run_command Lint
           run_command Push
           run_command Publish

data/lib/cocoapods-tdfire-binary/command/lint.rb

@@ -23,7 +23,7 @@ module Pod
 					@sources = argv.option('sources')
 					@one_binary = argv.flag?('one-binary')
 					@spec_file = first_podspec
-					@spec_name = @spec_file.split('/').last.split('.').first
+					@spec_name = @spec_file.split('/').last.split('.').first unless @spec_file.nil?
 					unzip_framework
 					super
 				end

data/lib/cocoapods-tdfire-binary/command/package.rb

@@ -1,5 +1,6 @@
 require 'colored2'
 require 'fileutils'
+require 'cocoapods_packager'
 require 'cocoapods-tdfire-binary/binary_url_manager'
 require 'cocoapods-tdfire-binary/binary_specification_refactor'
 
@@ -17,11 +18,15 @@ module Pod
           [
             ['--clean', '执行成功后，删除 zip 文件外的所有生成文件'],
             ['--spec-sources', '私有源地址'],
+            # ['--local', '使用本地代码'],
+            ['--use-carthage', 'carthage使用carthage进行打包'],
           ].concat(super)
         end
 
 	      def initialize(argv)
 	      	@clean = argv.flag?('clean')
+          @local = argv.flag?('local')
+          @use_carthage = argv.flag?('use-carthage')
 	      	@spec_sources = argv.option('spec-sources')
 	      	@spec_file = first_podspec
 	      	super
@@ -33,16 +38,40 @@ module Pod
         end
 
         def run
+          # 组件有多个 platform 时，限制 cocoapods-packager 只打 ios 代码
+          Pod::Tdfire::BinaryStateStore.limit_platform = true
+
         	spec = Specification.from_file(@spec_file)
+          prepare(spec)
         	package(spec)
         	zip(spec)
+
+          Pod::Tdfire::BinaryStateStore.limit_platform = false
         end
 
         private
 
+        def prepare(spec)
+          UI.section("Tdfire: prepare for packaging ...") do
+            clean(spec)
+          end
+        end
+
         def package(spec)
         	UI.section("Tdfire: package #{spec.name} ...") do
-	        	system "pod package #{spec.name}.podspec --exclude-deps --force --no-mangle --spec-sources=#{@spec_sources || Pod::Tdfire::BinaryUrlManager.private_cocoapods_url}"
+            argvs = [
+                "#{spec.name}.podspec",
+                "--exclude-deps",
+                "--force",
+                "--no-mangle",
+                "--spec-sources=#{@spec_sources || Pod::Tdfire::BinaryUrlManager.private_cocoapods_url}",
+            ]
+
+            argvs << "--local" if @local
+            
+            package = Pod::Command::Package.new(CLAide::ARGV.new(argvs))
+            package.validate!
+            package.run
 	        end
         end
 
@@ -56,7 +85,7 @@ module Pod
 					# cocoapods-packager 使用了 --exclude-deps 后，虽然没有把 dependency 的符号信息打进可执行文件，但是它把 dependency 的 bundle 给拷贝过来了 (builder.rb 229 copy_resources)
 					# 这里把多余的 bundle 删除
 					# https://github.com/CocoaPods/cocoapods-packager/pull/199
-					resource_bundles = spec.all_hash_value_for_attribute('resource_bundles').keys.flatten.uniq
+					resource_bundles = spec.tdfire_recursive_value('resource_bundles').map(&:keys).flatten.uniq
 					FileUtils.chdir("#{framework_path}/Versions/A/Resources") do
 						dependency_bundles = Dir.glob('*.bundle').select { |b| !resource_bundles.include?(b.split('.').first) }
 						unless dependency_bundles.empty?
@@ -78,7 +107,14 @@ module Pod
 
 					Pod::UI::puts "Tdfire: save framework zip file to #{Dir.pwd}/#{output_name}".green
 
-					system "rm -fr #{spec.name}-#{@spec.version}" if @clean
+					clean(spec) if @clean
+        end
+
+        def clean(spec)
+          file = "#{spec.name}-#{spec.version}"
+
+          UI.message "Tdfire: cleaning #{file}"
+          system "rm -fr #{spec.name}-#{spec.version}" if File.exist?(file)
         end
 
 			end

data/lib/cocoapods-tdfire-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/cocoapods-tdfire-binary/specification_dsl.rb

@@ -28,8 +28,7 @@ module Pod
 
           configurator.call self
 
-          # 在设置了 use_frameworks! 的情况下才会生效
-          tdfire_refactor.set_use_static_framework
+          tdfire_refactor.configure_source
         end
       end
 
@@ -49,10 +48,10 @@ module Pod
 
           # 如果存在 subspec，则生成 default subpsec ，并将所有的 subspec 配置转移到此 subspec 中
           # 已存在的 subspec 依赖此 subspec
-          unless @tdfire_reference_spec.subspecs.empty?
-            tdfire_refactor.configure_binary_default_subspec_with_reference_spec( @tdfire_reference_spec)
+          unless @tdfire_reference_spec.recursive_subspecs.empty?
+            tdfire_refactor.configure_binary_default_subspec(@tdfire_reference_spec)
           else
-            tdfire_refactor.configure_binary_with_reference_spec( @tdfire_reference_spec)
+            tdfire_refactor.configure_binary(@tdfire_reference_spec)
           end
         end
       end
@@ -60,7 +59,7 @@ module Pod
 
       # 配置二进制文件下载、cache 住解压好的 framework
       def tdfire_set_binary_download_configurations
-        tdfire_refactor.set_preserve_paths_with_reference_spec(tdfire_reference_spec)
+        tdfire_refactor.set_preserve_paths(tdfire_reference_spec)
 
         # 没有发布的pod，没有二进制版本，不进行下载配置
         return if tdfire_should_skip_download?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cocoapods-packager
   requirement: !ruby/object:Gem::Requirement