cocoapods-tdfire-binary 1.2.6 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c55ded4b343b1782c4e2ad32cd076e90ffb88c11
-  data.tar.gz: 11b749e91acc889247de163ae5c879709dff99b7
+  metadata.gz: 1475a8c11630304a9897521dae4abf2e0f75b361
+  data.tar.gz: 94dd308bcb41eb406276132f39f0a106155aa30e
 SHA512:
-  metadata.gz: 78251194d17d6307fdac6bd652206bac2fc652f6c22fbd94f70fec8895d4f9967448cd6bb4295843fb71877e39f1025cdac04a6cfaf0672a66e1d2f9d9680c8c
-  data.tar.gz: 26dc292c74bc37687f6439f623b83aaacf620aa5a213c82c159905380b609d5d5c8c27001c0c1b87032edbee5f4f548fa5f01bf3dba8675ca810b6e99fff4ab5
+  metadata.gz: 76e3124b8c513a60e25aaf0f80f5c50247d5533516a9a1c656653705c4f92f3ee154c93317f9363c85abbe2fbb0076490133b4fa107cc674195e71987667d2ef
+  data.tar.gz: e85391b1931c34e1561798ec0cfd4be6043869695af5afdbc3953a1414fdf279485a4fb251be19c6ef1cd328ec5115e3bb9f65d9ee5a7f07b35054e3d5fb2bf3

data/Gemfile.lock

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

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

@@ -56,12 +56,21 @@ module Pod
         ENV[FORCE_USE_SOURCE_KEY] == USE_SURE_VALUE
       end
 
+      def self.set_third_party_use_binary
+        ENV[THIRD_PARTY_USE_BINARY_KEY] = USE_SURE_VALUE
+      end
+
+      def self.third_party_use_binary?
+        ENV[THIRD_PARTY_USE_BINARY_KEY] == USE_SURE_VALUE
+      end
+
       private
 
       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'
+      THIRD_PARTY_USE_BINARY_KEY = 'tdfire_third_party_use_binary'
       LIMIT_PLATFORM_KEY = 'tdfire_limit_platform'
       USE_SURE_VALUE = '1'
     end

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

@@ -45,7 +45,7 @@ module Pod
 
 
 	      	@path = path
-	      	@name = name || path.split('/').last - ZIP_SUBFFIX
+	      	@name = name || path.split('/').last.sub(ZIP_SUBFFIX, '')
 	      	@version = version
 	      	@commit = commit
 	      	super

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.2.6"
+  VERSION = "1.3.6"
 end

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

@@ -4,6 +4,7 @@ require 'cocoapods-tdfire-binary/binary_state_store'
 module Pod
   class Podfile
     module DSL
+
       # 使用源码依赖的pod
       def tdfire_use_source_pods(pods)
         Pod::UI.puts "Tdfire: set use source pods: #{Array(pods).join(', ')}"
@@ -15,6 +16,10 @@ module Pod
         Pod::Tdfire::BinaryStateStore.set_use_binary
       end  
 
+      def tdfire_third_party_use_binary!
+        Pod::Tdfire::BinaryStateStore.set_third_party_use_binary
+      end
+
       # 因为暂时无法将全部组件二进制化，tdfire_use_binary! 默认全部进行二进制依赖不利于渐进测试
       # 所以添加 tdfire_use_source! 默认全部进行源码依赖，开放指定二进制依赖组件接口
       # 

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

@@ -76,14 +76,22 @@ module Pod
     end
 
     def tdfire_use_source?
-      (((!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_binary? &&
+          (!Pod::Tdfire::BinaryStateStore.use_binary? || Pod::Tdfire::BinaryStateStore.real_use_source_pods.include?(root.name)) && 
+          (!(Pod::Tdfire::BinaryStateStore.third_party_use_binary? && tdfire_third_party?) || 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)) || 
-          !tdfire_had_set_binary_strategy
+          !tdfire_had_set_binary_strategy)
     end
 
     private 
+    def tdfire_third_party?
+      if source 
+        source[:git]&.include?('cocoapods-repos')
+      else 
+        false
+      end
+    end
 
     # 没有配置二进制策略的，使用源码依赖
     def tdfire_had_set_binary_strategy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.6
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler