AbsoluteRenamer 1.1.0 → 1.1.1

data/lib/absolute_renamer/iparser.rb

@@ -1,8 +1,8 @@
 require 'absolute_renamer/with_children'
 
 module AbsoluteRenamer
-    # Parsers parent class.
-    # Parsers must inherit of it.
-    class IParser < AbsoluteRenamer::WithChildren
-    end
+  # Parsers parent class.
+  # Parsers must inherit of it.
+  class IParser < AbsoluteRenamer::WithChildren
+  end
 end

data/lib/absolute_renamer/iplugin.rb

@@ -1,11 +1,11 @@
 require 'absolute_renamer/with_children'
 
 module AbsoluteRenamer
-    # Plugins parent class.
-    # Plugins must inherit of it.
-    class IPlugin < AbsoluteRenamer::WithChildren
-        def self.symbol
-            name.intern
-        end
+  # Plugins parent class.
+  # Plugins must inherit of it.
+  class IPlugin < AbsoluteRenamer::WithChildren
+    def self.symbol
+      name.intern
     end
+  end
 end

data/lib/absolute_renamer/libs/file.rb

@@ -1,11 +1,11 @@
 # Extension of existing File class.
 class << File
-    # Returns the extension of a file.
-    # path: the path of the file
-    # dot: starting from the end, number of dots to count before cuting extension.
-    def extname(path, dot = 1)
-        pattern = (0...dot).inject('') { |pat,x| pat << '\.[^\.]+' } << '$'
-        ext = File.basename(path).match(pattern).to_s
-        ext.empty? ? "" : ext[1..ext.length]
-    end
+  # Returns the extension of a file.
+  # path: the path of the file
+  # dot: starting from the end, number of dots to count before cuting extension.
+  def extname(path, dot = 1)
+    pattern = (0...dot).inject('') { |pat,x| pat << '\.[^\.]+' } << '$'
+    ext = File.basename(path).match(pattern).to_s
+    ext.empty? ? "" : ext[1..ext.length]
+  end
 end

data/lib/absolute_renamer/libs/hash.rb

@@ -1,28 +1,28 @@
 # Extension of existing Hash class
 class Hash
-    # Returns a new hash containing resulting of a recursive merge between two hashes
-    # new_hash: the hash to merge
-    #    h1 = { :key1 => :val1, :key2 => { :key21 => :val21 } }
-    #    h2 = { :key2 => { :key22 => :val22 }, :key3 => val3 }
-    #    h1.deep_marge! h2 #=> { :key1 => val1, :key2 => { :key21 => :val21. :key22 => :val22 }, test3 => val3 }
-    #    h1 #=> { :key1 => :val1, :key2 => { :key21 => :val21 } }
-    def deep_merge(new_hash)
-      self.clone.deep_merge! new_hash
-    end
+  # Returns a new hash containing resulting of a recursive merge between two hashes
+  # new_hash: the hash to merge
+  #  h1 = { :key1 => :val1, :key2 => { :key21 => :val21 } }
+  #  h2 = { :key2 => { :key22 => :val22 }, :key3 => val3 }
+  #  h1.deep_marge! h2 #=> { :key1 => val1, :key2 => { :key21 => :val21. :key22 => :val22 }, test3 => val3 }
+  #  h1 #=> { :key1 => :val1, :key2 => { :key21 => :val21 } }
+  def deep_merge(new_hash)
+    self.clone.deep_merge! new_hash
+  end
 
-    # Adds the contents of new_hash to another hash recusively
-    # new_hash: the hash to merge
-    #    h1 = { :key1 => :val1, :key2 => { :key21 => :val21 } }
-    #    h2 = { :key2 => { :key22 => :val22 }, :key3 => val3 }
-    #    h1.deep_marge! h2
-    #    h1 #=> { :key1 => val1, :key2 => { :key21 => :val21. :key22 => :val22 }, test3 => val3 }
-    def deep_merge!(new_hash)
-        merge! new_hash do |key, v1, v2|
-            if v1.is_a? Hash
-                v1.deep_merge! v2
-            else
-                self[key] = v2
-            end
-        end
+  # Adds the contents of new_hash to another hash recusively
+  # new_hash: the hash to merge
+  #  h1 = { :key1 => :val1, :key2 => { :key21 => :val21 } }
+  #  h2 = { :key2 => { :key22 => :val22 }, :key3 => val3 }
+  #  h1.deep_marge! h2
+  #  h1 #=> { :key1 => val1, :key2 => { :key21 => :val21. :key22 => :val22 }, test3 => val3 }
+  def deep_merge!(new_hash)
+    merge! new_hash do |key, v1, v2|
+      if v1.is_a? Hash
+        v1.deep_merge! v2
+      else
+        self[key] = v2
+      end
     end
+  end
 end

data/lib/absolute_renamer/libs/string.rb

@@ -1,26 +1,26 @@
 # Extension of existing String class
 class String
-    # Returns a camelized version of a string
-    # word_separator: a regular expression used to separate words.
-    #    str = "hello.THE world"
-    #    str.camelize           # => "Hello.The World"
-    #    str                    # => "hello.THE world"
-    def camelize
-        self.clone.camelize!
-    end
+  # Returns a camelized version of a string
+  # word_separator: a regular expression used to separate words.
+  #  str = "hello.THE world"
+  #  str.camelize       # => "Hello.The World"
+  #  str                # => "hello.THE world"
+  def camelize
+    self.clone.camelize!
+  end
 
-    # Camelizes a string and returns it.
-    #    str = "Hello.THE World"
-    #    str.camelize!          # => "Hello.The World"
-    #    str                    # => "Hello.The World"
-    def camelize!
-        word_separators = /[^a-zA-Z0-9']/
-        self.downcase!
-        self.each_char.each_with_index do |c,i|
-            if self[i-1].chr =~ word_separators or i.zero?
-                self[i] = c.upcase if c =~ /[a-z]/
-            end
-        end
-        self
+  # Camelizes a string and returns it.
+  #  str = "Hello.THE World"
+  #  str.camelize!      # => "Hello.The World"
+  #  str                # => "Hello.The World"
+  def camelize!
+    word_separators = /[^a-zA-Z0-9']/
+    self.downcase!
+    self.each_char.each_with_index do |c,i|
+      if self[i-1].chr =~ word_separators or i.zero?
+        self[i] = c.upcase if c =~ /[a-z]/
+      end
     end
+    self
+  end
 end

data/lib/absolute_renamer/parser.rb

@@ -4,70 +4,69 @@ require 'absolute_renamer/use_config'
 require 'pp'
 
 module AbsoluteRenamer
-    # Class in charge of the command line parsing.
-    class Parser
-        class << self
-            include AbsoluteRenamer::UseConfig
+  # Class in charge of the command line parsing.
+  class Parser
+    class << self
+      include AbsoluteRenamer::UseConfig
 
-            # Calls all registred parsers.
-            # The parsers are written in configuration files.
-            # The core parsers are automaticaly added.
-            def parse_cmd_line
-                ARGV.options do |parser|
-                    begin
-                        list = AbsoluteRenamer::IParser.children
-                        list.each do |class_name|
-                            class_name.add_options(parser, conf[:options])
-                        end
-                        parser.parse!
-                    rescue RuntimeError => ex
-                        STDERR.puts(ex)
-                        exit 1
-                    end
-                    conf[:files] = self.get_files(ARGV, 0) || []
-                    conf[:options][:maxdepth] ||= 0
-                    conf[:options][:interactive] ||= :never
-                    conf[:options][:mode] ||= :rename
-                    pp conf.get if conf[:debug]
-                end
+      # Calls all registred parsers.
+      # The parsers are written in configuration files.
+      # The core parsers are automaticaly added.
+      def parse_cmd_line
+        ARGV.options do |parser|
+          begin
+            list = AbsoluteRenamer::IParser.children
+            list.each do |class_name|
+              class_name.add_options(parser, conf[:options])
             end
+            parser.parse!
+          rescue RuntimeError => ex
+            STDERR.puts(ex)
+            exit 1
+          end
+          conf[:files] = self.get_files(ARGV, 0) || []
+          pp conf.get if conf[:debug]
+        end
+      end
 
-            # Creates a list of all files and directories to rename.
-            # All options that have not been matched are considered as path.
-            # For directories, if the recursive otpion is set to true (conf[:rec] == true),
-            # files are searched in sub directories.
-            #
-            # list: a list of path to explore
-            # depth: maximum recursion depth
-            #
-            # Returns the files/directories list
-            def get_files(list, depth)
-                files = []
-                options = conf[:options]
-
-                list.each do |entry|
-                    return files unless File.exists?(entry)
-                    is_dir =   File.directory?(entry)
-                    mod_dir =  options[:dir]
-                    depth_ok = (depth < options[:maxdepth] or options[:maxdepth].zero?)
-                    mod_rec =  (options[:rec] and depth_ok)
+      # Creates a list of all files and directories to rename.
+      # All options that have not been matched are considered as path.
+      # For directories, if the recursive otpion is set to true (conf[:rec] == true),
+      # files are searched in sub directories.
+      #
+      # list: a list of path to explore
+      # depth: maximum recursion depth
+      #
+      # Returns the files/directories list
+      def get_files(list, depth)
+        files   = []
+        options = conf[:options]
 
-                    add_dir =  (is_dir and mod_dir)
-                    add_file = (!is_dir and !mod_dir)
-                    add_sub =  (is_dir and (mod_rec or (!mod_dir and depth < 1)))
+        list.each do |entry|
+          if File.exists?(entry)
+            is_dir   = File.directory?(entry)
+            mod_dir  = options[:dir]
+            depth_ok = (depth < options[:maxdepth] or options[:maxdepth].zero?)
+            mod_rec  = (options[:rec] and depth_ok)
 
-                    files << FileInfo.new(entry) if (add_dir or add_file)
-                    files += self.get_files(self.get_subentries(entry), depth + 1) if (add_sub)
-                end
-                files
-            end
+            add_dir  = (is_dir and mod_dir)
+            add_file = (!is_dir and !mod_dir)
+            add_sub  = (is_dir and (mod_rec or (!mod_dir and depth < 1)))
 
-            # Returns files and directories contained in +path+.
-            def get_subentries(path)
-                files = Dir.entries(path)
-                files.delete_if { |file| file[0,1] == '.' }
-                files.collect! { |file| path + '/' + file }
-            end
+            files << FileInfo.new(entry) if (add_dir or add_file)
+            files += self.get_files(self.get_subentries(entry), depth + 1) if (add_sub)
+          end
         end
+
+        files
+      end
+
+      # Returns files and directories contained in +path+.
+      def get_subentries(path)
+        files = Dir.entries(path)
+        files.delete_if { |file| file[0,1] == '.' }
+        files.collect!  { |file| File.join(path, file) }
+      end
     end
+  end
 end

data/lib/absolute_renamer/use_config.rb

@@ -1,11 +1,11 @@
 require 'absolute_renamer/config'
 
 module AbsoluteRenamer
-    # Module that provide configuration usage.
-    module UseConfig
-        # Returns the configuration class
-        def conf
-            @conf ||= AbsoluteRenamer::Config
-        end
+  # Module that provide configuration usage.
+  module UseConfig
+    # Returns the configuration class
+    def conf
+      @conf ||= AbsoluteRenamer::Config
     end
+  end
 end

data/lib/absolute_renamer/version.rb

@@ -0,0 +1,3 @@
+module AbsoluteRenamer
+  VERSION = "1.1.1"
+end

data/lib/absolute_renamer/with_children.rb

@@ -1,22 +1,22 @@
 require 'absolute_renamer/use_config'
 
 module AbsoluteRenamer
-    # Class allowing childs listing.
-    class WithChildren
-        include AbsoluteRenamer::UseConfig
+  # Class allowing childs listing.
+  class WithChildren
+    include AbsoluteRenamer::UseConfig
 
-        @children = []
-        class << self
-            attr_reader :children
+    @children = []
+    class << self
+      attr_reader :children
 
-            # Inheritance callback.
-            # When a class inherit from a WithChildren class, it is added to
-            # the childs list of this class.
-            # This list is available as the +children+ attribute.
-            def inherited(by)
-                @children << by
-                by.instance_variable_set(:@children, [])
-            end
-        end
+      # Inheritance callback.
+      # When a class inherit from a WithChildren class, it is added to
+      # the childs list of this class.
+      # This list is available as the +children+ attribute.
+      def inherited(by)
+        @children << by
+        by.instance_variable_set(:@children, [])
+      end
     end
+  end
 end

data/test/config_test.rb

@@ -2,16 +2,10 @@ require 'test_helper'
 
 class ConfigTest < Test::Unit::TestCase
   context "The Config instance" do
-    
+
     should "exist" do
       assert_not_nil AbsoluteRenamer::Config
     end
-    
-    should "raise ENOENT if config file not found" do
-      assert_raise(Errno::ENOENT) do
-        AbsoluteRenamer::Config.load('a file that must not be found')
-      end  
-    end
 
     should "not raise ENOENT if config file is found" do
       assert_nothing_raised(Errno::ENOENT) do
@@ -38,7 +32,6 @@ class ConfigTest < Test::Unit::TestCase
         AbsoluteRenamer::Config[:test_key] = :test_val
         assert_equal(:test_val, AbsoluteRenamer::Config[:test_key])
       end
-      
     end
 
   end

data/test/file_info_test.rb

@@ -2,27 +2,28 @@ require 'test_helper'
 
 class FileInfoTest < Test::Unit::TestCase
   context "A FileInfo instance" do
-    context "loaded with some/path/to/a_file.txt" do
+    context "loaded with /tmp/test-absrenamer.txt" do
 
       setup do
-        @pwd = Dir.pwd
-        @fileinfo = AbsoluteRenamer::FileInfo.new('some/path/to/a_file.txt')
+        AbsoluteRenamer::Config.load('conf/absrenamer/absrenamer.conf')
+        `touch /tmp/test-absrenamer.txt`
+        @fileinfo = AbsoluteRenamer::FileInfo.new('/tmp/test-absrenamer.txt')
       end
 
-      should "have as name : a_file" do
-        assert_equal('a_file', @fileinfo.name)
+      should "have as name : test-absrenamer" do
+        assert_equal('test-absrenamer', @fileinfo.name)
       end
 
-      should "have as dir_path : pwd/some/path/to" do
-        assert_equal(@pwd + '/some/path/to', @fileinfo.dir_path)
+      should "have as dir_path : /tmp" do
+        assert_equal('/tmp', @fileinfo.dir_path)
       end
 
-      should "have as path : some/path/to/a_file.txt" do
-        assert_equal('some/path/to/a_file.txt', @fileinfo.path)
+      should "have as path : /tmp/test-absrenamer.txt" do
+        assert_equal('/tmp/test-absrenamer.txt', @fileinfo.path)
       end
 
-      should "have as real_path : pwd/some/path/to/a_file.txt" do
-        assert_equal(@pwd + '/some/path/to/a_file.txt', @fileinfo.real_path)
+      should "have as real_path : /tmp/test-absrenamer.txt" do
+        assert_equal('/tmp/test-absrenamer.txt', @fileinfo.real_path)
       end
 
       should "have as ext : txt" do
@@ -39,27 +40,27 @@ class FileInfoTest < Test::Unit::TestCase
 
     end
 
-    context "loaded with lib/absolute_renamer" do
+    context "loaded with /usr/bin" do
 
       setup do
-        @pwd = Dir.pwd
-        @fileinfo = AbsoluteRenamer::FileInfo.new('lib/absolute_renamer')
+        AbsoluteRenamer::Config.load('conf/absrenamer/absrenamer.conf')
+        @fileinfo = AbsoluteRenamer::FileInfo.new('/usr/bin')
       end
 
-      should "have as name : absolute_renamer" do
-        assert_equal('absolute_renamer', @fileinfo.name)
+      should "have as name : bin" do
+        assert_equal('bin', @fileinfo.name)
       end
 
-      should "have as dir_path : pwd/lib" do
-        assert_equal(@pwd + '/lib', @fileinfo.dir_path)
+      should "have as dir_path : /usr" do
+        assert_equal('/usr', @fileinfo.dir_path)
       end
 
-      should "have as path : lib/absolute_renamer" do
-        assert_equal('lib/absolute_renamer', @fileinfo.path)
+      should "have as path : usr/bin" do
+        assert_equal('/usr/bin', @fileinfo.path)
       end
 
-      should "have as real_path : pwd/lib/absolute_renamer" do
-        assert_equal(@pwd + '/lib/absolute_renamer', @fileinfo.real_path)
+      should "have as real_path : /usr/bin" do
+        assert_equal('/usr/bin', @fileinfo.real_path)
       end
 
       should "have as ext : nil" do