cocoapods-util 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64106c89882c33e0febe8aa3623478f1b5c9a3325c7efdb6a10a4a2a998ab91
-  data.tar.gz: ec9b2691eecd6fba14b374f0fd8b9a302595b958d314d85c8b065e85896b5f35
+  metadata.gz: d3e136a04158a95c53ec3bf85971b13f137f85ad816633d64cf9655fca06234c
+  data.tar.gz: 32fd218bb662f121551dd394782a97691fee24c86d7105cf3d5c0f7d5a16275c
 SHA512:
-  metadata.gz: e21f0d9d26c4c4ae210f25f462f706e57a0867536316b4ec81321c9e422ce4469c3df09a3ee2637516f49c27026bbd83f428268efe1999204c83f0d4ec23c8b0
-  data.tar.gz: '0818fdf44b6dc9cc552ba5464de71aa95e004190cea4a21b827d049b16641a82fd103feda06421c2d897e59faa0d303b8472205b7d1f08d8a8ea3bf369811730'
+  metadata.gz: 14561d493194c787d69f8749f30e14c57227f623a3954cf8017376a84544df4dbd23906e4041b3361211e31340cae48344ff4c0b61601bd02d9cb27db96bf07b
+  data.tar.gz: dc4fcb6c4dafd62b2b107d6f7d40f254b2544e91beeaaa9ca75296c2816c5af3b48c46f1dd44c9af622835a25db823f6eec9b606e57f87ec14535f1aad5c39c0

data/lib/cocoapods-util/CocoapodsUtilHook.rb

@@ -1,6 +1,52 @@
 module CocoapodsUtilHook
-    Pod::HooksManager.register('cocoapods-util', :pre_install) do |context, _|
+    Pod::HooksManager.register('cocoapods-util', :pre_install) do |installer_context, _|
         puts "pre_install"
+        require_relative 'hooks/feature_switch'
+        if Pod.is_prebuild_stage
+            next
+        end
+
+        # [Check Environment]
+        podfile = installer_context.podfile
+        # podfile.target_definition_list.each do |target_definition|
+        #     # next if target_definition.prebuild_framework_pod_names.empty?
+        #     # if not target_definition.uses_frameworks?
+        #     #     STDERR.puts "[!] Cocoapods-binary requires `use_frameworks!`".red
+        #     #     exit
+        #     # end
+        # end
+
+        require_relative 'hooks/prebuild_sandbox'
+
+        # 读取update和repo_update参数
+        update = nil
+        repo_update = nil
+        include ObjectSpace
+        ObjectSpace.each_object(Pod::Installer) { |installer|
+            update = installer.update
+            repo_update = installer.repo_update
+        }
+
+        # switches setting
+        Pod.is_prebuild_stage = true
+
+        # make another custom sandbox
+        standard_sandbox = installer_context.sandbox
+        prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sandbox)
+
+        # get the podfile for prebuild
+        prebuild_podfile = Pod::Podfile.from_ruby(podfile.defined_in_file)
+        
+        # install
+        lockfile = installer_context.lockfile
+        binary_installer = Pod::Installer.new(prebuild_sandbox, prebuild_podfile, lockfile)
+
+        binary_installer.update = update
+        binary_installer.repo_update = repo_update
+        # binary_installer.install!
+
+        # reset switches setting
+        Pod.is_prebuild_stage = false
     end
     Pod::HooksManager.register('cocoapods-util', :pre_integrate) do |context, _|
         puts "pre_integrate"
@@ -14,5 +60,4 @@ module CocoapodsUtilHook
     Pod::HooksManager.register('cocoapods-util', :source_provider) do |context, _|
         puts "source_provider"
     end
-end
-  
+end

data/lib/cocoapods-util/command/cocoapods-extend/install/list.rb

@@ -40,7 +40,11 @@ module Pod
                 check_all_componment
               else
                 installed = pod_installed
-                help! "没有找到#{@name}组件的相关信息，请检查输入的组件名称" unless installed.include?(@name)
+                help! "没有找到#{@name}组件的相关信息，请检查输入的组件名称" unless installed.include?(@name) || installed.map do |item|
+                  downcase = item.downcase
+                  @name = item if @name.downcase == downcase
+                  downcase
+                end.include?(@name.downcase)
                 check_componment_with_name(@name)
               end
             end
@@ -101,9 +105,9 @@ module Pod
               subspecs.uniq!
               dependencies.uniq!
               parents.uniq!
-              UI.puts "   - SUBSPEC: ".yellow "#{subspecs.join('、')}".green unless subspecs.empty?
+              UI.puts "   - SUBSPECS: ".yellow "#{subspecs.join('、')}".green unless subspecs.empty?
               UI.puts "   - DEPENDENCIES: ".yellow "#{dependencies.join('、')}".green unless dependencies.empty?
-              UI.puts "   - DEPENDENTS: ".yellow "#{parents.join('、')}".green unless parents.empty?
+              UI.puts "   - WHO DEPENDS ON IT: ".yellow "#{parents.join('、')}".green unless parents.empty?
             end
 
             def pod_tags_info

data/lib/cocoapods-util/command/cocoapods-extend/repo/push.rb

@@ -15,6 +15,7 @@ module Pod
 
           def initialize(argv)
             @skip_validate = argv.flag?('skip-validate', false)
+            @skip_build = argv.flag?('skip-build', false)
             super
             @argvs = argv.remainder!
 
@@ -31,6 +32,7 @@ module Pod
             @target = Pod::Command::Repo::Push.new(CLAide::ARGV.new(@argvs))
             @target.validate!
             @target.skip_validate = @skip_validate
+            @target.skip_build = @skip_build
             @target.run
           end
         end

data/lib/cocoapods-util/command/cocoapods-extend/repo/push_helper.rb

@@ -1,29 +1,23 @@
-class Module
-    def strong_alias(to, from)
-      # https://tieba.baidu.com/p/5535445605?red_tag=0735709674  贴吧大神给出的方案
-      # 类方法可以看做singleton class（单例类）的实例方法，下面两个方法都可以，上面这个方式也适用于早起的ruby版本
-      (class << self;self;end).send(:alias_method, to, from)
-      # self.singleton_class.send(:alias_method, to, from)
-    end
-end
-
 module Pod
     class Command
       class Repo < Command
         class Push < Repo
-            attr_accessor :skip_validate
-
-            self.strong_alias(:old_options, :options)
+            attr_accessor :skip_validate, :skip_build
+            
+            class_alias_method(:old_options, :options)
             def self.options
               [
-                ['--skip-validate', '跳过验证，不验证推送的podspec文件，默认为验证']
+                ['--skip-validate', '跳过整个验证，不验证推送的podspec文件，默认为验证'],
+                ['--skip-build', '跳过编译过程，还是会校验pod下载和依赖']
               ].concat(self.old_options)
             end
 
             # 调用原方法的两种方式
             old_validate_podspec_files = instance_method(:validate_podspec_files)
             define_method(:validate_podspec_files) do
+                Pod::Validator.skip_build = @skip_build
                 old_validate_podspec_files.bind(self).() unless @skip_validate
+                Pod::Validator.skip_build = false
             end
 
             alias_method :old_check_repo_status, :check_repo_status
@@ -33,4 +27,25 @@ module Pod
         end
       end
     end
+end
+
+module Pod
+  class Validator
+    class_attr_accessor :skip_build
+
+    alias_method :old_build_pod, :build_pod
+    def build_pod
+      old_build_pod unless Pod::Validator.skip_build
+    end
+
+    alias_method :old_test_pod, :test_pod
+    def test_pod
+      old_test_pod unless Pod::Validator.skip_build
+    end
+
+    alias_method :old_validated?, :validated?
+    def validated?
+      Pod::Validator.skip_build || old_validated?
+    end
+  end
 end

data/lib/cocoapods-util/command/package/helper/pod_utils.rb

@@ -32,6 +32,7 @@ module Pod
             default_build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" unless @xcframework && self.match_pod_version?('~> 1.11') # 非xcframework排除ios simulator 64位架构
             default_build_settings["EXCLUDED_ARCHS[sdk=appletvsimulator*]"] = "arm64" unless @xcframework && self.match_pod_version?('~> 1.11') # 非xcframework排除tvos simulator 64位架构
             default_build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES" # 编译swift生成swiftinterface文件
+            default_build_settings["CODE_SIGN_IDENTITY"] = "" if `xcodebuild -version`.lines.shift.gsub!('Xcode ', '') >= "14" #xcode版本大于等于xcode 14时需要添加
             
             # merge user setting
             default_build_settings.merge!(@build_settings) unless @build_settings.empty?

data/lib/cocoapods-util/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsUtil
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/cocoapods-util/hooks/feature_switch.rb

@@ -0,0 +1,3 @@
+module Pod
+    class_attr_accessor :is_prebuild_stage
+end

data/lib/cocoapods-util/hooks/prebuild_sandbox.rb

@@ -0,0 +1,14 @@
+module Pod
+    class PrebuildSandbox < Sandbox
+
+        # [String] standard_sandbox_path
+        def self.from_standard_sanbox_path(path)
+            prebuild_sandbox_path = Pathname.new(path).realpath + "_Prebuild"
+            self.new(prebuild_sandbox_path)
+        end
+
+        def self.from_standard_sandbox(sandbox)
+            self.from_standard_sanbox_path(sandbox.root)
+        end
+    end
+end

data/lib/cocoapods-util/tool.rb

@@ -0,0 +1,12 @@
+class Module
+    def class_alias_method(to, from)
+      # https://tieba.baidu.com/p/5535445605?red_tag=0735709674  贴吧大神给出的方案
+      # 类方法可以看做singleton class（单例类）的实例方法，下面两个方法都可以，上面这个方式也适用于早期的ruby版本
+      (class << self;self;end).send(:alias_method, to, from)
+      # self.singleton_class.send(:alias_method, to, from)
+    end
+
+    def class_attr_accessor(symbol)
+        self.class.send(:attr_accessor, symbol)
+    end
+end

data/lib/cocoapods_plugin.rb

@@ -1,2 +1,3 @@
+require 'cocoapods-util/tool'
 require 'cocoapods-util/command'
 require 'cocoapods-util/CocoapodsUtilHook.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-util
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,10 @@ files:
 - lib/cocoapods-util/command/xcframework/xcframework.rb
 - lib/cocoapods-util/command/xcframework/xcframework_build.rb
 - lib/cocoapods-util/gem_version.rb
+- lib/cocoapods-util/hooks/feature_switch.rb
 - lib/cocoapods-util/hooks/installer.rb
+- lib/cocoapods-util/hooks/prebuild_sandbox.rb
+- lib/cocoapods-util/tool.rb
 - lib/cocoapods_plugin.rb
 homepage: https://github.com/CaryGo/cocoapods-util
 licenses: