cocoapods-util 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e136a04158a95c53ec3bf85971b13f137f85ad816633d64cf9655fca06234c
-  data.tar.gz: 32fd218bb662f121551dd394782a97691fee24c86d7105cf3d5c0f7d5a16275c
+  metadata.gz: 83da9a9a68fa2cc89f013255846c38e0ff5f7dd8631c96ac21555b4a30d58e14
+  data.tar.gz: 39a88b6de2d54f2d68a3ae0b84727650a3b89fb006d5a3aa3f03eef7070d0f06
 SHA512:
-  metadata.gz: 14561d493194c787d69f8749f30e14c57227f623a3954cf8017376a84544df4dbd23906e4041b3361211e31340cae48344ff4c0b61601bd02d9cb27db96bf07b
-  data.tar.gz: dc4fcb6c4dafd62b2b107d6f7d40f254b2544e91beeaaa9ca75296c2816c5af3b48c46f1dd44c9af622835a25db823f6eec9b606e57f87ec14535f1aad5c39c0
+  metadata.gz: 17ad6705b93f62ed103cccf0d8c102c684bc662506c682053b2e1c2120aa6f70522c24af830b1e7f8ac5148a6ae4096525889c4de1abab1d254d5f254d0db913
+  data.tar.gz: '09847e25cdcd0f23b107322a2ab76fb47f792031824bce7d0ef369d161765c144c80c56f9b566cf5374f9e612c21a160c22577c73c863528803a9523bf6c7c2a'

data/lib/cocoapods-util/binary/config.rb

@@ -0,0 +1,23 @@
+module BinaryPrebuild
+    def self.config
+        BinaryPrebuild::Config.instance
+    end
+
+    class Config 
+        attr_accessor :enable_all, :enable_targets
+    
+        def initialize()
+            @enable_all = false
+            @enable_targets = []
+        end
+    
+        def self.instance
+          @instance ||= new()
+        end
+
+        def add_enable_target(name)
+            @enable_targets.push name
+            @enable_targets.uniq!
+        end
+    end
+end

data/lib/cocoapods-util/binary/hooks/CocoapodsUtilHook.rb

@@ -0,0 +1,24 @@
+require_relative 'pre_install'
+require_relative 'post_install'
+
+module CocoapodsUtilHook
+    Pod::HooksManager.register('cocoapods-util', :pre_install) do |installer_context, _|
+        BinaryPrebuild::PreInstall.new(installer_context).run
+    end
+
+    Pod::HooksManager.register('cocoapods-util', :pre_integrate) do |context, _|
+        
+    end
+
+    Pod::HooksManager.register('cocoapods-util', :post_install) do |context, _|
+        BinaryPrebuild::PostInstall.new(context).run
+    end
+
+    Pod::HooksManager.register('cocoapods-util', :post_integrate) do |context, _|
+
+    end
+    
+    Pod::HooksManager.register('cocoapods-util', :source_provider) do |context, _|
+
+    end
+end

data/lib/cocoapods-util/binary/hooks/post_install.rb

@@ -0,0 +1,10 @@
+module BinaryPrebuild
+    class PostInstall
+        def initialize(installer_context)
+            @installer_context = installer_context
+        end
+
+        def run
+        end
+    end
+end

data/lib/cocoapods-util/binary/hooks/pre_install.rb

@@ -0,0 +1,20 @@
+require_relative '../targets/pod_target'
+
+module BinaryPrebuild
+    class PreInstall
+        def initialize(installer_context)
+            @installer_context = installer_context
+        end
+
+        def run
+            # [Check Environment]
+            # podfile = @installer_context.podfile
+            # podfile.target_definition_list.each do |target_definition|
+            #     if not target_definition.uses_frameworks?
+            #         STDERR.puts "[!] Cocoapods-binary requires `use_frameworks!`".red
+            #         exit
+            #     end
+            # end
+        end
+    end
+end

data/lib/cocoapods-util/binary/main.rb

@@ -0,0 +1,4 @@
+require_relative 'config'
+require_relative 'podfile_dsl'
+require_relative 'prebuild'
+require_relative 'hooks/CocoapodsUtilHook'

data/lib/cocoapods-util/binary/podfile_dsl.rb

@@ -0,0 +1,27 @@
+module Pod    
+    class Podfile
+        module DSL
+            def self.enable_framework_header_keyword
+                :enable_framework_header
+            end
+
+            def enable_all_framework_header!(enable: true)
+                BinaryPrebuild.config.enable_all = enable
+            end
+
+            # hook
+            old_method = instance_method(:pod)
+            define_method(:pod) do |name, *args|
+                enable = BinaryPrebuild.config.enable_all
+                options = args.last
+                keyword = DSL.enable_framework_header_keyword
+                if options.is_a?(Hash) && options[keyword] != nil
+                    enable = options.delete(keyword)
+                    args.pop if options.empty?
+                end
+                BinaryPrebuild.config.add_enable_target name.to_s.gsub(/\/.*$/, '') if enable
+                old_method.bind(self).(name, *args)
+            end
+        end
+    end
+end

data/lib/cocoapods-util/binary/prebuild.rb

@@ -0,0 +1,3 @@
+module BinaryPrebuild
+    
+end

data/lib/cocoapods-util/binary/targets/pod_target.rb

@@ -0,0 +1,76 @@
+module Pod
+    class Target
+      # @since 1.5.0
+      class BuildSettings
+        # missing framework header search paths
+        def missing_framework_header_search_path(pt)
+            return [] unless BinaryPrebuild.config.enable_targets.include? pt.name
+
+            paths = []
+            pt.file_accessors.each do |file_accessor|
+                # xcframeworks
+                greater_than_or_equal_to_1_10_0 = Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
+                greater_than_or_equal_to_1_11_0 = Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.11.0')
+                file_accessor.vendored_xcframeworks.map { |path| 
+                    if greater_than_or_equal_to_1_11_0
+                        Xcode::XCFramework.new(file_accessor.spec.name, path)
+                    else
+                        Xcode::XCFramework.new(path)
+                    end
+                }.each { |xcfwk| 
+                    xcfwk.slices.each { |slice|
+                        fwk_name = slice.path.basename
+                        if greater_than_or_equal_to_1_11_0
+                            paths.push "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{xcfwk.target_name}/#{fwk_name}/Headers"
+                        elsif greater_than_or_equal_to_1_10_0
+                            paths.push "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{fwk_name.to_s.gsub(/\.framework$/, '')}/#{fwk_name}/Headers"
+                        else
+                            paths.push "${PODS_CONFIGURATION_BUILD_DIR}/#{fwk_name}/Headers"
+                        end
+                    }
+                }
+                # Cocoapods 1.9.x bugs
+                if Gem::Version.new(Pod::VERSION) < Gem::Version.new('1.10.0')
+                    file_accessor.vendored_xcframeworks.each { |path| 
+                        Dir.glob("#{path.to_s}/**/*.framework").each do |fwk_path|
+                            header_path = Pathname.new("#{fwk_path}/Headers")
+                            next unless header_path.exist?
+                            paths.push "${PODS_ROOT}/#{header_path.relative_path_from(pt.sandbox.root)}"
+                        end 
+                    }
+                end
+
+                # frameworks
+                (file_accessor.vendored_frameworks - file_accessor.vendored_xcframeworks).each { |framework|
+                    header_path = Pathname.new("#{framework}/Headers")
+                    next unless header_path.exist?
+                    paths.push "${PODS_ROOT}/#{header_path.relative_path_from(pt.sandbox.root)}"
+                }
+            end
+            paths.uniq
+        end
+
+         # A subclass that generates build settings for a `PodTarget`
+         class AggregateTargetSettings
+            # @return [Array<String>]
+            alias_method :old_raw_header_search_paths, :_raw_header_search_paths
+            def _raw_header_search_paths
+                header_search_paths = old_raw_header_search_paths
+                header_search_paths.concat pod_targets.flat_map { |pt| missing_framework_header_search_path(pt) }
+                header_search_paths.uniq
+            end
+         end
+
+         # A subclass that generates build settings for a {PodTarget}
+        class PodTargetSettings
+            # @return [Array<String>]
+            alias_method :old_raw_header_search_paths, :_raw_header_search_paths
+            def _raw_header_search_paths
+                header_search_paths = old_raw_header_search_paths
+                header_search_paths.concat dependent_targets.flat_map { |pt| missing_framework_header_search_path(pt) } if target.should_build?
+                header_search_paths.uniq
+            end
+         end
+      end
+    end
+end

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

@@ -67,10 +67,11 @@ module Pod
               UI.puts "   - SPEC REPO: ".yellow "#{repo_name}".green unless repo_name.nil?
               
               # external sources
-              external_dict = @lockfile.internal_data['EXTERNAL SOURCES']
-              unless external_dict.nil?
-                external = external_dict[name]
-                external.each { |key, value| UI.puts "   - #{key}: ".yellow "#{value}".green } unless external.nil?
+              external_sources = @lockfile.internal_data['EXTERNAL SOURCES']
+              unless external_sources.nil?
+                external_dict = external_sources[name]
+                UI.puts "   - EXTERNAL SOURCES: ".yellow unless external_dict.nil?
+                external_dict.each { |key, value| UI.puts "     - #{key}: ".yellow "#{value}".green } unless external_dict.nil?
               end
 
               # subspecs、dependencies、parents
@@ -78,23 +79,33 @@ module Pod
             end
 
             def show_moreinfo(name)
-              subspecs = []
-              dependencies = []
-              parents = Array.new
+              # checkout options
+              checkout_options = @lockfile.internal_data['CHECKOUT OPTIONS']
+              unless checkout_options.nil?
+                checkout_dict = checkout_options[name]
+                UI.puts "   - CHECKOUT OPTIONS: ".yellow unless checkout_dict.nil?
+                checkout_dict.each { |key, value| UI.puts "     - #{key}: ".yellow "#{value}".green } unless checkout_dict.nil?
+              end
+
+              subspecs, dependencies, parents = [], [], []
               @lockfile.internal_data["PODS"].each { |item|
+                # 取遍历的pod名称
                 pod_name = item.keys.first if item.is_a?(Hash) && item.count == 1
                 pod_name = item if item.is_a?(String)
-                if pod_name =~ /^#{name}.*$/
-                  subspecs.push(pod_name.match(/^[^\s]*/).to_s) if pod_name =~ /^#{name}\/.*$/
+                if pod_name =~ /^#{name}[\s\/]/ # 以#{name}开头，后跟一个'空格'或一个'/'
+                  subspecs.push(pod_name.match(/^[^\s]*/).to_s) if pod_name =~ /^#{name}\// # 如果#{name}后跟的是'/'，则是subspec
                   if item.is_a?(Hash)
                     item.each_value do |value| 
+                      # 如果不是以#{name}开头的，则是dependency
                       value.each {|dependency| dependencies.push(dependency.to_s) unless dependency =~ /^#{name}/ }
                     end
                   elsif item.is_a?(String)
+                    # 如果不是以#{name}开头的，则是dependency
                     dependencies.push(item.to_s) unless item =~ /^#{name}/
                   end
                 else
                   next if pod_name.nil?
+                  # 如果不是匹配到的pod名称，则检查是不是依赖了该pod
                   if item.is_a?(Hash)
                     item.each_value do |value|
                       value.each {|dependency| parents.push(pod_name.match(/^[^\s\/]*/).to_s) if dependency =~ /^#{name}/ }
@@ -102,12 +113,9 @@ module Pod
                   end
                 end
               }
-              subspecs.uniq!
-              dependencies.uniq!
-              parents.uniq!
-              UI.puts "   - SUBSPECS: ".yellow "#{subspecs.join('、')}".green unless subspecs.empty?
-              UI.puts "   - DEPENDENCIES: ".yellow "#{dependencies.join('、')}".green unless dependencies.empty?
-              UI.puts "   - WHO DEPENDS ON IT: ".yellow "#{parents.join('、')}".green unless parents.empty?
+              UI.puts "   - SUBSPECS: ".yellow "#{subspecs.uniq.join('、')}".green unless subspecs.empty?
+              UI.puts "   - DEPENDENCIES: ".yellow "#{dependencies.uniq.join('、')}".green unless dependencies.empty?
+              UI.puts "   - DEPENDS ON IT: ".yellow "#{parents.uniq.join('、')}".green unless parents.empty?
             end
 
             def pod_tags_info
@@ -118,10 +126,10 @@ module Pod
               @lockfile.internal_data["PODS"].each do |item|
                 info = item.keys.first if item.is_a?(Hash) && item.count == 1
                 info = item if item.is_a?(String)
-                if info =~ /^[^\/]*$/
-                  name = info.match(/^[^\/\s]*/)
-                  tag = info.match(/\(.*\)/) || ''
-                  @tags_info[name.to_s] = tag.to_s
+                name = info.match(/^[^\/\s]*/).to_s
+                unless @tags_info.keys.include?(name)
+                  tag = info.match(/\(.*\)/).to_s
+                  @tags_info[name] = tag unless tag.empty?
                 end
               end
               @tags_info

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

@@ -29,8 +29,8 @@ module Pod
             default_build_settings = Hash.new
             default_build_settings["CLANG_MODULES_AUTOLINK"] = "NO"
             default_build_settings["GCC_GENERATE_DEBUGGING_SYMBOLS"] = "YES" # 生成Debug编译信息
-            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["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" # unless @xcframework && Gem::Version.new(Pod::VERSION) >=  Gem::Version.new('1.11')# 非xcframework排除ios simulator 64位架构
+            default_build_settings["EXCLUDED_ARCHS[sdk=appletvsimulator*]"] = "arm64" # unless @xcframework && Gem::Version.new(Pod::VERSION) >=  Gem::Version.new('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时需要添加
             
@@ -121,10 +121,6 @@ module Pod
 
           Specification.from_file(@path)
         end
-
-        def match_pod_version?(*version)
-          Gem::Dependency.new('', *version).match?('', Pod::VERSION)
-        end
       end
     end
   end

data/lib/cocoapods-util/gem_version.rb

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

data/lib/cocoapods_plugin.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-util
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -68,7 +68,14 @@ files:
 - LICENSE
 - README.md
 - lib/cocoapods-util.rb
-- lib/cocoapods-util/CocoapodsUtilHook.rb
+- lib/cocoapods-util/binary/config.rb
+- lib/cocoapods-util/binary/hooks/CocoapodsUtilHook.rb
+- lib/cocoapods-util/binary/hooks/post_install.rb
+- lib/cocoapods-util/binary/hooks/pre_install.rb
+- lib/cocoapods-util/binary/main.rb
+- lib/cocoapods-util/binary/podfile_dsl.rb
+- lib/cocoapods-util/binary/prebuild.rb
+- lib/cocoapods-util/binary/targets/pod_target.rb
 - lib/cocoapods-util/command.rb
 - lib/cocoapods-util/command/cocoapods-extend/extend.rb
 - lib/cocoapods-util/command/cocoapods-extend/install.rb
@@ -90,9 +97,6 @@ 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

data/lib/cocoapods-util/CocoapodsUtilHook.rb

@@ -1,63 +0,0 @@
-module CocoapodsUtilHook
-    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"
-    end
-    Pod::HooksManager.register('cocoapods-util', :post_install) do |context, _|
-        puts "post_install"
-    end
-    Pod::HooksManager.register('cocoapods-util', :post_integrate) do |context, _|
-        puts "post_integrate"
-    end
-    Pod::HooksManager.register('cocoapods-util', :source_provider) do |context, _|
-        puts "source_provider"
-    end
-end

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

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

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

@@ -1,4 +0,0 @@
-module Pod
-    class Installer < Command
-    end
-end

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

@@ -1,14 +0,0 @@
-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