@@ -28,12 +28,15 @@ changes to instance methods. The API is likely to change drastically. This is likely to change a bunch, but for the moment: ruby_diff old_file new_file -Or for git repositories, etc. +For git repositories, etc. ruby_diff --git HEAD --git-wd Compare three different release tags. ruby_diff --git v0.1 --git v0.2 --git v0.3 - + +For subversion repositories + ruby_diff --svn http://project.svnserver.org/lib --svn BASE:lib + See help for more information. == Contact README.txt @@ -27,10 +27,7 @@ feeder_mapping = { feeders = [] opts = OptionParser.new -opts.banner = "Usage: ruby_diff.rb [options]" - -opts.separator "" -opts.separator "Specific options:" +opts.banner = "Usage: ruby_diff.rb [options] sources" opts.define_head <<-HEAD @@ -40,17 +37,10 @@ ruby_diff --git HEAD --git-wd ./ Changes between two sets of files: ruby_diff --file old_dir --file new_dir - HEAD -opts.on('--sexp', "Show the s expressions for each input (mostly for debugging)"){ - @options[:sexp] = true -} - -opts.on('--verbose', "Shows more information while processing files"){ - @options[:verbose] = true -} - +opts.separator "" +opts.separator "Code sources:" opts.on('--git PATH', "Use a git repository as a code source"){|path| feeders << feeder_mapping[:git].new(path) } @@ -67,6 +57,17 @@ opts.on('--file PATH', "Use a file system path as a code source"){|path| feeders << feeder_mapping[:file].new(path) } + +opts.separator "" +opts.separator "Options:" +opts.on('--sexp', "Show the s expressions for each input (mostly for debugging)"){ + @options[:sexp] = true +} + +opts.on('--verbose', "Shows more information while processing files"){ + @options[:verbose] = true +} + opts.on_tail('-v', '--version') { puts "ruby_diff #{RubyDiff::VERSION}" ; exit } opts.on_tail('-h', '--help') { puts opts; exit } bin/ruby_diff @@ -124,7 +124,7 @@ class StructureProcessor < SexpProcessor def process_class(exp) name = exp.shift - super_class = exp.shift #? + super_class = exp.shift body = exp.shift record ClassCode.new(name, self.scope, body) do lib/ruby_diff/structure_processor.rb @@ -2,8 +2,8 @@ # run over. FileFeeder reads them from the file system. # # Example Usage: -# ruby_diff --file old_version.rb --file new_version.rb -# ruby_diff --file old_dir/ --file new_dir +# ruby_diff --svn PREV:file.rb --svn new_version.rb +# ruby_diff --svn http://project.server.org/lib --svn . class SVNFeeder attr_accessor :files attr_accessor :path @@ -14,10 +14,24 @@ class SVNFeeder # --file [PATH] def initialize(path) @path = path + + # TODO: Add support for SVN date format + if @path =~ /^(\d+)|HEAD|BASE|COMMITTED|PREV\:/ + parts = path.split(":",2) + svn_path = parts.pop + rev = parts.shift + else + svn_path = @path + rev = nil + end + + @svn_options = (rev ? "-r #{rev} " : " ")+svn_path + @file_pattern = "**/*.rb" @files = [] - svn("ls -R #{@path}").each_line do |file| + + svn("ls -R #{@svn_options}").each_line do |file| file.chomp! @files << file if File.fnmatch(@file_pattern, file) end @@ -25,7 +39,7 @@ class SVNFeeder def each @files.each do |file| - cat_path = File.join(@path, file) + cat_path = File.join(@svn_options, file) yield(svn("cat #{cat_path}"), file) end end lib/ruby_diff/svn_feeder.rb fd42d12819c8b344370096d930c43eec5c84ae73 Adam Sanderson netghost@gmail.com http://github.com/adamsanderson/ruby_diff/commit/3398765a3c6cd4a1f6ef6e36948f162e2ee6a3a6 3398765a3c6cd4a1f6ef6e36948f162e2ee6a3a6 2008-06-11T00:14:32-07:00 2008-06-11T00:14:32-07:00 Added support for SVN revisions 4dff8684b60bbb48dcd8bd16491e18f8e534e68f Adam Sanderson netghost@gmail.com