cocoapods-tdfire-binary 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634fd53981febf3d906dc8eac645e9fcb3aa587c
-  data.tar.gz: 249b2eee8fede99bb2e13b4529e5bfdfde90c0ef
+  metadata.gz: 4804df6979892a35670db313dbc793f2a6ec59a4
+  data.tar.gz: ad1eea3a414dae65b80e304b1aee005b901946c6
 SHA512:
-  metadata.gz: 64ad162b0a8c2a9133105879a3a8736af3da1cc9f527c58f26a4f66f89784df6b4fcda6c6cb166f9629e8b367013eb933edb57ab7c01d77574428dfec5cf7a4d
-  data.tar.gz: f78da99150e3aa00ddda4355af716764acb9a554a8941e83f93df0184849383c3728b693cc6928e7ccffa3622d4698cf59d49508c626ba2e5fb9d6d6b8aff930
+  metadata.gz: 67703dd621d664580d71d2dad724f16f167431bd9c27f3bbfcd8ce0e23c8f278a3f61c33fde5d8d74866be990276a002cf68db608b9fc19ef39efac6b127ac4c
+  data.tar.gz: 351f7e2f5b6ac8d1e1ee4b05a7d1a9da9423e759a144f0620e71d1da7aac0488679ecadaa7dbbab0f7f6ed9014326b62417ce1fd105ff4d4b2b3f5598ef367f1

data/Gemfile.lock

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

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

@@ -10,7 +10,6 @@ module Pod
         attr_reader :printed_pods
         attr_accessor :use_frameworks
         attr_accessor :use_source
-        attr_accessor :lib_lint_binary_pod
         attr_accessor :limit_platform
       end
 

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

@@ -14,7 +14,7 @@ module Pod
 					[
 							['--sources', '私有源地址'],
 							['--clean', '执行成功后，删除 zip 文件外的所有生成文件'],
-							['--one-binary', '只让 Lint 的 Pod 进行二进制依赖，其余都用源码'],
+							['--binary-first', '二进制优先'],
 							['--subspec', 'lint 特定 subspec']
 					].concat(super)
 				end
@@ -23,7 +23,7 @@ module Pod
 					@clean = argv.flag?('clean')
 					@sources = argv.option('sources')
 					@subspec = argv.option('subspec')
-					@one_binary = argv.flag?('one-binary')
+					@binary_first = argv.flag?('binary-first')
 
 					@spec_file = first_podspec
 					@spec_name = @spec_file.split('/').last.split('.').first unless @spec_file.nil?
@@ -47,10 +47,9 @@ module Pod
 				end
 
 				def run
-					if @one_binary
-						Pod::Tdfire::BinaryStateStore.lib_lint_binary_pod = @spec_name
-					else
-						Pod::Tdfire::BinaryStateStore.set_force_use_binary
+					if @binary_first
+						Pod::Tdfire::BinaryStateStore.unpublished_pods = Pod::Tdfire::BinaryStateStore.unpublished_pods + Array(@spec_name)
+						Pod::Tdfire::BinaryStateStore.set_use_binary
 					end
 
 					argvs = [
@@ -66,12 +65,6 @@ module Pod
 					lint.validate!
 					lint.run
 
-					if @one_binary
-						Pod::Tdfire::BinaryStateStore.lib_lint_binary_pod = nil
-					else
-						Pod::Tdfire::BinaryStateStore.unset_force_use_binary
-					end
-
 					system "rm -fr #{@spec_name}.framework " if @clean
 				end
 			end

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

@@ -2,6 +2,7 @@ require 'colored2'
 require 'fileutils'
 require 'cocoapods_packager'
 require 'cocoapods-tdfire-binary/binary_url_manager'
+require 'cocoapods-tdfire-binary/binary_state_store'
 require 'cocoapods-tdfire-binary/binary_specification_refactor'
 
 module Pod
@@ -20,7 +21,8 @@ module Pod
             ['--spec-sources', '私有源地址'],
             # ['--local', '使用本地代码'],
             ['--use-carthage', 'carthage使用carthage进行打包，三方库提供carthage的优先'],
-						['--subspecs', '打包子组件']
+						['--subspecs', '打包子组件'],
+						['--binary-first', '二进制优先']
           ].concat(super)
         end
 
@@ -31,6 +33,7 @@ module Pod
 	      	@spec_sources = argv.option('spec-sources')
 					@subspecs= argv.option('subspecs')
 	      	@spec_file = first_podspec
+	      	@binary_first = argv.flag?('binary-first')
 	      	super
 	      end
 
@@ -54,6 +57,12 @@ module Pod
 
 					spec = Specification.from_file(@spec_file)
 					prepare(spec)
+
+					if @binary_first
+						Pod::Tdfire::BinaryStateStore.unpublished_pods = Pod::Tdfire::BinaryStateStore.unpublished_pods + Array(spec.name)
+						Pod::Tdfire::BinaryStateStore.set_use_binary
+					end
+
 					package(spec)
 					zip_packager_framework(spec)
 

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

@@ -1,3 +1,5 @@
+require 'cocoapods-tdfire-binary/binary_state_store'
+
 module Pod
   class Command
     class Binary < Command
@@ -14,7 +16,8 @@ module Pod
 
         def self.options
           [
-            ['--commit="Fix some bugs"', '发布的 commit 信息']
+            ['--commit="Fix some bugs"', '发布的 commit 信息'],
+            ['--binary-first', '二进制优先']
           ].concat(super)
         end
 
@@ -24,6 +27,7 @@ module Pod
 
           spec_file = first_podspec if spec_file.nil?
           @spec_file = spec_file
+          @binary_first = argv.flag?('binary-first')
           super
         end
 
@@ -35,6 +39,11 @@ module Pod
         def run
           spec = Specification.from_file(@spec_file)
 
+          if @binary_first
+            Pod::Tdfire::BinaryStateStore.unpublished_pods = Pod::Tdfire::BinaryStateStore.unpublished_pods + Array(spec.name)
+            Pod::Tdfire::BinaryStateStore.set_use_binary
+          end
+
           UI.section("Tdfire: start publishing #{spec.name} ...") do
             argvs = [
                 private_sources.first.name,

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.3.9"
+  VERSION = "1.3.10"
 end

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

@@ -76,12 +76,26 @@ 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.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)
+      (
+        (
+          (
+            !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? # 强制源码
+        ) || 
+        !tdfire_had_set_binary_strategy  # 没有配置二进制策略
+      )
     end
 
     private 
@@ -108,8 +122,7 @@ module Pod
     end
 
     def tdfire_should_skip_download?
-      (!Pod::Tdfire::BinaryStateStore.force_use_binary? && Pod::Tdfire::BinaryStateStore.unpublished_pods.include?(root.name)) ||
-          (Pod::Tdfire::BinaryStateStore.lib_lint_binary_pod == root.name)
+      (!Pod::Tdfire::BinaryStateStore.force_use_binary? && Pod::Tdfire::BinaryStateStore.unpublished_pods.include?(root.name)) 
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler