@@ -3,5 +3,6 @@ duplikate changes trunk ----- -add report method, to display lists of files by category -add dry_run method, to display commands +add Duplikate#ignore method +add Duplikate#report and Duplikate.report, to display lists of files by kategory +add Duplikate#dry_run and Duplikate.dry_run, to print commands that would execute CHANGES @@ -2,7 +2,7 @@ require 'pathname' require 'fileutils' class Duplikate attr_accessor :source, :destination - attr_reader :deleted_files, :deleted_directories, :added_files, :added_directories, :existing_files, :commands + attr_reader :deleted_files, :deleted_directories, :added_files, :added_directories, :existing_files, :commands, :ignore_patterns # Processes the differences between the given source and destination # paths. The returned Duplikate object has the *_directories and *_files @@ -52,6 +52,13 @@ class Duplikate @debug = @options[:debug] @source, @destination = Pathname.new(source), Pathname.new(dest) @inverse = self.class.new(dest, source, @options.merge(:is_inverse => true)) unless @options[:is_inverse] + @ignore_patterns = [/^\.(git|svn)?\.?$/] + end + + # Ignores paths that match one of the +patterns+, where each pattern + # is either a String or Regexp + def ignore(*patterns) + @ignore_patterns += patterns end def process @@ -128,6 +135,7 @@ protected unless path.nil? dest_entry = @destination + path unless dest_entry.directory? + return if ignore?(path.to_s) puts "ADDING DIR: #{path.inspect}" if @debug @added_directories << path.to_s return @@ -135,8 +143,9 @@ protected end (path.nil? ? @source : @source + path).each_entry do |entry| - next if entry.to_s =~ /^\.(git|svn)?\.?$/ + next if entry.to_s =~ /^\.{1,2}$/ full_entry = path.nil? ? entry : path + entry + next if ignore?(full_entry.to_s) source_entry = @source + full_entry if source_entry.directory? process_path(full_entry) @@ -155,4 +164,8 @@ protected @added_files << file.to_s end end + + def ignore?(pathname) + ignore_patterns.find { |p| p === pathname } + end end lib/duplikate.rb @@ -79,6 +79,33 @@ describe Duplikate do end end +describe Duplikate, "ignore" do + before do + @source = File.join(File.dirname(__FILE__), 'source') + @dest = File.join(File.dirname(__FILE__), 'dest') + @duplikate = Duplikate.new @source, @dest + end + + it "omits ignored files" do + @duplikate.ignore 'addme.txt' + @duplikate.process + @duplikate.added_files.should_not include("addme.txt") + end + + it "omits ignored directories" do + @duplikate.ignore 'foo/addme' + @duplikate.process + @duplikate.added_directories.should_not include("foo/addme") + end + + it "omits ignored file patterns" do + @duplikate.ignore /ad*me/ + @duplikate.process + @duplikate.added_directories.should_not include("foo/addme") + @duplikate.added_files.should_not include("addme.txt") + end +end + describe Duplikate, "syncing two directories" do before do @source = File.join(File.dirname(__FILE__), 'source') spec/duplikate_spec.rb 17034859650054beec134a5e04d8c51de259cfe8 Oliver Steele steele@osteele.com http://github.com/technoweenie/duplikate/commit/dc4c73182bd56c9e765e983e5fa8ce2810131450 dc4c73182bd56c9e765e983e5fa8ce2810131450 2008-04-06T08:11:54-07:00 2008-04-06T08:11:54-07:00 add Duplikate#ignore ac690f8709df384db4baf167abf646ff19fef7d9 Oliver Steele steele@osteele.com