rfs 0.1 → 0.2

data/lib/rename_functions.rb

@@ -24,10 +24,11 @@ protected
   end
 
   def rename_count
-    count = 0
+    count = opt(:count_start, Numeric, String)
     rename_each_match do |file, md|
-      count += 1
-      subst(file, md, count.to_s)
+      r = subst(file, md, count.to_s)
+      count = count.succ
+      r
     end
   end
 
@@ -63,7 +64,11 @@ protected
       verbose {"search: #{@options[:search].to_s}"}
     end
     rename_each_match do |file, md|
-      subst(file, md, active_capture(md).toggle_roman) if active_capture(md).length > 0 
+      begin
+        subst(file, md, active_capture(md).toggle_roman) if active_capture(md).length > 0
+      rescue RomanNumeralError => e
+        [:fileerror, e.message]
+      end 
     end
   end
 
@@ -136,6 +141,15 @@ protected
       :delete
     end
   end
+
+  def rename_eval
+    raw_expr = opt(:eval_expr, String) 
+    rename_each_match do |file, md, path|
+      s = md.interpolate(raw_expr)
+      verbose {"evaluate #{s}"}
+      subst(file, md, eval(s).to_s)
+    end
+  end
 end
 
 

data/lib/renamer.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'innate/array'
 require 'innate/mkdirs'
 require 'innate/roman'
 require 'innate/titlecase'
@@ -40,6 +42,8 @@ protected
   end
 
   def actual_rename(o, n)
+    len = File.expand_path(n).length
+    raise NameLengthError.new(len) if len >= 255
     File.mkdirs File.split(n).first
     if File.directory? n
       raise DirectoryExistsError.new("Can't overwrite an existing directory.")
@@ -140,9 +144,10 @@ protected
   end
   
   def rename_each
+    filter = opt_if(:filter, Filter)
     if @options[:action] == :list
       @options[:file_provider].each do |path, file|
-        opt_if(:filter, Filter) do |filter|
+        if filter
           unless filter.filter path, file
             verbose { "filtered: #{file}" }
             next
@@ -153,7 +158,6 @@ protected
     elsif @options[:action] == :commit || @options[:action] == :preview
       catch :cancel do
         search = opt :search, Regexp
-        filter = opt_if(:filter, Filter)
         @options[:file_provider].each do |path, file|
           verbose {'-------------------------'}
           if filter; unless filter.filter path, file
@@ -172,6 +176,8 @@ protected
               rename path, file, text, true if text
             elsif action == :message
               result :message, text, path, file
+            elsif action == :fileerror
+              result :fileerror, text, path, file
             elsif r == :delete
               delete path, file
             elsif r
@@ -183,7 +189,7 @@ protected
               if md
                 t = md.display
               end
-              result :fileerror, "Error: #{e.class} on #{t}\n#{e.message}", path, file
+              result :fileerror, "Error: #{e.class} on #{t}: #{e.message}", path, file
             else
               raise e
             end

data/lib/results.rb

@@ -3,7 +3,7 @@ class CollectResults
   attr_accessor :out 
   attr_reader :results
   
-  def initialize(out_io)
+  def initialize(out_io, width)
     @verbose = false
     @quiet = false
     @silent = false
@@ -13,6 +13,7 @@ class CollectResults
     @list = false
     
     @out = out_io
+    @width = width
     
     @results = Hash.new do |h, k|
       case k when :fileerror, :ok, :skipped
@@ -51,14 +52,23 @@ class CollectResults
             when :skipped: skipped += v.length
             when :fileerror: errors += v.length
             end
-            s = "\n#{File.expand_path(k)}"
-            s += ": #{mode.to_s.upcase} - #{v.length} files" unless @quiet or @list
-            @out.puts s
+            s = ''
+            unless @lineways
+              s += "\n#{File.expand_path(k)}"
+              s += ": #{mode.to_s.upcase} - #{v.length} files" unless @quiet or @list
+              @out.puts s
+            end
             v = v.sort if @sorted
             if @lineways
-              @out.puts v.join("\n")
+              v.each do |file|
+                if @list
+                  out.puts File.join(k, file)
+                else
+                  @out.puts format('%s:  %s', mode.to_s.upcase, File.join(k, file))
+                end
+              end
             else
-              @out.puts v.send(m, 80)
+              @out.puts v.send(m, @width)
             end
           end
         else
@@ -66,7 +76,7 @@ class CollectResults
           if @lineways
             @out.puts value.join("\n")
           else
-            @out.puts value.send(m, 80)
+            @out.puts value.send(m, @width)
           end
         end
       end

data/profile.txt

@@ -0,0 +1,226 @@
+C:\Documents and Settings\Darrick\docs\code\Ruby\RenameFileSet\bin>ruby -rprofile rfs.rb -lR "\Documents and Settings" > \rfs-profile.large.txt
+  %   cumulative   self              self     total
+ time   seconds   seconds    calls  ms/call  ms/call  name
+ 15.01   281.14    281.14    23147    12.15    17.58  Integer#times
+ 11.83   502.83    221.70   104136     2.13    89.93  Array#each
+ 10.67   702.77    199.94    57361     3.49     5.07  Array#collect!
+  5.58   807.22    104.45    29076     3.59    13.33  Options.opt_if
+  5.47   909.64    102.42     3152    32.49   331.70  Integer#upto
+  5.01  1003.46     93.82    29076     3.23     6.34  Options.opt
+  4.00  1078.40     74.94    57361     1.31     8.03  Array#check_cols
+  3.61  1146.03     67.63    29076     2.33     3.54  CollectResults#output
+  3.32  1208.30     62.27   629956     0.10     0.10  Fixnum#+
+  3.02  1264.78     56.48   600691     0.09     0.09  Fixnum#*
+  2.47  1311.11     46.32   482111     0.10     0.10  Array#[]
+  2.34  1354.85     43.74    29076     1.50     3.20  Filter#filter
+  2.06  1393.41     38.56   352182     0.11     0.11  Array#<<
+  1.89  1428.75     35.34    29076     1.22     2.46  Enumerable.find
+  1.83  1463.13     34.37    58152     0.59     0.80  File#directory?
+  1.44  1490.08     26.96   245490     0.11     0.11  String#to_s
+  1.41  1516.52     26.43    29076     0.91     6.07  Renamer#result
+  1.29  1540.66     24.15    32236     0.75     4.56  Proc#call
+  1.19  1562.86     22.20    29076     0.76     0.76  Filter#next_filter
+  1.17  1584.77     21.91   239561     0.09     0.09  String#length
+  1.15  1606.37     21.60    87857     0.25     0.31  Hash#[]
+  1.10  1627.01     20.64    29076     0.71     0.71  Filter#text
+  1.02  1646.05     19.04    29076     0.65     4.20  CommandLineInterface#output
+  0.99  1664.64     18.60   190692     0.10     0.10  Fixnum#>
+  0.99  1683.22     18.57    57361     0.32     1.35  Enumerable.inject
+  0.97  1701.38     18.16   118255     0.15     0.15  Kernel.respond_to?
+  0.86  1717.40     16.02    68238     0.23     0.23  File#join
+  0.64  1729.41     12.01    58243     0.21     0.21  Kernel.block_given?
+  0.53  1739.24      9.84     5042     1.95  1380.72  Provider::File::Recursive#recursive_each
+  0.47  1748.11      8.86    33342     0.27     0.37  Array#*
+  0.44  1756.38      8.27    32643     0.25     0.25  Symbol#===
+  0.42  1764.34      7.96     6308     1.26     1.79  Array#collect
+  0.40  1771.75      7.42    35931     0.21     0.26  Array#<=>
+  0.40  1779.17      7.41    85940     0.09     0.09  Array#length
+  0.38  1786.29      7.12     8631     0.82   927.61  Kernel.send
+  0.38  1793.31      7.02    36110     0.19     0.24  Array#==
+  0.36  1799.99      6.68    29082     0.23     0.23  Kernel.is_a?
+  0.35  1806.59      6.60    29076     0.23     0.23  Regexp#=~
+  0.34  1812.90      6.31    29122     0.22     0.22  Array#empty?
+  0.32  1818.88      5.98     3152     1.90   337.64  Array#columns
+  0.27  1823.98      5.10    57361     0.09     0.09  Fixnum#<
+  0.24  1828.55      4.57        1  4573.00 13941.00  Array#sort
+  0.21  1832.58      4.03     5043     0.80     1.44  Enumerable.collect
+  0.19  1836.14      3.56    43122     0.08     0.08  Array#last
+  0.18  1839.54      3.41     6305     0.54     0.83  IO#puts
+  0.17  1842.75      3.21     5042     0.64     0.64  Dir#each
+  0.15  1845.61      2.86    33342     0.09     0.09  Fixnum#%
+  0.15  1848.42      2.81    33342     0.08     0.08  Fixnum#-
+  0.13  1850.81      2.38    23147     0.10     0.10  Fixnum#/
+  0.12  1853.00      2.19     5107     0.43     0.73  Class#new
+  0.11  1855.08      2.08     3171     0.65     1.70  Hash#default
+  0.10  1857.03      1.95    35931     0.05     0.05  String#<=>
+  0.10  1858.81      1.78    21584     0.08     0.08  Fixnum#==
+  0.08  1860.31      1.50     5042     0.30     0.30  Dir#initialize
+  0.07  1861.71      1.39    13937     0.10     0.10  Kernel.format
+  0.07  1863.07      1.36    12536     0.11     0.11  Array#transpose
+  0.07  1864.37      1.30    19855     0.07     0.07  Kernel.==
+  0.07  1865.65      1.27    12617     0.10     0.10  IO#write
+  0.06  1866.83      1.18    13937     0.08     0.08  String#rstrip
+  0.05  1867.71      0.88     3580     0.25     0.25  Hash#[]=
+  0.05  1868.58      0.87    10195     0.09     0.09  Array#+
+  0.04  1869.30      0.72     8690     0.08     0.08  Fixnum#to_s
+  0.04  1870.01      0.71     6308     0.11     0.11  Array#join
+  0.02  1870.39      0.38      437     0.87     1.01  OptionParser::List#search
+  0.02  1870.72      0.33       52     6.35    53.12  Kernel.require
+  0.02  1871.02      0.30     3153     0.10     0.10  File#expand_path
+  0.01  1871.29      0.27     3153     0.09     0.09  String#*
+  0.01  1871.53      0.24      147     1.63     5.65  Array#reverse_each
+  0.01  1871.76      0.23       23    10.00    23.91  Kernel.require__
+  0.01  1871.94      0.18       34     5.29    10.29  Array#delete_if
+  0.01  1872.05      0.11     2267     0.05     0.05  Kernel.hash
+  0.01  1872.15      0.10       34     2.94     4.12  Hash#update
+  0.00  1872.24      0.09       68     1.32     2.06  Hash#invert
+  0.00  1872.32      0.08      318     0.25     0.31  Kernel.===
+  0.00  1872.39      0.07      147     0.48     6.54  OptionParser#search
+  0.00  1872.46      0.07      152     0.46     0.59  String#gsub!
+  0.00  1872.52      0.06      437     0.14     0.14  Hash#fetch
+  0.00  1872.58      0.06      147     0.41     6.06  OptionParser#visit
+  0.00  1872.64      0.06     1186     0.05     0.05  Module#method_added
+  0.00  1872.69      0.05       34     1.47    45.35  OptionParser#make_switch
+  0.00  1872.74      0.05     1212     0.04     0.04  Module#===
+  0.00  1872.78      0.04       29     1.41    24.17  OptionParser::List#append
+  0.00  1872.82      0.04       21     1.90     1.90  OptionParser#notwice
+  0.00  1872.86      0.04      169     0.24     0.24  Class#inherited
+  0.00  1872.90      0.04       74     0.54     0.54  Array#push
+  0.00  1872.94      0.04       34     1.18    20.29  OptionParser::List#update
+  0.00  1872.98      0.04      152     0.26     0.86  Config.expand
+  0.00  1873.01      0.03       29     1.03    72.17  OptionParser#define
+  0.00  1873.04      0.03        1    30.00    30.00  Profiler__.start_profile
+  0.00  1873.06      0.02        6     3.50     3.50  Hash#each_pair
+  0.00  1873.08      0.02       29     0.69    72.86  OptionParser#on
+  0.00  1873.10      0.02       17     1.18     1.18  Kernel.eval
+  0.00  1873.12      0.02        9     2.22     3.33  Gem::Specification#array_attribute
+  0.00  1873.14      0.02       37     0.54     0.81  Module#attr_accessor
+  0.00  1873.15      0.01       11     0.91     0.91  Module#module_eval
+  0.00  1873.16      0.01       10     1.00     1.00  String#to_i
+  0.00  1873.17      0.01       34     0.29     0.29  String#downcase
+  0.00  1873.18      0.01       19     0.53     1.05  Gem::Specification#attribute
+  0.00  1873.19      0.01        5     2.00    52.00  OptionParser#on_head
+  0.00  1873.20      0.01      108     0.09     0.09  String#initialize_copy
+  0.00  1873.21      0.01      109     0.09     0.18  Kernel.dup
+  0.00  1873.22      0.01        4     2.50 272401.75  Hash#each
+  0.00  1873.23      0.01        1    10.00   120.00  Hash#each_value
+  0.00  1873.24      0.01       20     0.50     0.50  Module#include
+  0.00  1873.25      0.01       47     0.21     0.21  OptionParser#top
+  0.00  1873.26      0.01        2     5.00     5.00  OptionParser::Switch::NoArgument#parse
+  0.00  1873.27      0.01      517     0.02     0.02  Regexp#===
+  0.00  1873.28      0.01        1    10.00 1872282.00  CommandLineInterface#start
+  0.00  1873.28      0.00        1     0.00     0.00  File#dirname
+  0.00  1873.28      0.00        1     0.00     0.00  PrepareRegexp#each
+  0.00  1873.28      0.00        1     0.00 780312.00  Provider::File::Recursive#each
+  0.00  1873.28      0.00        2     0.00     0.00  Gem::Specification#read_only
+  0.00  1873.28      0.00        7     0.00     0.00  Array#unshift
+  0.00  1873.28      0.00       18     0.00     0.00  Module#define_method
+  0.00  1873.28      0.00       20     0.00     0.00  Module#included
+  0.00  1873.28      0.00        1     0.00     0.00  CommandLineInterface#confirm
+  0.00  1873.28      0.00        1     0.00     0.00  OptionParser#base
+  0.00  1873.28      0.00       19     0.00     0.00  String#==
+  0.00  1873.28      0.00        1     0.00 780312.00  Renamer#rename_each
+  0.00  1873.28      0.00       12     0.00     0.00  Module#>=
+  0.00  1873.28      0.00        2     0.00     0.00  OptionParser::Switch#conv_arg
+  0.00  1873.28      0.00       13     0.00     0.77  OptionParser::List#accept
+  0.00  1873.28      0.00        4     0.00     0.00  Proc#new
+  0.00  1873.28      0.00        1     0.00     0.00  Gem::Version::Requirement#initialize
+  0.00  1873.28      0.00        1     0.00     0.00  String#upcase
+  0.00  1873.28      0.00        3     0.00     0.00  Kernel.puts
+  0.00  1873.28      0.00        1     0.00    10.00  OptionParser#parse
+  0.00  1873.28      0.00        5     0.00     4.20  Gem::Security::Policy#initialize
+  0.00  1873.28      0.00       20     0.00     0.00  Module#append_features
+  0.00  1873.28      0.00        1     0.00 780312.00  RenameFunctions.rename_replace
+  0.00  1873.28      0.00        1     0.00     0.00  OptionParser::Arguable.extend_object
+  0.00  1873.28      0.00       19     0.00     0.00  Kernel.freeze
+  0.00  1873.28      0.00       38     0.00     0.00  OptionParser::Switch#initialize
+  0.00  1873.28      0.00        1     0.00     0.00  String#sub
+  0.00  1873.28      0.00        1     0.00    10.00  OptionParser#parse!
+  0.00  1873.28      0.00        3     0.00     0.00  Module#public
+  0.00  1873.28      0.00        2     0.00     0.00  Module#private_class_method
+  0.00  1873.28      0.00        7     0.00     0.00  Regexp#quote
+  0.00  1873.28      0.00        6     0.00     0.00  Kernel.kind_of?
+  0.00  1873.28      0.00        3     0.00     0.00  Numeric#nonzero?
+  0.00  1873.28      0.00        1     0.00 780312.00  Method#call
+  0.00  1873.28      0.00        1     0.00 1873273.00  #toplevel
+  0.00  1873.28      0.00        1     0.00     0.00  Kernel.instance_eval
+  0.00  1873.28      0.00        7     0.00     0.00  Kernel.lambda
+  0.00  1873.28      0.00        2     0.00     0.00  Forwardable.def_instance_delegator
+  0.00  1873.28      0.00        5     0.00     6.00  OptionParser::List#prepend
+  0.00  1873.28      0.00        1     0.00     0.00  Gem.user_home
+  0.00  1873.28      0.00        1     0.00 780312.00  Renamer#run
+  0.00  1873.28      0.00        2     0.00     5.00  Gem::Specification#attributes
+  0.00  1873.28      0.00        1     0.00     0.00  Array#initialize_copy
+  0.00  1873.28      0.00       22     0.00     0.00  OptionParser::Switch::NoArgument#pattern
+  0.00  1873.28      0.00       10     0.00     0.00  Module#remove_method
+  0.00  1873.28      0.00        8     0.00     0.00  Array#first
+  0.00  1873.28      0.00        1     0.00     0.00  Gem.ssl_available?
+  0.00  1873.28      0.00        2     0.00     0.00  NilClass#nil?
+  0.00  1873.28      0.00        1     0.00     0.00  Array#size
+  0.00  1873.28      0.00       12     0.00     0.00  OptionParser::Switch::NoArgument#guess
+  0.00  1873.28      0.00        1     0.00     0.00  Filter#initialize
+  0.00  1873.28      0.00       19     0.00     0.00  Module#class_eval
+  0.00  1873.28      0.00        1     0.00     0.00  ENV.include?
+  0.00  1873.28      0.00        5     0.00     0.00  Hash#initialize_copy
+  0.00  1873.28      0.00        3     0.00     0.00  Module#module_function
+  0.00  1873.28      0.00        1     0.00     0.00  Filter#each
+  0.00  1873.28      0.00        3     0.00     0.00  Fixnum#zero?
+  0.00  1873.28      0.00        1     0.00 1089577.00  CollectResults#display
+  0.00  1873.28      0.00        1     0.00     0.00  OptionParser#initialize
+  0.00  1873.28      0.00        1     0.00     0.00  Forwardable.def_delegators
+  0.00  1873.28      0.00       21     0.00     0.00  Module#private
+  0.00  1873.28      0.00        5     0.00     0.00  Object#initialize
+  0.00  1873.28      0.00        1     0.00     0.00  String#scan
+  0.00  1873.28      0.00        1     0.00     0.00  String#split
+  0.00  1873.28      0.00       10     0.00     0.00  Module#method_removed
+  0.00  1873.28      0.00        1     0.00    10.00  OptionParser#order!
+  0.00  1873.28      0.00        4     0.00     0.00  Array#shift
+  0.00  1873.28      0.00      437     0.00     0.00  Kernel.__send__
+  0.00  1873.28      0.00        3     0.00     0.00  Kernel.proc
+  0.00  1873.28      0.00        4     0.00     0.00  Module#protected
+  0.00  1873.28      0.00        1     0.00     0.00  String#[]
+  0.00  1873.28      0.00        9     0.00     0.00  Module#const_set
+  0.00  1873.28      0.00        1     0.00     0.00  Gem::Version#initialize
+  0.00  1873.28      0.00        3     0.00     0.00  OptionParser::List#initialize
+  0.00  1873.28      0.00        3     0.00     0.00  Module#method_undefined
+  0.00  1873.28      0.00        1     0.00     0.00  OptionParser#add_officious
+  0.00  1873.28      0.00        3     0.00     0.00  Module#extend_object
+  0.00  1873.28      0.00        3     0.00     0.00  Regexp#hash
+  0.00  1873.28      0.00        1     0.00     0.00  String#sub!
+  0.00  1873.28      0.00        1     0.00 780312.00  Renamer#rename_each_match
+  0.00  1873.28      0.00        1     0.00     0.00  Kernel.method
+  0.00  1873.28      0.00        1     0.00    10.00  Kernel.catch
+  0.00  1873.28      0.00       12     0.00     0.00  OptionParser::Switch::NoArgument#incompatible_argument_styles
+  0.00  1873.28      0.00        5     0.00    50.00  OptionParser#define_head
+  0.00  1873.28      0.00       15     0.00     0.00  Module#attr_reader
+  0.00  1873.28      0.00        5     0.00     0.00  Hash#merge
+  0.00  1873.28      0.00        3     0.00     0.00  Kernel.extend
+  0.00  1873.28      0.00        1     0.00     0.00  File#split
+  0.00  1873.28      0.00        2     0.00     0.00  Module#attr
+  0.00  1873.28      0.00        1     0.00     0.00  Module#alias_method
+  0.00  1873.28      0.00        2     0.00     0.00  Regexp#initialize
+  0.00  1873.28      0.00      105     0.00     0.00  Hash#keys
+  0.00  1873.28      0.00        1     0.00     0.00  Gem::Version#correct?
+  0.00  1873.28      0.00        4     0.00     0.00  Gem::Specification#attribute_alias_singular
+  0.00  1873.28      0.00       10     0.00     0.00  Hash#initialize
+  0.00  1873.28      0.00        1     0.00     0.00  Provider::File::Base#initialize
+  0.00  1873.28      0.00        1     0.00     0.00  Gem::Version::Requirement#default
+  0.00  1873.28      0.00        7     0.00     1.43  Gem::Specification#required_attribute
+  0.00  1873.28      0.00        3     0.00     0.00  Module#extended
+  0.00  1873.28      0.00        2     0.00     0.00  MatchData#[]
+  0.00  1873.28      0.00       71     0.00     0.00  Symbol#to_s
+  0.00  1873.28      0.00        1     0.00     0.00  Gem.find_home
+  0.00  1873.28      0.00        1     0.00     0.00  CollectResults#initialize
+  0.00  1873.28      0.00       14     0.00     0.00  Regexp#to_s
+  0.00  1873.28      0.00        1     0.00     0.00  IO#print
+  0.00  1873.28      0.00        1     0.00     0.00  Time#gm
+  0.00  1873.28      0.00        1     0.00     0.00  Array#[]=
+  0.00  1873.28      0.00      196     0.00     0.00  Kernel.singleton_method_added
+  0.00  1873.28      0.00        1     0.00     0.00  Gem::Version::Requirement#parse
+  0.00  1873.28      0.00        3     0.00     0.00  ENV.[]
+  0.00  1873.28      0.00       10     0.00     0.00  Gem::Specification#overwrite_accessor
+  0.00  1873.28      0.00        5     0.00     0.00  Module#attr_writer
+  0.00  1873.28      0.00       13     0.00     1.54  OptionParser#accept
+  0.00  1873.28      0.00        1     0.00    10.00  OptionParser#permute!
+  0.00  1873.28      0.00        2     0.00     0.00  Regexp#match
+

data/tests/test_rename_functions.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require '../lib/test/test_helper'
 
 class TestBasics < BaseTest
   def test_list
@@ -315,11 +315,19 @@ end
 class TestCount < BaseTest
   def test_count
     count = 0
-    r :preview, :rename_count, 3, :search => /()./ do |h|
+    r :preview, :rename_count, 3, :search => (/()./), :count_start => 1 do |h|
       count += 1
       assert_equal "#{count}#{h[:oldfn]}", h[:newfn]
     end
   end
+
+  def test_count_string
+    count = "b.9 "
+    r :preview, :rename_count, 3, :search => (/()./), :count_start => count do |h|
+      assert_equal "#{count}#{h[:oldfn]}", h[:newfn]
+      count.succ!
+    end
+  end
 end
 
 

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rfs
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2005-08-30 00:00:00 -04:00
-summary: A utility that allows you to use regular expressions to manage large sets of files or folders.
+  version: "0.2"
+date: 2005-09-03 00:00:00 -04:00
+summary: A utility that allows you to use regular expressions to rename large sets of files or folders. Fxruby and cmd-line interfaces.
 require_paths: 
   - lib
 email: darrick@innatesoftware.com
@@ -33,7 +33,9 @@ files:
   - "./description.txt"
   - "./lib"
   - "./MIT-LICENSE"
+  - "./profile.txt"
   - "./Rakefile.rb"
+  - "./README"
   - "./tests"
   - "./bin/RenameFileSet.rbw"
   - "./bin/rfs.rb"
@@ -46,7 +48,6 @@ files:
   - "./lib/options.rb"
   - "./lib/providers.rb"
   - "./lib/regexp.rb"
-  - "./lib/RenameFileSet.bak.rb"
   - "./lib/renamer.rb"
   - "./lib/rename_functions.rb"
   - "./lib/results.rb"
@@ -88,12 +89,13 @@ files:
   - "./lib/innate/test/files/reloadtarget2.rb"
   - "./lib/test/test_helper.rb"
   - "./tests/dir"
-  - "./tests/test_helper.rb"
   - "./tests/test_rename_functions.rb"
   - "./tests/dir/file1"
   - "./tests/dir/file2"
   - "./tests/dir/file3"
-test_files: []
+test_files: 
+  - "./tests/test_rename_functions.rb"
+  - "./lib/innate/test/all_tests.rb"
 rdoc_options: []
 extra_rdoc_files: []
 executables: 

data/lib/RenameFileSet.bak.rb

@@ -1,372 +0,0 @@
-require 'rubygems'
-require_gem 'fxruby'
-require 'innate/mkdirs'
-require 'innate/roman'
-require 'innate/titlecase'
-
-include Fox
-
-#TO DO:
-# change pattern to combobox with some useful patterns
-# \d.+(\d+).+
-# (\d+[AB])
-
-#user interface
-class RenameWindow < FXMainWindow
-  def initialize(app)
-    super(app, 'Rename File Set', nil, nil, DECOR_ALL, 20, 100, 1000, 500)
-    
-    FXHorizontalFrame.new(self, LAYOUT_FILL | PACK_UNIFORM_WIDTH) { |mainFrame|
-      # navigation on left
-      @dirList = FXDirList.new mainFrame, nil, 0, LAYOUT_FILL | FRAME_NORMAL
-      # controls in centre
-      FXVerticalFrame.new(mainFrame, LAYOUT_FILL | PACK_UNIFORM_WIDTH) { |controls|
-        FXLabel.new controls, 'Search (replace first capture):', nil, LAYOUT_FILL_X | JUSTIFY_LEFT
-        @search = FXTextField.new controls, 0, nil, LAYOUT_FILL
-        
-        FXGroupBox.new(controls, 'Replacement Method', LAYOUT_FILL | FRAME_GROOVE | JUSTIFY_LEFT ) { |group|
-          @selReplace = FXRadioButton.new(group, 'Replace with:') { |r|
-            connectRadio r
-          }
-          @replace = FXTextField.new group, 30, nil, PACK_UNIFORM_WIDTH
-          @selAdd = FXRadioButton.new(group, 'Add to captured digits: ', nil, LAYOUT_FILL_Y) { |r|
-            connectRadio r
-          }
-          @add = FXSpinner.new(group, 10, nil, FRAME_NORMAL) { |s| s.range = (-500..500)}
-          @selRoman = FXRadioButton.new(group, 'Convert to Roman Numerals', nil, LAYOUT_FILL_X ) { |r|
-            connectRadio r
-          }
-          @selTapeNumbers = FXRadioButton.new(group, 'Convert Tape Numbers', nil, LAYOUT_FILL_X) { |r|
-            connectRadio r
-          }
-          @selFill = FXRadioButton.new(group, 'Replace capture with last match capture:', nil, LAYOUT_FILL_X) { |r|
-            connectRadio r
-          }
-          @fill = FXTextField.new group, 30, nil, PACK_UNIFORM_WIDTH
-          @selFile = FXRadioButton.new(group, 'Replace from files.txt', nil, LAYOUT_FILL_X) { |r|
-            connectRadio r
-          }
-          @selCount = FXRadioButton.new(group, 'Count', nil, LAYOUT_FILL_X) { |r|
-            connectRadio r
-          }
-          @selMarkChange = FXRadioButton.new(group, 'Mark Changes', nil, LAYOUT_FILL_X) { |r|
-            connectRadio r
-          }
-          @selFromFullName = FXRadioButton.new(group, 'Replace with capture in full name:', nil, LAYOUT_FILL_X) { |r|
-            connectRadio r
-          }
-          @fullNamePattern = FXTextField.new group, 30, nil, PACK_UNIFORM_WIDTH
-          @selMoveUp = FXRadioButton.new(group, 'Move to Parent Directory', nil, LAYOUT_FILL_X) { |r|
-            connectRadio r
-          }
-          @selCapitalize = FXRadioButton.new(group, 'Capitalize', nil, LAYOUT_FILL_X) { |r|
-            connectRadio r
-          }
-        }
-        
-        FXButton.new(controls, '&List Files', nil, nil, 0, LAYOUT_FILL_X | BUTTON_NORMAL) { |b|
-          b.connect SEL_COMMAND, method(:onListClick)
-        }
-        FXButton.new(controls, '&Preview', nil, nil, 0, LAYOUT_FILL_X | FRAME_RAISED | FRAME_THICK) { |b|
-          b.connect SEL_COMMAND, method(:onPreviewClick)
-        }
-        FXButton.new(controls, '&Apply', nil, nil, 0, LAYOUT_FILL_X | FRAME_RAISED | FRAME_THICK) { |b|
-          b.connect SEL_COMMAND, method(:onReplaceClick)
-        }
-      }
-      # results on right
-      @results = FXText.new mainFrame, nil, 0, LAYOUT_FILL | FRAME_NORMAL | TEXT_READONLY
-    }
-    
-    @selReplace.checkState = TRUE
-    onRadioUpdate @selReplace, nil, nil
-  end
-  
-  def connectRadio(r)
-    r.connect SEL_COMMAND, method(:onRadioUpdate)
-  end
-
-  def onPreviewClick(sender, sel, ptr)
-    start false
-  end
-  
-  def onReplaceClick(sender, sel, ptr)
-    start true
-  end
-  
-  def onListClick(sender, sel, ptr)
-    start false, true
-    @dirList.setFocus
-  end
-  
-  def onRadioUpdate(sender, sel, ptr)
-    sender.parent.each_child do |c|
-      if FXRadioButton === c and c != sender
-        c.checkState = FALSE
-      end
-    end
-    @selReplace.checked? ? @replace.enable : @replace.disable
-    @selAdd.checked? ? @add.enable : @add.disable      
-    @selFill.checked? ? @fill.enable : @fill.disable
-    @selFromFullName.checked? ? @fullNamePattern.enable : @fullNamePattern.disable
-  end
-end
-
-#the real work of it
-class RenameWindow
-      
-  def start(commit, listonly = false)
-    @results.text = ''
-    traverseList @dirList, commit, listonly
-  end
-  
-  def traverseList(list, commit, listonly)
-    list.each do |i|
-       if i.selected?
-        doReplace @dirList.itemPathname(i), commit, listonly
-      end
-      traverseList(i, commit, listonly) if i.expanded?
-    end
-  end
-   
-  def subst(src, matchdata, repl)
-    return src unless matchdata and matchdata[1]
-    t = repl
-    c = 1
-    matchdata.to_a[c..-1].each do |m|
-      t.gsub!("%#{c}", m ? m : '')
-      c += 1
-    end
-    src[0, matchdata.offset(1)[0]] + (t == nil ? '' : t) + src[matchdata.offset(1)[1], src.length]
-  end
-  
-  def result(t)
-    @results.text += t.to_s + "\n"
-  end
-  
-  def rename(path, oldfn, newfn, commit)
-    unless oldfn == newfn
-      t = newfn
-      if commit
-        begin
-          fn = File.join(path, newfn)
-          mkdirs File.split(fn).first
-          File.rename(File.join(path, oldfn), fn)
-        rescue
-          t += ' - Error'
-        else
-          t += ' - OK'
-        end
-      end
-      result t
-    end
-  end
-  
-  def rename_each_match(re, path, commit)
-    return unless Regexp === re
-    dir = Dir.new(path) rescue return
-    dir.each do |file|
-      next if /^\.+$/ =~ file
-      md = re.match(file)
-      if md
-        newfn = yield(file, md) 
-        rename path, file, newfn, commit if newfn
-      end
-    end
-  end
-
-  def new_regexp(pattern)
-    begin
-      Regexp.new(pattern)
-    rescue
-      result "Error parsing regular expression:\n#{$!}\n------------"
-      nil
-    end
-  end
-
-  def doReplace(path, commit, listonly)
-    re = new_regexp @search.text
-    
-    if listonly
-      Dir.new(path).each do |file, md|
-        result "#{(File.directory?(File.join(path, file)) ? '\\' : '')}#{file}"
-      end
-      return
-    end
-
-    if @selReplace.checked?
-      rename_each_match(re, path, commit) do |file, md|
-        if md.length >= 2
-          subst(file, md, @replace.text)
-        else
-          file.sub(re, @replace.text)
-        end
-      end
-    elsif @selFile.checked?
-      fn = File.join(path, 'files.txt')
-      return unless File.exist? fn
-      File.open(fn) do |f|
-        rename_each_match(re, path, commit) do |file, md|
-          if md.length >= 2
-            t = f.readline.chomp rescue '--no data--'
-            subst(file, md, t)
-          end
-        end
-      end
-    elsif @selAdd.checked?
-      rename_each_match(re, path, commit) do |file, md|
-        if md.length >= 2
-          int = md[1].to_i rescue int = md[1] rescue int = 0
-          subst(file, md, (int + @add.value).to_s)
-        end
-      end
-    elsif @selCount.checked?
-      count = 0
-      rename_each_match(re, path, commit) do |file, md|
-        if md.length >= 2
-          count += 1
-          subst(file, md, count.to_s)
-        end
-      end
-    elsif @selFromFullName.checked?
-      r = new_regexp(@fullNamePattern.text)
-      if r
-        rename_each_match(re, path, commit) do |file, md|
-          fn = path + '\\' + file
-          m = r.match(fn)
-          if m
-            if m.length >= 2
-              replace = m[1]
-            else
-              replace = m
-            end
-            if md.length >= 2
-              subst(file, md, replace)
-            else
-              file.sub(re, replace)
-            end
-          else
-            result "no match: #{fn}"
-            nil
-          end
-        end
-      end
-    elsif @selMoveUp.checked?
-      p = File.split(path).first
-      unless p == '\\' 
-        rename_each_match(re, path, commit) do |file, md|
-          d = File.join(p, file)
-          File.rename File.join(path, file), d if commit
-          result d
-          nil
-        end
-      else
-        nil
-      end
-    elsif @selRoman.checked?
-      rename_each_match(re, path, commit) do |file, md|
-        if md.length >= 2
-          t = md[1].to_i rescue t = md[1] rescue t = 0
-          subst(file, md, t.roman) if Integer === t 
-        end
-      end
-    elsif @selMarkChange.checked?
-      prev = ''
-      rename_each_match(re, path, commit) do |file, md|
-        if md.length >= 2
-          unless prev == md[1]
-            prev = md[1]
-            subst(file, /()\..+?$/.match(file), '-change-')
-          end
-        end
-      end
-    elsif @selTapeNumbers.checked?
-      rename_each_match(re, path, commit) do |file, md|
-        if md.length >= 2
-          t = md[1]
-          n = t.to_i * 2 + (/a/i =~ t[-1,1] ? -1 : 0)
-          n += 2 if n < 1
-          subst(file, md, n.to_s)
-        end
-      end
-    elsif @selCapitalize.checked?
-      always_lower = %w{ vol
-        mp3 wav txt avi nfo pdf rar zip rb ape sfk mpg rm qt doc }
-      lower = %w{ as of in the and at or a to is on by for with an } + always_lower
-      split_chars = /[ �\-().]/
-      upper = /^[MDCLXVIW]+$/
-      rename_each_match(re, path, commit) do |file, md|
-        o = md[1]
-        prev = ''
-        if md.length >= 2
-          res = o.split(split_chars).inject([]) do |r, w|
-            if r.empty? or prev =~ /^([\d.]+|.*[;.!_]|)$/
-              if always_lower.include?(w.downcase)
-                r << w.downcase
-              elsif w =~ upper
-                r << w.upcase
-              else
-                r << w.capitalize
-              end
-            else
-              if lower.include?(w.downcase)
-                r << w.downcase
-              elsif w =~ upper
-                r << w.upcase
-              else
-                r << w.capitalize
-              end
-            end
-            prev = w
-            r
-          end
-          r = res.inject('') do |s, w|
-            unless w.empty?
-              until o[s.length, 1] =~ Regexp.new(Regexp.escape(w[0,1]), 'i') do
-                s << o[s.length, 1]
-              end
-              s << w
-            end
-            s
-          end
-          subst(file, md, r)
-        end
-      end
-    elsif @selFill.checked?
-      begin
-        fillRE = Regexp.new(@fill.text)
-      rescue
-        result "Error parsing regular expression:\n#{$!}\n------------"
-        return
-      end
-      fillText = ''
-      dir = Dir.new(path) rescue return
-      dir.each do |file|
-        next if /^\.+$/ =~ file
-        md = re.match(file)
-        if md or fillText
-          if md and md.length >= 2 and md[1].length > 0 and not (fillRE and fillRE.match(file))
-            fillText = md[1]
-            result "source: #{file}"
-          else
-            md = fillRE.match(file)
-            if md and md.length >= 2
-              t = subst(file, md, fillText)
-              rename path, file, t, commit
-            else
-              result "* No capture to fill * #{file}" 
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-if $0 == __FILE__
-  theApp = FXApp.new
-  theMainWindow = RenameWindow.new theApp 
-  theApp.create
-  theMainWindow.show
-  theApp.run
-end