cocoapods-tdfire-binary 0.1.10 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3fbfbd4f0231fca2f46f6bc95053c1ae0a3eed
-  data.tar.gz: b41935b3736913c805656aa70b26c06ae3003294
+  metadata.gz: 94e8dc020c5e66365a856c284dcdd3c7b1a00898
+  data.tar.gz: 9e8eddca9a7c4c3697a5b4cce1256f329d1656fe
 SHA512:
-  metadata.gz: d13eccc90c8fe444f2c34656ba967d97b79a07d5acff8f0a3fcbcfb9add7e15807c54aa133dcc7d22ce09618ce8242300d268425c2633eebc6be0dd6e39b9d61
-  data.tar.gz: 98fa67145ff31b06c6a53b556f319a7be0a72ada17c7b496dc51986e2dc1c58fcfad8f63ef9910603883fa0e1c653f74d354996a3527dc4078f4ff62875d123b
+  metadata.gz: 51f6ec7edc094cf223b6569ccd75b8da5b4a01e2f7c459a3eebc43923d477cc3cc503776a78b1bb7b4d3f8e83c5ac2b1d3efbf7df95e1738dfc235544071fe1c
+  data.tar.gz: cbcffa261842a595262f2881eb8ae4e4ff446d05f76c88e3702a5c0277d1fe09b84d63b04e8893413dcc8477cfd011158eb3825abbe8f63ebf2099918f5de138

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    cocoapods-tdfire-binary (0.1.10)
+    cocoapods-tdfire-binary (1.0.0)
       cocoapods (~> 1.4)
