geny 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d07d1a5700e58f2b989bd93d768549d94cb51dff
-  data.tar.gz: 06e23fcb08d75d370accea16c1f431349567a2ec
+  metadata.gz: f7804461eee63b3bde29b4cb845b48495beb971a
+  data.tar.gz: 112ed6a31d7e95fa182146ec49fd6894fcad4997
 SHA512:
-  metadata.gz: e4ba13c3b7d643ea21532242d2de50bbc60fd1d286ecaddc0b2c1ff206ec68500c6741aac7ba5ca0cd7a201f16c411b4611fcc3b75c9a94c99802561ab366022
-  data.tar.gz: 369e5da4a210fd8db57f64f189575a96f51fdb98d46eee9362259af0a10628becef42cd402918223e7da05f8d807ca69c4820e9451079428be51aa60a940f3d0
+  metadata.gz: 4e08c3295f7d454a2addee666f1cbbc2830434adacb9a82e9b9aea6b973e2eaf799ea9a3afe462f513968ba6ca6166d72c7a02a74d79b217f965e8766f1e8bd7
+  data.tar.gz: 4f92d295a6b7fd5d64c5bb87acf52cd40e9985a57f6ddc13f4b2c9385e735da946df578cb49fbb1a5e9001892215d1c16e43e300e4add286434df1c49a03ffff

data/lib/geny/actions/find.rb

@@ -23,7 +23,7 @@ module Geny
           next if path == root
 
           # Don't look any further into this directory
-          ::Find.prune if excluding && excluding.match?(excluding)
+          ::Find.prune if excluding && path.match?(excluding)
 
           # We don't care about directories
           next if File.directory?(path)
@@ -51,31 +51,27 @@ module Geny
       # @example
       #   find.rename("src", "Boilerplate", "YourProject")
       def rename(root, pattern, replacement, force: false, excluding: nil)
-        matches = []
-        options = {force: force, excluding: nil}
+        options = {force: force, excluding: excluding}
 
         ::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)
+          ::Find.prune if excluding && path.match?(excluding)
 
           # The path doesn't match, keep searching
           next unless path.match?(pattern)
 
-          # Record the match
-          matches << path
+          # The path matches, so rename it
+          dest = path.sub(pattern, replacement)
+          FileUtils.mv(path, dest, force: force)
 
-          # 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
-
-        matches.each do |source|
-          dest = source.sub(pattern, replacement)
-          FileUtils.mv(source, dest, force: force)
+          # Find and rename the children of the path
           rename(dest, pattern, replacement, options) if File.directory?(dest)
+
+          # We already searched the directory's children, so we should stop
+          ::Find.prune
         end
       end
     end

data/lib/geny/version.rb

@@ -1,3 +1,3 @@
 module Geny
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geny
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Ray Zane