cocoapods-bb-bin 0.2.8.1 → 0.2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a407974bf0e3a3d83090414b24bc3a141b5e43266209880a76612f6803a495a2
-  data.tar.gz: 4172223e8c1f104fd0a8bc04f5dcc576b0a171cc1887d7fdbd43c8a8d956da09
+  metadata.gz: 6fce318ef901fcad220462267c7b775a896a713d64b709ea17dcb25fda700e81
+  data.tar.gz: 558223276cae0cdb2c17d46c28860b5710d5c43495a7d1e0e03c2602f79aca1b
 SHA512:
-  metadata.gz: 1cba0529db54c5feceb01b4aa88f088b281ca517204a28dd31e9d6e93fc4c704711fc23191bb227e92b691d75376f42ec908eb234a6e5805896fde57e0ecba15
-  data.tar.gz: cc7d774005f4d73e11c09ec84044db1254932bfe0ebfd1adb9cc67c21a50af59b64a2e41f478747afb724a87ee5af5a07b1e1dd430781c8cc6a6031b5926e607
+  metadata.gz: 754e5f52ac96ddf65d2e66a3f3ff1cf1c48703d8718e90ef65b5297693103b88acd8a9019c2070397f8e961327d4ae2fcfa0d29f942fb3974ad1387564c8b835
+  data.tar.gz: 185d627c29158d5449769975f2bbec760da7ed7212bed6331c1751c81cff707ef468c5be2fffc15d057ea344961542b164c8366759870892402b0876ede59b2a

data/lib/cocoapods-bb-bin/command/bin/localPush.rb

@@ -19,9 +19,12 @@ module Pod
           [
             ['--sources', '私有源地址，多个用分号区分'],
             ['--path', '(必传)需要上传文件路径'],
+            ['--new_pod_name', '(可选)组件库新名称'],
             ['--vendored_framework_name', '(可选)组件库依赖framework名称，默认组件名称'],
             ['--dylib', '(可选)是否动态库,默认静态库'],
             ['--developer_mode', '(可选)是否开发者模式,默认发布模式'],
+            ['--upload_res', '(可选)是否上传资源文件，格式：zip、tgz'],
+            ['--only_business_spec', '(可选)仅仅上传到业务线专属spec，需要配合sources一起使用'],
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -35,9 +38,14 @@ module Pod
             @podspec = argv.shift_argument || find_podspec
             @sources = argv.option('sources') || []
             @localPath = argv.option('path') || nil
+            @pod_name = argv.option('new_pod_name') || nil
             @vendored_framework_name = argv.option('vendored_framework_name') || nil
             @is_dylib = argv.flag?('dylib', false )
             @is_dev_model = argv.flag?('developer_mode', false )
+            # 上传资源
+            @is_up_res = argv.flag?('upload_res', false )
+            # 上传到业务线专属spec
+            @only_business_spec = argv.flag?('only_business_spec', false )
           end
           super
         end
@@ -57,6 +65,11 @@ module Pod
             @spec = Specification.from_file(@podspec)
             # dev环境修改version规则 by hm 24/8/20
             @spec.version = binary_version(@is_dev_model)
+            # 修改pod名称 by hm 24/10/9
+            if @pod_name
+              puts "====修改pod名称，原始：#{@spec.name} 新：#{@pod_name}"
+              @spec.name = @pod_name
+            end
             # 上传文件
             localPath = update_uploadpath unless !@localPath
             if File.file?(localPath)
@@ -65,9 +78,11 @@ module Pod
                 sources_sepc << @spec
 
                 fail_push_specs = []
+                pushsourcespec = hasUploadSourceCodeSpec # 是否需要上传源码spec
                 sources_sepc.uniq.each do |spec|
                     begin
-                        fail_push_specs << spec unless CBin::Upload::Helper.new(spec,true,@sources,true).upload_binary_file(localPath, @is_dylib, @vendored_framework_name)
+                        is_upload_sourcecode = 
+                        fail_push_specs << spec unless CBin::Upload::Helper.new(spec,true,@sources,pushsourcespec).upload_binary_file(localPath, @is_dylib, @vendored_framework_name, @is_up_res)
                     rescue  Object => exception
                         UI.puts exception
                         fail_push_specs << spec
@@ -141,6 +156,17 @@ module Pod
           return new_version
         end
 
+        # 是否需要上传源码spec
+        def hasUploadSourceCodeSpec()
+          # 如果配置业务线专属spec，那么不去设置源码spec
+          hasSource = true
+          if @only_business_spec == true && !@sources.empty?
+            puts "配置业务线专属spec：#{@sources}".yellow
+            hasSource = false
+          end
+          return hasSource
+        end
+
       end
     end
   end

data/lib/cocoapods-bb-bin/command/bin/repo/push.rb

@@ -61,7 +61,7 @@ module Pod
                 Podfile.execute_with_allow_prerelease(@allow_prerelease) do
                   Podfile.execute_with_use_binaries(!@code_dependencies) do
                     argvs = [
-                      repo,
+                      push_repo,
                       "--sources=#{sources_option(@code_dependencies, @sources)}",
                       *@additional_args
                     ]
@@ -74,7 +74,7 @@ module Pod
                         argvs << '--use-libraries'
                       end
                     end
-  
+                    puts "push argvs: #{argvs}".yellow
                     push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
                     push.validate!
                     push.run
@@ -98,15 +98,10 @@ module Pod
                   end
                   @podspec = podspecs.first
                 end
-                new_repo = repo # 内部判断区源码还是二进制
-                if !@repo.nil?
-                  new_repo = @repo # 使用命令传入
-                end
                 argvs = [
-                  new_repo, 
+                  push_repo, 
                   @podspec,
                   "--sources=#{sources_option(@code_dependencies, @sources)}",
-                  # '--verbose',
                   '--allow-warnings',
                   '--use-static-frameworks',
                   '--skip-import-validation',
@@ -162,9 +157,15 @@ module Pod
             end
           end
 
-          def repo
-            @binary ? binary_source.name : code_source.name
+          def push_repo
+            if !@repo.empty?
+              new_repo = @repo # 使用命令传入
+            else 
+              new_repo = @binary ? binary_source.name : code_source.name # 内部判断区源码还是二进制
+            end
+            return new_repo
           end
+
         end
       end
     end

data/lib/cocoapods-bb-bin/command/bin/repo/update.rb

@@ -8,7 +8,7 @@ module Pod
           self.summary = '更新私有源'
 
           self.arguments = [
-            CLAide::Argument.new('NAME', false)
+            CLAide::Argument.new('NAME', false) # local spec name
           ]
 
           def self.options
@@ -28,6 +28,7 @@ module Pod
             if @name || @all
               config.sources_manager.update(@name, show_output)
             else
+              puts "repo update valid_sources:#{valid_sources}"
               Parallel.each(valid_sources, in_threads: 4) do |source|
                 UI.puts "更新私有源仓库 #{source.to_s}".yellow
                 source.update(show_output)

data/lib/cocoapods-bb-bin/config/config.rb

@@ -13,6 +13,11 @@ module CBin
     def template_hash
       {
           'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
+          'br_repo_url' => { description: 'BR产品线-源码私有源(源/静态库) Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
+          'bw_repo_url' => { description: 'BW产品线-源码私有源(源/静态库) Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
+          'math_repo_url' => { description: '数学产品线-源码私有源(源/静态库) Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
+          'science_repo_url' => { description: '科学产品线-源码私有源(源/静态库) Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
+          'abc_repo_url' => { description: 'ABC产品线-源码私有源(源/静态库) Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
           'code_repo_url' => { description: '源码私有源(源/静态库) Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
           'binary_repo_url' => { description: '二进制静态库私有源 Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
           'dylib_repo_url' => { description: '动态链接库私有源 Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },

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

@@ -1,7 +1,7 @@
 require 'cocoapods'
 
 module CBin
-  VERSION = '0.2.8.1'
+  VERSION = '0.2.10.0'
 end
 
 module Pod

data/lib/cocoapods-bb-bin/helpers/push_spec_helper.rb

@@ -11,41 +11,38 @@ module CBin
     class Helper
       include CBin::SourcesHelper
 
-      def initialize()
+      def initialize(sources="")
+        @sources = sources
       end
 
       # 上传二进制 podspec
       def push_binary_repo(binary_podsepc_json,isGenDylib=false)
-        argvs = [
-            "#{binary_source.name}",  # repo
-            "#{binary_podsepc_json}", # spec
-            "--binary",
-            "--sources=#{binary_source},https:\/\/cdn.cocoapods.org",
-            "--skip-import-validation",
-            "--use-libraries",
-            "--allow-warnings",
-            "--verbose",
-            "--code-dependencies",
-            '--no-cocoapods-validator', #不采用cocoapods验证
-        ]
-        if @verbose
-          argvs += ['--verbose']
+        if !@sources.empty?
+          customsource = custom_business_source(@sources)
+        else
+          customsource = binary_source
         end
-        if isGenDylib # 生成动态库
-          argvs += ['--dylib']
-        end
-        Pod::UI.message "上传二进制 argvs: #{argvs}"
-        push = Pod::Command::Bin::Repo::Push.new(CLAide::ARGV.new(argvs))
-        push.validate!
-        push.run
+        puts "binary customsource=#{customsource}"
+        push_customsource_repo(binary_podsepc_json, customsource, isGenDylib, true)
       end
 
       # 上传源码podspec
       def push_source_repo(source_podsepc_json)
+        if !@sources.empty?
+          customsource = custom_business_source(@sources)
+        else
+          customsource = code_source
+        end
+        puts "source customsource=#{customsource}"
+        push_customsource_repo(source_podsepc_json, customsource, false, false)
+      end
+
+      # 上传自定义源podspec
+      def push_customsource_repo(source_podsepc_json, customsource=code_source, isGenDylib=false, isBinary=false)
         argvs = [
-          "#{code_source.name}",  # repo
+          "#{customsource.name}",  # repo
           "#{source_podsepc_json}", # spec
-          "--sources=#{code_source},https:\/\/cdn.cocoapods.org",
+          "--sources=#{customsource},https:\/\/cdn.cocoapods.org",
           "--skip-import-validation",
           "--use-libraries",
           "--allow-warnings",
@@ -56,7 +53,15 @@ module CBin
         if @verbose
           argvs += ['--verbose']
         end
-        Pod::UI.message "上传源码 argvs: #{argvs}"
+        if isGenDylib # 生成动态库
+          argvs += ['--dylib']
+        end
+        if isBinary # 是否二进制
+          argvs += ['--binary']
+          Pod::UI.message "上传【二进制】argvs: #{argvs}"
+        else
+          Pod::UI.message "上传【源码】argvs: #{argvs}"
+        end
         push = Pod::Command::Bin::Repo::Push.new(CLAide::ARGV.new(argvs))
         push.validate!
         push.run

data/lib/cocoapods-bb-bin/helpers/sources_helper.rb

@@ -15,6 +15,30 @@ module CBin
     def code_source
       sources_manager.code_source
     end
+    # br产品线源
+    def br_source
+      sources_manager.br_source
+    end
+    # bw产品线源
+    def bw_source
+      sources_manager.bw_source
+    end
+    # 思维产品线源
+    def math_source
+      sources_manager.math_source
+    end
+    # 科学产品线源
+    def science_source
+      sources_manager.science_source
+    end
+    # ABC产品线源
+    def abc_source
+      sources_manager.abc_source
+    end
+    # 自定义产品线源
+    def custom_business_source(source_spec)
+      sources_manager.custom_business_source(source_spec)
+    end
 
     # 优先采用对应依赖的 source
     # cocoapods 内部会先匹配前面符合的 specification

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

@@ -19,10 +19,14 @@ module CBin
         raise Pod::Informative, '源码 podspec 不能为空 .' unless code_spec
       end
 
-      def create(frameworkName=nil, is_xcframework=false)
+      def create(frameworkName=nil, is_xcframework=false, isUpRes=false)
         # spec = nil
         if CBin::Build::Utils.is_framework(@code_spec)
-          Pod::UI::puts "make framework spec. vendored_framework_name:#{frameworkName} is_xcframework:#{is_xcframework}"
+          if isUpRes
+            Pod::UI::puts "make res spec. vendored_framework_name:#{frameworkName}"
+          else
+            Pod::UI::puts "make framework spec. vendored_framework_name:#{frameworkName} is_xcframework:#{is_xcframework}"
+          end
           if !frameworkName # 如果外部没有传入fk名称默认组件名称
             frameworkName = code_spec.root.name
           end
@@ -31,7 +35,6 @@ module CBin
           Pod::UI::puts "make source code spec. vendored_framework_name:#{frameworkName}"
           spec = create_from_code_spec
         end
-
         spec
       end
 

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

@@ -22,14 +22,26 @@ module CBin
         @pushsourcespec = pushsourcespec # 推送源码
       end
 
-      def upload(isGenDylib=false)
+      def upload(isGenDylib=false, isUpRes=false)
         Dir.chdir(CBin::Config::Builder.instance.root_dir) do
-          return upload_binary_file(own_source_binary_file, isGenDylib, @spec.name)
+          zip_file=nil
+          if isUpRes
+            zip_file = own_res_binary_file(restype)
+          else
+            zip_file = own_source_binary_file
+          end
+          return upload_binary_file(zip_file, isGenDylib, @spec.name, isUpRes)
         end
       end
 
-      def upload_binary_file(zip_file, isGenDylib=false, vendored_framework_name=nil)
+      def upload_binary_file(zip_file, isGenDylib=false, vendored_framework_name=nil, isUpRes=false)
         Dir.chdir(CBin::Config::Builder.instance.root_dir) do
+          res_type = "zip"
+          extension = File.extname(zip_file)
+          if extension == '.gz' || extension == '.tgz'
+            res_type = "tgz"
+          end
+          puts "res extension:#{res_type} isUpRes:#{isUpRes}".red
           # 创建binary-template.podsepc
           # 上传二进制文件
           # 上传二进制 podspec
@@ -38,19 +50,23 @@ module CBin
           puts "上传二进制文件完成 状态:#{isupload}".green
           if isupload
             is_xcframework = false
-            [
-              "xcframework.zip", # 三方库
-              "xcframework_#{@spec.version}.zip", # 自有库
-            ].each do |name|
-              is_xcframework = zip_file.include?(name)
-              if is_xcframework == true
-                break
+            if isUpRes
+              is_xcframework = false
+            else 
+              [
+                "xcframework.zip", # 三方库
+                "xcframework_#{@spec.version}.zip", # 自有库
+              ].each do |name|
+                is_xcframework = zip_file.include?(name)
+                if is_xcframework == true
+                  break
+                end
               end
             end
             # is_xcframework = zip_file.include?('xcframework.zip')
-            filename = spec_creator(vendored_framework_name, is_xcframework)
-            Pod::UI.puts "上传二进制 podspec: #{filename} zip:#{zip_file} 是否动态库: #{isGenDylib} vendored_framework_name:#{vendored_framework_name} is_xcframework:#{is_xcframework}"
-            push_helper = CBin::Push::Helper.new()
+            filename = spec_creator(vendored_framework_name, is_xcframework, isUpRes)
+            Pod::UI.puts "上传二进制 podspec: #{filename} zip:#{zip_file} 是否动态库: #{isGenDylib} vendored_framework_name:#{vendored_framework_name} is_xcframework:#{is_xcframework} isUpRes:#{isUpRes}"
+            push_helper = CBin::Push::Helper.new(@sources)
             push_helper.push_binary_repo(filename,isGenDylib)
             # 上传源码 podspec
             if @pushsourcespec
@@ -63,10 +79,10 @@ module CBin
       end
 
       private
-      def spec_creator(vendored_framework_name=nil, is_xcframework=false)
+      def spec_creator(vendored_framework_name=nil, is_xcframework=false, isUpRes=false)
         spec_creator = CBin::SpecificationSource::Creator.new(@spec)
         @spec_creator = spec_creator
-        spec_creator.create(vendored_framework_name, is_xcframework)
+        spec_creator.create(vendored_framework_name, is_xcframework, isUpRes)
         spec_creator.write_spec_file
         spec_creator.filename
       end
@@ -92,6 +108,16 @@ module CBin
         end
         return nil
       end
+      #推送资源二进制文件
+      def own_res_binary_file(type="zip")
+        zip_file = "#{CBin::Config::Builder.instance.library_file(@spec)}.#{type}"
+        res = File.exist?(zip_file)
+        Pod::UI.puts "上传res path: #{res}"
+        if res
+          return zip_file
+        end
+        return nil
+      end
 
       # 上传二进制文件
       private
@@ -110,6 +136,7 @@ EOF
             puts "curl上传出错，❌错误信息如下：".red
             puts "#{result}"
             puts "FAQ:帮助快速解决问题\
+            \n错误吗=7 Failed to connect to localhost port 8080，二进制库环境有问题，执行命令/重试 /bin/bash -c \"$(curl -fsSL https://ios.file.babybus.co/Shell/env/install_binary_env.sh)\" -c local \
             \n错误吗=308 Permanent Redirect，记得请求url带上https \
             \n错误吗=413 Request Entity Too Large，运维限制域名访问大小 \
             \n其它错误@hm排查原因

data/lib/cocoapods-bb-bin/native/sources_manager.rb

@@ -35,6 +35,31 @@ module Pod
         return supportDylibSource ? dylib_binary_source : static_binary_source
       end
 
+      # br产品线源
+      def br_source
+        source_with_name_or_url(CBin.config.br_repo_url)
+      end
+      # bw产品线源
+      def bw_source
+        source_with_name_or_url(CBin.config.bw_repo_url)
+      end
+      # 思维产品线源
+      def math_source
+        source_with_name_or_url(CBin.config.math_repo_url)
+      end
+      # 科学产品线源
+      def science_source
+        source_with_name_or_url(CBin.config.science_repo_url)
+      end
+      # ABC产品线源
+      def abc_source
+        source_with_name_or_url(CBin.config.abc_repo_url)
+      end
+      # 自定义产品线源
+      def custom_business_source(source_spec)
+        source_with_name_or_url(source_spec)
+      end
+
       # 是否支持动态库
       def supportDylibSource
         if @dylib

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.8.1
+  version: 0.2.10.0
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between