cocoapods-hmap-simple 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 250c86d07ab698229d2c1683751d8de2505af1e5438c55e8b3b186aa20f4dc36
-  data.tar.gz: cb0a9e02ed361ca71e6e8c04f1d58f0a05f9635bb6d7a44dc270c1f0b116c9c1
+  metadata.gz: 2a3b893c05e8ef2c396266909325327cbe743f58aaef2273ae2c68c73908b98a
+  data.tar.gz: 858a3e1164807760c20e02315a4da1808cdbf80e1266e2409dddfa0ed1bd3aa2
 SHA512:
-  metadata.gz: 76b7e5bf4fdd3591f3e865a2094771bddc58cb320bad99047fab61c112eb19ea8b9dcda5a8da5b136c793296eec29fe83660e48cb552c2195ff63c673029671a
-  data.tar.gz: abc8efb050e94118684bb9241504d5d0cc69826007b4f3c3251be574fa72f8ad01e13ba254f0da8e250f6ead2d23539b3064eaae87f49406931ebc706ede5872
+  metadata.gz: a21d12e5951be1ad6b712df56278ddbbddaafa80b57826f036fe720ac388f50b9a8c8b3eab7d6ce2e9a96457fb28bf6096455738c459912809c5c54e1cd08bed
+  data.tar.gz: dd2187bdd5c9a93ea2a0d7ab485759e47c4203b2f214d10a9badf66d4979e304a497633ca7445678e4d7bf1b0e86c46e599f46c83061ae026169eacb44cf8ef4

data/lib/hmap_optimize.rb

@@ -4,132 +4,120 @@ combining "${PODS_ROOT}/Headers/Public/*" to a single hmap. (not including ${POD
 =end
 
 module Pod
-  class Target
-    class BuildSettings
-      attr_accessor :hmap_md5
-    end
-  end
-
-  class Installer
-    # helper functions
-    def to_remove?(header_search_path)
-      header_search_path.include?("${PODS_ROOT}/Headers/Public/")
-    end
-
-    def headers_for_path(path)
-      @cached_headers ||= {}
-      cached = @cached_headers.fetch(path, {})
-      return cached unless cached.blank?
-
-      full_path = path.sub(/^\$\{PODS_ROOT\}/, sandbox.root.to_s)
-      headers = Dir.glob("#{full_path}/**/{*.h,*.hpp}")
-      return {} if headers.blank?
-
-      target_headers_hash = headers.to_h do |header|
-        prefix  = File.dirname(header)
-        relative_dir = prefix.sub(/^#{full_path}/, '').sub(/^\//, '')
-        file_name = File.basename(header)
-        file_name = File.join(relative_dir, file_name) unless relative_dir.blank?
-
-        sub_header_hash = {}
-        sub_header_hash['suffix'] = File.basename(header)
-        sub_header_hash['prefix'] = prefix + "/"
-
-        [file_name, sub_header_hash]
+  class HmapHelper
+    def self.post_install(installer)
+      to_remove = -> path { path.include?("${PODS_ROOT}/Headers/Public/") || path.include?("${PODS_ROOT}/Headers/hmap/") }
+
+      headers_for_path = -> path do
+        @cached_headers ||= {}
+        cached = @cached_headers.fetch(path, {})
+        return cached unless cached.blank?
+
+        full_path = path.sub(/^\$\{PODS_ROOT\}/, installer.sandbox.root.to_s)
+        headers = Dir.glob("#{full_path}/**/{*.h,*.hpp}")
+        return {} if headers.blank?
+
+        target_headers_hash = headers.to_h do |header|
+          prefix  = File.dirname(header)
+          relative_dir = prefix.sub(/^#{full_path}/, '').sub(/^\//, '')
+          file_name = File.basename(header)
+          file_name = File.join(relative_dir, file_name) unless relative_dir.blank?
+
+          sub_header_hash = {}
+          sub_header_hash['suffix'] = File.basename(header)
+          sub_header_hash['prefix'] = prefix + "/"
+
+          [file_name, sub_header_hash]
+        end
+        @cached_headers[path] = target_headers_hash
+        target_headers_hash
       end
-      @cached_headers[path] = target_headers_hash
-      target_headers_hash
-    end
 
-    def create_hmap(build_settings)
-      header_search_paths = build_settings.header_search_paths
-      return if header_search_paths.blank?
+      create_hmap = -> build_settings do
+        header_search_paths = build_settings.header_search_paths
+        return if header_search_paths.blank?
 
-      convert_paths = header_search_paths.select { |p| to_remove?(p) }
-      return if convert_paths.blank?
+        convert_paths = header_search_paths.select { |p| to_remove.call(p) }
+        return if convert_paths.blank?
 
-      convert_paths_string = convert_paths.join(" ")&.strip
-      md5_string = Digest::MD5.hexdigest(convert_paths_string)
+        convert_paths_string = convert_paths.join(" ")&.strip
+        md5_string = Digest::MD5.hexdigest(convert_paths_string)
 
-      UI.message "md5(#{convert_paths_string})=#{md5_string}"
+        UI.message "md5(#{convert_paths_string})=#{md5_string}"
 
-      hmap_dir = File.expand_path("Headers/hmap", sandbox.root.to_s)
-      hmap_path = File.expand_path("#{md5_string}.hmap", hmap_dir)
-      if File.exist?(hmap_path)
-        build_settings.hmap_md5 = md5_string
-        return
-      end
+        hmap_dir = File.expand_path("Headers/hmap", installer.sandbox.root.to_s)
+        hmap_path = File.expand_path("#{md5_string}.hmap", hmap_dir)
+        if File.exist?(hmap_path)
+          return md5_string
+        end
 
-      header_path_hash = convert_paths.map { |x| headers_for_path(x) }.inject(:merge)
-      return if header_path_hash.blank?
+        header_path_hash = convert_paths.map { |x| headers_for_path.call(x) }.inject(:merge)
+        return if header_path_hash.blank?
 
-      begin
         FileUtils.mkdir_p(hmap_dir) unless File.directory?(hmap_dir)
         json_path = File.expand_path("#{md5_string}.json", hmap_dir)
         File.open(json_path, 'w') do |file|
           file << header_path_hash.to_json
         end
 
-        convert_json_to_hmap(json_path, hmap_path)
+        hmap = File.expand_path("hmap", File.dirname(__FILE__ ))
+        `#{hmap} convert '#{json_path}' '#{hmap_path}' `
         File.delete(json_path)
 
-        build_settings.hmap_md5 = md5_string
         UI.message "created hmap #{hmap_path}"
-      rescue => e
-        UI.warn "create hmap error: #{e.inspect}"
+        return md5_string
       end
-    end
 
-    def convert_json_to_hmap(public_json, public_hmap)
-      hmap = File.expand_path("hmap", File.dirname(__FILE__ ))
-      `#{hmap} convert '#{public_json}' '#{public_hmap}' `
-    end
+      handle_target_with_settings = -> hmap_md5, target, config do
+        return if hmap_md5.blank?
 
-    def handle_target_with_settings(build_settings, xcconfig, xcconfig_path)
-      return if build_settings.blank? || build_settings.hmap_md5.blank?
+        xcconfig_path = target.xcconfig_path(config)
+        return unless File.exist?(xcconfig_path)
+        xcconfig = Xcodeproj::Config.new(xcconfig_path)
 
-      hmap_path = File.expand_path("Headers/hmap/#{build_settings.hmap_md5}.hmap", sandbox.root.to_s)
-      return unless File.exist?(hmap_path)
+        hmap_path = File.expand_path("Headers/hmap/#{hmap_md5}.hmap", installer.sandbox.root.to_s)
+        return unless File.exist?(hmap_path)
 
-      hmap_item = "\"${PODS_ROOT}/Headers/hmap/#{build_settings.hmap_md5}.hmap\""
+        hmap_item = "\"${PODS_ROOT}/Headers/hmap/#{hmap_md5}.hmap\""
 
-      header_search_paths = xcconfig.to_hash['HEADER_SEARCH_PATHS']
-      path_items = header_search_paths.split(/\s+/)
+        header_search_paths = xcconfig.to_hash['HEADER_SEARCH_PATHS']
+        path_items = header_search_paths.split(/\s+/)
 
-      keep_paths = path_items.reject { |p| to_remove?(p) }
-      keep_paths << hmap_item
+        keep_paths = path_items.reject { |p| to_remove.call(p) }
+        keep_paths << hmap_item
 
-      new_header_search_paths = keep_paths.join(" ")
-      xcconfig.attributes['HEADER_SEARCH_PATHS'] = new_header_search_paths
-      xcconfig.save_as(xcconfig_path)
-    end
+        new_header_search_paths = keep_paths.join(" ")
+        xcconfig.attributes['HEADER_SEARCH_PATHS'] = new_header_search_paths
+        xcconfig.save_as(xcconfig_path)
+      end
 
-    # hook point
-    alias_method :_old_run_podfile_post_install_hook, :run_podfile_post_install_hook
-    def run_podfile_post_install_hook
       # 生成 hmap file，然后修改 xcconfig 文件
-      aggregate_targets.each do |aggregate_target|
+      installer.aggregate_targets.each do |aggregate_target|
         UI.message "convert hmap for aggregate_target #{aggregate_target}"
         aggregate_target.user_build_configurations.each_key do |config| # "Debug" => :debug
           build_settings = aggregate_target.build_settings(config) # AggregateTargetSettings
-          create_hmap(build_settings)
-
-          xcconfig_path = aggregate_target.xcconfig_path(config)
-          xcconfig = aggregate_target.xcconfigs[config]
-          handle_target_with_settings(build_settings, xcconfig, xcconfig_path)
+          hmap_md5 = create_hmap.call(build_settings)
+          handle_target_with_settings.call(hmap_md5, aggregate_target, config)
         end
       end
 
-      pod_targets.each do |pod_target|
+      installer.pod_targets.each do |pod_target|
         UI.message "convert hmap for pod_target #{pod_target}"
         pod_target.build_settings.each do |config, build_settings| # "Debug" => PodTargetSettings
-          create_hmap(build_settings)
-
-          xcconfig_path = pod_target.xcconfig_path(config)
-          xcconfig = Xcodeproj::Config.new(xcconfig_path)
-          handle_target_with_settings(build_settings, xcconfig, xcconfig_path)
+          hmap_md5 = create_hmap.call(build_settings)
+          handle_target_with_settings.call(hmap_md5, pod_target, config)
         end
       end
+    end
+  end
+end
+
+# hook point
+module Pod
+  class Installer
+    alias_method :_old_run_podfile_post_install_hook, :run_podfile_post_install_hook
+    def run_podfile_post_install_hook
+      HmapHelper.post_install(self)
 
       _old_run_podfile_post_install_hook
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hmap-simple
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - shyang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies: []
 description: |-
   This plugin modifies HEADER_SEARCH_PATHS in Pods/Target Support Files/*/*.xcconfig
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: A simple hmap generating plugin for cocoapods.