cocoapods-tdf-bin 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d58cea5d61fb520ad758e073c7a48ae4aa12e671ddbd5a37d9986dd6a95bb48c
-  data.tar.gz: b624142d0d1188145253d0dae5a92b7ebfc8330ed473638f626d748f25bf4406
+  metadata.gz: 86a91d0128afbce92cb49c569930af615972ff11440d4272345e0a077a6a1fa1
+  data.tar.gz: 01c470b5ac5dc999e4a3abcbd8cb39f355780358f4a738de7e053156a0d26b3c
 SHA512:
-  metadata.gz: c60b46825ec13f889eeeee0082e5963fba468a7ad6f62bde80bf1d0277cb3a2505c30a8920e198082cb89c6827d25ef1ae2c18c0a07b196149c57d69fd78184e
-  data.tar.gz: de6cca9c41748e410a7b865ce4b90a5fbc2340b04dbf566abe17eeeaf0889e961ca87cb410681dc30f59bdfbd9447a375aea8bb7b0828f89710115e9ed1894c0
+  metadata.gz: 2d450a0cd70705f4a4603bf64e40313c3c2ca1015aa9dc39fa24d2c1e069f594812cfdb48a9c228cc0605e126c00264a578171f33afb075ccb068fae1517d7c0
+  data.tar.gz: 40eb0a9bb0963bf0b1009d00f82c30c68104542d8a55a739e626a7da2fb42b441af52485e30f5b4ba727780cab78ff7cb7dd17b17bcaed519af14adcba58263b

data/lib/cocoapods-tdf-bin/command/bin/auto.rb

@@ -50,6 +50,7 @@ module Pod
           @additional_args = argv.remainder!
 
           Pod::Resolver.build_dependencies_only_build(@only_build)
+          Pod::Resolver.build_dependencies_bin(true)
 
           super
         end

data/lib/cocoapods-tdf-bin/gem_version.rb

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end
 
 module Pod

data/lib/cocoapods-tdf-bin/helpers/framework_builder.rb

@@ -258,8 +258,17 @@ module CBin
           resources.each do |source|
             escape_resource << Shellwords.join(source)
           end
-          UI.message "Copying resources #{escape_resource}"
-          `cp -rp #{escape_resource.join(' ')} #{resource_target_dir}`
+
+          escape_resource_str = escape_resource.join(' ')
+          escape_resource_arr = escape_resource_str.split(' ')
+
+          escape_resource_arr = escape_resource_arr.select do | source |
+            suffix = File.extname(source)
+            not expand_suffix(suffix)
+          end
+
+          UI.message "Copying resources #{escape_resource_arr}"
+          `cp -rp #{escape_resource_arr.join(' ')} #{resource_target_dir}`
         end
       end
 
@@ -269,6 +278,17 @@ module CBin
         end
       end
 
+      def expand_suffix(suffix)
+        case suffix
+        when '.storyboard'        then true
+        when '.xib'               then true
+        when '.xcdatamodel'       then true
+        when '.xcdatamodeld'      then true
+        when '.xcmappingmodel'    then true
+        else                      false
+        end
+      end
+
       def framework
         @framework ||= begin
                          framework = Framework.new(@spec.name, @platform.name.to_s)

data/lib/cocoapods-tdf-bin/helpers/spec_creator.rb

@@ -119,8 +119,6 @@ module CBin
 
         @spec.resources = binary_resources if @spec.attributes_hash.keys.include?("resources")
 
-
-
         @spec
       end
 
@@ -133,7 +131,7 @@ module CBin
       end
 
       def framework_contents(name)
-        ["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
+        ["#{code_spec.root.name}.framework"].map { |path| "#{path}/#{name}" }
       end
 
       def binary_source_files

data/lib/cocoapods-tdf-bin/helpers/spec_source_creator.rb

@@ -140,8 +140,15 @@ module CBin
         if code_spec_consumer.resources.any?
           extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
         end
+
+        extnames = extnames.select do | extname |
+          not expand_suffix(extname)
+        end
+
         if extnames.any?
-          @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+          resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+          resources << "#{code_spec.root.name}.framework/*.{storyboardc,nib,mom,momd,cdm}"
+          @spec.resources = resources
         end
 
         # Source Location
@@ -182,6 +189,16 @@ module CBin
         @spec
       end
 
+      def expand_suffix(suffix)
+        if suffix.end_with?('.storyboard') ||
+          suffix.end_with?('.xib') ||
+          suffix.end_with?('.xcdatamodel') ||
+          suffix.end_with?('.xcdatamodeld') ||
+          suffix.end_with?('.xcmappingmodel')
+          return true
+        end
+        false
+      end
 
       def binary_source
         { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
@@ -192,7 +209,6 @@ module CBin
       end
 
       def framework_contents(name)
-        # ["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
         ["#{code_spec.root.name}.framework"].map { |path| "#{path}/#{name}" }
       end
 

data/lib/cocoapods-tdf-bin/native/resolver.rb

@@ -11,8 +11,12 @@ require 'cocoapods-tdf-bin/command/bin/archive'
 module Pod
   class Resolver
 
+    # 仅仅只是编译出产物，不上传
     @@build_dependencies_only_build = false
 
+    # 是否是在进行二进制打包处理，没有的话一些步奏需要省略掉
+    @@build_dependencies_bin = false
+
     if Pod.match_version?('~> 1.6')
       # 其实不用到 resolver_specs_by_target 再改 spec
       # 在这个方法里面，通过修改 dependency 的 source 应该也可以
@@ -97,6 +101,11 @@ module Pod
       def Resolver.build_dependencies_only_build(only_build)
         @@build_dependencies_only_build = only_build
       end
+
+      def Resolver.build_dependencies_bin(bin)
+        @@build_dependencies_bin = bin
+      end
+
     end
 
       # >= 1.4.0 才有 resolver_specs_by_target 以及 ResolverSpecification
@@ -138,8 +147,11 @@ module Pod
             source = use_binary ? sources_manager.binary_source : sources_manager.code_source
 
             spec_version = rspec.spec.version
-            UI.message 'cocoapods-tdf-bin 插件'
-            UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
+
+            if use_binary
+              UI.message 'cocoapods-tdf-bin 插件'
+              UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
+            end
 
             if @@build_dependencies_only_build
               missing_binary_specs << rspec.spec
@@ -183,6 +195,10 @@ module Pod
           end.compact
         end
 
+        unless @@build_dependencies_bin
+          return specs_by_target
+        end
+
         if missing_binary_specs.any?
           missing_binary_specs.uniq.each do |spec|
             UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel