cocoapods-patch 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8a1091ce7f95d367d0fb5cdcdc01533bade7aa87c3750c03607ca0d0d6893b
-  data.tar.gz: 91ad3babdd2763618a7bedc0bb4186d63558df08c6bbc2a72453e4dcc2fbe555
+  metadata.gz: 9c776a1fc38b8a256df3593271ef62449d5eb48dd754198e718005c1107f3136
+  data.tar.gz: ab2a05988e78230620cfd26cd9d68442fcb85b9b1e6b9823bf1737c6d03d6863
 SHA512:
-  metadata.gz: 56c086ce0f18238fedb169377d9de115cf50a660d2d5356b78c9c973441fe79e30f98372fcce72242431afcbbe418ae95aaaa23f5986ba9bdbdf551f8a8843ba
-  data.tar.gz: 29cafa7c713700b5ff74a3c82ade35f20885d8411ee9a117be870e473ee60a8d4c58f377c0506ab9e2b4ef382734b1768c4318d65c930000008357178221749d
+  metadata.gz: e48a2c658ca3d8e47b03294312b945c2a4b9a797f0b6348ecf45b5877db0aaff2beb4470ead4292e1c84e99534f08624bdc345abd6c928bf000559fde0e2c55c
+  data.tar.gz: 9ef7532fd542f35a45cad2c239266944b8c671d9e5fec3f0c3d15394cd30b60fbdcc1ce6e795ac887f336efdc2b5898f3a633045efe083d7b4092cf1a44f074c

data/CHANGELOG.md

@@ -12,6 +12,16 @@ To install or update cocoapods-patch see [README](https://github.com/DoubleSymme
 
 * None.
 
+## 1.0.2 (6.12.21)
+
+##### Enhancements
+
+* None.
+
+##### Bug Fixes
+
+* Revert to previous way of applying patches. There's a bug in Cocoapods that does not call hooks.
+
 ## 1.0.1 (2.11.21)
 
 ##### Enhancements

data/lib/cocoapods_patch.rb

@@ -1,3 +1,3 @@
 module CocoapodsPatch
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/pod/hook.rb

@@ -15,9 +15,25 @@ module CocoapodsPatch
         end
       end
     end
+  end
+end
+
+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
 
-    Pod::HooksManager.register('cocoapods-patch', :pre_integrate) do |context|
-      Pod::UI.puts 'Applying patches if necessary'
+  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') }
@@ -31,6 +47,7 @@ module CocoapodsPatch
           apply_patch(p)
         end
       end
-    end
   end
 end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-patch
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Double Symmetry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods