cocoapods-tdfire-binary 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a77aad2d719b86b57ec8d1f4850d04311a01e430
-  data.tar.gz: 57f18aa0d34ff95a4ce0608d4c834292a6be39a6
+  metadata.gz: f18d003702464d5348466610a3bf47a5b8b7f051
+  data.tar.gz: aa789bc5aa73e6b9daf31b4bd2f2a3fd1ac0141b
 SHA512:
-  metadata.gz: e227912c44fb0ec66f050a85c157c36c38ba0a5d898fcd7d1defb58ae03b4b44ce7c9619dfbe0fea84653c70bf80ee926aba2744df880d99e7ab777328b542b2
-  data.tar.gz: e55e16ccfa8bc61049f2868750002bc110d41683fc6e3777c55801dc02c8e2f9c8de0950be6219fbc495574e4c513f8da1e5ee8868cf918d702d930b09479c8a
+  metadata.gz: 58d963064f599b58aebdf327526b9b7d2ce21fd9b1ef4fd1fe4e6c3b6016b5d1aceaf93bfa7a928f4bf7805e5b59900fc1a6597567cfb4f54c0f7537d8b0101b
+  data.tar.gz: 63b57e9f55de5e684b669b573722cb4d8650728a838fa1bfccccfda3e8fc1ca530983b7bcbe8e9c6a8a9dd61ae518d37581ba3f4b83d9f30095fe9d5a3ac5b2d

data/Gemfile.lock

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

data/README.md

@@ -1,4 +1,4 @@
-# cocoapods-tdfire-binary
+x# cocoapods-tdfire-binary
 
 A description of cocoapods-tdfire-binary.
 

data/Rakefile

@@ -5,9 +5,9 @@ def specs(dir)
 end
 
 desc 'Runs all the specs'
-task :specs do
+task :spec do
   sh "bundle exec bacon #{specs('**')}"
 end
 
-task :default => :specs
+task :default => :spec
 

data/cocoapods-tdfire-binary.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |spec|
   spec.version       = CocoapodsTdfireBinary::VERSION
   spec.authors       = ['tripleCC']
   spec.email         = ['triplec.linux@gmail.com']
-  spec.description   = %q{cocoapods-tdfire-binary is a plugin which helps developer switching there project dependency between source and binary.}
   spec.summary       = %q{cocoapods-tdfire-binary is a plugin which helps developer switching there project dependency between source and binary.}
   spec.homepage      = 'https://github.com/tripleCC/cocoapods-tdfire-binary'
   spec.license       = 'MIT'

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

@@ -95,8 +95,17 @@ module Pod
 
 				# 组件 frameworks 的依赖
 				target_spec.vendored_frameworks = "#{target_spec.root.name}.framework"
-				# target_spec.source_files = "#{target_spec.root.name}.framework/Headers/*"
-				# target_spec.public_header_files = "#{target_spec.root.name}.framework/Headers/*"
+        # 如果不加这一句，会提示找不到 bundle。测试时需要 shift + cmd + k 清除 production
+        #
+        # static framework 不像 dynamic framework ，后者在生成 production 后，会有一个专门的 Frameworks 文件夹，其内部的结构和打包前是一致的， bundle 也会在 .framework 文件中
+        # 而 static framework 的可执行文件部分，会被合并到 App 的可执行文件中， bundle 按逻辑会放到 main bundle 中，
+        # 但是 CocoaPods 并不会帮 vendored_frameworks 中的 static framework  做 bundle 的拷贝工作，
+        # 所以这里需要暴露 static framework 中的 bundle ，明确让 CocoaPods 拷贝 bundle 到 main bundle，
+        # 可以查看 高德地图 和 友盟等 framework ，都已这种方式处理
+        #
+        target_spec.resources = ["#{target_spec.root.name}.framework/Resources/*.bundle", "#{target_spec.root.name}.framework/Versions/A/Resources/*.bundle"]
+				# target_spec.source_files = ["#{target_spec.root.name}.framework/Headers/*", "#{target_spec.root.name}.framework/Versions/A/Headers/*"]
+				# target_spec.public_header_files = ["#{target_spec.root.name}.framework/Headers/*", "#{target_spec.root.name}.framework/Versions/A/Headers/*"]
 
         available_platforms(spec).each do |platform|
           Pod::UI.section("Tdfire: copying configuration for platform #{platform}") do
@@ -129,11 +138,10 @@ module Pod
 			#--------------------------------------------------------------------#
 			# spec 是源码依赖时的配置
 			def set_preserve_paths(spec)
-        # 这里一般不会和上面那个方法一样，不同平台的配置还不一致，所以就不用 consumer 了
-				# 源码、资源文件
-        #
         available_platforms(spec).each do |platform|
           Pod::UI.section("Tdfire: set preserve paths for platform #{platform}") do
+            # 源码、资源文件
+            #
             source_files = spec.tdfire_recursive_value('source_files', platform)
             resources = spec.tdfire_recursive_value('resources', platform)
             resource_bundles = spec.tdfire_recursive_value('resource_bundles', platform)
@@ -149,7 +157,7 @@ module Pod
             preserve_paths += target_preserve_paths unless target_preserve_paths.empty?
 
             target_platform = target_spec.send(platform.to_sym)
-            target_platform.send("preserve_paths=", preserve_paths)
+            target_platform.preserve_paths = preserve_paths.uniq
 
             Pod::UI.message "Tdfire: preserve paths for #{platform}: #{preserve_paths.join(', ')}"
           end
@@ -159,6 +167,9 @@ module Pod
 			#--------------------------------------------------------------------#
 
 			def set_use_static_framework
+        # 1.4.0 版本生效
+        # 使用 use_frameworks! 后，生成静态 Framework
+        #
 				target_spec.static_framework = true if target_spec.respond_to?('static_framework')
 			end
 

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

@@ -25,7 +25,7 @@ module Pod
 			end
 
 			def self.run_curl(command)
-				Pod::UI.message "CURL: \n" + command
+				Pod::UI.message "CURL: \n" + command + "\n"
 
 				system command
 			end

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

@@ -20,10 +20,34 @@ module Pod
         end
 
         def run
-          run_command Package, ['--clean']
-          run_command Lint
-          run_command Push
-          run_command Publish
+          # 每条命令要重开一个上下文
+
+          run_commands [
+                           'pod binary package --clean',
+                           'pod binary lint',
+                           'pod binary push',
+                           'pod binary publish'
+                       ]
+          #
+          # system 'pod binary package --clean'
+          # system 'pod binary lint'
+          # system 'pod binary push'
+          # system 'pod binary publish'
+
+          # the sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
+          # lint 和 publish 的时候，都会出现这个问题
+          #
+          # run_command Package, ['--clean']
+          # run_command Lint
+          # run_command Push
+          # run_command Publish
+        end
+
+        def run_commands(commands)
+          commands.each do |c|
+            system c
+            break if $?.exitstatus != 0
+          end
         end
 
         def run_command(command_class, argv = [])

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

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

@@ -37,7 +37,7 @@ module Pod
       def tdfire_external_pods(pods, *rest)
       	argvs = rest.last || {}
         if !argvs.kind_of?(Hash)
-          info =  <<~EOF
+          info =  <<-EOF
             输入参数错误.
 
             Example:

data/spec/command/specification_spec.rb

@@ -0,0 +1,102 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+module Pod
+  describe Specification do
+    it 'get recursive value' do
+      spec = Specification.new do |s|
+        s.framework = 'UIKit'
+        s.ios.framework = 'CoreGraphics'
+
+        s.subspec 'boy' do |ss|
+          ss.framework = 'Accounts'
+          ss.ios.framework = 'ARKit'
+        end
+      end
+      spec.tdfire_recursive_value('frameworks', :ios).should == ['UIKit', 'CoreGraphics', 'Accounts', 'ARKit']
+      spec.tdfire_recursive_value('frameworks', :osx).should == ['UIKit', 'Accounts']
+    end
+  end
+
+  describe SpecificationRefactor = Tdfire::BinarySpecificationRefactor do
+    before do
+      @boy_spec = Specification::new(nil, 'Preson') do |s|
+        s.public_header_files = 'boy.h'
+        s.source_files = 'boy.{h,m}'
+        s.resources = 'boy.png'
+        s.resource_bundles = {:boy => 'boy_next_door.png' }
+
+        s.frameworks = 'UIKit'
+        s.dependency 'ReactiveX'
+      end
+
+      @girl_spec = Specification::new(nil, 'Preson') do |s|
+        s.public_header_files = 'boy.h'
+        s.source_files = 'boy.{h,m}'
+        s.resources = 'boy.png'
+        s.resource_bundles = {:boy => 'boy_next_door.png' }
+
+        s.frameworks = 'UIKit'
+        s.dependency 'ReactiveX'
+
+        s.subspec 'Core' do |ss|
+          ss.public_header_files = 'Core/Core.h'
+          ss.source_files = 'Core.{h,m}'
+          ss.resources = 'Core.png'
+          ss.resource_bundles = {:Core => 'core_next_door.png' }
+
+          ss.frameworks = 'CoreGraphics'
+          ss.dependency 'AFNetworking'
+        end
+
+        s.subspec 'Car' do |ss|
+          ss.public_header_files = 'Car/Car.h'
+          ss.source_files = 'Car.{h,m}'
+          ss.resources = 'Car.png'
+          ss.resource_bundles = {:Car => 'car_next_door.png' }
+
+          ss.frameworks = 'Accounts'
+          ss.dependency 'SDWebImage'
+          ss.dependency 'Preson/Core'
+        end
+      end
+
+      @empty_spec = Specification::new(nil, 'Preson')
+    end
+
+    it 'configure binary' do
+      refactor = SpecificationRefactor.new(@empty_spec)
+      refactor.configure_binary(@boy_spec)
+
+      ios_consumer = @empty_spec.consumer(:ios)
+      ios_consumer.frameworks.should == ['UIKit']
+      ios_consumer.dependencies.map(&:name).should == ['ReactiveX']
+      ios_consumer.vendored_frameworks.should == ['Preson.framework']
+    end
+
+    it 'configure binary default subspec' do
+      refactor = SpecificationRefactor.new(@empty_spec)
+      refactor.configure_binary_default_subspec(@girl_spec)
+
+      (@empty_spec.subspecs.map(&:name) - ['Preson/TdfireBinary']).should == @girl_spec.subspecs.map(&:name)
+      ios_consumer = @empty_spec.subspecs.select { |s| s.name == 'Preson/TdfireBinary' }.first.consumer(:ios)
+      ios_consumer.frameworks.should == ['UIKit', 'CoreGraphics', 'Accounts']
+      ios_consumer.dependencies.map(&:name).should == ['ReactiveX', 'AFNetworking', 'SDWebImage']
+      ios_consumer.vendored_frameworks.should == ['Preson.framework']
+    end
+
+    it 'set preserve paths' do
+      refactor = SpecificationRefactor.new(@empty_spec)
+      refactor.set_preserve_paths(@boy_spec)
+
+      preserve_paths = ['Preson.framework']
+      preserve_paths += ['boy.{h,m}', 'boy.png', 'boy_next_door.png']
+      @empty_spec.consumer(:ios).preserve_paths.sort.should == preserve_paths.sort
+
+      refactor = SpecificationRefactor.new(@empty_spec)
+      refactor.set_preserve_paths(@girl_spec)
+      preserve_paths += ['Core.{h,m}', 'Core.png', 'core_next_door.png']
+      preserve_paths += ['Car.{h,m}', 'Car.png', 'car_next_door.png']
+      @empty_spec.consumer(:ios).preserve_paths.sort.should == preserve_paths.sort
+    end
+  end
+end

data/spec/fixtures/boy.podspec

@@ -0,0 +1,13 @@
+Pod::Spec.new do |s|
+  s.name             = "boy"
+  s.version          = "1.0.0"
+  s.author           = { "boy" => "boy.@next.door" }
+  s.summary          = "🙈🙉🙊"
+  s.description      = "boy next door"
+  s.homepage         = "http://httpbin.org/html"
+  s.source           = { :git => "http://boy.next/door.git", :tag => s.version.to_s }
+  s.license          = 'MIT'
+
+  s.public_header_files   = 'boy.h'
+  s.source_files   = 'boy.{h,m}'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,8 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-description: cocoapods-tdfire-binary is a plugin which helps developer switching there
-  project dependency between source and binary.
+description: 
 email:
 - triplec.linux@gmail.com
 executables: []
@@ -102,6 +101,8 @@ files:
 - lib/cocoapods-tdfire-binary/specification_dsl.rb
 - lib/cocoapods_plugin.rb
 - spec/command/binary_spec.rb
+- spec/command/specification_spec.rb
+- spec/fixtures/boy.podspec
 - spec/spec_helper.rb
 homepage: https://github.com/tripleCC/cocoapods-tdfire-binary
 licenses:
@@ -130,4 +131,6 @@ summary: cocoapods-tdfire-binary is a plugin which helps developer switching the
   project dependency between source and binary.
 test_files:
 - spec/command/binary_spec.rb
+- spec/command/specification_spec.rb
+- spec/fixtures/boy.podspec
 - spec/spec_helper.rb