cocoapods-bb-bin 0.2.10.3 → 0.2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f51ce2893ada809b89311ad03da700570c3083ff606b0c6cd75be5aa7ce6e1
-  data.tar.gz: 86271e6db12464449ff97cdb5a68bdce3bf76fac993347ecaaa11ba5449f3a4d
+  metadata.gz: f953b910386947eb6941f1e14dafc3f446afb00f1de322cd0d7fcd59a9a3d41c
+  data.tar.gz: 75197fee26017d961e4b595db614037ba0a28516cbf123b303009a28e9eaa449
 SHA512:
-  metadata.gz: 5566ed63c60e4e2759a7627bbe190dc21b8beef163b2ca660807a64a0719006df0715347d28c115593dddc67b4e5ef25ea06ee6af09790375fcfaa86c73a260b
-  data.tar.gz: f47b7a8eb2daa9af8a53a6ff572a258322ee4c0364b2cad60a8de1a9f7ff2aeffdea371c2e8e36b966188f00f1c0f29de741710b4f036b32994cca535e9f5f82
+  metadata.gz: 593dc79efc4817dddc129b68b1d6be9e437f41bfbe1ce74376d14eb75f6093451ccb62edf813cc45a9d4fcc6af796abe877560bd489d88c7757766524ccae7f1
+  data.tar.gz: 3eba028e3ee5ede153f04efe8bc91b374971f63f6b7852f27c5da5028df402d5b4e8af295114fc07b2af1f244071c2b8993f156cbc044f01928ffe133c274b2e

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

@@ -61,7 +61,7 @@ module Pod
           end
           if is_build_ok && !@is_debug
             # step.2 工程编译ok，进行标签推送
-            push_helper = CBin::Push::Helper.new()
+            push_helper = CBin::Push::Helper.new(@sources)
             push_helper.push_source_repo(@podspec)
           end
         end
@@ -121,17 +121,33 @@ module Pod
           project.save
         end
 
+        private def podfile
+          podfile_path = Pod::Config.instance.podfile_path
+          if podfile_path && File.exist?(podfile_path)
+            return podfile_path
+          else
+            worksppace_path = Pathname.pwd
+            podfile_path = File.join(worksppace_path, "Example/Podfile")
+            if podfile_path && File.exist?(podfile_path)
+              return podfile_path
+            end
+          end
+          return ""
+        end
+
         def generate_project
+          podfile_path = podfile
           Podfile.execute_with_bin_plugin do
             Podfile.execute_with_use_binaries(!@code_dependencies) do
+                # pod gen --help
                 argvs = [
                   "--sources=#{sources_option(@code_dependencies, @sources)}",
                   "--gen-directory=#{CBin::Config::Builder.instance.gen_dir}",
                   '--clean',
                   "--verbose",
+                  "--podfile-path=#{podfile}",
                   *@additional_args
                 ]
-                podfile_path = Pod::Config.instance.podfile_path
                 if podfile_path && File.exist?(podfile_path)
                   argvs += ['--use-podfile']
                 end
@@ -141,7 +157,7 @@ module Pod
                 end
 
                 argvs << @podspec if @podspec
-                # UI.puts "argvs:#{argvs}"
+                UI.puts "argvs:#{argvs}"
                 gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))
                 gen.validate!
                 gen.run

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

@@ -1,7 +1,7 @@
 require 'cocoapods'
 
 module CBin
-  VERSION = '0.2.10.3'
+  VERSION = '0.2.11.1'
 end
 
 module Pod

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

@@ -165,7 +165,8 @@ module CBin
         #   iphone5,iphone5s以下的模拟器
         # >x86_64
         #   iphone6以上的模拟器
-        archs = %w[arm64 armv7]
+        # archs = %w[arm64 armv7]
+        archs = %w[arm64]
         # archs = %w[x86_64 arm64 armv7s i386]
         # @vendored_libraries.each do |library|
         #   archs = `lipo -info #{library}`.split & archs

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

@@ -64,12 +64,22 @@ module CBin
 
     # 二进制优先
     def sources_option(code_dependencies, additional_sources)
-      (valid_sources(code_dependencies).map(&:url) + Array(additional_sources)).join(',')
+      # 传入源地址需要http开头
+      url = nil
+      if additional_sources && additional_sources.include?("http")
+        url = additional_sources
+      end
+      (valid_sources(code_dependencies).map(&:url) + Array(url)).join(',')
     end
 
     # 源码优先
     def sources_optionV2(code_dependencies, additional_sources)
-      (valid_sourcesV2(code_dependencies).map(&:url) + Array(additional_sources)).join(',')
+      # 传入源地址需要http开头
+      url = nil
+      if additional_sources && additional_sources.include?("http")
+        url = additional_sources
+      end
+      (valid_sourcesV2(code_dependencies).map(&:url) + Array(url)).join(',')
     end
 
   end

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

@@ -91,6 +91,7 @@ module Pod
     # >= 1.5.0 ResolverSpecification 才有 source，供 install 或者其他操作时，输入 source 变更
     #
     if Pod.match_version?('~> 1.4')
+      # pod in / up进行拦截，该入口目前使用使用上，如果继续执行pod指令出现异常可以考虑把当前函数删除，避免hook导致异常操作
       old_resolver_specs_by_target = instance_method(:resolver_specs_by_target)
       define_method(:resolver_specs_by_target) do
         specs_by_target = old_resolver_specs_by_target.bind(self).call
@@ -135,7 +136,8 @@ module Pod
               specification = source.specification(rspec.root.name, spec_version)
               UI.message "#{rspec.root.name} #{spec_version} \r\n specification =#{specification} "
               # 组件是 subspec
-              if rspec.spec.subspec?
+              # subspec_by_name 函数远端spec查找subspec，如果第一次生成组件不会存在，故做条件过滤 by hm 25/4/9
+              if use_binary && rspec.spec.subspec?
                 specification = specification.subspec_by_name(rspec.name, false, true)
               end
               # 这里可能出现分析依赖的 source 和切换后的 source 对应 specification 的 subspec 对应不上

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.10.3
+  version: 0.2.11.1
 platform: ruby
 authors:
 - humin
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.5
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between
   source code and binary.