cocoapods-tdfire-binary 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45829ae42e2a0f6c412b2cf810af6f003b9a41e3
-  data.tar.gz: 8f5a58fa5f96f30572af33628d43ef3a6c4c3aee
+  metadata.gz: acd61a8fc27d59b7ae852462154207384ff601b4
+  data.tar.gz: fa102856a43da8b0df1c36728587cf8190bc546d
 SHA512:
-  metadata.gz: ef3864030787c1e79cea783b4191a4ec78c0b1009ad4b7569efa77fbbd075f2254e7e8c6fb57820bae954251e6312e33650df143c4182fad24a53c19f8fd2ad1
-  data.tar.gz: bc6bf5177615471d48fdae5b079bced6592714ed2c36f162af7fbbadbf8cf958568991cb273a28a369c9e30d52b5c6135c3432dbcdbdc94299df55a3b84c7aef
+  metadata.gz: 61b5e196df25b38f14111abb2cf9e061d91f621a0838e14d970a28769c782b0c9f6fa8a99e1c39b4edb36cecf8600a60a6bc2a08ac41e979646eeee752cb615e
+  data.tar.gz: fc78624a2262aae4038e4de31dd3911fbba73f176c87218528fa3ddc48a1939cdffe135e0fdf11385c4e013af7ea42f832db7235910716e51634290a4db1bbbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-tdfire-binary (1.2.2)
+    cocoapods-tdfire-binary (1.2.3)
       cocoapods (~> 1.2)
       cocoapods-packager (~> 1.5.0)
 

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

@@ -16,7 +16,11 @@ module Pod
 			if cleaner.no_binary_specs.any?
 				pods = cleaner.no_binary_specs.map { |s| s.root.name }
 				Pod::Tdfire::BinaryStateStore.use_source_pods += pods
-				UI.warn "Tdfire: 以下组件没有二进制版本，将强制使用源码依赖，添加以下代码至Podfile规避此警告: tdfire_use_source_pods #{pods}"
+        UI.warn "Tdfire: 以下组件没有二进制版本，将强制使用源码依赖，添加以下代码至Podfile规避此警告: tdfire_use_source_pods #{pods}"
+        
+        # 在这个时间点设置 use_source_pods ，实际上并不会生效，因为 analysis_result 已经生成，依赖关系不会改变
+        # 所以这里强制进行第二次分析，更新 analysis_result
+        old_resolve_dependencies.bind(self).call()
       end
 		end
 	end

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

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

@@ -4,7 +4,6 @@ require 'colored2'
 
 module Pod
   class Specification
-
     def tdfire_refactor
       @refactor ||= Pod::Tdfire::BinarySpecificationRefactor.new(self)
     end
@@ -20,6 +19,8 @@ module Pod
 
       # 源码依赖配置
       def tdfire_source(configurator)
+        tdfire_set_binary_strategy_flag
+
         if tdfire_use_source?
           if !Pod::Tdfire::BinaryStateStore.printed_pods.include?(root.name)
             UI.message "Source".magenta.bold + " dependecy for " + "#{root.name} #{version}".green.bold
@@ -34,6 +35,8 @@ module Pod
 
       # 二进制依赖配置
       def tdfire_binary(configurator, &block)
+        tdfire_set_binary_strategy_flag
+
         if !tdfire_use_source?
           if !Pod::Tdfire::BinaryStateStore.printed_pods.include?(root.name)
             UI.message "Binary".cyan.bold + " dependecy for " + "#{root.name} #{version}".green.bold
@@ -59,6 +62,8 @@ module Pod
 
       # 配置二进制文件下载、cache 住解压好的 framework
       def tdfire_set_binary_download_configurations
+        tdfire_set_binary_strategy_flag
+
         tdfire_refactor.set_preserve_paths(tdfire_reference_spec)
 
         # 没有发布的pod，没有二进制版本，不进行下载配置
@@ -71,14 +76,24 @@ module Pod
     end
 
     def tdfire_use_source?
-      ((!Pod::Tdfire::BinaryStateStore.force_use_binary? &&
+      (((!Pod::Tdfire::BinaryStateStore.force_use_binary? &&
           (!Pod::Tdfire::BinaryStateStore.use_binary? || Pod::Tdfire::BinaryStateStore.real_use_source_pods.include?(root.name))) ||
           Pod::Tdfire::BinaryStateStore.force_use_source?) &&
-          (Pod::Tdfire::BinaryStateStore.lib_lint_binary_pod != root.name)
+          (Pod::Tdfire::BinaryStateStore.lib_lint_binary_pod != root.name)) || 
+          !tdfire_had_set_binary_strategy
     end
 
     private 
 
+    # 没有配置二进制策略的，使用源码依赖
+    def tdfire_had_set_binary_strategy
+      @tdfire_binary_strategy_flag || false
+    end
+
+    def tdfire_set_binary_strategy_flag
+      @tdfire_binary_strategy_flag = true
+    end
+
     def tdfire_reference_spec
       @tdfire_reference_spec || self        
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - tripleCC