fastlane-plugin-patch 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6f15eb1e0e061b321516b1b0e2d10078fdc9862
-  data.tar.gz: 937b14b6afd6fa88b64bfe0cdf8a8d34399eea51
+  metadata.gz: ca22332d6aadf5ba6d6ef8caae93aa206e1cceb0
+  data.tar.gz: 0e7329cfd451552872dc685fef793709c837a246
 SHA512:
-  metadata.gz: df39ffa6eb89432594b8ca3f1cc711aa50a8f1b5b51ea017d66be7d7578097ae4de76118b32b4a2b431038e046a03a44d0e686465d254c9599c1a2fe1b64b4ac
-  data.tar.gz: 407a273c955a255c4073a49e29b3aeadf47a62e665c5c7bfee6f53a07813159f8ff3f5e1610c79362f410e66034aa530b9a1bffdbd9d0c4e4123d144e131000f
+  metadata.gz: 52cbcad0a3515ce3b37c484a1bbc6999bbf97639832d06f0f1e41add939bd40a15831e554b12319b5a76487c26860a2929b322c427fe2caed258d1bf72112cfd
+  data.tar.gz: 9d5170068631d7d53cccfcc3f9f3a800d1eaeb01c7b59d2bf22f2d4ae471573600087611fb2f159e0f7fa28df6ad623263cb6c46c70f355d9f994581d9b839b0

data/README.md

@@ -62,17 +62,22 @@ patch(
 
 #### Capture groups
 
-Capture groups may be used in `:replace` mode.
+Capture groups may be used within the text argument in any mode. Note that
+this works best without interpolation (single quotes or %q). If you use double
+quotes, the backslash must be escaped, e.g. `text: "\\1\"MyOtherpod\""`.
 
 ```Ruby
 patch(
   files: "MyPod.podspec",
-  regexp: /(s.name\s*=\s*)"MyPod"/,
+  regexp: /(s\.name\s*=\s*)"MyPod"/,
   text: '\1"MyOtherPod"',
   mode: :replace
 )
 ```
 
+Patches in `:append` mode using capture groups in the text argument may be
+reverted. This is not currently supported in `:prepend` mode.
+
 #### Revert patches
 
 Revert patches by passing the optional `:revert` parameter:

data/lib/fastlane/plugin/patch/helper/patch_helper.rb

@@ -1,3 +1,32 @@
+class String
+  # Replace capture group references in self with appropriate
+  # data from matches. Modifies the receiver. The receiver
+  # need not match the matches.regexp.
+  #
+  # :matches: A MatchData object returned by Regexp#match
+  def apply_matches!(matches)
+    search_position = 0
+    while (m = /\\(\d+)/.match(self, search_position))
+      capture_group = m[1].to_i
+      search_position = index m[0]
+      gsub! m[0], matches[capture_group]
+      search_position += matches[capture_group].length
+    end
+    nil
+  end
+
+  # Return a copy of the receiver with capture group references
+  # in self replaced by appropriate data from matches. The receiver
+  # need not match the matches.regexp.
+  #
+  # :matches: A MatchData object returned by Regexp#match
+  def apply_matches(matches)
+    string = clone
+    string.apply_matches! matches
+    string
+  end
+end
+
 module Fastlane
   module Helper
     class PatchHelper
@@ -17,9 +46,9 @@ module Fastlane
             patched_pattern =
               case mode
               when :append
-                "#{matches[0]}#{text}"
+                "#{matches[0]}#{text.apply_matches matches}"
               when :prepend
-                "#{text}#{matches[0]}"
+                "#{text.apply_matches matches}#{matches[0]}"
               when :replace
                 matches[0].sub regexp, text
               else
@@ -27,8 +56,8 @@ module Fastlane
               end
 
             contents = "#{matches.pre_match}#{patched_pattern}#{matches.post_match}"
-            search_position = matches.pre_match.length + patched_pattern.length
             break unless global
+            search_position = matches.pre_match.length + patched_pattern.length
           end
           contents
         end
@@ -51,18 +80,24 @@ module Fastlane
           patched_regexp =
             case mode
             when :append
-              /#{regexp_string}#{Regexp.quote(text)}/m
+              /#{regexp_string}#{text}/m
             when :prepend
-              /#{Regexp.quote(text)}#{regexp_string}/m
+              # TODO: Capture groups aren't currently revertible in :prepend mode.
+              # This patched regexp can turn into something like /\1.*(\d+)/.
+              # The capture group reference cannot occur in the regexp before definition
+              # of the group. This would have to be transformed to something like
+              # /(\d+).*\1/. Patch reversion is probably not a major use case right
+              # now, so ignore for the moment.
+              /#{text}#{regexp_string}/m
             else
               raise ArgumentError, "Invalid mode argument. Specify :append or :prepend."
             end
 
           while (matches = patched_regexp.match(contents, search_position))
-            reverted_text = matches[0].sub(text, '')
+            reverted_text = matches[0].sub(text.apply_matches(matches), '')
             contents = "#{matches.pre_match}#{reverted_text}#{matches.post_match}"
-            search_position = matches.pre_match.length + reverted_text.length
             break unless global
+            search_position = matches.pre_match.length + reverted_text.length
           end
 
           contents

data/lib/fastlane/plugin/patch/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Patch
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-patch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jimmy Dee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -161,4 +161,3 @@ signing_key:
 specification_version: 4
 summary: Apply and revert pattern-based patches to any text file.
 test_files: []
-has_rdoc: