geny 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26e05f21ea0266a46ce4c2cdf05d3fd46be21cce
-  data.tar.gz: 5ab64929a864a15791f9a7a4604eda223619c7eb
+  metadata.gz: 558b6cc3a2985012f76f27a23c8a1a338aef4bdf
+  data.tar.gz: a859475b06d94fdba962beb25b0ffece71eb1119
 SHA512:
-  metadata.gz: 312151d3e72663e279482d451a2e72400f8ee7d735a61bd063c35755af9967dc10bec11e0725744824378fab911d073831a2f52160ff4f76ad4888d763ddd0cb
-  data.tar.gz: fd10235c2db8e2bbdac6df3aff16a71a9c61dce8bb589d1d1af2b211b63be2f4edb98d92bfb07d0e9365d755660cb7cfb2959dec678a26b8c08c383f74e65de8
+  metadata.gz: cd59935ac74a3cdb86e94e93c61e2154a5a62db930c0f699aef8ff5d9d825d2dc78da99e2a5e94cd103c410b12ac5aac9aac1ff480d2ff5ab4f2ba79b546d9dc
+  data.tar.gz: 0c4465488a3d5920d51659e399cbed3d972179ea7d528c79e9ab92e4f3fffca154565858e78b2f99c674fbf5cd72696ecf2970b6b9ae1dc4c8a8fc803f965f19

data/lib/geny/actions/find.rb

@@ -4,6 +4,7 @@ require "tty-file"
 
 module Geny
   module Actions
+    # Utilities for manipulating files in bulk
     class Find
       # Replace the content of any file that matches the pattern with
       # a replacement
@@ -17,21 +18,27 @@ module Geny
       # @example
       #   find.replace("src", "Boilerplate", "YourProject")
       def replace(root, pattern, replacement, force: false, excluding: nil)
-        ::Find.find(root)
-          .lazy
-          .reject { |path| path == root }
-          .reject { |path| excluding && path.match?(excluding) }
-          .reject { |path| File.directory?(path) }
-          .reject { |path| TTY::File.binary?(path) }
-          .each do |path|
-            TTY::File.replace_in_file(
-              path,
-              pattern,
-              replacement,
-              verbose: false,
-              force: force
-            )
-          end
+        ::Find.find(root) do |path|
+          # The first emitted path will be the root directory
+          next if path == root
+
+          # Don't look any further into this directory
+          ::Find.prune if excluding && excluding.match?(excluding)
+
+          # We don't care about directories
+          next if File.directory?(path)
+
+          # We can't replace binary files
+          next if TTY::File.binary?(path)
+
+          TTY::File.replace_in_file(
+            path,
+            pattern,
+            replacement,
+            verbose: false,
+            force: force
+          )
+        end
       end
 
       # Replace any filename that matches the pattern with a replacement
@@ -44,28 +51,32 @@ module Geny
       # @example
       #   find.rename("src", "Boilerplate", "YourProject")
       def rename(root, pattern, replacement, force: false, excluding: nil)
-        ::Find.find(root)
-          .lazy
-          .reject { |path| path == root }
-          .reject { |path| excluding && path.match?(excluding) }
-          .select { |path| path.match?(pattern) }
-          .sort { |path| depth(path) }
-          .map { |path| [path, rsub(path, pattern, replacement)] }
-          .each { |source, dest| FileUtils.mv(source, dest) }
-      end
+        matches = []
+        options = {force: force, excluding: nil}
 
-      private
+        ::Find.find(root) do |path|
+          # The first emitted path will be the root directory
+          next if path == root
 
-      # Replace the last match of a string
-      def rsub(str, pattern, replacement)
-        prefix, match, suffix = str.rpartition(pattern)
-        return str if prefix.empty? and match.empty?
-        "#{prefix}#{replacement}#{suffix}"
-      end
+          # Don't look any further into this directory
+          ::Find.prune if excluding && excluding.match?(excluding)
+
+          # The path doesn't match, keep searching
+          next unless path.match?(pattern)
+
+          # Record the match
+          matches << path
+
+          # Don't search the children of the match, because it will
+          # be renamed. We'll have re-run against the renamed path
+          ::Find.prune
+        end
 
-      # Get the depth of a path
-      def depth(path)
-        path.split(File::SEPARATOR).length
+        matches.each do |source|
+          dest = source.sub(pattern, replacement)
+          FileUtils.mv(source, dest, force: force)
+          rename(dest, pattern, replacement, options) if File.directory?(dest)
+        end
       end
     end
   end

data/lib/geny/version.rb

@@ -1,3 +1,3 @@
 module Geny
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geny
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: argy