cocoapods-bb-bin 0.2.9.0 → 0.2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cc0ab50509e17f48d29a81ccf19a46f2dc332b4efc0d035a13023106366424f
-  data.tar.gz: d7211405407238227f83864a8c24148889730bcf226e00f50dfa7526d9204e26
+  metadata.gz: adaeaf327c8e0a9cf4a3bb44a19251e339a3ca1ab0ef66150dbc89668ee979ca
+  data.tar.gz: cdd539303b089e4a4c2f0f7bdc1e33b926bd0119605036a117b5f1ed8c2e9ce6
 SHA512:
-  metadata.gz: 71bb50eca6908d30e199bbe4a4c65e1c86db0b9e3e470417626f8d6a56a192567f05687051ef79137a058f38e4398d9fbe53efb2ecb88dce4aa6ab2130573685
-  data.tar.gz: ed760852033d74d21498c5c671ef66136e890bdd53976b93bb32eb02f058d0e345ea754b59c46be14ce43493c6fb6ddbe3812cd0c20a919c15b12c895887524b
+  metadata.gz: 8659db8e50d3093614ae7d66db9a42ae9766ecd030dce9c474daa30b3c4e5214d81f71642ae910c61412a1e6b9b628e1cdd2c33b4e4c6b18491a4f8550de3523
+  data.tar.gz: 551e4e6c6ac07b842c2938d0c6bc30cf5fbf93738c5f3c4fd0d7beb077929cb982e125017a6e3807142609ae6f74b9b05d3371e68aa162ca8c5b8dc682dc6176

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

@@ -24,6 +24,7 @@ module Pod
             ['--dylib', '(可选)是否动态库,默认静态库'],
             ['--developer_mode', '(可选)是否开发者模式,默认发布模式'],
             ['--upload_res', '(可选)是否上传资源文件，格式：zip、tgz'],
+            ['--only_business_spec', '(可选)仅仅上传到业务线专属spec，需要配合sources一起使用'],
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -43,6 +44,8 @@ module Pod
             @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
@@ -75,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_up_res)
+                        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
@@ -102,7 +107,14 @@ module Pod
                 end
                 #pod repo update
                 UI.section("\nUpdating Spec Repositories\n".yellow) do
-                    Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new([])).run
+                    if !@sources.empty?
+                      argvs = [
+                        @sources,
+                      ]
+                    else
+                      argvs = []
+                    end
+                    Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new(argvs)).run
                 end
             end
         end
@@ -151,6 +163,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.9.0'
+  VERSION = '0.2.10.1'
 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/upload_helper.rb

@@ -66,7 +66,7 @@ module CBin
             # is_xcframework = zip_file.include?('xcframework.zip')
             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()
+            push_helper = CBin::Push::Helper.new(@sources)
             push_helper.push_binary_repo(filename,isGenDylib)
             # 上传源码 podspec
             if @pushsourcespec
@@ -136,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.9.0
+  version: 0.2.10.1
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 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.20
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between