AbsoluteRenamer 1.0.4 → 1.1.0

data/AbsoluteRenamer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{AbsoluteRenamer}
-  s.version = "1.0.4"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon COURTOIS"]
-  s.date = %q{2009-10-05}
+  s.date = %q{2009-11-02}
   s.default_executable = %q{absrenamer}
   s.description = %q{AbsoluteRenamer is a very powerful tool that helps files and directories renaming using the Krename syntax. Unlike many batch renaming tools, AbsoluteRenamer is able to rename folders. AbsoluteRenamer is modular and can be extended to adapt itself to any kind of file or to add new options and features.}
   s.email = %q{happynoff@free.fr}

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1.0

data/lib/absolute_renamer/core-packages/core-general/module.rb

@@ -1,31 +1,39 @@
 module AbsoluteRenamer
     class GeneralModule < AbsoluteRenamer::IModule
         def initialize
-            @actions = {'*'  => :file_camelize,
-                        '$'  => :file_original,
-                        '%'  => :file_downcase,
-                        '&'  => :file_upcase,
-                        '\\' => :file_strip,
-                        '#'  => :count
-                       }
-
-            @case_filters = ['(\\\\\*)',    # \*
-                             '(\\\\\$)',    # \$
-                             '(\\\%)',      # \%
-                             '(\\\&)',      # \&
-                             '(\\\\\\\)',   # \\
-                             '(\*)',        # *
-                             '(\$)',        # $
-                             '(%)',         # %
-                             '(&)',         # &
-                             '(\\\)'        # \
-                            ]
+            @actions = {
+                '*'  => :file_camelize,
+                '$'  => :file_original,
+                '%'  => :file_downcase,
+                '&'  => :file_upcase,
+                '\\' => :file_strip,
+                '#'  => :count
+            }
+
+            @case_filters = [
+                /\\\*/,     # \*
+                /\\\$/,     # \$
+                /\\%/,      # \%
+                /\\&/,      # \&
+                /\\\\/,     # \\
+                /\*/,       # *
+                /\$/,       # $
+                /%/,        # %
+                /&/,        # &
+                /\\/        # \
+            ]
 
             # matches strings like [42-43] [42-] [*42-43] [42;43] etc...
-            @part_filters = ['(\[(.)?(\d+)(((-)(\d+)?)|((;)(\d+)))?\])']
+            @part_filters = [
+                pattern('(\d+)((-(\d+)?)|(;\d+))?')
+            ]
 
             # matches counters like # ### #{2} ##{2;42} or [length-42]
-            @misc_filters = ['(/)', '(#+(\{.*\})?)', '(\[length(--?\d+)?\])']
+            @misc_filters = [
+                /\//,
+                /#+(\{.*\})?/,
+                /\[length(--?\d+)?\]/
+            ]
 
             @filters = @case_filters + @part_filters + @misc_filters
         end
@@ -67,7 +75,6 @@ module AbsoluteRenamer
         def file_part(file, infos, type)
             matched = infos[0].match(/(\[([^\d])?(\d+)(((;)(\d+))|((-)(\d+)?))?\])/)
 
-            modifier = matched[2]
             x = matched[3].to_i - 1
             y = matched[7] || matched[10]
             y = y.to_i unless y.nil?        
@@ -87,11 +94,7 @@ module AbsoluteRenamer
 
             val ||= ''
 
-            unless modifier.nil?
-                mp = CaseModule.method(CaseModule.actions[modifier])
-                val = mp.call(val)
-            end
-            val
+            modify val, matched[2]
         end
 
         def count(file, infos, type)

data/lib/absolute_renamer/external.rb

@@ -14,7 +14,7 @@ module AbsoluteRenamer
             include AbsoluteRenamer::UseConfig
 
             def load_gems
-                if Gem
+                if defined?(Gem)
                     @gems = {}
 
                     find_gems
@@ -22,6 +22,7 @@ module AbsoluteRenamer
                     exclude_gems
 
                     @gems.each do |gem_name, gem_infos|
+                        puts "Loading gem #{gem_name} (#{gem_infos[:version]}) : #{gem_infos[:lib]}" if conf[:debug]
                         gem gem_name, gem_infos[:version]
                         require gem_infos[:lib]
                     end

data/lib/absolute_renamer/file_info.rb

@@ -40,9 +40,15 @@ module AbsoluteRenamer
         end
 
         # Displays the action that will be done on the file.
-        # some_fileinfo.display_change      # => "rename a_file.txt --> A_File.TXT"
+        #   some_fileinfo.display_change    # => "rename a_file.txt --> A_File.TXT"
         def display_change
-            puts "#{conf[:options][:mode]} #{@real_path.sub(Dir.pwd+'/', '')} --> #{new_path.sub(Dir.pwd+'/', '')}"
+            puts "#{color conf[:options][:mode]} #{@real_path.sub(Dir.pwd+'/', '')} #{color '-->'} #{new_path.sub(Dir.pwd+'/', '')}"
+        end
+
+        # Returns a text colorized in red.
+        #   color('hello')                  #=> "\e[31mhello\e[0m"
+        def color(text)
+            "\e[31m#{text}\e[0m"
         end
 
         # Returns the new path of the file.

data/lib/absolute_renamer/imodule.rb

@@ -13,6 +13,24 @@ module AbsoluteRenamer
             name.intern
         end
 
+        # Returns a format pattern generated from pattern_string that
+        # can be used to match strings like [*test] in the filename format
+        #   pattern('test') #=> '(\[(.)?test\])'
+        def pattern(pattern_string)
+            Regexp.new "(\\[(.)?#{pattern_string}\\])"
+        end
+
+        # Returns a value modified using a modifier defined in the Case module
+        #   modifiy('value', '&') #=> 'VALUE'
+        #   modifiy('value', '*') #=> 'Value'
+        def modify(val, modifier)
+            if CaseModule.actions.include?(modifier)
+                mod = CaseModule.method(CaseModule.actions[modifier])
+                val = mod.call(val)
+            end
+            val
+        end
+
         # Process a +file+ by searching for a known pattern in its name
         # and replacing it by the corresponding value.
         # The pattern is a regular expression obtained by concatening
@@ -26,11 +44,11 @@ module AbsoluteRenamer
 
             str = format
             result = []
-            pattern = Regexp.new(@filters.join('|'))
+            pattern = Regexp.union @filters
 
             idx = str.index(pattern)
             while idx
-                matched = pattern.match(str).to_a.compact
+                matched = pattern.match(str).to_a
                 part = str.partition(matched[0])
                 result.push(part[0])
                 val = self.interpret(file, matched, type)

data/test/file_info_test.rb

@@ -33,6 +33,10 @@ class FileInfoTest < Test::Unit::TestCase
         assert_equal(false, @fileinfo.dir)
       end
 
+      should "be able to return a colorized string" do
+          assert_equal("\e[31mhello\e[0m", @fileinfo.color('hello'))
+      end
+
     end
 
     context "loaded with lib/absolute_renamer" do

data/test/imodule_test.rb

@@ -40,6 +40,29 @@ class IModuleTest < Test::Unit::TestCase
         assert_equal(@default_string, @imodule.interpret(@fileinfo, @infos, :ext))
       end
 
+      should "be able to build a pattern from a pattern_string" do
+        assert_equal(/(\[(.)?test\])/, @imodule.pattern('test'))
+      end
+
+      context "and core modules loaded" do
+
+          setup do
+            AbsoluteRenamer::External.load_core
+          end
+
+          should "be able to return a string transformed with a case modifier" do
+            assert_equal("Hello World", @imodule.modify("heLLo wORLd", "*"))
+          end
+
+          should "return the original value if a non existing modifier is passed to modify" do
+            assert_equal("Hello World", @imodule.modify("Hello World", "x"))
+          end
+
+          should "return the original value if a nil modifier is passed to modify" do
+            assert_equal("Hello World", @imodule.modify("Hello World", nil))
+          end
+      end
+
     end
   end
 end

data/test/string_test.rb

@@ -19,14 +19,6 @@ class LibStringTest < Test::Unit::TestCase
       assert_equal("Hello..World", "hello..world".camelize)
     end
 
-    should "return Hello.World when camelizing hello.world with the /\./ separation pattern" do
-      assert_equal("Hello.World", "hello.world".camelize(/\./))
-    end
-
-    should "return Hello The.world when camelizing hello THE.world with the / / separation pattern" do
-      assert_equal("Hello The.world", "hello THE.world".camelize(/ /))
-    end
-
     context "set to hello world" do
 
       setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: AbsoluteRenamer
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Simon COURTOIS
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +02:00
+date: 2009-11-02 00:00:00 +01:00
 default_executable: absrenamer
 dependencies: 
 - !ruby/object:Gem::Dependency