cocoapods-tdfire-binary 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc2eea59094cada53569777975bb4eee561a17c3
-  data.tar.gz: a73aec5469a5bf31588a7cc6f05fd4709da29e1d
+  metadata.gz: 1283821d7be8c8aebc0b55802ae00628f6a543ff
+  data.tar.gz: a25824ad9fb8669a90cd9321bc0d18e66883b957
 SHA512:
-  metadata.gz: 1b43040556944cfacc21448f3c5f5421781b43b45542769bb8461923b5189c0f218fe376e3ba8dd44cee7b1f68fe0132a469822b2fc206cab2ef4f5677a46c44
-  data.tar.gz: 28be0dc5cb5d4b0e6c675004efb854f57dca89b9b22d61b9d8886317ed412611465c89a95969c73767406d933c33246f8f0ecfe652f066972a697892b9533388
+  metadata.gz: be01bc1a1fbd715a4abdea2119afdf294c807cf515454a125e4cfc3e55285399eaaeaff9530bd7688d83c846753c0ab643dbf81f36917f8d24d6826bf446bb9d
+  data.tar.gz: 9b0798ed207d7de84d54d2d6a7afd879ca0255aab144dcf39b734f6533cb3a4ab61c93a5e51e7efdd1838c47eb241ed99a309b5fb0648c0a46a9c1e90d8c9ff7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-tdfire-binary (0.1.2)
+    cocoapods-tdfire-binary (0.1.3)
       cocoapods (~> 1.4)
       colorize (~> 0.8)
 

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

@@ -2,30 +2,49 @@ module  Tdfire
 	class BinaryStateStore
 		public
 
-		def self.printed_pods
-			@printed_pods ||= []
+		class << self
+			attr_accessor :unpublished_pods
+			attr_writer :use_source_pods
+			attr_reader :printed_pods
 		end
+		@unpublished_pods = []
+		@use_source_pods = []
+		@printed_pods = []
 
 		def self.use_source_pods
-			String(ENV[USE_SOURCE_PODS_KEY]).split('|')
-		end
-
-		def self.use_source_pods=(pods)
-			ENV[USE_SOURCE_PODS_KEY] = Array(pods).join('|')
+			(@use_source_pods + @unpublished_pods).uniq			
 		end
 
 		def self.use_binary?
-			ENV[USE_BINARY_KEY] == USE_BINARY_SURE_VALUE
+			ENV[USE_BINARY_KEY] == USE_SURE_VALUE
 		end
 
 		def self.set_use_binary
-			ENV[USE_BINARY_KEY] = USE_BINARY_SURE_VALUE
+			ENV[USE_BINARY_KEY] = USE_SURE_VALUE
 		end
 
-		private
+		def self.force_use_binary?
+			ENV[FORCE_USE_BINARY_KEY] == USE_SURE_VALUE
+		end
+
+		def self.force_use_source?
+			ENV[FORCE_USE_SOURCE_KEY] == USE_SURE_VALUE
+		end
 
-		USE_SOURCE_PODS_KEY = 'tdfire_use_source_pods'
+		def self.auto_set_default_unpublished_pod?
+			ENV[AUTO_SET_DEFAULT_UNPUBLISHED_POD_KEY]	== USE_SURE_VALUE 
+		end
+
+		def self.set_auto_set_default_unpublished_pod
+			ENV[AUTO_SET_DEFAULT_UNPUBLISHED_POD_KEY]	= USE_SURE_VALUE 
+		end
+
+		private
+		
+		AUTO_SET_DEFAULT_UNPUBLISHED_POD_KEY = 'auto_set_default_unpublished_pod'
+		FORCE_USE_SOURCE_KEY = 'tdfire_force_use_source'
+		FORCE_USE_BINARY_KEY = 'tdfire_force_use_binary'
 		USE_BINARY_KEY = 'tdfire_use_binary'
-		USE_BINARY_SURE_VALUE = '1'
+		USE_SURE_VALUE = '1'
 	end
 end

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

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

@@ -6,10 +6,15 @@ module Pod
     module DSL
       # 使用源码依赖的pod
       def tdfire_use_source_pods(pods)
-      	old_pods = Tdfire::BinaryStateStore.use_source_pods
-      	UI.puts "Tdfire: the use source pods: #{old_pods.join(',')} will be overrided by new pods: #{pods.join(',')}".cyan if (!old_pods.empty? && old_pods != pods )
+        Pod::UI.puts "Tdfire: set use source pods: #{Array(pods).join(', ')}"
+      	Tdfire::BinaryStateStore.use_source_pods = Array(pods)
+      end
 
-      	Tdfire::BinaryStateStore.use_source_pods = pods
+      # 标明未发布的pod，因为未发布pod没有对应的二进制版本，无法下载
+      # 未发布的pod，一定是源码依赖的
+      def tdfire_unpublished_pods(pods)
+        Pod::UI.puts "Tdfire: set unpublished pods: #{Array(pods).join(', ')}"
+        Tdfire::BinaryStateStore.unpublished_pods = Array(pods)
       end
 
       # 使用二进制依赖
@@ -17,6 +22,10 @@ module Pod
         Tdfire::BinaryStateStore.set_use_binary
       end
 
+      def tdfire_auto_set_default_unpublished_pod!
+        Tdfire::BinaryStateStore.set_auto_set_default_unpublished_pod
+      end      
+
       # 外源组件依赖
       def tdfire_external_pods(pods, *rest)
       	argvs = rest.last || {}
@@ -25,9 +34,9 @@ module Pod
 输入参数错误.
 
 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' 
+  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' 
   ...
 
 默认值：
@@ -66,8 +75,10 @@ EOF
           else
         end
 
-      	# 除了依赖私有源正式版本的组件，其余组件一律进行源码依赖
-        Tdfire::BinaryStateStore.use_source_pods = Array(pods) + Tdfire::BinaryStateStore.use_source_pods
+      	# 除了依赖私有源正式版本的组件，其余组件一律视为未发布组件，进行源码依赖
+        Tdfire::BinaryStateStore.unpublished_pods += Array(pods)
+
+        # Tdfire::BinaryStateStore.use_source_pods = Array(pods) + Tdfire::BinaryStateStore.use_source_pods
       end
     end
 	end

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

@@ -7,15 +7,16 @@ module CocoapodsTdfireBinary
 		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: set share scheme for development pod: \'#{development_pod}\'") do
+		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?
 
-		if Tdfire::BinaryStateStore.use_binary?
-			Pod::UI.section("Tdfire: set use source for development_pod: \'#{development_pod}\'") do 
-				# 开发 Pod 使用源码依赖
-				Tdfire::BinaryStateStore.use_source_pods = Array(development_pod) + Tdfire::BinaryStateStore.use_source_pods
+		# 在采用二进制依赖，并且不是强制二进制依赖的情况下，当前打成 framework 的开发 Pod 需要源码依赖
+		if Tdfire::BinaryStateStore.use_binary? && Tdfire::BinaryStateStore.auto_set_default_unpublished_pod?
+			Pod::UI.section("Tdfire: auto set unpublished for development pod: \'#{development_pod}\'") do 
+				# 开发 Pod 默认设置为未发布状态
+				Tdfire::BinaryStateStore.unpublished_pods << development_pod
 			end unless development_pod.nil?
 			tdfire_default_development_pod = development_pod
 		end
@@ -23,7 +24,7 @@ module CocoapodsTdfireBinary
 
 	#fix `Shell Script` Build Phase Fails When Input / Output Files List is Too Large
 	Pod::HooksManager.register('cocoapods-tdfire-binary', :post_install) do |context, _|
-		Pod::UI.section('Tdfire: clean input and output files') do
+		Pod::UI.section('Tdfire: auto clean input and output files') do
 			context.umbrella_targets.map(&:user_targets).flatten.uniq.each do |t|
 	      phase = t.shell_script_build_phases.find { |p| p.name.include?(Pod::Installer::UserProjectIntegrator::TargetIntegrator::COPY_PODS_RESOURCES_PHASE_NAME) }
 
@@ -43,12 +44,14 @@ module CocoapodsTdfireBinary
 	    end
 		end
 
+		# 在采用二进制依赖，并且不是强制二进制依赖的情况下，提示当前工程的未发布的 Pods 
 		if Tdfire::BinaryStateStore.use_binary?
 			all_development_pods = context.sandbox.development_pods.keys - Array(tdfire_default_development_pod) - Tdfire::BinaryStateStore.use_source_pods
 			all_development_pods_displayed_text = all_development_pods.map { |p| "'#{p}'" }.join(',')
-			Pod::UI.puts "Tdfire: You should add following code to your `Podfile`, and then run `pod install or pod update` again. \n\ntdfire_use_source_pods [#{all_development_pods_displayed_text}]\n".cyan unless all_development_pods.empty?
+			Pod::UI.puts "Tdfire: You should add following code to your `Podfile`, and then run `pod install or pod update` again. \n\ntdfire_unpublished_pods [#{all_development_pods_displayed_text}]\n".cyan unless all_development_pods.empty?
 		end
 
 		Pod::UI.puts "Tdfire: all source dependency pods: #{Tdfire::BinaryStateStore.use_source_pods.join(', ')}"
+		Pod::UI.puts "Tdfire: all unpublished pods: #{Tdfire::BinaryStateStore.unpublished_pods.join(', ')}"
 	end
 end

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

@@ -5,11 +5,19 @@ module Pod
   class Specification
     module DSL
 
+      private 
+
+      def use_source?
+        (!Tdfire::BinaryStateStore.force_use_binary? && 
+        (!Tdfire::BinaryStateStore.use_binary? || Tdfire::BinaryStateStore.use_source_pods.include?(name))) ||
+        Tdfire::BinaryStateStore.force_use_source?
+      end
+
     	public
 
     	# 源码依赖配置
       def tdfire_source(&block)
-        if !Tdfire::BinaryStateStore.use_binary? || Tdfire::BinaryStateStore.use_source_pods.include?(self.name)
+        if use_source?
           if !Tdfire::BinaryStateStore.printed_pods.include?(name)
           	UI.puts "Source".magenta.bold + " dependecy for " + "#{name} #{version}".light_blue 
             Tdfire::BinaryStateStore.printed_pods << name
@@ -21,7 +29,7 @@ module Pod
 
       # 二进制依赖配置
       def tdfire_binary(&block)
-        if Tdfire::BinaryStateStore.use_binary? && !Tdfire::BinaryStateStore.use_source_pods.include?(self.name)
+        if !use_source?
           if !Tdfire::BinaryStateStore.printed_pods.include?(name)
           	UI.puts "Binary".cyan.bold + " dependecy for " + "#{name} #{version}".light_blue 
             Tdfire::BinaryStateStore.printed_pods << name
@@ -33,6 +41,10 @@ module Pod
 
       # 配置二进制文件下载、cache 住解压好的 framework
       def tdfire_set_binary_download_configurations_at_last(download_url = nil)
+
+        # 没有发布的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
@@ -49,8 +61,11 @@ module Pod
         framework_preserve_paths = ["#{name}.framework"]
         framework_preserve_paths += consumer(Platform.ios).preserve_paths unless consumer(Platform.ios).preserve_paths.nil?
 
+        # 规避 preserve_paths don't match any files 错误
+        source_preserve_paths = ["#{name}/**/**/*", "Classes/**/*"]
+
         # preserve_paths = xxx 无法不会将值设置进去，不明白其原理
-        store_attribute('preserve_paths', framework_preserve_paths)
+        store_attribute('preserve_paths', framework_preserve_paths + source_preserve_paths)
       end
 
       def set_framework_download_script(download_url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler