cocoapods-hmap-prebuilt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d189ef8201c8798107aea9e91ed335cc4aeea99814cc78cfe053b89c97259ebf
-  data.tar.gz: e99400f4e44fe8ac3e64167493eb62d71826d5fdb1e58e89948c43dcd82bcfb2
+  metadata.gz: 723e044d815f6fad29a5df76f527a938d172da2c530f0a1af71fa8af0e1b5e69
+  data.tar.gz: 81e969600276c30f6d23345ee3aa228b147756461268d81b4dbaf69d4f2f6c02
 SHA512:
-  metadata.gz: a70c5f2440ffb93a27c6706b997067111ab6a16598e751354653d53c49dce4219a6e19a846ac3b54c0a22ceb84360a2830c7d98d35ae0b38d2dacb0dc5e3c103
-  data.tar.gz: 76b7ed93626493ca1385034f271bbfdcc4e98b3e700e09a0e708b9253bb56c6889c0f44f03f09ae535452127752b3a4855a924f5646765a93c64e19656761425
+  metadata.gz: fe850c4aacb92d776ac2deb632206a057a134cc53b05c1551552b9ad903e80cb7265e1a96fdf50985014e51cd54cdf8affd5130f7b061ffbca7a7df3b2d6ed0c
+  data.tar.gz: c27233d8032b87602afa6c94f4e9b49b55032ccbdceab090f3c776d000faddeb728867a61f5d7dc98547ca88a952114900c35f072b500cd05c0338f767eeca5e

data/lib/cocoapods-hmap-prebuilt.rb

@@ -1,13 +1 @@
-# The primary namespace for cocoapods-hmap-prebuilt.
-module HMap
-    require_relative 'cocoapods-hmap-prebuilt/hmap_version'
-    require_relative 'cocoapods-hmap-prebuilt/hmap_view'
-    require_relative 'cocoapods-hmap-prebuilt/hmap_struct'
-    require_relative 'cocoapods-hmap-prebuilt/hmap_utils'
-    require_relative 'cocoapods-hmap-prebuilt/hmap_helper'
-    require_relative 'cocoapods-hmap-prebuilt/hmap_exceptions'
-  
-    autoload :HMapFileReader, 'cocoapods-hmap-prebuilt/hmap_file_reader'
-    autoload :HMapFileWriter, 'cocoapods-hmap-prebuilt/hmap_file_writer'
-    autoload :HMapFile, 'cocoapods-hmap-prebuilt/hmap_file'
-end
+require_relative 'cocoapods-hmap-prebuilt/hmap_version'

data/lib/cocoapods-hmap-prebuilt/hmap_constructor.rb

@@ -0,0 +1,48 @@
+# !/usr/bin/env ruby
+
+module HMap
+  class HMapConstructor
+    def initialize
+      @bucket = Hash.new
+    end
+
+    # header_mapping : [Hash{FileAccessor => Hash}] Hash of file accessors by header mappings.
+    def add_hmap_with_header_mapping(header_mapping, target_name = nil)
+      header_mapping.each do |accessor, headers|
+        headers.each do |key, paths|
+          paths.each do |path|
+            pn = Pathname.new(path)
+            basename = pn.basename.to_s
+            dirname = pn.dirname.to_s + '/'
+            # construct hmap hash info
+            bucket = Hash['suffix' => basename, 'prefix' => dirname]
+            if $use_strict_mode == false
+              @bucket[basename] = bucket
+            end
+            if target_name != nil
+              @bucket["#{target_name}/#{basename}"] = bucket
+            end
+          end
+        end
+      end
+    end
+
+    # @path : path/to/xxx.hmap
+    # @return : success
+    def save_to(path)
+      if path != nil && @bucket.empty? == false
+        pn = Pathname(path)
+        json_path = pn.dirname.to_s + '/temp.json'
+        # write hmap json to file
+        File.open(json_path, 'w') { |file| file << @bucket.to_json }
+        # json to hmap
+        success = system("hmap convert #{json_path} #{path}")
+        # delete json file
+        File.delete(json_path)
+        success
+      else
+        false
+      end
+    end
+  end
+end

data/lib/cocoapods-hmap-prebuilt/hmap_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsHmapPrebuilt
-  VERSION = "0.0.2"
-end
+  VERSION = "0.0.3"
+end

data/lib/cocoapods-hmap-prebuilt/hmap_writer.rb

@@ -0,0 +1,54 @@
+require 'cocoapods'
+require_relative 'hmap_constructor'
+require_relative 'pod_xcconfig'
+require_relative 'pod_target'
+require_relative 'podfile_dsl'
+require_relative 'pod_context_hook'
+
+module HMap
+  class HMapFileWriter
+    def initialize(context)
+      hmap_dir = context.sandbox_root + '/Headers/HMap'
+      aggregate_targets = context.aggregate_targets
+      Dir.mkdir(hmap_dir) if !File.exist?(hmap_dir)
+      gen_hmapfile(aggregate_targets, hmap_dir)
+    end
+
+    def gen_hmapfile(aggregate_targets, hmap_dir)
+      aggregate_targets.each do |aggregate_target|
+        pods_hmap = HMap::HMapConstructor.new
+        puts "- hanlding headers of aggregate target :#{aggregate_target.name}".green
+        aggregate_target.pod_targets.each do |target|
+          puts "- hanlding headers of target :#{target.name}".yellow
+          public_header_mapping = target.public_header_mappings_by_file_accessor
+          pods_hmap.add_hmap_with_header_mapping(public_header_mapping, target.name)
+
+          unless $skip_hmap_for_pods.include?(target.name)
+            target_hmap = HMap::HMapConstructor.new
+            header_mappings = target.header_mappings_by_file_accessor
+            target_hmap.add_hmap_with_header_mapping(header_mappings, target.name)
+            target.dependent_targets.each do |dependent_target|
+              target_hmap.add_hmap_with_header_mapping(dependent_target.public_header_mappings_by_file_accessor, dependent_target.name)
+            end
+
+            target_hmap_name = "#{target.name}-prebuilt.hmap"
+            target_hmap_path = hmap_dir + "/#{target_hmap_name}"
+            relative_hmap_path = "Headers/HMap/#{target_hmap_name}"
+            if target_hmap.save_to(target_hmap_path)
+              target.reset_header_search_with_relative_hmap_path(relative_hmap_path)
+            end
+          else
+            puts "- skip handling headers of target :#{target.name}"
+          end
+        end
+
+        pods_hmap_name = "#{aggregate_target.name}-prebuilt.hmap"
+        pods_hmap_path = hmap_dir + "/#{pods_hmap_name}"
+        relative_hmap_path = "Headers/HMap/#{pods_hmap_name}"
+        if pods_hmap.save_to(pods_hmap_path)
+          aggregate_target.reset_header_search_with_relative_hmap_path(relative_hmap_path)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-hmap-prebuilt/pod_context_hook.rb

@@ -0,0 +1,42 @@
+# !/usr/bin/env ruby
+
+module Pod
+  class Installer
+    class PostInstallHooksContext
+      attr_accessor :aggregate_targets
+
+      version = Gem::Version.new(Pod::VERSION)
+      if version < Gem::Version.new('1.7.0')
+        # Method `generate` has two args
+        class << self
+          alias old_generate generate
+          def generate(sandbox, aggregate_targets)
+            context = old_generate(sandbox, aggregate_targets)
+            UI.info "- generate method of post install hook context hooked"
+            context.aggregate_targets = aggregate_targets
+            context
+          end
+        end
+      elsif version < Gem::Version.new('1.10.0')
+        # Method `generate` has three args
+        class << self
+          alias old_generate generate
+          def generate(sandbox, pods_project, aggregate_targets)
+            context = old_generate(sandbox, pods_project, aggregate_targets)
+            UI.info "- generate method of post install hook context hooked"
+            context.aggregate_targets = aggregate_targets
+            context
+          end
+        end
+      else
+        # PostInstallHooksContext inherit BaseContext, just override `generate`
+        def self.generate(sandbox, pods_project, aggregate_targets)
+          context = super
+          UI.info "- generate method of post install hook context override"
+          context.aggregate_targets = aggregate_targets
+          context
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-hmap-prebuilt/pod_target.rb

@@ -0,0 +1,40 @@
+# !/usr/bin/env ruby
+
+require_relative 'pod_xcconfig'
+
+module Pod
+  class PodTarget
+    def reset_header_search_with_relative_hmap_path(hmap_path)
+      if build_settings.instance_of?(Hash)
+        build_settings.each do |config_name, setting|
+          config_file = setting.xcconfig
+          config_file.reset_header_search_with_relative_hmap_path(hmap_path)
+          # https://github.com/CocoaPods/CocoaPods/issues/1216
+          config_file.set_use_hmap(false)
+          config_path = xcconfig_path(config_name)
+          config_file.save_as(config_path)
+        end
+      elsif build_settings.instance_of?(BuildSettings::PodTargetSettings)
+        config_file = build_settings.xcconfig
+        config_file.reset_header_search_with_relative_hmap_path(hmap_path)
+        # https://github.com/CocoaPods/CocoaPods/issues/1216
+        config_file.set_use_hmap(false)
+        config_path = xcconfig_path
+        config_file.save_as(config_path)
+      else
+        puts 'Unknown build settings'.red
+      end
+    end
+  end
+
+  class AggregateTarget
+    def reset_header_search_with_relative_hmap_path(hmap_path)
+      # override xcconfig
+      xcconfigs.each do |config_name, config_file|
+        config_file.reset_header_search_with_relative_hmap_path(hmap_path)
+        config_path = xcconfig_path(config_name)
+        config_file.save_as(config_path)
+      end
+    end
+  end
+end

data/lib/cocoapods-hmap-prebuilt/pod_xcconfig.rb

@@ -0,0 +1,71 @@
+# !/usr/bin/env ruby
+
+module Xcodeproj
+  class Config
+    def remove_attr_with_key(key)
+      if key != nil
+        @attributes.delete(key)
+      end
+    end
+
+    def remove_header_search_path
+      header_search_paths = @attributes['HEADER_SEARCH_PATHS']
+      if header_search_paths
+        new_paths = Array.new
+        header_search_paths.split(' ').each do |path|
+          unless path.include?('${PODS_ROOT}/Headers')
+            new_paths << p
+          end
+        end
+        if new_paths.size > 0
+          @attributes['HEADER_SEARCH_PATHS'] = new_paths.join(' ')
+        else
+          remove_attr_with_key('HEADER_SEARCH_PATHS')
+        end
+      end
+      remove_system_options_in_other_cflags
+    end
+
+    def remove_system_options_in_other_cflags
+      flags = @attributes['OTHER_CFLAGS']
+      if flags
+        new_flags = ''
+        skip = false
+        flags.split(' ').each do |substr|
+          if skip
+            skip = false
+            next
+          end
+          if substr == '-isystem'
+            skip = true
+            next
+          end
+          if new_flags.length > 0
+            new_flags += ' '
+          end
+          new_flags += substr
+        end
+        if new_flags.length > 0
+          @attributes['OTHER_CFLAGS'] = new_flags
+        else
+          remove_attr_with_key('OTHER_CFLAGS')
+        end
+      end
+    end
+
+    def reset_header_search_with_relative_hmap_path(hmap_path)
+      remove_header_search_path
+      # add build flags
+      new_paths = Array["${PODS_ROOT}/#{hmap_path}"]
+      header_search_paths = @attributes['HEADER_SEARCH_PATHS']
+      if header_search_paths
+        new_paths.concat(header_search_paths.split(' '))
+      end
+      @attributes['HEADER_SEARCH_PATHS'] = new_paths.join(' ')
+    end
+
+    def set_use_hmap(use_hmap = false)
+      @attributes['USE_HEADERMAP'] = (use_hmap ? 'YES' : 'NO')
+    end
+  end
+end

data/lib/cocoapods-hmap-prebuilt/podfile_dsl.rb

@@ -0,0 +1,22 @@
+# !/usr/bin/env ruby
+
+$skip_hmap_for_pods = []
+$use_strict_mode = false
+
+module Pod
+  class Podfile
+    module DSL
+      def skip_hmap_for_pods(pods)
+        if pods != nil && pods.size() > 0
+          $skip_hmap_for_pods.concat(pods)
+        end
+      end
+
+      # if use strict mode, main project can only use `#import <PodA/HeaderA.h>`
+      # `#import <HeaderA.h>` will get 'file not found' error
+      def use_strict_mode!
+        $use_strict_mode = true
+      end
+    end
+  end
+end

data/lib/cocoapods_plugin.rb

@@ -1,13 +1,12 @@
-require 'cocoapods-hmap-prebuilt/command/hmap_writer'
-require 'cocoapods-hmap-prebuilt/command/hmap_reader'
 
-module Pod
-  module CocoapodsHmapPrebuiltHook
-    Pod::HooksManager.register('cocoapods-hmap-prebuilt', :post_install) do
-        Command::HMapWriter.run(["--project-directory=#{Config.instance.installation_root}", "--nosave-origin-header-search-paths"])
-    end
-    Pod::HooksManager.register('cocoapods-hmap-prebuilt', :post_update) do
-        Command::HMapWriter.run(["--project-directory=#{Config.instance.installation_root}", "--nosave-origin-header-search-paths"])
-    end
+require 'cocoapods-hmap-prebuilt/hmap_writer'
+require 'cocoapods-hmap-prebuilt/pod_context_hook'
+
+module HMapPrebuiltHook
+  Pod::HooksManager.register('cocoapods-hmap-prebuilt', :post_install) do |context|
+    HMap::HMapFileWriter.new(context)
+  end
+  Pod::HooksManager.register('cocoapods-hmap-prebuilt', :post_update) do |context|
+    HMap::HMapFileWriter.new(context)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hmap-prebuilt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - EricLou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,45 +52,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: cocoapods
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
 description: A short description of cocoapods-hmap-prebuilt.
 email:
 - 499304609@qq.com
-executables:
-- hmap-prebuilt-read
-- hmap-prebuilt-write
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- README.md
-- bin/hmap-prebuilt-read
-- bin/hmap-prebuilt-write
 - lib/cocoapods-hmap-prebuilt.rb
-- lib/cocoapods-hmap-prebuilt/command/hmap_reader.rb
-- lib/cocoapods-hmap-prebuilt/command/hmap_writer.rb
-- lib/cocoapods-hmap-prebuilt/hmap_exceptions.rb
-- lib/cocoapods-hmap-prebuilt/hmap_file.rb
-- lib/cocoapods-hmap-prebuilt/hmap_file_reader.rb
-- lib/cocoapods-hmap-prebuilt/hmap_file_writer.rb
-- lib/cocoapods-hmap-prebuilt/hmap_helper.rb
-- lib/cocoapods-hmap-prebuilt/hmap_struct.rb
-- lib/cocoapods-hmap-prebuilt/hmap_utils.rb
+- lib/cocoapods-hmap-prebuilt/hmap_constructor.rb
 - lib/cocoapods-hmap-prebuilt/hmap_version.rb
-- lib/cocoapods-hmap-prebuilt/hmap_view.rb
+- lib/cocoapods-hmap-prebuilt/hmap_writer.rb
+- lib/cocoapods-hmap-prebuilt/pod_context_hook.rb
+- lib/cocoapods-hmap-prebuilt/pod_target.rb
+- lib/cocoapods-hmap-prebuilt/pod_xcconfig.rb
+- lib/cocoapods-hmap-prebuilt/podfile_dsl.rb
 - lib/cocoapods_plugin.rb
 homepage: http://gitlab.webuy.ai/iOS/cocoapod-hamp-prebuilt.git
 licenses:
@@ -118,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="