modname 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a75ac155dd3255d8cebd50ec9e01e629a9f64aa0b17090e482db22978baf8832
-  data.tar.gz: 29414f4677355f27ddda53fbfd857241adf1550c28709c955da4e2165b71d1c6
+  metadata.gz: '08c89eeb3f25ef386045b8ee7ac0f52695b24b7491362f18ad0e71dec728a35c'
+  data.tar.gz: 442c1038cd4ea91b61e82612468506789fab3d5d9702d97135ec45673be99138
 SHA512:
-  metadata.gz: 2ea30c66c31f07b5b5f928cb49c0fd8cbddd6d765042b7b3f1cdd7c08e746d0085f7dd916e32488424b3c9a594a46a9c7ccd1fe769d663b0217b49b60216e6f6
-  data.tar.gz: 39b3a3d68f4462308713223c71b6fc7a7b307f333f452e1b1c4cf7e9509698e075c7ab2023dd6adcc25581e87dbecceb1dde56cf62b7022b29f1c5abbdb2eed8
+  metadata.gz: 3e0e66eeb5c5c7bdde75c518f57ec348cbf686af0514e764fd2aeb508d157984b1faf739f3dfb5db55aa72905063c0602ae83557e6dbc35a929dce29bc2524a7
+  data.tar.gz: bee28f157f2963a03495a8b44271dc389d4b5923e5ada5be317bd78778e299cd8b66717425d7dbb5623280362bee385d81e3dd018567dfb615b514dc34ec2e96

data/lib/modname/banner.rb

@@ -11,6 +11,7 @@ Modname::HELP_BANNER = <<~HELP.freeze
        -e #{'|'.cyan} change file extensions
        -f #{'|'.cyan} force run; don't pre-check
        -r #{'|'.cyan} run modname recursively
+   --dirs #{'|'.cyan} also rename directory names
        -h #{'|'.cyan} show more help, examples
 HELP
 

data/lib/modname/modder.rb

@@ -5,7 +5,7 @@
 
 # any module including modder should implement:
 # @transfer => hash of file transfers to occur
-# @options => hash with :recurse and :force
+# @options => hash with :recurse, :force, and :dirs
 
 # extensions
 module Modder
@@ -13,7 +13,7 @@ module Modder
   def regex(args = [])
     match, trans = Modder.parse args
 
-    Modder.files(@options[:recurse]).each do |file|
+    Modder.files(@options[:recurse], dirs: @options[:dirs]).each do |file|
       new = Modder.rename_base(file) do |base|
         result = base.sub Regexp.new(match), trans
         result.empty? ? base : result # no changes
@@ -38,7 +38,7 @@ module Modder
       undercase_ext match
 
     else # move match extension to targeted
-      Modder.files(@options[:recurse]).each do |file|
+      Modder.files(@options[:recurse], dirs: @options[:dirs]).each do |file|
         new = Modder.rename_base(file) { |base| base.sub(/#{match}$/, trans) }
 
         next if new.nil?
@@ -52,7 +52,7 @@ module Modder
 
   # top level wrapper for exts
   def undercase_ext(ext = '')
-    transfer = Modder.undercase_ext_get ext, @options[:recurse]
+    transfer = Modder.undercase_ext_get ext, @options[:recurse], dirs: @options[:dirs]
     Modder.undercase_ext_set ext, transfer, @options[:force]
   end
 end
@@ -74,15 +74,40 @@ class << Modder
     $stdin.gets.chomp.downcase[0] == 'y'
   end
 
-  # return a list of files to examine
-  def files(recurse)
-    if recurse
-      Dir['**/*'].select { |f| File.file?(f) }
-    else
-      Dir.entries(Dir.pwd).select { |f| File.file? f }
+  # return a list of files (and, optionally, directories) to examine.
+  # files always come first; directories are sorted deepest-first so a
+  # parent is only renamed after everything nested inside it.
+  # dotfiles/dotdirs (.git, etc.) are always excluded, matching Dir['**/*']'s
+  # default behavior in the recursive case
+  def files(recurse, dirs: false)
+    paths = recurse ? Dir['**/*'] : Dir.entries(Dir.pwd).reject { |f| f.start_with?('.') }
+    found, folders = Modder.classify(paths)
+
+    return found unless dirs
+
+    found + folders.sort_by { |f| -f.count('/') }
+  end
+
+  # split paths into [files, directories]; a single stat covers both checks
+  # per path, skipping entries that vanished mid-scan or are broken symlinks
+  def classify(paths)
+    paths.each_with_object([[], []]) do |f, (fs, ds)|
+      stat = Modder.safe_stat(f)
+      next unless stat
+
+      fs << f if stat.file?
+      ds << f if stat.directory?
     end
   end
 
+  # stat a path, returning nil (instead of raising) for entries that
+  # disappeared mid-scan or are broken symlinks
+  def safe_stat(file)
+    File.stat(file)
+  rescue Errno::ENOENT
+    nil
+  end
+
   # apply a transformation to a file's basename only, preserving its directory.
   # the block receives the basename and returns a new basename; returning it
   # unchanged means no rename should happen, in which case nil is returned
@@ -105,7 +130,9 @@ class << Modder
     end
   end
 
-  # rename all files
+  # rename all files. must run in insertion order: when directories are
+  # included, Modder.files places them deepest-first so a parent is never
+  # renamed before what's nested inside it
   def execute(transfer, force: false)
     transfer.each { |o, n| Modder.rename o, n, force }
   end
@@ -138,10 +165,10 @@ class << Modder
   end
 
   # get all extensions to change
-  def undercase_ext_get(ext, recurse)
+  def undercase_ext_get(ext, recurse, dirs: false)
     transfer = {}
     allexts = ext.empty?
-    Modder.files(recurse).each do |file|
+    Modder.files(recurse, dirs: dirs).each do |file|
       new = Modder.rename_base(file) do |base|
         cur_ext = allexts ? base.split('.').last : ext
         next base if cur_ext == base # no extension to change
@@ -154,7 +181,24 @@ class << Modder
       transfer[file] = new
     end
 
-    transfer
+    Modder.resolve_dir_renames(transfer)
+  end
+
+  # rewrite each target path so it reflects any ancestor directory renames
+  # also present in this transfer. undercase_ext_set flattens every entry to
+  # a bare temp name before restoring it, which loses the "renaming a
+  # directory carries its contents along" guarantee that Modder.execute
+  # otherwise gets for free from File.rename — so a nested file's precomputed
+  # target must have its renamed ancestor directory's NEW name spliced in
+  def resolve_dir_renames(transfer)
+    dir_renames = transfer.select { |k, _| File.directory?(k) }
+    return transfer if dir_renames.empty?
+
+    transfer.transform_values do |target|
+      dir_renames.reduce(target) do |path, (old_dir, new_dir)|
+        path.start_with?("#{old_dir}/") ? path.sub("#{old_dir}/", "#{new_dir}/") : path
+      end
+    end
   end
 
   # set all extensions to change
@@ -172,7 +216,8 @@ class << Modder
       final = {}
       temp = {}
 
-      # create hash temp map
+      # create hash temp map; iterating `transfer` preserves its deepest-first
+      # directory ordering, which `temp` needs to safely rename originals away
       transfer.each do |k, v|
         tempfile = (v.hash * v.object_id).abs.to_s
         final[tempfile] = v
@@ -180,7 +225,10 @@ class << Modder
       end
 
       Modder.execute temp
-      Modder.execute final
+      # `transfer`'s order is files-then-dirs-deepest-first (see Modder.files);
+      # reversing it gives dirs-shallowest-first-then-files, which is exactly
+      # what's needed to restore ancestors before anything nested inside them
+      Modder.execute(final.to_a.reverse)
       puts 'Modifications complete.'
     else
       puts 'No modifications done.'

data/lib/modname/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modname
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/modname.rb

@@ -21,7 +21,7 @@ module Modname
     attr_reader :options
 
     def initialize
-      @options = { force: false, recurse: false }
+      @options = { force: false, recurse: false, dirs: false }
       @transfer = {}
     end
 
@@ -49,24 +49,27 @@ module Modname
       end
     end
 
+    # boolean options toggled by a single flag with no argument
+    FLAGS = { '-f' => :force, '-r' => :recurse, '--dirs' => :dirs }.freeze
+
+    # flags that select which command to run
+    COMMANDS = {
+      '-e' => 'ext', '--ext' => 'ext',
+      '-h' => 'help', '--help' => 'help',
+      '-v' => 'version', '--version' => 'version'
+    }.freeze
+
     # parse out arguments
     def parse(args)
       opts = { cmd: 'file', args: [] }
 
       args.each do |opt|
-        case opt
-        when '-f'
-          @options[:force] = true
-        when '-r'
-          @options[:recurse] = true
-        when '-e', '--ext'
-          opts[:cmd] = 'ext'
-        when '-h', '--help'
-          opts[:cmd] = 'help'
-        when '-v', '--version'
-          opts[:cmd] = 'version'
-        else # command argument
-          opts[:args] << opt
+        if (flag = FLAGS[opt])
+          @options[flag] = true
+        elsif (cmd = COMMANDS[opt])
+          opts[:cmd] = cmd
+        else
+          opts[:args] << opt # command argument
         end
       end
 

data/readme.md

@@ -28,6 +28,7 @@ modname | rename files, fast
      -e | change file extensions
      -f | force run; don't pre-check
      -r | run modname recursively
+ --dirs | also rename directory names
      -h | show more help, examples
 
 commands
@@ -80,5 +81,4 @@ This uses `rspec` and `just` to run a suite of unit tests. To run the suite:
 ## todos
 
 - figure out whats up with the extension globbing
-- apply optionally to directories as well
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modname
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeremy Warner
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="