cocoapods-tdf-bin 0.0.28 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bdb076bb3b6e381790ebe749eb7c95ec28a50c80d9881dcdba36f2a65fc59b7
-  data.tar.gz: 68aad5923bd08c16e4ff9cacc08e8fdb41b4295504affbb306e08524cc65ac4f
+  metadata.gz: 52d79d7c48a4fa498edfe0d2a4676363072fbac3d1edcbef40a3885261213f60
+  data.tar.gz: 9f2481c7880b46e3474650aea259d97432d60abfba3cfdaf45af00c07f467d4f
 SHA512:
-  metadata.gz: 40db87d009cb7925f78947f40aa2bfaa32fe6bae59df182dab8ec99a61bb7a3cb906c4b43fb95dcb0adc7654709ac42933d7a1c6f65c955dee1ae2cd3a223107
-  data.tar.gz: ad74c200ef28f06b6f2f9cbf63dbb464c0ca628092b6b22be36bc2e85ede55c8a3ccb30125f4e2d3d9811a8ec1c22ba59c6cb89e56448e4fee3f5a6b99f0b349
+  metadata.gz: e472d730c0ec163ab3ab78c751f5c4ed68e4a401a32771a9e6444a2fc64028ab4e66ae2e4d230aacd0543c4d1dfcd8317466be1cd0b150814eeff2e0bf78d929
+  data.tar.gz: 426600ad46764c5d356a788bdff3ff89487eb146a5e45e0924e5608b6007c98e96a84f98311ddb016bc7d6d8447c0c0528077cda720f0701f2cc10fb644d408f

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

@@ -9,6 +9,11 @@ module Pod
 
         self.summary = "批量操作本地依赖组件的 git 命令"
         self.description = <<-DESC
+          批量导入的例子：
+          batch_pod [
+            "TDFHomeModule",
+            "TDFLogin",
+          ], "../../", :branch => "feature/smallNeeds", :isLocal => true
           用来批量操作通过 batch_pod_local 本地依赖的组件库，比如 pod bin batch pull, pod bin batch checkout master 等等；
           操作的是是通过 batch_pod_local 依赖的本地组件
         DESC
@@ -57,23 +62,35 @@ module Pod
           local_pods = podfile_instance.get_batch_local_pods
           local_pods.each_key do |name|
             path = local_pods[name][0][:path]
+            branch = local_pods[name][0][:branch]
             repo_url = Batch.find_repo_with_pod(name)
             puts "============== #{name} 开始 clone 到 #{path}==============".tdf_blue
             puts `git clone #{repo_url} #{path}`
+            res = `git -C #{path} checkout #{branch}`
+            puts "imwcl1"
+            puts res
+            if res != 0
+              puts "imwcl2"
+              `git -C #{path} checkout -b #{branch}`
+            end 
           end
         end
 
         def run_git(podfile_instance)
+          arg = @arguments.map do |v|
+            match_str = /\s/.match(v)
+            if nil != match_str
+              v = "\"#{v}\""
+            end
+            v
+          end
+          arg = arg.join(" ")
+
+          puts "============== 主工程开始执行 git #{arg} 命令 ==============".tdf_blue
+          puts `git #{arg}`
+
           podfile_instance.get_batch_local_pods.each_value do |value|
             path = value[0][:path]
-            arg = @arguments.map do |v|
-              match_str = /\s/.match(v)
-              if nil != match_str
-                v = "\"#{v}\""
-              end
-              v
-            end
-            arg = arg.join(" ")
             puts "============== #{path} 开始执行 git #{arg} 命令 ==============".tdf_blue
             puts `git -C #{path} #{arg}`
           end

data/lib/cocoapods-tdf-bin/command/bin/spec/push.rb

@@ -59,8 +59,6 @@ module Pod
                     end
                   end
 
-                  argvs << '--verbose'
-
                   push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
                   push.validate!
                   push.run

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.28'
+  VERSION = "0.0.31"
 end
 
 module Pod

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

@@ -165,7 +165,41 @@ module CBin
         spec_hash.delete('resource_bundles')
         spec_hash.delete('exclude_files')
         spec_hash.delete('preserve_paths')
-        # spec_hash.delete('source_files')
+        spec_hash.delete('source_files')
+
+        # 处理子库，将二进制子库的依赖全部放到最外层，删除子库的source_files
+        dependencies = Hash(spec_hash["dependencies"])
+        sub_specs = spec_hash["subspecs"]
+        if sub_specs != nil
+          sub_specs.each { |suc_spec|
+            begin
+              deps_hash = suc_spec["dependencies"]
+              # 删除二进制下无用的字段，目前只支持 ios 架构
+              suc_spec["vendored_frameworks"] = spec_hash["vendored_frameworks"]
+              suc_spec.delete('source_files')
+              suc_spec.delete('dependencies')
+              suc_spec.delete('osx')
+              suc_spec.delete('tvos')
+              suc_spec.delete('watchos')
+              platforms = suc_spec["platforms"]
+              platforms.delete('osx')
+              platforms.delete('tvos')
+              platforms.delete('watchos')
+              if deps_hash != nil
+                dependencies = dependencies.merge(deps_hash)
+              end
+            rescue
+            end
+          }
+        end
+
+        # 去重自己对自己的依赖
+        dependencies = dependencies.reject do |d|
+          d.start_with?("#{@spec.name}/")
+        end
+        spec_hash["dependencies"] = dependencies
+        spec_hash["subspecs"] = sub_specs
+
         # 这里不确定 vendored_libraries 指定的时动态/静态库
         # 如果是静态库的话，需要移除，否则就不移除
         # 最好是静态库都独立成 Pod ，cocoapods-package 打静态库去 collect 目标文件时好做过滤

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

@@ -69,7 +69,7 @@ EOF
         argvs = [
             "#{binary_podsepc_json}",
             "--binary",
-            "--sources=#{sources_option(@code_dependencies, @sources)},https:\/\/cdn.cocoapods.org",
+            "--sources=#{sources_option(@code_dependencies, @sources)}",
             "--skip-import-validation",
             "--use-libraries",
             "--allow-warnings",

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

@@ -13,10 +13,26 @@ module Pod
         set_internal_hash_value(ALLOW_PRERELEASE, true)
       end
 
-      def batch_pod_local(pods, path = "../../")
+      def batch_pod(pods, path = "../../", *requirements)
+        isLocal = requirements[0][:isLocal]
+        branch = requirements[0][:branch]
+        if isLocal.nil?
+          isLocal = false
+        end
+        if branch.nil?
+          branch = "master"
+        end
+        if isLocal
+          batch_pod_local(pods, path, branch)
+        else
+          batch_pod_remote(pods, branch)
+        end
+      end
+
+      def batch_pod_local(pods, path = "../../", branch = "master")
         pod_hash = Hash.new
         pods.each do |name|
-          pod_hash[name] =  [ :path => "#{path}#{name}" ]
+          pod_hash[name] =  [ :path => "#{path}#{name}", :branch => branch ]
         end
         if get_batch_local_pods.nil?
           set_internal_hash_value(BATCH_POD_LOCAL, pod_hash)

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

@@ -120,12 +120,12 @@ module Pod
         use_source_pods = podfile.use_source_pods
 
         # 所有库的个数
-        all_spec_count = 0
+        # all_spec_count = 0
 
         missing_binary_specs = []
         specs_by_target.each do |target, rspecs|
 
-          all_spec_count = all_spec_count + rspecs.count
+          # all_spec_count = all_spec_count + rspecs.count
 
           # use_binaries 并且 use_source_pods 不包含  本地可过滤
           use_binary_rspecs = if podfile.use_binaries? || podfile.use_binaries_selector
@@ -237,8 +237,8 @@ module Pod
         end
 
         # 二进制库的个数
-        bin_spec_count = all_spec_count - sources_sepc.count
-        UI.message "组件二进制化比例 #{bin_spec_count}/#{all_spec_count}"
+        # bin_spec_count = all_spec_count - sources_sepc.count
+        # UI.message "组件二进制化比例 #{bin_spec_count}/#{all_spec_count}"
 
         specs_by_target
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.31
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel