cocoapods-patch 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1906c058ad8d231b40db3b069f987234f90d5e8fff70f61196ed785f18787c46
-  data.tar.gz: 1a59dd3429f39519559aa6d7807c3cc94db9178551e492422844bd86a7ebdaea
+  metadata.gz: 5f1fc48aa0350d562d1ad476ab439624105cee81c22bab3b604a73131e1dd6eb
+  data.tar.gz: b03c8bf4611c20f40536936fa02c2b43f833588b63038d083fe834be9a368a0c
 SHA512:
-  metadata.gz: 1b20fefdce67bafc583858bce2a4f5fa8f6f8996b587ac27b359917422f5d7d8edb2cec2af0a5c16735777015a37c23380af3c78f4017e89ce2943d94f4c91ef
-  data.tar.gz: d578b7a256154fe8f0cafea6f4c9eb7845a8d8a98868f43e15448e025acb4b3836d5f3d47d94a3933d16bdf405601ed89b203fa7b81f514527b6789310c6bfad
+  metadata.gz: c96592ef2a7c17cbc4916afc582a0af9219bf2ecf351dbc6f21ab10a6660cb4de8e5a8fcd69c3cada1d5d69c6c29c53e654143f426193e23a0e4bf757acb4d78
+  data.tar.gz: c7c7d93705236d902f9ddd02d4102ae800c9280bc1f8549d31b600a7fc4a1c5b6616b2029a0e2468fa58678fabc3dc5d5a9d09ddcba34f83ad414251a7added1

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

@@ -1,3 +1,5 @@
+require 'cocoapods'
+
 module Pod
   class Command
     class Patch < Command
@@ -28,15 +30,25 @@ 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
-      UI.puts "Successfully applied #{patch_file}"
-    else
-      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) {
+    Pod::UI.puts "YOOOOO #{patch_file} - #{directory_arg}"
+    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/gem_version.rb

@@ -1,4 +1,3 @@
 module CocoapodsPatch
-  VERSION = "0.0.1"
-  NAME = 'cocoapods-patch'
+  VERSION = "0.0.6"
 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.1
+  version: 0.0.6
 platform: ruby
 authors:
 - Double Symmetry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler