cocoapods-tdfire-binary 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f5ba72a9ddd8d74b307cad072481ea4f0e1282
-  data.tar.gz: 190b2307c266f0ea597697267a1f48d043ec2c44
+  metadata.gz: d8328e8ae8eaa871044cbb0532223f282d1f882f
+  data.tar.gz: d6378235a93ebb956a8ed486fd0f089aac2d1297
 SHA512:
-  metadata.gz: 5ef9d0e540afae2ee4953c5fdac5b54de4c266c8907ea778a6bca0b84e7f9fd54c2e89b93dd41a35c125d32a4e5efc8742e99603a8e5d90f3db89093658f17ed
-  data.tar.gz: e30c8ebe815e9c99f1d2987deaf4222dd2bae7afb883451b591d45ea4fc3a04ce4e10e7bf2203c86cafcfdcbb3101ad3686d46ba81dd10dfac498fb1b94c1f7e
+  metadata.gz: cb56e5c7c6176d9c4754c10318459a17ab27ea688c6c22a63fe03ce48838f4f849f1efab2bf35ec12f60c34a40ddd037066f2e77016466eae16110f6974ce108
+  data.tar.gz: df1a74d5402762726901609e32b1e8c5cbe0d4ad962a363e3f37ebad79cc2fc354d0f05ffaa19848cfac30ff66d588780c5c6402919633fcf441f06e4dcde6f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-tdfire-binary (1.0.0)
+    cocoapods-tdfire-binary (1.0.3)
       cocoapods (~> 1.4)
       cocoapods-packager (~> 1.5.0)
 

data/cocoapods-tdfire-binary.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 12.0'
 
-  spec.add_dependency 'cocoapods', '~> 1.5'
+  spec.add_dependency 'cocoapods', '~> 1.4'
   spec.add_dependency 'cocoapods-packager', '~> 1.5.0'
 end

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

@@ -8,6 +8,7 @@ module  Tdfire
 			attr_reader :printed_pods
 			attr_accessor :use_frameworks
 			attr_accessor :use_source
+			attr_accessor :lib_lint_binary_pod
 		end
 		
 		@use_source_pods = []

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

@@ -1,3 +1,5 @@
+require 'cocoapods-tdfire-binary/binary_state_store'
+
 module Pod
 	class Command
 		class Binary < Command
@@ -8,9 +10,53 @@ module Pod
 					对本地二进制进行 Lint
 	      DESC
 
-	      def run
-        	
-        end
+				def self.options
+					[
+							['--sources', '私有源地址'],
+							['--clean', '执行成功后，删除 zip 文件外的所有生成文件'],
+					].concat(super)
+				end
+
+				def initialize(argv)
+					@clean = argv.flag?('clean')
+					@sources = argv.option('sources')
+					@spec_file = first_podspec
+					@spec_name = @spec_file.split('/').last.split('.').first
+					unzip_framework
+					super
+				end
+
+				def validate!
+					super
+					help! '当前目录下没有podspec文件.' if @spec_file.nil?
+					framework = "#{@spec_name}.framework"
+					help! "当前目录下没有#{framework}文件" unless File.exist?(framework)
+				end
+
+				def unzip_framework
+					framework = "#{@spec_name}.framework"
+					zip_name = "#{framework}.zip"
+					if File.exist?(zip_name) && !File.exist?("#{@spec_name}.framework")
+						system "unzip #{zip_name}"
+					end
+				end
+
+				def run
+					Tdfire::BinaryStateStore.lib_lint_binary_pod = @spec_name
+
+					argvs = [
+							"--sources=#{@sources || Tdfire::BinaryUrlManager.private_cocoapods_url}",
+							'--allow-warnings',
+							'--use-libraries',
+							'--verbose'
+					]
+
+					lint= Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
+					lint.validate!
+					lint.run
+
+					system "rm -fr #{@spec_name}.framework " if @clean
+				end
 			end
 		end
 	end

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

@@ -66,7 +66,7 @@ module Pod
 								FileUtils.rm_rf(b)
 							end
 						end
-					end
+					end if File.exist? "#{framework_path}/Versions/A/Resources"
 
         	output_name = "#{framework_name}.zip"
         	UI.section("Tdfire: zip #{framework_path} ...") do

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

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

@@ -58,12 +58,13 @@ module Pod
         end
       end
 
+
       # 配置二进制文件下载、cache 住解压好的 framework
       def tdfire_set_binary_download_configurations
         tdfire_refactor.set_preserve_paths_with_reference_spec(tdfire_reference_spec)
 
         # 没有发布的pod，没有二进制版本，不进行下载配置
-        return if !Tdfire::BinaryStateStore.force_use_binary? && Tdfire::BinaryStateStore.unpublished_pods.include?(root.name)
+        return if tdfire_should_skip_download?
 
         raise Pod::Informative, "You must invoke the method after setting name and version" if root.name.nil? || version.nil?
 
@@ -78,9 +79,15 @@ module Pod
     end
 
     def tdfire_use_source?
-      (!Tdfire::BinaryStateStore.force_use_binary? && 
-      (!Tdfire::BinaryStateStore.use_binary? || Tdfire::BinaryStateStore.real_use_source_pods.include?(root.name))) ||
-      Tdfire::BinaryStateStore.force_use_source?
+      ((!Tdfire::BinaryStateStore.force_use_binary? &&
+          (!Tdfire::BinaryStateStore.use_binary? || Tdfire::BinaryStateStore.real_use_source_pods.include?(root.name))) ||
+          Tdfire::BinaryStateStore.force_use_source?) &&
+          (Tdfire::BinaryStateStore.lib_lint_binary_pod != root.name)
+    end
+
+    def tdfire_should_skip_download?
+      (!Tdfire::BinaryStateStore.force_use_binary? && Tdfire::BinaryStateStore.unpublished_pods.include?(root.name)) ||
+          (Tdfire::BinaryStateStore.lib_lint_binary_pod == root.name)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - tripleCC
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: cocoapods-packager
   requirement: !ruby/object:Gem::Requirement