cocoapods-patch 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09b3961ea67614d95650203463aa53b0e556e4630f52bc88a1d826670aa932db'
-  data.tar.gz: 2bbd9aeedbf8912b991c7e83762b12c5b1ef4def1d2fc0af03a066126fd6569f
+  metadata.gz: 9f8a1091ce7f95d367d0fb5cdcdc01533bade7aa87c3750c03607ca0d0d6893b
+  data.tar.gz: 91ad3babdd2763618a7bedc0bb4186d63558df08c6bbc2a72453e4dcc2fbe555
 SHA512:
-  metadata.gz: d973db22fe9a736b16df29b251cc3cd177ce6c7cac399f3f7f75ca55786776015e650fb680003c4376d144621c765c6eaca66d429e4eae8e00e86bcbea2f3bb9
-  data.tar.gz: ee4054f9540888b48282e1275355658d17bf1b744dbe2f3ad725b53b4cf0a980085f49d34eb6815fdbf03484b92bb3e253669702bd6804b6ff50aefcd470e5d0
+  metadata.gz: 56c086ce0f18238fedb169377d9de115cf50a660d2d5356b78c9c973441fe79e30f98372fcce72242431afcbbe418ae95aaaa23f5986ba9bdbdf551f8a8843ba
+  data.tar.gz: 29cafa7c713700b5ff74a3c82ade35f20885d8411ee9a117be870e473ee60a8d4c58f377c0506ab9e2b4ef382734b1768c4318d65c930000008357178221749d

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 To install or update cocoapods-patch see [README](https://github.com/DoubleSymmetry/cocoapods-patch).
 
-## Main
+## Master
 
 ##### Enhancements
 
@@ -12,6 +12,20 @@ To install or update cocoapods-patch see [README](https://github.com/DoubleSymme
 
 * None.
 
+## 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

data/README.md

@@ -17,7 +17,13 @@ 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.5.
+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
 

data/lib/cocoapods_patch.rb

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

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

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

@@ -21,7 +21,15 @@ module CocoapodsPatch
       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) }
+        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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-patch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Double Symmetry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -81,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: