fastlane-plugin-patch 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca22332d6aadf5ba6d6ef8caae93aa206e1cceb0
-  data.tar.gz: 0e7329cfd451552872dc685fef793709c837a246
+  metadata.gz: 168fcc13fa33b2037f80ebe36b8eb19b2a065d66
+  data.tar.gz: 2a57c7080d0197ceeef5ce90be08f76ba2e79237
 SHA512:
-  metadata.gz: 52cbcad0a3515ce3b37c484a1bbc6999bbf97639832d06f0f1e41add939bd40a15831e554b12319b5a76487c26860a2929b322c427fe2caed258d1bf72112cfd
-  data.tar.gz: 9d5170068631d7d53cccfcc3f9f3a800d1eaeb01c7b59d2bf22f2d4ae471573600087611fb2f159e0f7fa28df6ad623263cb6c46c70f355d9f994581d9b839b0
+  metadata.gz: 1132ec65c4b40ae558d0cb5e312113e6ab7cf31910ee72a034b360923e221b4bb5d51e634864db44c565a5dc07fe609c27d777bcd951ddf1f83af0be13b5fdd4
+  data.tar.gz: 104cbfa158a62f046569f3c0eee24ee5a885fe5345d571033e12f1c59594402d99b4fa4aef7bc583491c50a27de1e94d80321777e9b5ba6ff97fe624920ef761

data/lib/fastlane/plugin/patch/actions/apply_patch_action.rb

@@ -34,12 +34,12 @@ module Fastlane
 
         files.each do |file|
           modified_contents = File.open(file, "r") do |f|
-            helper.apply_patch f.read,
-                               params[:regexp],
-                               params[:text],
-                               params[:global],
-                               params[:mode],
-                               params[:offset]
+            PatternPatch::Utilities.apply_patch f.read,
+                                                params[:regexp],
+                                                params[:text],
+                                                params[:global],
+                                                params[:mode],
+                                                params[:offset]
           end
 
           File.open(file, "w") { |f| f.write modified_contents }

data/lib/fastlane/plugin/patch/actions/patch_action.rb

@@ -1,3 +1,4 @@
+require 'pattern_patch'
 require 'yaml'
 
 module Fastlane
@@ -35,19 +36,19 @@ module Fastlane
         files.each do |file|
           modified_contents = File.open(file, "r") do |f|
             if params[:revert]
-              helper.revert_patch f.read,
-                                  params[:regexp],
-                                  params[:text],
-                                  params[:global],
-                                  params[:mode],
-                                  params[:offset]
+              PatternPatch::Utilities.revert_patch f.read,
+                                                   params[:regexp],
+                                                   params[:text],
+                                                   params[:global],
+                                                   params[:mode],
+                                                   params[:offset]
             else
-              helper.apply_patch f.read,
-                                 params[:regexp],
-                                 params[:text],
-                                 params[:global],
-                                 params[:mode],
-                                 params[:offset]
+              PatternPatch::Utilities.apply_patch f.read,
+                                                  params[:regexp],
+                                                  params[:text],
+                                                  params[:global],
+                                                  params[:mode],
+                                                  params[:offset]
             end
           end
 

data/lib/fastlane/plugin/patch/actions/revert_patch_action.rb

@@ -1,3 +1,4 @@
+require 'pattern_patch'
 require 'yaml'
 
 module Fastlane
@@ -34,12 +35,12 @@ module Fastlane
 
         files.each do |file|
           modified_contents = File.open(file, "r") do |f|
-            helper.revert_patch f.read,
-                                params[:regexp],
-                                params[:text],
-                                params[:global],
-                                params[:mode],
-                                params[:offset]
+            PatternPatch::Utilities.revert_patch f.read,
+                                                 params[:regexp],
+                                                 params[:text],
+                                                 params[:global],
+                                                 params[:mode],
+                                                 params[:offset]
           end
 
           File.open(file, "w") { |f| f.write modified_contents }

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

@@ -1,108 +1,7 @@
-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
       class << self
-        # Add the specified text after the specified pattern.
-        # Returns a modified copy of the string.
-        #
-        # :contents: A string to modify, e.g. the contents of a file
-        # :regexp: A regular expression specifying a pattern to be matched
-        # :text: Text to be appended to the specified pattern
-        # :global: Boolean flag. If true, patch all occurrences of the regex.
-        # :mode: :append, :prepend or :replace to specify how to apply the patch
-        # :offset: Starting position for matching
-        def apply_patch(contents, regexp, text, global, mode, offset)
-          search_position = offset
-          while (matches = regexp.match(contents, search_position))
-            patched_pattern =
-              case mode
-              when :append
-                "#{matches[0]}#{text.apply_matches matches}"
-              when :prepend
-                "#{text.apply_matches matches}#{matches[0]}"
-              when :replace
-                matches[0].sub regexp, text
-              else
-                raise ArgumentError, "Invalid mode argument. Specify :append, :prepend or :replace."
-              end
-
-            contents = "#{matches.pre_match}#{patched_pattern}#{matches.post_match}"
-            break unless global
-            search_position = matches.pre_match.length + patched_pattern.length
-          end
-          contents
-        end
-
-        # Reverts a patch. Use the same arguments that were supplied to apply_patch.
-        # The mode argument can only be :append or :prepend. Patches using :replace
-        # cannot be reverted.
-        # Returns a modified copy of the string.
-        #
-        # :contents: A string to modify, e.g. the contents of a file
-        # :regexp: A regular expression specifying a pattern to be matched
-        # :text: Text to be appended to the specified pattern
-        # :global: Boolean flag. If true, patch all occurrences of the regex.
-        # :mode: :append or :prepend. :replace patches cannot be reverted automatically.
-        # :offset: Starting position for matching
-        def revert_patch(contents, regexp, text, global, mode, offset)
-          search_position = offset
-          regexp_string = regexp.to_s
-
-          patched_regexp =
-            case mode
-            when :append
-              /#{regexp_string}#{text}/m
-            when :prepend
-              # 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.apply_matches(matches), '')
-            contents = "#{matches.pre_match}#{reverted_text}#{matches.post_match}"
-            break unless global
-            search_position = matches.pre_match.length + reverted_text.length
-          end
-
-          contents
-        end
-
         def files_from_params(params)
           case params[:files]
           when Array

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

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-patch
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jimmy Dee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pattern_patch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Apply and revert pattern-based patches to any text file.