cocoapods-podfile_patch 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f77646a10d7c52a203f05f40f7aaf01c114bf53
-  data.tar.gz: 7d0847e74adf0f08706038a25368360755c977cb
+  metadata.gz: 458241a69c9825a176500aa680c5f3529c1565f6
+  data.tar.gz: 39348fff4a039b73f68ab1edb75be9b9ccfdebf5
 SHA512:
-  metadata.gz: 175f1f52932b1da20131980b0304c8a6512813247937ccf281c568f4c69abc143a2db483692cdf2f9fd1e540b8d4979c4240dcd29561b7fb31a99ddaf838eb03
-  data.tar.gz: c69e2686993aec5f6af4bcf9a860e29f95fec20fe30890a78210d0af0bc1cbf485504e179934ea69f009c81ae6c87af65a7c1c834f0daac57284f2f63ab244a7
+  metadata.gz: 572effa83441d770ebe21c0596ae9f778d3f860744f2478addb3ea3480f808784d6c118174bdc5f23fdb6611528c27e72e769d09ed42d239456f34261bef279f
+  data.tar.gz: 5b5f96a44cfb9c67affb45c43e4a402ffaa489d2fb5d67b6a24501f2bde8a6dde90e593cf653aa4e19027b4a3fb8814e0ffcaca6e0cf4703e7d69074e2616b62

data/lib/cocoapods-podfile_patch/gem_version.rb

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

data/lib/cocoapods-podfile_patch/podfile_patch.rb

@@ -7,8 +7,12 @@ require 'set'
 
 class PodfilePatch
 
-    def main(podfile, patchfile_path)
-    
+    ABSTRACT_PATCH_TARGET_NAME = "cocoapods-podfile_patch-fake-target"
+
+
+    def load_patch_target(podfile, patchfile_path)
+
+        # find patch file
         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
@@ -18,37 +22,42 @@ class PodfilePatch
             Pod::UI.info "Podfile patch feature is enabled. (No patch file now.)"
             return  
         end
+        
+        # load patch file content. And add it to a abstract target
+        contents = File.read(patch_file_path)
+        podfile.target ABSTRACT_PATCH_TARGET_NAME do
+            podfile.instance_eval contents
+        end
+
+        # find the patch target and delete it in original podfile
+        root_target = podfile.root_target_definitions[0]
+        patch_target = root_target.children.find {|t| t.name == ABSTRACT_PATCH_TARGET_NAME }
+        root_target.children.delete(patch_target)
+
+        return patch_target
+    end
     
-        patchfile = self.patchfile(patch_file_path)
-        self.patch(podfile: podfile, with_podfile: patchfile)
-    
+
+    def merge_patch_and_original_podfile(podfile, patch_target)
+        
+        root_target = podfile.root_target_definitions[0]
+        
+        # merge patch_target and original_target
+        patch_target.name = root_target.name
+        merge_target_definitions_dependency(root_target,  patch_target)
+
         Pod::UI.titled_section "Podfile patch feature is enabled" do
             next unless Pod::UI.config.verbose?
             Pod::UI.section "Patchfile Info" do 
-                self.print_podfile_raw_dependencies patchfile
+                self.print_podfile_raw_dependencies patch_target
             end
             Pod::UI.section "Modified Podfile Info" do 
-                self.print_podfile_raw_dependencies podfile
+                self.print_podfile_raw_dependencies root_target
             end
         end
     end
 
 
-
-    def patchfile(patch_file_path) # [Podfile]
-        Pod::Podfile.from_ruby(patch_file_path)
-    end
-
-    def patch(podfile:, with_podfile: )
-        original = podfile
-        patch = with_podfile
-
-        merge_target_definitions_dependency(
-            podfile.root_target_definitions[0], 
-            patch.root_target_definitions[0]
-            )
-    end
-
     def merge_target_definitions_dependency(targetdef, patch_targetdef)
         # Demo Data
         # Original Target
@@ -224,7 +233,7 @@ class PodfilePatch
         end
     end
 
-    def print_podfile_raw_dependencies(podfile)
+    def print_podfile_raw_dependencies(target)
 
         def print_target_def_and_its_dependencies(target_def, intend = "")
             puts "|\n"
@@ -235,10 +244,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
+        print_target_def_and_its_dependencies(target)
     end 
 end
 

data/lib/cocoapods_plugin.rb

@@ -38,13 +38,18 @@ module Pod
             # you do in podfile, i.e. your custom pod function or other plugins.
             #
             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" 
+                
+                @current_patch_files ||= []
+                if @current_patch_files.include? patchfile_path
+                    # Yes, you could even use it recureively, but don't use the same patch file.
+                    raise "`use_patch_file!` called recursively. Most case is it's used in Patch file."
+                    return 
                 end
+                
+                @current_patch_files << patchfile_path
+                require 'cocoapods-podfile_patch/podfile_patch'
+                @patch_target = PodfilePatch.new.load_patch_target self, patchfile_path
+                @current_patch_files.delete(patchfile_path)
             end
 
         end
@@ -57,10 +62,8 @@ module Pod
         define_method(:initialize) do |defined_in_file = nil, internal_hash = {}, &block|
             old_initialize_function.bind(self).(defined_in_file, internal_hash, &block)
 
-            if @enable_patch
-                require 'cocoapods-podfile_patch/podfile_patch'
-                patcher = PodfilePatch.new
-                patcher.main(self, @patchfile_path)
+            if not @patch_target.nil?
+                PodfilePatch.new.merge_patch_and_original_podfile(self, @patch_target)
             end
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-podfile_patch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Gao