+      cocoapods-packager (~> 1.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -41,6 +42,8 @@ GEM
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
     cocoapods-downloader (1.1.3)
+    cocoapods-packager (1.5.0)
+      cocoapods (>= 1.1.1, < 2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)

data/README.md

@@ -5,15 +5,40 @@ A description of cocoapods-tdfire-binary.
 ## Installation
 
     $ gem install cocoapods-tdfire-binary
+    
+    
+## TODO
+
+1. 拥有 Subspec 的组件二进制依赖方式
+2. 本地 Lint 二进制
 
 ## Usage
 
-> For .gitignore
+```
+
+Usage:
+
+    $ pod binary COMMAND
+
+      2Dfire 二进制工具库，提供打包、lint、推送、拉取、发布等命令
+
+Commands:
+
+    + lint      对本地二进制进行 Lint
+    + package   二进制打包
+    + publish   正式发布二进制组件
+    + pull      下载二进制 zip 包
+    + push      推送二进制 zip 包
+
+```
+
+### For .gitignore
 
 ```
 ...
 
 *.framework
+*.zip
 ```
 
 > For Podfile
@@ -31,31 +56,84 @@ use_frameworks!
 
 ```
 
-> For podspec
+### For podspec
 
 ```
 ...
 
-tdfire_source_proc = Proc.new do
+tdfire_source_configurator = lambda do |s|
     # source configuration
+    # s.source_files = 'PodA/Classes/**/*'
+    # s.resource_bundles = {
+    #   'PodA' => ['PodA/Assets/*']
+    # }
 end
 
-unless %w[tdfire_set_binary_download_configurations_at_last tdfire_source tdfire_binary].reduce(true) { |r, m| s.respond_to?(m) & r }
+unless %w[tdfire_set_binary_download_configurations tdfire_source tdfire_binary].reduce(true) { |r, m| s.respond_to?(m) & r }
     
-  tdfire_source_proc.call
+  tdfire_source_configurator.call s
 else
-  s.tdfire_source &tdfire_source_proc
-  
-  s.tdfire_binary do 
-    s.vendored_framework = "#{s.name}.framework"
-    s.source_files = "#{s.name}.framework/Headers/*"
-    s.public_header_files = "#{s.name}.framework/Headers/*"
+  s.tdfire_source tdfire_source_configurator
+  s.tdfire_binary tdfire_source_configurator
+  s.tdfire_set_binary_download_configurations
+end
+
+```
 
-    # binary configuration
+- tdfire_source_proc
+  - 配置源码依赖
+
+- tdfire_binary
+  - 配置二进制依赖，其中 `vendored_framework`、`source_files`、`public_header_files` 内部设置成如下路径
+    
+  ```
+  s.vendored_framework = "#{s.name}.framework"
+  s.source_files = "#{s.name}.framework/Headers/*"
+  s.public_header_files = "#{s.name}.framework/Headers/*"
+  ```
+  - 提取 subspec 中的依赖、frameworks、 libraries、 weak_frameworks，至二进制组件对应属性中
+  - 在组件源码依赖有 subspec 的情况下，插件会在二进制依赖时，动态创建 default subspec `TdfireBinary`，以及源码依赖时的 subspec ，并且让后者的所有 subspec 依赖 `TdfireBinary`
+  - 由于此方案对二进制中的 subspec 并**不做区分**，统一打包成一个二进制文件，所以如果在使用二进制依赖时，依赖了 subspec ，插件还是会去下载完整的二进制文件，并且从最终生成的结果看，目录中只有 `TdfireBinary` subspec
+  - 此插件不支持嵌套 subspec 场景，如
+  
+  ```ruby
+  Pod::Spec.new do |s|
+    s.name = 'Root'
+    s.subspec 'Level_1' do |sp|
+      sp.subspec 'Level_2' do |ssp|
+      end
+    end
   end
+  ``` 
+   
+- tdfire_set_binary_download_configurations
+  - 强制设置 static_framework 为 true，规避使用 use_frameworks! 时，动态库依赖链（动态库依赖静态库问题）、影响启动时间问题
+  - 设置 preserve_paths，让 cache 保留源码、资源、二进制全部文件
+    - preserve_paths 由组件，子组件的源码、资源路径，以及 Framework 路径组成
+  - 设置下载 prepare_command，未发布组件将会略过这一步骤
+
+### For Lib Env
+
+> Warning: 在发布二进制组件前，走二进制依赖流程，无法下载到对应 framework
+
+
+- Env Key
+  - tdfire_use_binary
+    - 使用二进制依赖，确认值 1
+  - tdfire_unpublished_pods 
+    - 未发布的组件，用 `|` 隔开 (如 PodA|PodB， 一般只有一个，即当前开发组件)，设置后对应组件走源码依赖流程。
+    - 二进制 lint 时，无法通过 Podfile 的 plugin 获取当前的 development pod （即当前开发组件） ，在发布对应二进制版本前，走二进制依赖流程，是下不到对应二进制版本的，所以需要自己设置当前开发组件名，对这一部分进行源码依赖。
+  - tdfire_force_use_source
+    - 强制使用源码依赖，确认值 1
+    - 源码 lint 、未发布二进制组件前 CI 中 pod install / update （优先级比 Podfile 中的设置高） 时可使用 
+  - tdfire_force_use_binary
+    - 强制使用二进制依赖，确认值 1
+    - 基本无用，在验证当前版本是否有对应二进制版本时可使用
   
-  # s.tdfire_set_binary_download_configurations_at_last(download_url)
-  s.tdfire_set_binary_download_configurations_at_last
-end
+
+例子：
 
 ```
+env tdfire_use_binary=1 tdfire_unpublished_pods=PodA pod lib lint xxxx
+env tdfire_force_use_source=1 pod install
+```

data/cocoapods-tdfire-binary.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
 
   spec.add_dependency 'cocoapods', '~> 1.4'
+  spec.add_dependency 'cocoapods-packager', '~> 1.5.0'
 end

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

@@ -0,0 +1,162 @@
+require 'cocoapods-tdfire-binary/binary_url_manager'
+
+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
+  	#--------------------------------------------------------------------#
+  end
+end
+
+module Tdfire
+	class BinarySpecificationRefactor
+		attr_accessor :target_spec
+
+		def initialize(target_spec)
+			@target_spec = target_spec
+		end
+
+		#--------------------------------------------------------------------#
+		# 生成default subspec TdfireBinary ，并将源码依赖时的配置转移到此 subspec 上
+		def configure_binary_default_subspec_with_reference_spec(spec)
+			default_subspec = "TdfireBinary"
+			target_spec.subspec default_subspec do |ss|
+				subspec_refactor = BinarySpecificationRefactor.new(ss)
+				subspec_refactor.configure_binary_with_reference_spec(spec)
+			end
+
+			# 创建源码依赖时的 subspec，并且设置所有的 subspec 依赖 default_subspec
+			spec.subspecs.each do |s|
+				target_spec.subspec s.base_name do |ss|
+					ss.dependency "#{target_spec.root.name}/#{default_subspec}"
+				end
+			end
+
+			target_spec.default_subspec = default_subspec
+			target_spec.default_subspec = default_subspec
+
+			Pod::UI.message "Tdfire: subspecs for #{target_spec.name}: #{target_spec.subspecs.map(&:name).join(', ')}"
+		end
+
+		#--------------------------------------------------------------------#		
+		# spec 是二进制依赖时的配置
+		def configure_binary_with_reference_spec(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
+
+      # 保留对其他组件的依赖
+      target_spec.store_hash_value_with_attribute_and_reference_spec('dependencies', spec) do |name|
+				# 去除对自身子组件的依赖
+				name.split('/').first != target_spec.root.name
+			end
+
+			Pod::UI.message "Tdfire: dependencies for #{target_spec.name}: #{target_spec.dependencies.map(&:name).join(', ')}"
+		end
+
+		#--------------------------------------------------------------------#		
+		# spec 是源码依赖时的配置
+		def set_preserve_paths_with_reference_spec(spec)
+			# 源码、资源文件
+      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
+
+      # 二进制文件
+      framework_preserve_paths = [framework_name]
+      preserve_paths = source_preserve_paths + framework_preserve_paths
+
+      # 保留原有的 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
+
+      Pod::UI.message "Tdfire: preserve paths for #{target_spec.name}: #{preserve_paths.join(', ')}"
+		end
+
+		#--------------------------------------------------------------------#
+
+		def set_use_static_framework
+			target_spec.static_framework = true
+		end
+
+		#--------------------------------------------------------------------#
+		def set_framework_download_script
+			download_url = BinaryUrlManager.pull_url_for_pod_version(target_spec.root.name, target_spec.version)
+
+			download_script = <<-EOF
+        #!/bin/sh
+
+        if [[ -d #{framework_name} ]]; then
+          echo "Tdfire: #{framework_name} is not empty"
+          exit 0
+        fi
+
+        if [[ ! -d tdfire_download_temp ]]; then
+          mkdir tdfire_download_temp
+        fi
+
+        cd tdfire_download_temp
+
+        curl --fail -O -J -v #{download_url}
+
+        if [[ -f #{framework_name}.zip ]]; then
+          echo "Tdfire: copying #{framework_name} ..."
+
+          unzip #{framework_name}.zip
+          cp -fr #{framework_name} ../
+        fi
+
+        cd ..
+        rm -fr tdfire_download_temp
+
+        echo "pod cache path for #{target_spec.root.name}: $(pwd)"
+      EOF
+
+      combined_download_script = %Q[echo '#{download_script}' > download.sh && sh download.sh && rm download.sh]
+      combined_download_script += " && " << target_spec.prepare_command unless target_spec.prepare_command.nil?
+
+      target_spec.prepare_command = combined_download_script
+		end
+
+		#--------------------------------------------------------------------#
+		private 
+
+		def framework_name
+      "#{target_spec.root.name}.framework"
+    end
+	end
+end

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

@@ -7,9 +7,11 @@ module  Tdfire
 			attr_accessor :use_source_pods
 			attr_reader :printed_pods
 			attr_accessor :use_frameworks
+			attr_accessor :use_source
 		end
-		# @unpublished_pods = []
+		
 		@use_source_pods = []
+		@use_binary_pods = []
 		@printed_pods = []
 		@use_frameworks = false
 

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

@@ -0,0 +1,41 @@
+module Tdfire
+	class BinaryUrlManager
+		HOST = "http://iosframeworkserver-shopkeeperclient.cloudapps.2dfire.com"
+
+		def self.pull_url_for_pod_version(pod, version)
+			HOST + "/getframework/PRODUCTION/#{pod}/#{version}"
+		end
+
+		def self.get_pull_url_for_pod_version(pod, version)
+			command = "curl #{pull_url_for_pod_version(pod, version)} > #{pod}.framework.zip"
+
+			run_curl command
+		end
+
+		def self.push_url
+			HOST + "/upload" #+ param
+		end
+
+		def self.post_push_url(name, version, path, commit = nil, commit_hash = nil)
+			param = %Q[-F "frameworkName=#{name}" -F "version=#{version}" -F "environment=PRODUCTION" -F "changelog=#{commit}" -F "featureName=#{commit}" -F "framework=@#{path}" -F "commitHash=#{commit_hash}"]
+			command = "curl #{push_url} #{param}"
+
+			run_curl command
+		end
+
+		def self.run_curl(command)
+			Pod::UI.message "CURL: \n" + command
+
+			system command
+		end
+
+		def self.private_cocoapods_url
+			"git@git.2dfire-inc.com:ios/cocoapods-spec.git"
+			# "git@git.2dfire-inc.com:qingmu/private_cocoapods.git"
+		end
+
+		def self.template_lib_url
+			"git@git.2dfire-inc.com:ios/binary-pod-template.git"
+		end
+	end
+end

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

@@ -0,0 +1 @@
+require 'cocoapods-tdfire-binary/command/binary'

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

@@ -0,0 +1,36 @@
+require 'cocoapods-tdfire-binary/command/package'
+require 'cocoapods-tdfire-binary/command/lint'
+require 'cocoapods-tdfire-binary/command/publish'
+require 'cocoapods-tdfire-binary/command/push'
+
+module Pod
+  class Command
+    class Binary < Command
+      class Assemble < Binary
+        self.abstract_command = false
+        self.summary = '执行二进制组件发布操作集合'
+        self.description = <<-DESC
+          执行二进制组件发布操作集合，依次为 package、lint、push、publish
+        DESC
+
+        def validate!
+          super
+          help! "当前目录下找不到有效的 podspec 文件" if first_podspec.nil?
+        end
+
+        def run
+          run_command Package
+          run_command Lint
+          run_command Push
+          run_command Publish
+        end
+
+        def run_command(command_class, argv = [])
+          lint = command_class::new(CLAide::ARGV.new(argv))
+          lint.validate!
+          lint.run
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'cocoapods-tdfire-binary/command/lint'
+require 'cocoapods-tdfire-binary/command/package'
+require 'cocoapods-tdfire-binary/command/publish'
+require 'cocoapods-tdfire-binary/command/pull'
+require 'cocoapods-tdfire-binary/command/push'
+require 'cocoapods-tdfire-binary/command/assemble'
+require 'cocoapods-tdfire-binary/command/lib'
+
+module Pod
+	class Command
+		class Binary < Command
+			self.abstract_command = true
+			self.summary = '2Dfire 二进制工具库'
+			self.description = <<-DESC
+				2Dfire 二进制工具库，提供打包、lint、推送、拉取、发布等命令
+      DESC
+
+			FIRE_FLAG = "2dfire"
+			# FIRE_FLAG = "private"
+
+      def first_podspec
+      	Dir["#{Dir.pwd}/*.podspec"].first
+			end
+
+			def fire_sources
+				config.sources_manager.all.select do |source|
+					source.url.downcase.include? FIRE_FLAG
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,16 @@
+require 'cocoapods-tdfire-binary/command/lib/create'
+
+module Pod
+	class Command
+		class Binary < Command
+			class Lib < Binary
+			self.abstract_command = true
+			self.default_subcommand = 'create'
+			self.summary = '二进制模版库操作'
+			self.description = <<-DESC
+				二进制模版库操作
+      DESC
+      end
+		end
+	end
+end

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

@@ -0,0 +1,42 @@
+require 'cocoapods-tdfire-binary/binary_url_manager'
+
+module Pod
+	class Command
+		class Binary < Command
+			class Lib < Binary
+				class Create < Lib
+					self.abstract_command = false
+					self.summary = '创建二进制模版库'
+					self.description = <<-DESC
+						创建二进制模版库
+		      DESC
+
+		      self.arguments = [
+            CLAide::Argument.new('NAME', true),
+        	]
+
+        	def initialize(argv)
+        		@name = argv.shift_argument
+        		super
+        	end
+
+        	def validate!
+        		super
+        		help! "必须提供有效组件名称" if @name.nil?
+        	end
+
+        	def run
+        		argvs = [
+        			"--template-url=#{Tdfire::BinaryUrlManager.template_lib_url}",
+        			@name
+        		]
+
+        		create = Pod::Command::Lib::Create.new(CLAide::ARGV.new(argvs))
+            create.validate!
+            create.run
+        	end
+		    end
+		  end
+		end
+	end
+end

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

@@ -0,0 +1,17 @@
+module Pod
+	class Command
+		class Binary < Command
+			class Lint < Binary
+				self.abstract_command = false
+				self.summary = '对本地二进制进行 Lint'
+				self.description = <<-DESC
+					对本地二进制进行 Lint
+	      DESC
+
+	      def run
+        	
+        end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,87 @@
+require 'colored2'
+require 'fileutils'
+require 'cocoapods-tdfire-binary/binary_url_manager'
+require 'cocoapods-tdfire-binary/binary_specification_refactor'
+
+module Pod
+	class Command
+		class Binary < Command
+			class Package < Binary 
+        self.abstract_command = false
+				self.summary = '二进制打包'
+				self.description = <<-DESC
+					将源码打包成二进制，并压缩成 zip 包
+	      DESC
+
+	      def self.options
+          [
+            ['--clean', '执行成功后，删除 zip 文件外的所有生成文件'],
+            ['--spec-sources', '私有源地址'],
+          ].concat(super)
+        end
+
+	      def initialize(argv)
+	      	@clean = argv.flag?('clean')
+	      	@spec_sources = argv.option('spec-sources')
+	      	@spec_file = first_podspec
+	      	super
+	      end
+
+        def validate!
+          super
+          help! '当前目录下没有podspec文件.' if @spec_file.nil?
+        end
+
+        def run
+        	spec = Specification.from_file(@spec_file)
+        	package(spec)
+        	zip(spec)
+        end
+
+        private
+
+        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 || Tdfire::BinaryUrlManager.private_cocoapods_url}"
+	        end
+        end
+
+        def zip(spec)
+					framework_directory = "#{spec.name}-#{spec.version}/ios"
+					framework_name = "#{spec.name}.framework"
+					framework_path = "#{framework_directory}/#{framework_name}"
+
+        	raise Informative, "没有需要压缩的 framework 文件：#{framework_path}" unless File.exist?(framework_path)
+
+					# 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
+					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?
+							Pod::UI::puts "Tdfire: remove dependency bundles: #{dependency_bundles.join(', ')}"
+
+							dependency_bundles.each do |b|
+								FileUtils.rm_rf(b)
+							end
+						end
+					end
+
+        	output_name = "#{framework_name}.zip"
+        	UI.section("Tdfire: zip #{framework_path} ...") do
+						FileUtils.chdir(framework_directory) do
+							system "zip --symlinks -r #{output_name} #{framework_name}"
+							system "mv #{output_name} ../../"
+						end
+					end
+
+					Pod::UI::puts "Tdfire: save framework zip file to #{Dir.pwd}/#{output_name}".green
+
+					system "rm -fr #{spec.name}-#{@spec.version}" if @clean
+        end
+
+			end
+		end
+	end
+end

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

@@ -0,0 +1,68 @@
+module Pod
+  class Command
+    class Binary < Command
+      class Publish < Binary
+        self.abstract_command = false
+        self.summary = '正式发布二进制组件'
+        self.description = <<-DESC
+					正式发布二进制组件版本
+        DESC
+
+        self.arguments = [
+            CLAide::Argument.new('NAME.podspec', false),
+        ]
+
+        def self.options
+          [
+            ['--commit="Fix some bugs"', '发布的 commit 信息']
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          spec_file = argv.shift_argument
+          @commit = argv.option('commit')
+
+          spec_file = first_podspec if spec_file.nil?
+          @spec_file = spec_file
+          super
+        end
+
+        def validate!
+          super
+          help! "当前目录下找不到有效的 podspec 文件" if @spec_file.nil?
+        end
+
+        def run
+          spec = Specification.from_file(@spec_file)
+
+          UI.section("Tdfire: start publishing #{spec.name} ...") do
+            argvs = [
+                fire_sources.first.name,
+                @spec_file,
+                '--allow-warnings',
+                '--use-libraries',
+                '--verbose'
+            ]
+            argvs << %Q[--commit-message=#{commit_prefix(spec) + "\n" + @commit}] unless @commit.to_s.empty?
+
+            push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+            push.validate!
+            push.run
+          end
+        end
+
+        private
+        def commit_prefix(spec)
+          output_path = fire_sources.first.pod_path(spec.name) + spec.version.to_s
+          if output_path.exist?
+            message = "[Fix] #{spec}"
+          elsif output_path.dirname.directory?
+            message = "[Update] #{spec}"
+          else
+            message = "[Add] #{spec}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'cocoapods-tdfire-binary/binary_url_manager'
+
+module Pod
+	class Command
+		class Binary < Command
+			class Pull < Binary
+				self.abstract_command = false
+				self.summary = '下载二进制 zip 包'
+				self.description = <<-DESC
+					通过 NAME 和 VERSION ，下载二进制 zip 包
+	      DESC
+
+	      self.arguments = [
+          CLAide::Argument.new('NAME', true),
+          CLAide::Argument.new('VERSION', true)
+        ]
+
+        def initialize(argv)
+        	@name = argv.shift_argument
+        	@version = argv.shift_argument
+        	super
+        end
+
+        def validate!
+          super
+          help! "必须提供有效组件名" if @name.nil?
+          help! "必须提供有效版本号" if @version.nil?
+        end
+
+        def run
+					UI.section("Tdfire: start pulling framework zip file ...") do
+						UI.puts "Tdfire: get argvs: name -> #{@name}, version -> #{@version}"
+        	  Tdfire::BinaryUrlManager.get_pull_url_for_pod_version(@name, @version)
+					end
+        end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,78 @@
+
+require 'cocoapods-tdfire-binary/binary_url_manager'
+
+module Pod
+	class Command
+		class Binary < Command
+			class Push < Binary
+				ZIP_SUBFFIX = '.framework.zip'
+
+				self.abstract_command = false
+				self.summary = '推送二进制 zip 包'
+				self.description = <<-DESC
+					将二进制 zip 包推送至二进制服务器
+	      DESC
+
+	      self.arguments = [
+          CLAide::Argument.new('PATH', false)
+        ]
+
+         def self.options
+          [
+            ['--name=组件名', '推送二进制的组件名'],
+            ['--version=版本号', '推送二进制的版本号'],
+            ['--commit=版本日志', '推送二进制的版本日志'],
+          ].concat(super)
+        end
+
+	      def initialize(argv)
+	      	path = argv.shift_argument
+	      	name = argv.option('name')
+	      	version = argv.option('version')
+	      	commit = argv.option('commit')
+	      	
+	      	unless first_podspec.nil? 
+	      		if path.nil?
+			      	path = first_podspec.split('.').first 
+			      end
+
+			      spec = Specification.from_file(Pathname.new(first_podspec))
+		      	version = spec.version if version.nil?
+						name = spec.name 
+	      	end
+
+		      path += ZIP_SUBFFIX unless path.end_with?(ZIP_SUBFFIX)
+
+
+	      	@path = path
+	      	@name = name || path.split('/').last - ZIP_SUBFFIX
+	      	@version = version
+	      	@commit = commit
+	      	super
+	      end
+
+	      def validate!
+          super
+          help! "指定目录下没有可推送文件: #{@path}" unless File.exist?(@path)
+          help! "必须为推送组件指定版本(--version)" if @version.nil?
+        end
+
+	      def run
+					tag_log = `git tag -l -n #{@version}` 	      	
+					tag_log = tag_log.split(' ')[1..-1].join('') unless tag_log.empty?
+					
+
+					hash_log =  `git show-ref #{@version}`
+					hash_log = hash_log.split(' ').first unless hash_log.empty?
+
+					commit = @commit || tag_log || @version
+
+					UI.section("Tdfire: start pushing framework zip file ...") do
+						UI.puts "Tdfire: post argvs: name -> #{@name}, version -> #{@version}, path -> #{@path}, commit -> #{commit}, commit hash -> #{hash_log}"
+						Tdfire::BinaryUrlManager.post_push_url(@name, @version, @path, commit, hash_log)
+					end
+        end
+			end
+		end
+	end
+end

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "0.1.10"
+  VERSION = "1.0.0"
 end

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

@@ -15,6 +15,19 @@ module Pod
         Tdfire::BinaryStateStore.set_use_binary
       end  
 
+      # 因为暂时无法将全部组件二进制化，tdfire_use_binary! 默认全部进行二进制依赖不利于渐进测试
+      # 所以添加 tdfire_use_source! 默认全部进行源码依赖，开放指定二进制依赖组件接口
+      # 
+      # 使用二进制依赖的pod
+      # 与 tdfire_use_binary 互斥
+      # def tdfire_use_binary_pods(pods)
+      #   Pod::UI.puts "Tdfire: set use binary pods: #{Array(pods).join(', ')}"
+      #   Tdfire::BinaryStateStore.use_binary_pods = Array(pods)
+      # end
+      #
+      # def tdfire_use_source!
+      # end
+
       # 强制使用二进制依赖，忽略未发布和依赖源码设置
       # def tdfire_force_use_binary!
       #   Tdfire::BinaryStateStore.set_force_use_binary
@@ -24,27 +37,27 @@ module Pod
       def tdfire_external_pods(pods, *rest)
       	argvs = rest.last || {}
         if !argvs.kind_of?(Hash)
-          info =  <<-EOF
-输入参数错误.
+          info =  <<~EOF
+            输入参数错误.
 
-Example:
-  tdfire_external_pods ['TDFCore'], source:'git', group:'ios', branch:'develop'
-  tdfire_external_pods 'TDFCore', source:'git', group:'ios', branch:'develop'
-  tdfire_external_pods ['TDFCore'], group:'cocoapods' 
-  ...
+            Example:
+              tdfire_external_pods ['TDFCore'], source:'git', group:'ios', branch:'develop'
+              tdfire_external_pods 'TDFCore', source:'git', group:'ios', branch:'develop'
+              tdfire_external_pods ['TDFCore'], group:'cocoapods' 
+              ...
 
-默认值：
-  source:path
-  group:ios
-  branch:develop
+            默认值：
+              source:path
+              group:ios
+              branch:develop
 
-所有值:
-  source -> git path
-  group -> 任意
-  branch -> 任意
+            所有值:
+              source -> git path
+              group -> 任意
+              branch -> 任意
 
-格式可以和pod语法一致
-EOF
+            格式可以和pod语法一致
+          EOF
           raise Pod::Informative, info
         end
 

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

@@ -5,13 +5,19 @@ module CocoapodsTdfireBinary
 	include Tdfire
 
 	Pod::HooksManager.register('cocoapods-tdfire-binary', :pre_install) do |context, _|
-		first_target_definition = context.podfile.target_definition_list.select{ |d| d.name != 'Pods' }.first
-		development_pod = first_target_definition.name.split('_').first unless first_target_definition.nil?
-
-		Pod::UI.section("Tdfire: auto set share scheme for development pod: \'#{development_pod}\'") do
-			# carthage 需要 shared scheme 构建 framework
-			context.podfile.install!('cocoapods', :share_schemes_for_development_pods => [development_pod])
-		end unless development_pod.nil?
+		# 使用 cocoapods package 打包，不使用 carthage 了，不用设置 share schemes
+		# 如果使用 carhtage ，一定要让需要二进制化的 target shared，此 target 不能是 static framework / library ，必须是 dynamic framework.
+		# 并且需要在这里做个标记，记录目标 target ，让这个 target 对应的 podspec 跳过 set_use_static_framework 这一步.
+		# pod install 时，强制使用源码，然后使用  --no-skip-current iOS --no-use-binaries
+		# carthage 生成 static framework 参照 https://github.com/Carthage/Carthage/blob/master/Documentation/StaticFrameworks.md
+		#
+		# first_target_definition = context.podfile.target_definition_list.select{ |d| d.name != 'Pods' }.first
+		# development_pod = first_target_definition.name.split('_').first unless first_target_definition.nil?
+    #
+		# Pod::UI.section("Tdfire: auto set share scheme for development pod: \'#{development_pod}\'") do
+		# 	# carthage 需要 shared scheme 构建 framework
+		# 	context.podfile.install!('cocoapods', :share_schemes_for_development_pods => [development_pod])
+		# end unless development_pod.nil?
 
 
 		# 标明未发布的pod，因为未发布pod没有对应的二进制版本，无法下载
@@ -22,17 +28,19 @@ module CocoapodsTdfireBinary
 			Pod::UI.message "> Tdfire: unpublished pods: #{BinaryStateStore.unpublished_pods.join(', ')}"
 		end
 
+		# 使用 static_framework ，不用 dynamic_framework ，不需要关心 dynamic_framework 的依赖链了
+		#
 		# 没有标识use_frameworks!，进行源码依赖需要设置Pod依赖链上，依赖此源码Pod的也进行源码依赖
-		BinaryStateStore.use_frameworks = first_target_definition.uses_frameworks?
-		unless BinaryStateStore.use_frameworks
-			Pod::UI.section("Tdfire: analyze chain pods depend on use source pods: #{BinaryStateStore.use_source_pods.join(', ')}") do
-				chain_pods = SourceChainAnalyzer.new(context.podfile).analyze(BinaryStateStore.use_source_pods)
+		# BinaryStateStore.use_frameworks = first_target_definition.uses_frameworks?
+		# unless BinaryStateStore.use_frameworks
+		# 	Pod::UI.section("Tdfire: analyze chain pods depend on use source pods: #{BinaryStateStore.use_source_pods.join(', ')}") do
+		# 		chain_pods = SourceChainAnalyzer.new(context.podfile).analyze(BinaryStateStore.use_source_pods)
 
-				Pod::UI.message "> Tdfire: find chain pods: #{chain_pods.join(', ')}"
+		# 		Pod::UI.message "> Tdfire: find chain pods: #{chain_pods.join(', ')}"
 
-				BinaryStateStore.use_source_pods += chain_pods 
-			end unless BinaryStateStore.use_source_pods.empty? 
-		end
+		# 		BinaryStateStore.use_source_pods += chain_pods 
+		# 	end unless BinaryStateStore.use_source_pods.empty? 
+		# end
 	end
 
 	#fix `Shell Script` Build Phase Fails When Input / Output Files List is Too Large
@@ -54,7 +62,7 @@ module CocoapodsTdfireBinary
 
 	    context.umbrella_targets.map(&:user_project).each do |project|
 	      project.save
-	    end
+	    end 
 		end
 
 		Pod::UI.puts "Tdfire: all source dependency pods: #{BinaryStateStore.real_use_source_pods.join(', ')}" if BinaryStateStore.use_binary?

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

@@ -1,4 +1,4 @@
-module Tdfire
+ module Tdfire
 	class SourceChainAnalyzer
 
 		def initialize(podfile)

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

@@ -1,116 +1,86 @@
 require 'cocoapods-tdfire-binary/binary_state_store'
+require 'cocoapods-tdfire-binary/binary_specification_refactor'
 require 'colored2'
 
 module Pod
   class Specification
-    module DSL
+    include Tdfire
 
-      private 
+    def tdfire_refactor
+      @refactor ||= BinarySpecificationRefactor.new(self)
+    end
 
-      def use_source?
-        (!Tdfire::BinaryStateStore.force_use_binary? && 
-        (!Tdfire::BinaryStateStore.use_binary? || Tdfire::BinaryStateStore.real_use_source_pods.include?(name))) ||
-        Tdfire::BinaryStateStore.force_use_source?
-      end
+    module DSL
 
-    	public
+      public
 
+      # 此次操作，Podfile 是否使用了 use_frameworks!
       def tdfire_use_frameworks?
         Tdfire::BinaryStateStore.use_frameworks
       end
 
-    	# 源码依赖配置
-      def tdfire_source(&block)
-        if use_source?
-          if !Tdfire::BinaryStateStore.printed_pods.include?(name)
-          	UI.message "Source".magenta.bold + " dependecy for " + "#{name} #{version}".green.bold
-            Tdfire::BinaryStateStore.printed_pods << name
+      # 源码依赖配置
+      def tdfire_source(configurator)
+        if tdfire_use_source?
+          if !Tdfire::BinaryStateStore.printed_pods.include?(root.name)
+            UI.message "Source".magenta.bold + " dependecy for " + "#{root.name} #{version}".green.bold
+            Tdfire::BinaryStateStore.printed_pods << root.name
           end
 
-          yield self if block_given?
+          configurator.call self
+
+          # 在设置了 use_frameworks! 的情况下才会生效
+          tdfire_refactor.set_use_static_framework
         end
       end
 
       # 二进制依赖配置
-      def tdfire_binary(&block)
-        if !use_source?
-          if !Tdfire::BinaryStateStore.printed_pods.include?(name)
-          	UI.message "Binary".cyan.bold + " dependecy for " + "#{name} #{version}".green.bold 
-            Tdfire::BinaryStateStore.printed_pods << name
+      def tdfire_binary(configurator, &block)
+        if !tdfire_use_source?
+          if !Tdfire::BinaryStateStore.printed_pods.include?(root.name)
+            UI.message "Binary".cyan.bold + " dependecy for " + "#{root.name} #{version}".green.bold 
+            Tdfire::BinaryStateStore.printed_pods << root.name
           end
 
           yield self if block_given?
+
+          # name 一定要有，否则 subspec dependecy 会出现 split nil 错误
+          @tdfire_reference_spec = Specification.new(nil, 'TdfireSpecification')
+          configurator.call @tdfire_reference_spec
+
+          # 如果存在 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)
+          else
+            tdfire_refactor.configure_binary_with_reference_spec( @tdfire_reference_spec)
+          end
         end
       end
 
       # 配置二进制文件下载、cache 住解压好的 framework
-      def tdfire_set_binary_download_configurations_at_last(download_url = nil)
+      def tdfire_set_binary_download_configurations
+        tdfire_refactor.set_preserve_paths_with_reference_spec(tdfire_reference_spec)
 
         # 没有发布的pod，没有二进制版本，不进行下载配置
-        return if !Tdfire::BinaryStateStore.force_use_binary? && Tdfire::BinaryStateStore.unpublished_pods.include?(name)
-
-        raise Pod::Informative, "You must invoke the method after setting name and version" if name.nil? || version.nil?
-
-        set_framework_preserve_paths
-        set_framework_download_script(download_url || framework_url_for_pod_version(name, version))
-      end
-
-      private
-
-      def framework_url_for_pod_version(pod, version)
-        "http://iosframeworkserver-shopkeeperclient.cloudapps.2dfire.com/getframework/PRODUCTION/#{pod}/#{version}"
-      end
-
-      def set_framework_preserve_paths
-        framework_preserve_paths = ["#{name}.framework"]
-        framework_preserve_paths += consumer(Platform.ios).preserve_paths unless consumer(Platform.ios).preserve_paths.nil?
+        return if !Tdfire::BinaryStateStore.force_use_binary? && Tdfire::BinaryStateStore.unpublished_pods.include?(root.name)
 
-        # 规避 preserve_paths don't match any files 错误
-        source_preserve_paths = ["#{name}/**/**/*", "Classes/**/*"]
+        raise Pod::Informative, "You must invoke the method after setting name and version" if root.name.nil? || version.nil?
 
-        # preserve_paths = xxx 无法不会将值设置进去，不明白其原理
-        store_attribute('preserve_paths', framework_preserve_paths + source_preserve_paths)
+        tdfire_refactor.set_framework_download_script
       end
+    end
 
-      def set_framework_download_script(download_url)
-        framework_name = "#{name}.framework"
-        framework_relative_path = "Carthage/Build/iOS/#{framework_name}"
-
-        download_script = <<-EOF
-#!/bin/sh
-
-if [[ -d #{framework_name} ]]; then
-  echo "Tdfire: #{framework_name} is not empty"
-  exit 0
-fi
-
-if [[ ! -d tdfire_download_temp ]]; then
-  mkdir tdfire_download_temp
-fi
-
-cd tdfire_download_temp
-
-curl --fail -O -J -v #{download_url}
-
-if [[ -f #{framework_name}.zip ]]; then
-  echo "Tdfire: copying #{framework_name} ..."
-
-  unzip #{framework_name}.zip
-  cp -fr #{framework_relative_path} ../
-fi
-
-cd ..
-rm -fr tdfire_download_temp
-
-echo "pod cache path for #{name}: $(pwd)"
-        EOF
+    private 
 
-        eval_download_script = %Q[echo '#{download_script}' > download.sh && sh download.sh && rm download.sh]
-        eval_download_script += " && " << prepare_command unless prepare_command.nil?
+    def tdfire_reference_spec
+      @tdfire_reference_spec || self        
+    end
 
-        # prepare_command = xxx 在内部执行的话，无法将值设置进hash，不明白其原理
-        store_attribute('prepare_command', eval_download_script)
-      end
+    def tdfire_use_source?
+      (!Tdfire::BinaryStateStore.force_use_binary? && 
+      (!Tdfire::BinaryStateStore.use_binary? || Tdfire::BinaryStateStore.real_use_source_pods.include?(root.name))) ||
+      Tdfire::BinaryStateStore.force_use_source?
     end
   end
 end

data/lib/cocoapods_plugin.rb

@@ -1,3 +1,4 @@
 require 'cocoapods-tdfire-binary/podfile_dsl'
 require 'cocoapods-tdfire-binary/specification_dsl'
 require 'cocoapods-tdfire-binary/podfile_hook'
+require 'cocoapods-tdfire-binary/command'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 1.0.0
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: cocoapods-packager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: cocoapods-tdfire-binary is a plugin which helps developer switching there
   project dependency between source and binary.
 email:
@@ -68,7 +82,19 @@ files:
 - Rakefile
 - cocoapods-tdfire-binary.gemspec
 - lib/cocoapods-tdfire-binary.rb
+- lib/cocoapods-tdfire-binary/binary_specification_refactor.rb
 - lib/cocoapods-tdfire-binary/binary_state_store.rb
+- lib/cocoapods-tdfire-binary/binary_url_manager.rb
+- lib/cocoapods-tdfire-binary/command.rb
+- lib/cocoapods-tdfire-binary/command/assemble.rb
+- lib/cocoapods-tdfire-binary/command/binary.rb
+- lib/cocoapods-tdfire-binary/command/lib.rb
+- lib/cocoapods-tdfire-binary/command/lib/create.rb
+- lib/cocoapods-tdfire-binary/command/lint.rb
+- lib/cocoapods-tdfire-binary/command/package.rb
+- lib/cocoapods-tdfire-binary/command/publish.rb
+- lib/cocoapods-tdfire-binary/command/pull.rb
+- lib/cocoapods-tdfire-binary/command/push.rb
 - lib/cocoapods-tdfire-binary/gem_version.rb
 - lib/cocoapods-tdfire-binary/podfile_dsl.rb
 - lib/cocoapods-tdfire-binary/podfile_hook.rb