cocoapods-mapfile 0.2.5 → 0.2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eb57eb32ca81d86a3af1b1fa9b49115c3a7607bf1e6c2c546060e865a855652
-  data.tar.gz: 78ce44dbd5d258ffa4baa8d27201447fc8c2c995163239ec48cdc163fa1ab661
+  metadata.gz: e976ef653409840f3071bf38d444adde2bf7fd3c3c3b4b5cf3306749e481e204
+  data.tar.gz: 76a41c0215836e6865cb3b8f4de6ac455a4698c1d86e3cc864dc52288c1a1581
 SHA512:
-  metadata.gz: e5acfc25fe04df059e746b82d1e4d6661ef598a378a19790bad48b04f5b10e11ad3e975bb61aa38b53a801bfe98234ed526744090be4cbb6477de4f982dce515
-  data.tar.gz: 73714efd5ea58856fd5170f2df67a036a15c9581bd5b4fd935f416b1508bf8b41d50f1e220d1cf81930891fb010ad3552583ee9925f8011801ca57feac14f18d
+  metadata.gz: f778fbad37bf41df0f26bd337c54babc8af7adb887cc64947aa90a00b3cb998c9fcae367c2ae3b3ab852e2213e08c15d0afe1c07dcccbd6d6808b1a2b4fe7979
+  data.tar.gz: 49a92092bdd8ea77ca0c22a8d251bf168b36eb17f0b10f1b6609e7d7cf914f124c3d25016f8b392dd4b1e4370821fe1c9a9f2ecb0eb0abe476d1056ad0114d8a

data/README.md

@@ -1,27 +1,29 @@
-# cocoapods-hmap
+# hmapfile
 
-[![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://raw.githubusercontent.com/wangson1237/SYCSSColor/master/LICENSE) 
+[![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://raw.githubusercontent.com/Cat1237/cocoapods-hmap/main/LICENSE) 
 
 A CocoaPods plugin which can gen/read header map file.
 
 **hmap-gen** is able to scan the header files of the target referenced components in the specified Cocoapods project, and generates a header map file that public to all the components
 as well as generates a public and private header map file for each referenced component.
 
-- <header.h> : -I<hmap file path>
-- "header.h" : -iquote <hmap file path>
+- `<header.h>` : `-I<hmap file path>`
+- `"header.h"` : `-iquote <hmap file path>`
 
 For framework, use [yaml-vfs](https://github.com/Cat1237/yaml-vfs) create VFS file to map framework Headers and Modules dir and pass VFS file to `-ivfsoverlay` parameter.
 
-- vfs : -ivfsoverlay <all-product-headers.yaml>
+- `vfs` : `-ivfsoverlay <all-product-headers.yaml>`
 
 A hmap file includes four types of headers:
 
-- "header.h"
-- <module/header.h> **based on project**
-- <project_name/header.h> **based on project**
-- <*\*/**/header.h> **based on project**
-- "*\*/**/header.h" **based on project**
-- "module/header.h" **based on project**
+- `"header.h"`
+- `<module/header.h>` **based on project**
+- `<project_name/header.h>` **based on project**
+- `<*\*/**/header.h>` **based on project**
+- `"*\*/**/header.h"` **based on project**
+- `"module/header.h"` **based on project**
+
+For hmapfile hashtbale, use [hashtbale](https://github.com/Cat1237/hashtable) create hashtable and bitmap to store headers.
 
 ## Installation
 
@@ -46,21 +48,25 @@ $ gem install cocoapods-mapfile
 ```
 
 ## Quickstart
+
 To begin gen hmap file by opening an Xcodeproj dir, and to your command line with:
+
 ```shell
-$ hmapfile gen
+hmapfile gen
 ```
+
 or to your podfile, add this line:
-```
-$ plugin 'cocoapods-mapfile'
-```
 
+```rb
+plugin 'cocoapods-mapfile'
+```
 
 ## Command Line Tool
 
 Installing the `cocoapods-mapfile` gem will also install two command-line tool `hmapfile reader` and `hmapfile writer` which you can use to generate header map file and read hmap file.
 
 For more information consult
+
 - `hmapfile --help`
 - `hmapfile gen --help`
 - `hmapfile reader --help`
@@ -89,6 +95,33 @@ $ hmapfile COMMAND
     - `--json-path=/project/dir/json`: The path to the hmap json data.
     - `--output-path=/project/dir/hmap file`: The path json data to the hmap file.
 
+**hmapfile writer json file:**
+
+```json
+{
+    "MM.h": [
+        "/Users/ws/Desktop/TestAndTestApp/TestAndTestApp/",
+        "MM.h"
+    ],
+    "Dog.h": [
+        "/Users/ws/Desktop/TestAndTestApp/TestAndTestApp/",
+        "MM.h"
+    ],
+    "Cat.h": [
+        "/Users/ws/Desktop/TestAndTestApp/TestAndTestApp/",
+        "MM.h"
+    ],
+    "TestAndTestApp/MM.h": [
+        "/Users/ws/Desktop/TestAndTestApp/TestAndTestApp/",
+        "MM.h"
+    ],
+    "TestAndTestApp/Dog.h": [
+        "/Users/ws/Desktop/TestAndTestApp/TestAndTestApp/",
+        "Dog.h"
+    ]
+}
+```
+
 example：
 
 ```shell
@@ -118,11 +151,13 @@ plugin 'cocoapods-mapfile'
 This was equl:
 
 ```rb
-$ hmapfile gen --project-directory=<project path>
+hmapfile gen --project-directory=<project path>
 ```
+
 or, you can set some value:
 
 Every time you execute pod install or pod update, `cocoapods-mapfile` will automatically generate a `header map file` for you and modify:
+
 - `OTHER_CPLUSPLUSFLAGS`
 - `OTHER_CFLAGS`
 - `USE_HEADERMAP`

data/lib/hmap/command/hmap_gen.rb

@@ -42,11 +42,14 @@ module HMap
       def run
         name = 'Gen'
         name = 'Clean' if @clean_hmap
-        UserInterface.puts("\n[hmapfile] #{name} start..............")
+        UserInterface.puts("\n[hmapfile] #{name} start")
+        unless @project_directory.exist?
+          UserInterface.puts("\n[hmapfile] #{name} [ERROR] #{@project_directory} dir not exist!".red)
+          return
+        end
         HMap::MapFileWriter.new(true, @project_directory, @clean_hmap)
-        UserInterface.puts("[hmapfile] #{name} finish..............")
+        UserInterface.puts("[hmapfile] #{name} finish")
       end
     end
   end
 end
- 

data/lib/hmap/command/hmap_reader.rb

@@ -17,16 +17,14 @@ module HMap
 
       def initialize(argv)
         super
-        mapfile_path = argv.option('hmap-path')
-        raise ArgumentError, "#{mapfile_path}: no such file!" if mapfile_path.nil? || !File.exist?(mapfile_path)
-
-        @mapfile_path = Pathname.new(mapfile_path).expand_path 
+        mapfile_path = argv.option('hmap-path') || ''
+        @mapfile_path = Pathname.new(mapfile_path).expand_path
       end
 
       def validate!
         super
         # banner! if help?
-        raise '[ERROR]: --hmap-path no set'.red unless File.exist?(@mapfile_path)
+        raise "[hmapfile] Reader [ERROR]: --hmap-path #{@mapfile_path} no exist".red if @mapfile_path.nil?
       end
 
       def self.options
@@ -36,9 +34,13 @@ module HMap
       end
 
       def run
-        UserInterface.puts "\n[hmapfile] Reader start..............\n".yellow
-        HMap::MapFileReader.new(@mapfile_path)
-        UserInterface.puts "\n[hmapfile] Reader finish..............\n".yellow
+        UserInterface.puts "\n[hmapfile] Reader start\n"
+        if File.exist?(@mapfile_path)
+          HMap::MapFileReader.new(@mapfile_path)
+        else
+          UserInterface.puts "\n[hmapfile] Reader input path: #{@mapfile_path} no such file!\n".red
+        end
+        UserInterface.puts "\n[hmapfile] Reader finish\n"
       end
     end
   end

data/lib/hmap/command/hmap_writer.rb

@@ -19,8 +19,7 @@ module HMap
 
       def initialize(argv)
         super
-        json_path = argv.option('json-path')
-        @json_path = json_path unless json_path.nil?
+        @json_path = argv.option('json-path') || ''
         output_path = argv.option('output-path')
         @output_path = output_path.nil? ? Pathname('.') : Pathname(output_path)
       end
@@ -28,7 +27,7 @@ module HMap
       def validate!
         super
         help! 'error: no input json files which to use with the `--json-path` option.' if @json_path.nil?
-        help! "error: Input json file #{@json_path}: no such file" unless File.exist?(@json_path)
+        help! 'error: no output path which to use the `--output-path`' if @output_path.nil?
       end
 
       # help
@@ -40,15 +39,24 @@ module HMap
       end
 
       def run
-        require 'json'
-        UserInterface.puts "\n[hmapfile-from-json] start..............".yellow
-        json_file = File.read(@json_path)
-        json = JSON.parse(json_file)
-        strs = json.map { |e| HMap::BucketStr.new(*e) }
-        path = @output_path
-        path = path.join("#{File.basename(@json_path, '.*')}.hmap") if path.directory?
-        HMapSaver.new_from_buckets(strs).write_to(path)
-        UserInterface.puts '[hmapfile-from-json] finish..............'.yellow
+        UserInterface.puts "\n[hmapfile-from-json] start"
+        if File.exist?(@json_path) && File.exist?(@output_path)
+          require 'json'
+          json_file = File.read(@json_path)
+          json = JSON.parse(json_file)
+          path = @output_path
+          path = path.join("#{File.basename(@json_path, '.*')}.hmap") if path.directory?
+          HMapSaver.new_from_buckets(json).write_to(path)
+          UserInterface.puts "[hmapfile-from-json] output path #{path}".green
+        else
+          unless File.exist?(@json_path)
+            UserInterface.puts "\n[hmapfile-from-json] Error json path: #{@json_path} no such file!".red
+          end
+          unless File.exist?(@output_path)
+            UserInterface.puts "\n[hmapfile-from-json] Error output path: #{@output_path} no such file!".red
+          end
+        end
+        UserInterface.puts "\n[hmapfile-from-json] finish"
       end
     end
   end

data/lib/hmap/constants.rb

@@ -9,7 +9,7 @@ module HMap
     HMAP_DIR = 'HMap'
     HMAP_GEN_DIR = 'HMAP_GEN_DIR'
     HMAP_GEN_DIR_VALUE = '${HMAP_GEN_DIR}'
-    XCBuildData = 'XCBuildData'
+    XC_BUILD_DATA = 'XCBuildData'
     PROJECT_TEMP_DIR = '${PROJECT}.build'
     TARGET_TEMP_DIR = '${TARGET_NAME}.build'
     TARGET_NAME = '${TARGET_NAME}'
@@ -25,6 +25,7 @@ module HMap
     OTHER_CFLAGS = 'OTHER_CFLAGS'
     OTHER_CPLUSPLUSFLAGS = 'OTHER_CPLUSPLUSFLAGS'
     CONFIGURATION_BUILD_DIR = 'CONFIGURATION_BUILD_DIR'
+    OTHER_SWIFT_FLAGS = 'OTHER_SWIFT_FLAGS'
 
     XCBuildConfiguration = Xcodeproj::Project::Object::XCBuildConfiguration
     PBXSourcesBuildPhase = Xcodeproj::Project::Object::PBXSourcesBuildPhase
@@ -34,7 +35,10 @@ module HMap
     PBXBuildFile = Xcodeproj::Project::Object::PBXBuildFile
     PBXAggregateTarget = Xcodeproj::Project::Object::PBXAggregateTarget
 
-    HMAP_TARGET_ROOT = [BUILD_DIR_KEY, '..', '..', HMAP_DIR,
+    # HMAP_TARGET_ROOT = [BUILD_DIR_KEY, '..', '..', HMAP_DIR,
+    #                     PROJECT_TEMP_DIR, CONFIGURATION_EFFECTIVE_PLATFORM,
+    #                     TARGET_TEMP_DIR].join('/')
+    HMAP_TARGET_ROOT = [SRCROOT, HMAP_DIR,
                         PROJECT_TEMP_DIR, CONFIGURATION_EFFECTIVE_PLATFORM,
                         TARGET_TEMP_DIR].join('/')
 
@@ -58,9 +62,9 @@ module HMap
       attr_writer :instance
     end
 
-    # def full_product_name(name, type)
-    #   name.join('.', FILE_TYPES_BY_EXTENSION[type])
-    # end
+    def initialize
+      @build_as_framework = {}
+    end
 
     def hmap_filename(type)
       filenames[type]
@@ -107,14 +111,11 @@ module HMap
       return @build_settings if defined? @build_settings
 
       attributes = HMAP_GEN_DIR_ATTRIBUTE
-      settings = hmap_build_setting_values
-      #   attributes[HMAP_HEADER_SETTING] = settings
       attributes[HEADER_SEARCH_PATHS] = build_setting_values_i
       attributes[OTHER_CFLAGS] = build_setting_values_c
       attributes[OTHER_CPLUSPLUSFLAGS] = build_setting_values_c
-      attributes[USER_HEADER_SEARCH_PATHS] = build_setting_values_iquote
-      #   attributes[OTHER_CFLAGS] = HMAP_HEADER_SETTING_KEY
-      #   attributes[OTHER_CPLUSPLUSFLAGS] = HMAP_HEADER_SETTING_KEY
+      attributes[OTHER_SWIFT_FLAGS] = build_setting_values_s
+      # attributes[USER_HEADER_SEARCH_PATHS] = build_setting_values_iquote
       attributes[USE_HEADERMAP] = 'NO'
       @build_settings = attributes
     end
@@ -132,22 +133,34 @@ module HMap
       end]
     end
 
+    def build_setting_values_s
+      %i[all_non_framework_target_headers own_target_headers all_product_headers project_headers].map do |type|
+        key = build_setting_keys[type]
+        value = xc_filenames[type]
+        if key == :I
+          "-Xcc -#{key}\"#{HMAP_GEN_DIR_VALUE}/#{value}\""
+        else
+          "-Xcc -#{key} -Xcc \"#{HMAP_GEN_DIR_VALUE}/#{value}\""
+        end
+      end.join(' ')
+    end
+
     def build_setting_values_i
-      %i[own_target_headers all_non_framework_target_headers].map do |type|
+      %i[all_non_framework_target_headers own_target_headers project_headers].map do |type|
         value = xc_filenames[type]
         "\"#{HMAP_GEN_DIR_VALUE}/#{value}\""
       end.join(' ')
     end
 
     def build_setting_values_iquote
-      %i[project_headers all_target_headers].map do |type|
+      %i[project_headers].map do |type|
         value = xc_filenames[type]
         "\"#{HMAP_GEN_DIR_VALUE}/#{value}\""
       end.join(' ')
     end
 
     def build_setting_values_c
-      %i[all_target_headers all_product_headers].map do |type|
+      %i[all_product_headers].map do |type|
         key = build_setting_keys[type]
         value = xc_filenames[type]
         blank = ' ' unless key == :I
@@ -190,6 +203,7 @@ module HMap
                [type, case type
                       when :all_product_headers then file_name
                       else
+                        # file_name.to_s
                         "#{Constants::PRODUCT_NAME_VALUE}-#{file_name}"
                       end]
              end]

data/lib/hmap/gem_version.rb

@@ -0,0 +1,5 @@
+module HMap
+  # The version of the hmapfile command line tool.
+  #
+  VERSION = '0.2.7.0'.freeze unless defined? HMap::VERSION
+end

data/lib/hmap/helper/utils.rb

@@ -57,10 +57,7 @@ module HMap
     end
 
     def self.string_downcase_hash(str)
-      str.downcase.bytes.inject(0) do |sum, value|
-        sum += value * 13
-        sum
-      end
+      str.downcase.bytes.inject(:+) * 13
     end
 
     def self.update_changed_file(path, contents)
@@ -73,6 +70,18 @@ module HMap
       File.open(path, 'w') { |f| f.write(contents) }
     end
 
+    def self.file_symlink_to(path, filepath)
+      return unless path.exist?
+
+      filepath.dirname.mkpath unless filepath.exist?
+
+      if Gem.win_platform?
+        FileUtils.ln(path, filepath, force: true)
+      else
+        FileUtils.ln_sf(path, filepath)
+      end
+    end
+
     def self.swapped_magic?(magic, version)
       magic.eql?(HEADER_CONST[:HMAP_SWAPPED_MAGIC]) && version.eql?(HEADER_CONST[:HMAP_SWAPPED_VERSION])
     end

data/lib/hmap/hmap/hmap_bucketstr.rb

@@ -11,6 +11,14 @@ module HMap
       @suffix = suffix
     end
 
+    def value
+      [perfix, suffix]
+    end
+
+    def to_a
+      [key, perfix, suffix]
+    end
+
     def description
       <<-DESC
         Key #{@key} -> Prefix #{@perfix}, Suffix #{@suffix}

data/lib/hmap/hmap/hmap_reader.rb

@@ -34,10 +34,10 @@ module HMap
     # @note This method is public, but should (almost) never need to be called.
     def populate_fields
       @header = populate_hmap_header
-      string_t = @raw_data[header.strings_offset..-1]
+      string_t = @raw_data[header.strings_offset..]
       @bucktes = populate_buckets do |bucket|
         bucket_s = bucket.to_a.map do |key|
-          string_t[key..-1].match(/[^\0]+/)[0]
+          string_t[key..].match(/[^\0]+/)[0]
         end
         BucketStr.new(*bucket_s)
       end

data/lib/hmap/hmap/hmap_saver.rb

@@ -2,60 +2,34 @@
 
 require 'hmap/hmap/hmap_struct'
 require 'hmap/hmap/mapfile'
+require 'hashtable'
 
 module HMap
+  # @class HMapSaver
   class HMapSaver
-    attr_reader :string_table, :buckets, :headers
+    attr_reader :string_table
 
     def self.new_from_buckets(buckets)
       saver = new
-      saver.add_to_buckets(buckets)
+      saver.add_to_buckets(buckets) unless buckets.empty?
       saver
     end
 
-    def initialize
-      @string_table = "\0"
-      @buckets = []
-      @headers = {}
-    end
-
-    def header_to_hash(keys, headers, index, buckets)
-      index = index.length
-      keys.inject('') do |sum, bucket|
-        buckte = BucketStr.new(*bucket)
-        string_t = buckte.bucket_to_string(headers, index + sum.length)
-        buckets.push(buckte)
-        sum + string_t
-      end
-    end
-
-    def add_to_string_table(str)
-      @string_table += "#{Utils.safe_encode(str, 'ASCII-8BIT')}\0"
-    end
+    def add_to_buckets(buckets)
+      return if buckets.nil?
 
-    def add_to_headers(key)
-      if headers[key].nil?
-        headers[key] = string_table.length
-        add_to_string_table(key)
+      hash_t = HashTable::HashTable.new_from_vlaue_placeholder(buckets.length, EMPTY_BUCKET, expand: true)
+      ta = HashTable::StringHashTraits.new { |bs| HMapBucket.new(*bs).serialize }
+      buckets.each_pair do |key, value|
+        hash_t.set(key, value, ta)
       end
-      headers[key]
-    end
-
-    def add_to_bucket(buckte)
-      key = add_to_headers(buckte.key)
-      perfix = add_to_headers(buckte.perfix)
-      suffix = add_to_headers(buckte.suffix)
-      bucket = HMapBucket.new(key, perfix, suffix)
-      bucket.uuid = Utils.string_downcase_hash(buckte.key)
-      @buckets << bucket
-    end
-
-    def add_to_buckets(buckets)
-      buckets.each { |bucket| add_to_bucket(bucket) }
+      @strings = ta.string_table
+      @buckets = hash_t.values
+      @entries = hash_t.num_entries
     end
 
     def write_to(path)
-      MapFile.new(@string_table, @buckets).write(Pathname(path))
+      MapFile.new(@strings, @buckets, @entries).write(Pathname(path))
     end
   end
 end

data/lib/hmap/hmap/hmap_struct.rb

@@ -9,6 +9,9 @@ module HMap
     HMAP_SWAPPED_VERSION: 0x0100
   }.freeze
 
+  EMPTY_HMAP = "pamh\u0001\u0000\u0000\u0000x\u0000\u0000\u0000\u0000\u0000\u0000\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+  EMPTY_BUCKET = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+  private_constant :EMPTY_HMAP
   # A general purpose pseudo-structure.
   # @abstract
   class HMapStructure
@@ -69,7 +72,7 @@ module HMap
     #  or nil if the HMapHeader was created via {create}.
     attr_reader :num_entries, :magic, :version, :reserved, :strings_offset, :num_buckets, :max_value_length
 
-    FORMAT = 'L=1S=2L4'
+    FORMAT = 'L=1S=2L=4'
     # @see HMapStructure::SIZEOF
     # @api private
     SIZEOF = 24
@@ -117,7 +120,7 @@ module HMap
   # @see https://clang.llvm.org/doxygen/structclang_1_1HMapHeader.html
   # @abstract
   class HMapBucket < HMapStructure
-    attr_accessor :key, :perfix, :suffix, :uuid
+    attr_accessor :key, :perfix, :suffix
 
     SIZEOF = 12
     FORMAT = 'L=3'
@@ -150,62 +153,24 @@ module HMap
 
   # HMap blobs.
   class HMapData
-    def initialize(buckets)
+    def initialize(strings, buckets, entries)
       super()
-      count = buckets.count
-      nums = num_buckets(count, Utils.next_power_of_two(count))
-      entries = entries(count, nums)
-      @header = populate_hmap_header(nums, entries)
-      @buckets = add_bucket(buckets, nums)
-    end
-
-    def num_buckets(count, pow2)
-      if count < 8
-        pow2 <<= 1 if count * 4 >= pow2 * 3
-        pow2 < 8 ? 8 : pow2
-      else
-        index = count > 341 ? 2 : -3
-        padding = count / 85 % 7 + index
-        Utils.next_power_of_two(count * 3 + padding)
-      end
-    end
-
-    def entries(count, nums)
-      return count if nums == 8
+      return if strings.nil? || buckets.empty?
 
-      last_pow = nums >> 1
-      index = last_pow < 1024 ? 3 : -2
-      count - (last_pow + 1 + index) / 3 + 1 + last_pow
+      @buckets = buckets
+      @strings = strings
+      @header = populate_hmap_header(buckets.count, entries)
     end
 
     # @return [String] the serialized fields of the mafile
     def serialize
-      @header.serialize + @buckets.inject('') do |sum, bucket|
-        sum += if bucket.nil?
-                 empty_b = [HEADER_CONST[:HMAP_EMPTY_BUCKT_KEY]] * 3
-                 empty_b.pack('L<3')
-               else
-                 bucket
-               end
-        sum
-      end
+      return EMPTY_HMAP if @strings.nil?
+
+      @header.serialize + @buckets.join + @strings
     end
 
     private
 
-    def add_bucket(buckets, num)
-      buckets.each_with_object(Array.new(num)) do |bucket, sum|
-        serialize = bucket.serialize
-        i = Utils.index_of_range(bucket.uuid, num)
-        loop do
-          sum[i] = serialize if sum[i].nil?
-          break if serialize == sum[i]
-
-          i = Utils.index_of_range(i += 1, num)
-        end
-      end
-    end
-
     def populate_hmap_header(num_buckets, entries)
       strings_offset = HMapHeader.bytesize + HMapBucket.bytesize * num_buckets
       HMapHeader.new(HEADER_CONST[:HMAP_HEADER_MAGIC_NUMBER],

data/lib/hmap/hmap/hmap_writer.rb

@@ -14,8 +14,8 @@ module HMap
     # @param allow_targets this targets will save origin build setting
     # @param use_build_in_headermap option use Xcode header map
     def initialize(use_origin, project_root, clean_hmap)
-      UserInterface.puts("[hmapfile] Workspace/project root: #{project_root}..............")
-      UserInterface.puts("[hmapfile] Analyzing dependencies..............")
+      UserInterface.puts("[hmapfile] Workspace/project root: #{project_root}")
+      UserInterface.puts('[hmapfile] Analyzing dependencies')
       Resolver.instance.installation_root = project_root
       Resolver.instance.use_origin = use_origin
       create_hmapfile(clean_hmap)
@@ -32,14 +32,17 @@ module HMap
       # Though this looks like a regular expression quantifier, it isn't.
       # For example, in regular expression, the pattern a{1,2} will match 1 or 2 'a' characters.
       # In globbing, it will match the string a1 or a2.
-      paths = Dir.glob(File.join(Resolver.instance.installation_root, '*.{xcworkspace,xcodeproj}'))
+      paths = Dir.glob(File.join(Resolver.instance.installation_root, '*.{xcworkspace,xcodeproj}')) || []
       workspace_paths = paths.select { |f| File.extname(f) == '.xcworkspace' }
-      xcs = if workspace_paths.nil?
+      xcs = if workspace_paths.empty?
               project_paths = paths.select { |f| File.extname(f) == '.xcodeproj' }
               Workspace.new_from_xcprojects(project_paths) unless project_paths.nil?
             else
               Workspace.new_from_xcworkspaces(workspace_paths)
             end
+      if xcs.empty?
+        UserInterface.puts("\n[hmapfile] Gen [ERROR] path: #{Resolver.instance.installation_root} not contain .{xcworkspace,xcodeproj} file!".red)
+      end
       xcs.each do |xc|
         if clean
           xc.remove_hmap_settings!

data/lib/hmap/hmap/mapfile.rb

@@ -3,31 +3,22 @@
 module HMap
   # hmap file writer
   class MapFile
-    # @return mapfile string_table
-    attr_reader :string_table
-
-    # @return [Array<HMap::BucketStr>] an array of the file's bucktes
-    # @note bucktes are provided in order of ascending offset.
-    attr_reader :buckets
-
     # @api private
-    def initialize(strings, buckets)
-      @string_table = strings
-      @buckets = buckets
-      @map_data = HMapData.new(buckets)
+    def initialize(strings, buckets, entries)
+      @map_data = HMapData.new(strings, buckets, entries)
     end
 
     # @return [String] the serialized fields of the mafile
     def serialize
-      @map_data.serialize + @string_table
+      @map_data.serialize
     end
 
     # Write all mafile data to the given filename.
     # @param filename [String] the file to write to
     # @return [void]
-    def write(path)
-      contents = serialize
-      Utils.update_changed_file(path, contents)
+    def write(filepath, contents = nil)
+      contents = serialize if contents.nil?
+      Utils.update_changed_file(filepath, contents)
     end
   end
 end