cocoapods-patch 0.0.8 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 765a982a7881db3b57c31e3bbe5e54ec56f5d990a4918c81f1ff7dbf6e7d9cf7
-  data.tar.gz: b9ec1d2c051c580b5f9c79f34e6905b8931a5ca3abcde268d61ff03fbdb6e938
+  metadata.gz: 9c776a1fc38b8a256df3593271ef62449d5eb48dd754198e718005c1107f3136
+  data.tar.gz: ab2a05988e78230620cfd26cd9d68442fcb85b9b1e6b9823bf1737c6d03d6863
 SHA512:
-  metadata.gz: 32860c686e91f67ee8d4939bb1507c852b34284c626086a74375e3c51a38d6c31e4b06e4f07e401f73724105824b55e3b3cc59001fbac875843e5e904046d970
-  data.tar.gz: 8702ff7065ed62bdca2455c145a7519bc9317db9f86a05639b8c2f08ae5dd9901e6566bfe6ea0dfd6b5501fa25d7a910af085ce3270996545a02d2117f701cfc
+  metadata.gz: e48a2c658ca3d8e47b03294312b945c2a4b9a797f0b6348ecf45b5877db0aaff2beb4470ead4292e1c84e99534f08624bdc345abd6c928bf000559fde0e2c55c
+  data.tar.gz: 9ef7532fd542f35a45cad2c239266944b8c671d9e5fec3f0c3d15394cd30b60fbdcc1ce6e795ac887f336efdc2b5898f3a633045efe083d7b4092cf1a44f074c

data/CHANGELOG.md

@@ -0,0 +1,49 @@
+# Installation & Update
+
+To install or update cocoapods-patch see [README](https://github.com/DoubleSymmetry/cocoapods-patch).
+
+## Master
+
+##### Enhancements
+
+* None.
+
+##### Bug Fixes
+
+* 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
+
+* Change name of generated patch files to include pod version used
+  [dcvz](https://github.com/dcvz)
+
+* Use lockfile to use more correct installation of fresh dependencies.
+  [dcvz](https://github.com/dcvz)
+
+##### Bug Fixes
+
+* None.
+
+## 1.0.0 (1.11.21)
+
+##### Enhancements
+
+* Use official pre_integrate hook
+  [dcvz](https://github.com/dcvz)
+  [#7](https://github.com/DoubleSymmetry/cocoapods-patch/pull/7)
+
+##### Bug Fixes
+
+* None.

data/README.md

@@ -15,6 +15,16 @@ Next, add a `plugin 'cocoapods-patch'` line to your Podfile to use the plugin. T
 
 That's it, you're done.
 
+**NOTE:**
+`cocoapods-patch` version 1.0.0 and above require you to use Cocoapods 1.11.0 or greater.
+For anything below that please use version 0.0.9.
+
+## Migrating to v1.0.1+
+
+In v1.0.1 of the plugin we've changed the naming scheme of the generated patch files to also include the version of the pods used to generate the patches. This will allow us to do more automation safety and make sure patches are applied successfully.
+
+We've added a new command to help with the migration. After updating before doing a `pod install` please first run `pod patch migrate` which will translate any existing patches into their new format. This will use the current version of the pods stated in your lockfile.
+
 ## Usage
 
 ### Creating a patch

data/lib/cocoapods_patch.rb

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

data/lib/pod/command/patch/apply.rb

@@ -37,7 +37,7 @@ def apply_patch(patch_file)
   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"
+    check_cmd = "git apply --check '#{patch_file}' --directory='#{directory_arg}' -p2 2> /dev/null"
 
     can_apply = system(check_cmd)
     if can_apply

data/lib/pod/command/patch/create.rb

@@ -36,7 +36,7 @@ module Pod
 
           Dir.mktmpdir('cocoapods-patch-', config.project_root) do |work_dir|
             sandbox = Pod::Sandbox.new(work_dir)
-            installer = Pod::Installer.new(sandbox, config.podfile)
+            installer = Pod::Installer.new(sandbox, config.podfile, config.lockfile)
             installer.clean_install = true
 
             installer.prepare
@@ -58,7 +58,7 @@ module Pod
             UI.puts "Creating patch"
             theirs = Pathname.new(work_dir).join(@name).relative_path_from(config.project_root)
             ours = config.project_pods_root.join(@name).relative_path_from(config.project_root)
-            gen_diff_cmd = "git diff --no-index #{theirs} #{ours} > #{patch_file}"
+            gen_diff_cmd = "git diff --no-index '#{theirs}' '#{ours}' > '#{patch_file}'"
 
             did_succeed = system(gen_diff_cmd)
             if not did_succeed.nil?

data/lib/pod/command/patch/migrate.rb

@@ -0,0 +1,44 @@
+require 'pathname'
+
+module Pod
+  class Command
+    class Patch < Command
+      class Migrate < Patch
+        self.description = <<-DESC
+            Migrates previous patch files to the new format.
+        DESC
+
+        def clear_patches_folder_if_empty
+          if Dir.empty?(patches_path)
+            FileUtils.remove_dir(patches_path)
+          end
+        end
+
+        def run
+          UI.puts 'Migrating patches...'
+          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 do |p|
+              # check if patch file has new format
+              if p.to_s.include?('+')
+                # do nothing
+              else
+                # rename patch file
+                pod_name = p.basename('.diff').to_s
+                UI.puts "Renaming #{pod_name}"
+
+                pod_version = config.lockfile.version(pod_name)
+                new_patch_name = p.to_s.gsub('.diff', "+#{pod_version}.diff")
+                
+                File.rename(p, new_patch_name)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/pod/command/patch.rb

@@ -8,7 +8,8 @@ module Pod
       self.summary = 'Create & apply patches to Pods.'
 
       def patch_file
-        config.project_root + 'patches' + "#{@name}.diff"
+        version = config.lockfile.version(@name)
+        return config.project_root + 'patches' + "#{@name}+#{version}.diff"
       end
 
       def patches_path

data/lib/pod/command.rb

@@ -1,3 +1,4 @@
 require_relative 'command/patch'
 require_relative 'command/patch/apply'
 require_relative 'command/patch/create'
+require_relative 'command/patch/migrate'

data/lib/pod/hook.rb

@@ -34,10 +34,20 @@ class Pod::Installer
 
   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
+      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 do |p|
+          pod_name = File.basename(p, ".diff")
+          # check if patch is in new format otherwise warn user
+          unless p.to_s.include?('+')
+            Pod::UI.puts "WARNING: #{pod_name}.diff has an old naming format. Please run pod patch migration first before pod install. See the README for more information.".yellow
+          end
+
+          apply_patch(p)
+        end
+      end
   end
 end
+
+

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-patch
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.2
 platform: ruby
 authors:
 - Double Symmetry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: 1.11.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: cocoapods
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '3.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.9'
 description: Create & apply patches to Pods
 email:
 - dev@doublesymmetry.com
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - README.md
 - lib/cocoapods_patch.rb
 - lib/cocoapods_plugin.rb
@@ -80,6 +81,7 @@ files:
 - lib/pod/command/patch.rb
 - lib/pod/command/patch/apply.rb
 - lib/pod/command/patch/create.rb
+- lib/pod/command/patch/migrate.rb
 - lib/pod/hook.rb
 homepage: https://github.com/DoubleSymmetry/cocoapods-patch
 licenses: