cocoapods-patch 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39b7df9e697a31cdcee1ce05641aecbce2536510730edbf4ebd309b83d90bef
-  data.tar.gz: 45a5256704d13fee7002291fd3dec27d7d46005613786d30be017f05fdcf2ea2
+  metadata.gz: 2626728359e198af7ecc119c2bc846520c233f725cea13857a12a936bfacb527
+  data.tar.gz: ef94a39a36598ce2274b099f34af86953a21086d52b135dff893f6e21cf5aebf
 SHA512:
-  metadata.gz: 3fdb4edae64ad26734cbd980cdb7502a4a3ea4ad956f2c7a4b2ceb604abdf00264b8e7ca5e3ff675ce998b707be504008cfce7e946c9148993255c119fd9ee0c
-  data.tar.gz: e23fc9606eb1d50a8e1ef0397da6947afd3af47929543f9b1226de9700c6bc1404d84c2eac27b2a2f5294b83b124d7f0663764edb68e55092df5280bc69ed440
+  metadata.gz: 230e132b95a6bcadeb9e442fa5576ec5b57c36cefc543fae0feed769569fbadf4ac0e0f8e7799939e938a3bdede73d15517e150a3e6daf042471d2321fc9584b
+  data.tar.gz: d335a0613d53c0931caacd4e2938e8083d7b32cdbb843dd406b91e5714a77e8b678537577fa8d05cef2d2f2a4accfc39a80f210db17f074f3d22012d82e4b5a8

data/lib/cocoapods-patch/command/patch/apply.rb

@@ -30,15 +30,24 @@ end
 
 # also used from the post-install hook
 def apply_patch(patch_file)
-  check_cmd = "git apply --check #{patch_file} --directory=Pods -p2 2> /dev/null"
-  can_apply = system(check_cmd)
-  if can_apply
-    apply_cmd = check_cmd.gsub('--check ', '')
-    did_apply = system(apply_cmd)
-    if did_apply
-      Pod::UI.puts "Successfully applied #{patch_file}"
-    else
-      Pod::UI.warn "Failed to apply #{patch_file}"
+  working_dir = Dir.pwd
+  repo_root = `git rev-parse --show-toplevel`.strip
+  ios_project_path = Pathname.new(working_dir).relative_path_from(Pathname.new(repo_root))
+
+  directory_arg = (ios_project_path.to_s.eql? ".") ? "Pods" : File.join(ios_project_path, 'Pods')
+
+  Dir.chdir(repo_root) {
+    check_cmd = "git apply --check #{patch_file} --directory=#{directory_arg} -p2 2> /dev/null"
+
+    can_apply = system(check_cmd)
+    if can_apply
+      apply_cmd = check_cmd.gsub('--check ', '')
+      did_apply = system(apply_cmd)
+      if did_apply
+        Pod::UI.puts "Successfully applied #{patch_file}"
+      else
+        Pod::UI.warn "Failed to apply #{patch_file}"
+      end
     end
-  end
+  }
 end

data/lib/cocoapods-patch/command/patch/create.rb

@@ -25,6 +25,7 @@ module Pod
         end
 
         def run
+          FileUtils.mkdir_p('patches')
           Dir.mktmpdir('cocoapods-patch-', config.project_root) do |work_dir|
             sandbox = Pod::Sandbox.new(work_dir)
             installer = Pod::Installer.new(sandbox, config.podfile)

data/lib/cocoapods-patch/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPatch
-  VERSION = "0.0.2"
+  VERSION = "0.0.7"
 end

data/lib/cocoapods-patch/hook.rb

@@ -2,11 +2,24 @@ require 'cocoapods'
 require 'pathname'
 require_relative 'command/patch/apply'
 
-module CocoapodsPatch
-  module Hooks
-    Pod::HooksManager.register('cocoapods-patch', :post_install) do |context|
-      Pod::UI.puts 'Applying patches if necessary'
-      patches_dir = Pathname.new(context.sandbox_root) + '..' + 'patches'
+class Pod::Installer
+  # Because our patches may also delete files, we need to apply them before the pod project is generated
+  # The project is generated in the `integrate` method, so we override it
+  # We first run our patch action and then the original implementation of the method
+  # Reference: https://github.com/CocoaPods/CocoaPods/blob/760828a07f8fcfbff03bce13f56a1789b6f5a95d/lib/cocoapods/installer.rb#L178
+  alias_method :integrate_old, :integrate
+
+  def integrate
+    # apply our patches
+    apply_patches
+    # run the original implementation
+    integrate_old
+  end
+
+  def apply_patches
+    Pod::UI.puts 'Applying patches if necessary'
+    patches_dir = Pathname.new(Dir.pwd) + 'patches'
+    if patches_dir.directory?
       patches = patches_dir.each_child.select { |c| c.to_s.end_with?('.diff') }
       patches.each { |p| apply_patch(p) }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-patch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Double Symmetry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler