cocoapods-tdfire-binary 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874fd6aebf5cebf48727df8baa0c51854986c995
-  data.tar.gz: 31d9a9f92b97355c2bdc9b9ff80003beeae8586d
+  metadata.gz: 557565f493e63f0aae84418d13f594d10765a227
+  data.tar.gz: 57905b4d491285860bdfd6969273e3be26c6abaa
 SHA512:
-  metadata.gz: 966aaaf0facd094a2ca7faa54084ffcc7ad1f3b4998623f3a4f0361216bd722512a7ebece32a52ef4b6b5481f2a2b1f5c28aca73e64b3c62f07036dd08f3b18b
-  data.tar.gz: 98099bf42395c06ce64ea8d441e57d5269613606750caf7ab75d26e488eb97d3623f63ccb41f9ecf429c3a4a8bb781033a7d5425374e5c30577e0bab663e9c06
+  metadata.gz: 75e7b0d512ce521dcbac84ca4dece0c17942b244f060b588657d587d0b8c4caae6f460294753a8eaf5e3fbab3d126b2c60a1b02690bf37aef6f3a521f4fa54b7
+  data.tar.gz: 3368ae748ea31de56c94c77fada4d23ad04a86dc5a1077651a61caa4e4f55eafba9baf7f995e0d99347ba95b64e2226462544aabf67e47fdb238acc5d81539cf

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    cocoapods-tdfire-binary (0.1.4)
+    cocoapods-tdfire-binary (0.1.6)
       cocoapods (~> 1.4)
+      colored2 (~> 3.1)
 
 GEM
   remote: https://rubygems.org/

data/cocoapods-tdfire-binary.gemspec

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

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

@@ -3,16 +3,24 @@ module  Tdfire
 		public
 
 		class << self
-			attr_accessor :unpublished_pods
-			attr_writer :use_source_pods
+			# attr_accessor :unpublished_pods
+			attr_accessor :use_source_pods
 			attr_reader :printed_pods
 		end
-		@unpublished_pods = []
+		# @unpublished_pods = []
 		@use_source_pods = []
 		@printed_pods = []
 
-		def self.use_source_pods
-			(@use_source_pods + @unpublished_pods).uniq			
+		def self.real_use_source_pods
+			(@use_source_pods + unpublished_pods).uniq	
+		end
+
+		def self.unpublished_pods
+			String(ENV[UNPBLISHED_PODS]).split('|')
+		end
+
+		def self.unpublished_pods=(pods)
+			ENV[UNPBLISHED_PODS] = Array(pods).join('|')
 		end
 
 		def self.use_binary?
@@ -27,21 +35,17 @@ module  Tdfire
 			ENV[FORCE_USE_BINARY_KEY] == USE_SURE_VALUE
 		end
 
-		def self.force_use_source?
-			ENV[FORCE_USE_SOURCE_KEY] == USE_SURE_VALUE
+		def self.set_force_use_binary
+			ENV[FORCE_USE_BINARY_KEY] = USE_SURE_VALUE
 		end
 
-		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 
+		def self.force_use_source?
+			ENV[FORCE_USE_SOURCE_KEY] == USE_SURE_VALUE
 		end
 
 		private
-		
-		AUTO_SET_DEFAULT_UNPUBLISHED_POD_KEY = 'auto_set_default_unpublished_pod'
+
+		UNPBLISHED_PODS = "tdfire_unpublished_pods"
 		FORCE_USE_SOURCE_KEY = 'tdfire_force_use_source'
 		FORCE_USE_BINARY_KEY = 'tdfire_force_use_binary'
 		USE_BINARY_KEY = 'tdfire_use_binary'

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

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

@@ -10,21 +10,15 @@ module Pod
       	Tdfire::BinaryStateStore.use_source_pods = Array(pods)
       end
 
-      # 标明未发布的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
-
       # 使用二进制依赖
       def tdfire_use_binary!
         Tdfire::BinaryStateStore.set_use_binary
-      end
+      end  
 
-      def tdfire_auto_set_default_unpublished_pod!
-        Tdfire::BinaryStateStore.set_auto_set_default_unpublished_pod
-      end      
+      # 强制使用二进制依赖，忽略未发布和依赖源码设置
+      # def tdfire_force_use_binary!
+      #   Tdfire::BinaryStateStore.set_force_use_binary
+      # end
 
       # 外源组件依赖
       def tdfire_external_pods(pods, *rest)
@@ -74,11 +68,6 @@ EOF
           end
           else
         end
-
-      	# 除了依赖私有源正式版本的组件，其余组件一律视为未发布组件，进行源码依赖
-        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

@@ -1,8 +1,8 @@
 require 'cocoapods-tdfire-binary/binary_state_store'
+require 'cocoapods-tdfire-binary/source_chain_analyzer'
 
 module CocoapodsTdfireBinary
 	
-	tdfire_default_development_pod = nil
 	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?
@@ -12,13 +12,24 @@ module CocoapodsTdfireBinary
 			context.podfile.install!('cocoapods', :share_schemes_for_development_pods => [development_pod])
 		end unless development_pod.nil?
 
-		# 在采用二进制依赖，并且不是强制二进制依赖的情况下，当前打成 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
+
+		# 标明未发布的pod，因为未发布pod没有对应的二进制版本，无法下载
+    # 未发布的pod，一定是源码依赖的
+    Pod::UI.section("Tdfire: auto set unpublished pods") do
+			Tdfire::BinaryStateStore.unpublished_pods = context.podfile.dependencies.select(&:external?).map(&:root_name)
+
+			Pod::UI.message "> Tdfire: unpublished pods: #{Tdfire::BinaryStateStore.unpublished_pods.join(', ')}"
+		end
+
+		# 没有标识use_frameworks!，进行源码依赖需要设置Pod依赖链上，依赖此源码Pod的也进行源码依赖
+		unless first_target_definition.uses_frameworks?
+			Pod::UI.section("Tdfire: analyze chain pods depend on use source pods: #{Tdfire::BinaryStateStore.use_source_pods.join(', ')}") do
+				chain_pods = Tdfire::SourceChainAnalyzer.new(context.podfile).analyze(Tdfire::BinaryStateStore.use_source_pods)
+
+				Pod::UI.message "> Tdfire: find chain pods: #{chain_pods.join(', ')}"
+
+				Tdfire::BinaryStateStore.use_source_pods += chain_pods 
+			end unless Tdfire::BinaryStateStore.use_source_pods.empty? 
 		end
 	end
 
@@ -44,14 +55,7 @@ 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_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 source dependency pods: #{Tdfire::BinaryStateStore.real_use_source_pods.join(', ')}"
 		Pod::UI.puts "Tdfire: all unpublished pods: #{Tdfire::BinaryStateStore.unpublished_pods.join(', ')}"
 	end
 end

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

@@ -0,0 +1,66 @@
+module Tdfire
+	class SourceChainAnalyzer
+
+		def initialize(podfile)
+			@lockfile = generate_lockfile(podfile)
+			@pods_data = @lockfile.internal_data['PODS']
+			@parent_pods = []
+		end
+
+		public
+
+		def analyze(pods)
+			pods.each do |pod|
+				find_parent_pods(pod, @pods_data) unless @parent_pods.include?(pod)
+			end unless @lockfile.nil?
+
+			@parent_pods.uniq
+		end
+
+		private
+
+		def find_parent_pods(pod, pods_data)
+			return if pod.nil?
+
+			parent_pod_hashes = pods_data.select{ |pod_data| pod_data.is_a?(Hash) && pod_data.values.flatten.include?(pod) }
+			parent_pod_hashes.each do |hold_pod_hash|
+				hold_pod_name = hold_pod_hash.keys.first.split('(').first.strip	
+				@parent_pods << hold_pod_name
+				find_parent_pods(hold_pod_name, pods_data - parent_pod_hashes)
+			end
+		end
+
+
+		def generate_lockfile(podfile)
+			fetch_external_source = false
+
+			lockfile = Pod::Lockfile.from_file(Pathname.new('Podfile.lock'))
+
+			# 如果手动去删除 Pods/Local Podspecs 里面的文件，那就会直接报错了
+			if lockfile.nil? || !Pathname.new('Pods').exist?
+				fetch_external_source = true
+			else
+				external = podfile.dependencies.select(&:external?)
+				external_source = {}
+				external.each { |d| external_source[d.root_name] = d.external_source }
+				lockfile_external_source = lockfile.internal_data['EXTERNAL SOURCES']
+				fetch_external_source = external_source != lockfile_external_source
+			end
+
+			sandbox = Pod::Config.instance.sandbox
+			analyzer = Pod::Installer::Analyzer.new(sandbox, podfile, lockfile)			
+			specs = Pod::Config.instance.with_changes(skip_repo_update: true) do 
+				# allow fetch ，初次install时，或者新增external source 时，由于Pods/Local Podspecs 是空，会抛出找不到specification异常
+				begin
+					analyzer.analyze(fetch_external_source).specs_by_target.values.flatten(1)	
+				rescue 
+					Pod::UI.message "> Tdfire: allow to fetch external source and try again".yellow
+					analyzer.analyze(true).specs_by_target.values.flatten(1)
+				end
+			end
+
+			Pod::Lockfile.generate(podfile, specs, {}) || lockfile
+		end
+
+	end
+end

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

@@ -1,5 +1,5 @@
 require 'cocoapods-tdfire-binary/binary_state_store'
-require 'colored'
+require 'colored2'
 
 module Pod
   class Specification
@@ -9,7 +9,7 @@ module Pod
 
       def use_source?
         (!Tdfire::BinaryStateStore.force_use_binary? && 
-        (!Tdfire::BinaryStateStore.use_binary? || Tdfire::BinaryStateStore.use_source_pods.include?(name))) ||
+        (!Tdfire::BinaryStateStore.use_binary? || Tdfire::BinaryStateStore.real_use_source_pods.include?(name))) ||
         Tdfire::BinaryStateStore.force_use_source?
       end
 
@@ -19,7 +19,7 @@ module Pod
       def tdfire_source(&block)
         if use_source?
           if !Tdfire::BinaryStateStore.printed_pods.include?(name)
-          	UI.puts "Source".magenta.bold + " dependecy for " + "#{name} #{version}".blue 
+          	UI.puts "Source".magenta.bold + " dependecy for " + "#{name} #{version}".green.bold
             Tdfire::BinaryStateStore.printed_pods << name
           end
 
@@ -31,7 +31,7 @@ module Pod
       def tdfire_binary(&block)
         if !use_source?
           if !Tdfire::BinaryStateStore.printed_pods.include?(name)
-          	UI.puts "Binary".cyan.bold + " dependecy for " + "#{name} #{version}".blue 
+          	UI.puts "Binary".cyan.bold + " dependecy for " + "#{name} #{version}".green.bold 
             Tdfire::BinaryStateStore.printed_pods << name
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-03-21 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: colored2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: cocoapods-tdfire-binary is a plugin which helps developer switching there
   project dependency between source and binary.
 email:
@@ -72,6 +86,7 @@ files:
 - lib/cocoapods-tdfire-binary/gem_version.rb
 - lib/cocoapods-tdfire-binary/podfile_dsl.rb
 - lib/cocoapods-tdfire-binary/podfile_hook.rb
+- lib/cocoapods-tdfire-binary/source_chain_analyzer.rb
 - lib/cocoapods-tdfire-binary/specification_dsl.rb
 - lib/cocoapods_plugin.rb
 - spec/command/binary_spec.rb