cocoapods-tdf-bin 0.0.12 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f426d0f65a3e2ad333f5ba92814d51e96c692e450e7971517d45049ec5091075
-  data.tar.gz: 2a6b18897c3bd6616f5833c3a586844fbbe2f038fc5fb0281600c7584168cf7e
+  metadata.gz: cf063e0d4570d17654e501c087cd63ae676b990238bb720cf5ff5303972a6984
+  data.tar.gz: c230891ecb4fbaacf6dcdedcb70f1c92610a164c31f75965a125fac8a49034de
 SHA512:
-  metadata.gz: b22d9c1539bc9591d3250a0e4ed11d988aa7b0c7028c19309d929b0aad76c2c52867bf53f9244efa39545be2e6c2f1f5e2a20501d14b1f01e24dacc956cd54b1
-  data.tar.gz: 81b428ff27cc72e2caf90e485fc362436e2a419294433ac144bf90f84cd41819e7b5d14ca6eb143f05ae5d40394e2f1cd93a8a12e14b561728430cc4004bea9d
+  metadata.gz: e682d524e2a7ab92f8be63fd9aafa1ec1fb190b2397d5991e9e7873294d1cee4390c510390ef240a772580685633098970af651772289464323c0c3cd8cbe2b4
+  data.tar.gz: 7a6c7498c6fc74a2972c157b92c6cf7181350e936ddf03e6c43defd9f4ed4063f67dd6b0ce3f03d6843f40c57fee36fbb086f13f91058e83cee1aa78727f52b2

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/config/config.rb

@@ -12,10 +12,10 @@ module CBin
     def template_hash
       {
           'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
-          'code_repo_url' => { description: '源码私有源 Git 地址', default: 'git@github.com:su350380433/example_spec_source.git' },
-          'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@github.com:su350380433/example_spec_bin_dev.git' },
-          'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://localhost:8080/download/%s/%s/zip' },
-          'binary_upload_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://localhost:8080/upload/%s/%s/zip' },
+          'code_repo_url' => { description: '源码私有源 Git 地址', default: 'git@git.2dfire.net:ios/cocoapods-spec.git' },
+          'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@git.2dfire.net:ios/cocoapods-spec-binary.git' },
+          'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://iosframeworkserver-shopkeeperclient.app.2dfire.com/download/%s/%s.zip' },
+          'binary_upload_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://iosframeworkserver-shopkeeperclient.app.2dfire.com/upload/%s/%s.zip' },
           # 'binary_type' => { description: '二进制打包类型', default: 'framework', selection: %w[framework library] },
           'download_file_type' => { description: '下载二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }
       }

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.12'
+  VERSION = '0.0.16'
 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
@@ -163,14 +175,13 @@ module Pod
                                end
                 # used_by_only = rspec.respond_to?(:used_by_tests_only) ? rspec.used_by_tests_only : rspec.used_by_non_library_targets_only
                 # 组装新的 rspec ，替换原 rspec
-                if use_binary
+                if rspec.source != false
                   rspec = if Pod.match_version?('~> 1.4.0')
                             ResolverSpecification.new(specification, used_by_only)
                           else
                             ResolverSpecification.new(specification, used_by_only, source)
                           end
                   UI.message "组装新的 rspec ，替换原 rspec #{rspec.root.name} #{spec_version} \r\n specification =#{specification} \r\n #{rspec} "
-
                 end
 
               rescue Pod::StandardError => e
@@ -186,6 +197,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.12
+  version: 0.0.16
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel