cocoapods-podfile_patch 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9754afa9090b5b5b1ee61171e615a45607974f51
-  data.tar.gz: 76ad7be9d5dc18fe4b5e252cce3b2798af59e073
+  metadata.gz: 5f77646a10d7c52a203f05f40f7aaf01c114bf53
+  data.tar.gz: 7d0847e74adf0f08706038a25368360755c977cb
 SHA512:
-  metadata.gz: 9ec67eea259cc5c40b20335efd4a766182ed785dd1aa70f43b2ed2ca4beb2aa9b7de9ee79402cc79e1663367d50e39b0c1b0c01b7f9c4713f69a3b93c4babdbf
-  data.tar.gz: 8686e788b26ea2e89d84bd5b8d450cb1024ad13175915968f434f6f31f193ba6f8e5482cae6b9ec441d04c96ee94dac1965daa08d90615aa5d74eebcdbbc9def
+  metadata.gz: 175f1f52932b1da20131980b0304c8a6512813247937ccf281c568f4c69abc143a2db483692cdf2f9fd1e540b8d4979c4240dcd29561b7fb31a99ddaf838eb03
+  data.tar.gz: c69e2686993aec5f6af4bcf9a860e29f95fec20fe30890a78210d0af0bc1cbf485504e179934ea69f009c81ae6c87af65a7c1c834f0daac57284f2f63ab244a7

data/lib/cocoapods-podfile_patch/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPodfile_patch
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/cocoapods-podfile_patch/podfile_patch.rb

@@ -7,10 +7,13 @@ require 'set'
 
 class PodfilePatch
 
-    def main(podfile)
+    def main(podfile, patchfile_path)
     
-        podfile_root_path = Pathname.new(podfile.defined_in_file).dirname
-        patch_file_path = self.patchfile_filepath(podfile_root_path)
+        patch_file_path = Pathname.new(patchfile_path)
+        if not patch_file_path.expand_path.file? 
+            podfile_root_path = Pathname.new(podfile.defined_in_file).dirname
+            patch_file_path = (podfile_root_path + patch_file_path).expand_path
+        end
         if not patch_file_path.file?
             Pod::UI.info "Podfile patch feature is enabled. (No patch file now.)"
             return  
@@ -30,9 +33,7 @@ class PodfilePatch
         end
     end
 
-    def patchfile_filepath(podfile_root) # [Pathname]
-        Pathname.new(podfile_root) + "Podfile.patch"
-    end
+
 
     def patchfile(patch_file_path) # [Podfile]
         Pod::Podfile.from_ruby(patch_file_path)
@@ -165,10 +166,10 @@ class PodfilePatch
         end
 
         # handle MODULAR_HEADERS & INHIBIT_WARNING
-        [ :raw_inhibit_warnings_hash,
-          :raw_use_modular_headers_hash].each do |method|
+        [ 'inhibit_warnings',
+          'use_modular_headers'].each do |method|
             modify_target_defination_recursively(targetdef) do |t|
-                original_inhibit_warning_dict = t.send method
+                original_inhibit_warning_dict = t.send(:get_hash_value,method, {})
                 original_inhibit_warning_dict.each do |key, value|
                     # the key is "for_pods" or "not_for_pods" or "all"
                     # Clear if patchfile have modified the pod
@@ -177,37 +178,48 @@ class PodfilePatch
                 end
     
                 patch_target = patch_file_all_targets_dict[t.name]
-                next if patch_target.nil?
-                patch_inhibit_warning_dict = patch_target.send method
-                patch_inhibit_warning_dict.each do |key, value|
-                    if value.kind_of? Array
-                        original = original_inhibit_warning_dict[key] || []
-                        original.concat(value).uniq! 
-                        original_inhibit_warning_dict[key] = original
-                    elsif [true, false].include? value # "all"
-                        original_inhibit_warning_dict[key] = value
+                if not patch_target.nil?
+                    patch_inhibit_warning_dict = patch_target.send(:get_hash_value,method, {})
+                    patch_inhibit_warning_dict.each do |key, value|
+                        if value.kind_of? Array
+                            original = original_inhibit_warning_dict[key] || []
+                            original.concat(value).uniq! 
+                            original_inhibit_warning_dict[key] = original
+                        elsif [true, false].include? value # "all"
+                            original_inhibit_warning_dict[key] = value
+                        end
                     end
                 end
+                # delete key if blank
+                if original_inhibit_warning_dict.empty?
+                    t.send(:internal_hash).delete(method)
+                end
             end
         end
 
         # handle CONFIGURATION_WHITELIST
         modify_target_defination_recursively(targetdef) do |t|
-            original = t.send :raw_configuration_pod_whitelist
+            key = "configuration_pod_whitelist"
+            original = t.send :get_hash_value, key, {}
             original.each do |config_name, pods|
                 # Clear if patchfile have modified the pod
                 next unless pods.kind_of? Array
                 pods.reject! { |name| modified_dependencies_names.include? name}
             end
-
+            
             patch_target = patch_file_all_targets_dict[t.name]
-            next if patch_target.nil?
-            patched = patch_target.send :raw_configuration_pod_whitelist
-            patched.each do |config_name, pods|
-                next unless pods.kind_of? Array
-                original_pods = original[config_name] || []
-                original_pods.concat(pods).uniq! 
-                original[config_name] = original_pods
+            if not patch_target.nil?
+                patched = patch_target.send :raw_configuration_pod_whitelist
+                patched.each do |config_name, pods|
+                    next unless pods.kind_of? Array
+                    original_pods = original[config_name] || []
+                    original_pods.concat(pods).uniq! 
+                    original[config_name] = original_pods
+                end
+            end
+            # delete key if blank
+            if original.empty?
+                t.send(:internal_hash).delete(key)
             end
         end
     end
@@ -223,6 +235,7 @@ class PodfilePatch
                 print_target_def_and_its_dependencies(target_def, intend + "    ")
             end
         end
+        puts "#{podfile.defined_in_file}"
         podfile.root_target_definitions.each do |target_def|
             print_target_def_and_its_dependencies(target_def)
         end

data/lib/cocoapods_plugin.rb

@@ -37,10 +37,13 @@ module Pod
             # This function is base on the parsed result of podfile. It means you could do ANYTHING
             # you do in podfile, i.e. your custom pod function or other plugins.
             #
-            def use_patch_file!(enabled = true)
-                @enable_patch = enabled
-                if self.defined_in_file.basename.to_s.downcase == "podfile.patch"
-                    raise "Cannot call `#{__method__}` in Podfile.patch" 
+            def use_patch_file!(patchfile_path = 'Podfile.patch')
+                @enable_patch = true
+                @patchfile_path = patchfile_path
+
+                # check not in patchfile
+                if self.defined_in_file.basename.to_s.downcase == Pathname.new(patchfile_path).basename.to_s.downcase
+                    raise "Cannot call `#{__method__}` in Podfile patchfile" 
                 end
             end
 
@@ -57,7 +60,7 @@ module Pod
             if @enable_patch
                 require 'cocoapods-podfile_patch/podfile_patch'
                 patcher = PodfilePatch.new
-                patcher.main(self)
+                patcher.main(self, @patchfile_path)
             end
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-podfile_patch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Gao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler