cocoapods-bb-bin 0.2.8.1 → 0.2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a407974bf0e3a3d83090414b24bc3a141b5e43266209880a76612f6803a495a2
-  data.tar.gz: 4172223e8c1f104fd0a8bc04f5dcc576b0a171cc1887d7fdbd43c8a8d956da09
+  metadata.gz: 8cc0ab50509e17f48d29a81ccf19a46f2dc332b4efc0d035a13023106366424f
+  data.tar.gz: d7211405407238227f83864a8c24148889730bcf226e00f50dfa7526d9204e26
 SHA512:
-  metadata.gz: 1cba0529db54c5feceb01b4aa88f088b281ca517204a28dd31e9d6e93fc4c704711fc23191bb227e92b691d75376f42ec908eb234a6e5805896fde57e0ecba15
-  data.tar.gz: cc7d774005f4d73e11c09ec84044db1254932bfe0ebfd1adb9cc67c21a50af59b64a2e41f478747afb724a87ee5af5a07b1e1dd430781c8cc6a6031b5926e607
+  metadata.gz: 71bb50eca6908d30e199bbe4a4c65e1c86db0b9e3e470417626f8d6a56a192567f05687051ef79137a058f38e4398d9fbe53efb2ecb88dce4aa6ab2130573685
+  data.tar.gz: ed760852033d74d21498c5c671ef66136e890bdd53976b93bb32eb02f058d0e345ea754b59c46be14ce43493c6fb6ddbe3812cd0c20a919c15b12c895887524b

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

@@ -19,9 +19,11 @@ module Pod
           [
             ['--sources', '私有源地址，多个用分号区分'],
             ['--path', '(必传)需要上传文件路径'],
+            ['--new_pod_name', '(可选)组件库新名称'],
             ['--vendored_framework_name', '(可选)组件库依赖framework名称，默认组件名称'],
             ['--dylib', '(可选)是否动态库,默认静态库'],
             ['--developer_mode', '(可选)是否开发者模式,默认发布模式'],
+            ['--upload_res', '(可选)是否上传资源文件，格式：zip、tgz'],
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -35,9 +37,12 @@ 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 )
           end
           super
         end
@@ -57,6 +62,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)
@@ -67,7 +77,7 @@ module Pod
                 fail_push_specs = []
                 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)
+                        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)
                     rescue  Object => exception
                         UI.puts exception
                         fail_push_specs << spec

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

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

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,18 +50,22 @@ 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}"
+            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.push_binary_repo(filename,isGenDylib)
             # 上传源码 podspec
@@ -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

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.9.0
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-10-10 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.20
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between