modname 0.2.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba0fa2d1f63b3777585a4202c0560d15b47c0c345b5c614015baed843d78f099
-  data.tar.gz: eb9bbbc814a25107ff88e4dae35ba29a1faebf9701c2af3d70a07a350d2e5eb1
+  metadata.gz: a75ac155dd3255d8cebd50ec9e01e629a9f64aa0b17090e482db22978baf8832
+  data.tar.gz: 29414f4677355f27ddda53fbfd857241adf1550c28709c955da4e2165b71d1c6
 SHA512:
-  metadata.gz: 909a24c120475377a6b323d56b4cf0ab1cb1a8b0d6b41a81eb1b241c8a13cbcf76bbbdaf028101456216d674dc2417e61a478113055838a6438cb646927f4ac1
-  data.tar.gz: b6686c14fad14cbd7025d39ef985e8ed6dfcb06f0bed43079ca0a01c53724498a4c124a39a592ea0f4906c2ab581779383bf0099c3184142c0d2fb3f4403294e
+  metadata.gz: 2ea30c66c31f07b5b5f928cb49c0fd8cbddd6d765042b7b3f1cdd7c08e746d0085f7dd916e32488424b3c9a594a46a9c7ccd1fe769d663b0217b49b60216e6f6
+  data.tar.gz: 39b3a3d68f4462308713223c71b6fc7a7b307f333f452e1b1c4cf7e9509698e075c7ab2023dd6adcc25581e87dbecceb1dde56cf62b7022b29f1c5abbdb2eed8

data/lib/modname/modder.rb

@@ -14,9 +14,12 @@ module Modder
     match, trans = Modder.parse args
 
     Modder.files(@options[:recurse]).each do |file|
-      new = file.sub Regexp.new(match), trans
+      new = Modder.rename_base(file) do |base|
+        result = base.sub Regexp.new(match), trans
+        result.empty? ? base : result # no changes
+      end
 
-      next if new == file || new == '' # no changes
+      next if new.nil?
 
       @transfer[file] = new
     end
@@ -36,9 +39,9 @@ module Modder
 
     else # move match extension to targeted
       Modder.files(@options[:recurse]).each do |file|
-        new = file.sub(/#{match}$/, trans)
+        new = Modder.rename_base(file) { |base| base.sub(/#{match}$/, trans) }
 
-        next if new == file # no changes
+        next if new.nil?
 
         @transfer[file] = new
       end
@@ -80,6 +83,18 @@ class << Modder
     end
   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
+  def rename_base(file)
+    dir, base = File.split(file)
+    new_base = yield base
+
+    return nil if new_base == base
+
+    dir == '.' ? new_base : File.join(dir, new_base)
+  end
+
   # show the status of current files
   def status(transfer)
     if transfer.empty?
@@ -127,10 +142,14 @@ class << Modder
     transfer = {}
     allexts = ext.empty?
     Modder.files(recurse).each do |file|
-      ext = file.split('.').last if allexts
+      new = Modder.rename_base(file) do |base|
+        cur_ext = allexts ? base.split('.').last : ext
+        next base if cur_ext == base # no extension to change
+
+        base.sub(/#{cur_ext}$/i, cur_ext.downcase)
+      end
 
-      new = file.sub(/#{ext}$/i, ext.downcase)
-      next if new == file || ext == file # no changes or extension
+      next if new.nil?
 
       transfer[file] = new
     end

data/lib/modname/version.rb

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

data/lib/modname.rb

@@ -3,9 +3,9 @@
 # parse modname's command line args
 
 require 'colored'
-require 'modname/banner'
-require 'modname/modder'
-require 'modname/version'
+require_relative 'modname/banner'
+require_relative 'modname/modder'
+require_relative 'modname/version'
 
 # Modname is a versatile file naming tool for renaming groups of files
 module Modname
@@ -13,10 +13,7 @@ module Modname
   class << self
     def run(args) = Driver.new.run(args)
   end
-end
 
-# Modname module containing the CLI driver
-module Modname
   # Driver class handles command-line argument parsing and execution
   class Driver
     include Modder

data/readme.md

@@ -70,16 +70,15 @@ try running `gem install bundler`. Once that is done:
 Now, we should be able to build the gem locally. This will build the local
 modname gem and link it in your path, so you can playing around with `modname`.
 
-    rake build
+    just build
 
-This uses `rspec` and `rake` to run a suite of unit tests. To run the suite:
+This uses `rspec` and `just` to run a suite of unit tests. To run the suite:
 
-    rake
+    just spec
 
 
 ## todos
 
-- only try to rename filenames, not folders on recursive calls
 - 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: 0.2.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeremy Warner
@@ -23,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: a versatile file naming tool.
 test_files: []