cocoapods-bb-bin 0.2.7.10 → 0.2.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65a5c44ba5cd1efb48d0d727c99a338d5ec13079196f8994c3657ee4788f8c7d
-  data.tar.gz: 32ecb7bd7747ef6f75131b0ba230fdcb67177caa9861f1fb324c28bfa7805cac
+  metadata.gz: ef6e723659917a02b23b7fa92a8e34630bd1d6526cb9d972f8583a570f12bfde
+  data.tar.gz: a3620ac0ba8003bda68bf6d57af984e77f6a0143795f5e72ec0db8632eccd02c
 SHA512:
-  metadata.gz: f3f52306d0944f803e20400c3b9419da2868c77b88cdd43d42bac58b5444102bba01b07182d9c60abb72ffd021da0c08c6038e347795f435c25ce5a3545fc587
-  data.tar.gz: 956654a7502c9da604d10c571a2b24d4ee6190ee824c7737f60164675b2ec37fc33fac5d89594ae9326bc9e91c1cb79dc5baae338dda9c940673608fa02d21b1
+  metadata.gz: e24a99b89a9bfc8245e02e70640f989bbbef0cfefd99cff3652d7df387a892b9e1d1152a021f8c67f949d89fe9a3c87ccf006b114cf6a4ab711139ae6e2771e9
+  data.tar.gz: 8c5169d2da2229bd14ae8959d520bf5539fad6efed981a46952fd0c32431d81e0abcc6421e33c05ba11ae81aa261cd6e49cbe41103db9f30d8efd8c3a1a07e94

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

@@ -137,7 +137,11 @@ EOF
           unless File.exist?(dir)
             # UI.puts "不存在 = #{dir}"
             begin
-              FileUtils.mkdir_p(dir) unless File.exists?(dir) # require 'fileutils'
+              unless File.exist?(dir)
+                require "fileutils"
+                FileUtils.mkdir_p(dir)
+              end
+              # FileUtils.mkdir_p(dir) unless File.exists?(dir) # require 'fileutils'
             rescue SystemCallError
               # mkdir: _fzzfm3x4y17bm6psx9yhbs00000gn: Permission denied
               unless File.exist?(dir)
@@ -285,7 +289,11 @@ EOF
 
         def source_root
           dir = File.join(@config.cache_root,"Source")
-          FileUtils.mkdir_p(dir) unless File.exist? dir
+          unless File.exist?(dir)
+            require "fileutils"
+            FileUtils.mkdir_p(dir)
+          end
+          # FileUtils.mkdir_p(dir) unless File.exist? dir
           dir
         end
 

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

@@ -215,7 +215,11 @@ module CBin
                         #  root_name = File.join(parent_dir,"#{basename}-build-temp")
                         #  Dir.mkdir(root_name) unless File.exist?root_name
                          root_name = File.join(parent_dir,"/build/#{basename}") # 统一修改build目录
-                         FileUtils.mkdir_p(root_name) unless File.exists?(root_name) # require 'fileutils'
+                        unless File.exist?(root_name)
+                          require "fileutils"
+                          FileUtils.mkdir_p(root_name)
+                        end
+                        #  FileUtils.mkdir_p(root_name) unless File.exists?(root_name) # require 'fileutils'
                          Pathname.new(root_name)
                        end
 

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

@@ -1,7 +1,7 @@
 require 'cocoapods'
 
 module CBin
-  VERSION = '0.2.7.10'
+  VERSION = '0.2.7.12'
 end
 
 module Pod

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

@@ -95,7 +95,11 @@ module CBin
         FileUtils.rm_rf(target_dir) if File.exist?(target_dir)
 
         zip_dir = CBin::Config::Builder.instance.zip_dir
-        FileUtils.mkdir_p(zip_dir) unless File.exist?(zip_dir)
+        unless File.exist?(zip_dir)
+          require "fileutils"
+          FileUtils.mkdir_p(zip_dir)
+        end
+        # FileUtils.mkdir_p(zip_dir) unless File.exist?(zip_dir)
 
         `cp -fa #{@platform}/#{framework_name} #{target_dir}`
       end

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

@@ -37,8 +37,12 @@ module CBin
 
       def write_spec_file(file = filename)
         create unless spec
-
-        FileUtils.mkdir_p(CBin::Config::Builder.instance.binary_json_dir) unless File.exist?(CBin::Config::Builder.instance.binary_json_dir)
+        dir = CBin::Config::Builder.instance.binary_json_dir
+        unless File.exist?(dir)
+          require "fileutils"
+          FileUtils.mkdir_p(dir)
+        end
+        # FileUtils.mkdir_p(dir) unless File.exist?(dir)
         FileUtils.rm_rf(file) if File.exist?(file)
 
         File.open(file, 'w+') do |f|
@@ -46,8 +50,8 @@ module CBin
         end
 
         @filename = file
-        # Pod::UI::puts "===copy origin file: #{file}"
-        # Pod::UI::puts "===copy desc file: #{sourceSpecFilePath}"
+        # Pod::UI::puts "===copy origin file: #{file}".red
+        # Pod::UI::puts "===copy desc file: #{sourceSpecFilePath}".red
         # 拷贝二进制spec到源码spec by hm 22/1/19
         `cp -fa #{file} #{sourceSpecFilePath}` 
       end
@@ -145,15 +149,27 @@ module CBin
         # vendored_frameworks | resources | source | source_files | public_header_files
         # license | resource_bundles | vendored_libraries
 
+        fkname = "#{frameworkName}.{framework,xcframework}" # 支持framework、xcframework
         # Project Linkin
-        @spec.vendored_frameworks = "#{frameworkName}.{framework,xcframework}" # 支持framework、xcframework
+        @spec.vendored_frameworks = "#{fkname}"
         
         # Resources # framework以业务方自己配置为主 by hm 23/10/18
         extnames = []
         extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
         if code_spec_consumer.resources.any?
           # extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
-          extnames = code_spec_consumer.resources
+          puts "create_framework_from_code_spec extnames:#{extnames}".red
+          puts "code_spec_consumer:#{code_spec_consumer}".red
+          puts "is_xcframework:#{is_xcframework}".red
+          # 自有库bundle需要修改路径，二进制生成在xx.xcframework/xx.bundle by hm 24/2/28
+          if is_xcframework == true 
+            code_spec_consumer.resources.map { |r| 
+              bundle_comp = File.basename(r) 
+              extnames << "#{fkname}/#{bundle_comp}"
+            }
+          else 
+            extnames = code_spec_consumer.resources
+          end
         end
         if extnames.any?
           @spec.resources = extnames

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

@@ -37,7 +37,17 @@ module CBin
           isupload = binary_upload(zip_file)
           puts "上传二进制文件完成 状态:#{isupload}".green
           if isupload
-            is_xcframework = zip_file.include?('xcframework.zip')
+            is_xcframework = false
+            [
+              "xcframework.zip", # 三方库
+              "xcframework_#{@spec.version}.zip", # 自有库
+            ].each do |name|
+              is_xcframework = zip_file.include?(name)
+              if is_xcframework == true
+                break
+              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()

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

@@ -61,6 +61,14 @@ module CBin
                 target_dir = File.join(framework_folder_path,framework_name)
                 return target_dir
             end
+            def podspec_name
+                file_name = "#{@spec.name}.podspec.json"
+                return file_name
+            end
+            def podspec_file_path
+                target_dir = File.join(framework_folder_path,podspec_name)
+                return target_dir
+            end
 
             def cp_to_source_dir
 
@@ -68,10 +76,21 @@ module CBin
                 FileUtils.rm_rf(target_dir) if File.exist?(target_dir)
 
                 zip_dir = CBin::Config::Builder.instance.zip_dir
-                FileUtils.mkdir_p(zip_dir) unless File.exist?(zip_dir)
+                unless File.exist?(zip_dir)
+                    require "fileutils"
+                    FileUtils.mkdir_p(zip_dir)
+                end
+                # FileUtils.mkdir_p(zip_dir) unless File.exist?(zip_dir)
 
                 UI.puts "Compressing #{framework_file_path} into #{target_dir}"
+                
+                # `cp -fa #{framework_file_path} #{target_dir}` # xcframework文件拷贝
                 `cp -fa #{framework_file_path} #{target_dir} && rm -rf #{framework_folder_path}` # xcframework文件拷贝 & 删除源文件
+
+                # 是否可以考虑以xcframework配置为主？？？
+                # spec_dir = CBin::Config::Builder.instance.local_psec_dir
+                # puts "spec_dir:#{spec_dir}".red
+                # `cp -fa #{podspec_file_path} #{spec_dir} && ls -al #{spec_dir}`
             end
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.7.10
+  version: 0.2.7.12
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6.3
+        version: 0.2.6.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6.3
+        version: 0.2.6.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between