ruby_diff 0.1.5 → 0.2

data/Manifest.txt

@@ -12,6 +12,7 @@ lib/ruby_diff/git_support.rb
 lib/ruby_diff/git_working_dir_feeder.rb
 lib/ruby_diff/patterns.rb
 lib/ruby_diff/structure_processor.rb
+lib/ruby_diff/svn_feeder.rb
 ruby_diff.gemspec
 test/code_comparison_test.rb
 test/file_feeder_test.rb

data/README.txt

@@ -28,14 +28,17 @@ 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
+== Contact 
 Feel free to get in touch with me:
   netghost@gmail.com

data/Rakefile

@@ -11,7 +11,7 @@ HOE = Hoe.new('ruby_diff', RubyDiff::VERSION) do |p|
   p.remote_rdoc_dir = '' # Release to root
   p.test_globs = ['test/*_test.rb']
   p.summary = "a higher level diff application for analyzing changes to ruby code"
-  p.extra_deps << ['ParseTree', '>= 2.0.2']
+  p.extra_deps << ['ParseTree', '~> 2.1']
 end
 SPEC = HOE.spec
 
@@ -30,7 +30,7 @@ namespace :git do
    
   desc "Updates the manifest to match the git repository"
   task :update_manifest do |t|
-    `git-ls-files > Manifest.txt`
+    `git ls-files > Manifest.txt`
   end
   
   desc "Pushes git repository out"

data/bin/ruby_diff

@@ -21,15 +21,13 @@ feeder_mapping = {
   :file =>  FileFeeder,
   :git  =>  GitFeeder,
   :git_wd  =>  GitWorkingDirFeeder,
+  :svn  =>  SVNFeeder
 }
 
 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
 
@@ -39,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) 
 }
@@ -58,10 +49,25 @@ opts.on('--git-wd PATH', "Use the git working directory as a code source"){|path
   feeders << feeder_mapping[:git_wd].new(path) 
 }
 
+opts.on('--svn PATH', "Use a svn repository as a code source"){|path| 
+  feeders << feeder_mapping[:svn].new(path)
+}
+
 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 }
 

data/lib/ruby_diff.rb

@@ -11,10 +11,10 @@ require 'set'
 require 'pp'
 
 module RubyDiff
-  VERSION = "0.1.5"
+  VERSION = "0.2"
 end
 
 # RubyDiff
-%w(code_comparison structure_processor file_feeder git_support git_feeder git_working_dir_feeder).each do |name|
+%w(code_comparison structure_processor file_feeder git_support git_feeder git_working_dir_feeder svn_feeder).each do |name|
   require File.expand_path(File.dirname(__FILE__) + "/ruby_diff/#{name}")
 end

data/lib/ruby_diff/structure_processor.rb

@@ -124,10 +124,12 @@ 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
+    name, temp_scope = process_colon2_constants(name) if name.is_a? Array
+    
+    record ClassCode.new(name, temp_scope || self.scope, body) do
       s(:class, name, process(super_class), process(body))
     end
   end
@@ -136,7 +138,9 @@ class StructureProcessor < SexpProcessor
     name = exp.shift
     body = exp.shift
     
-    record ModuleCode.new(name, self.scope, body) do
+    name, temp_scope = process_colon2_constants(name) if name.is_a? Array
+    
+    record ModuleCode.new(name, temp_scope || self.scope, body) do
       s(:class, name, process(body))
     end
   end
@@ -186,6 +190,22 @@ class StructureProcessor < SexpProcessor
   end
   
   protected
+  # If the class is defined as: A::B::C, then get the constants and register them.
+  # This is rather a dirty piece of code.  Fear it.
+  def process_colon2_constants(array)
+    array = array.flatten
+    constants = array[array.length/-2..-1]
+    name = constants.pop
+    
+    parent = self.scope
+    
+    constants.each do |c|
+      parent = record ModuleCode.new(c, parent, Sexp.new)
+    end
+        
+    [name,parent]
+  end
+  
   def record obj
     signature = obj.signature
     if !self.code_objects[signature]
@@ -196,7 +216,7 @@ class StructureProcessor < SexpProcessor
     self.scope_stack << self.code_objects[signature]
     result = yield if block_given?
     self.scope_stack.pop
-    result
+    result || obj
   end
   
   def scope

data/lib/ruby_diff/svn_feeder.rb

@@ -0,0 +1,56 @@
+# A Feeder reads in files for RubyDiff's processor to
+# run over.  FileFeeder reads them from the file system.
+#
+# Example Usage:
+#  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
+  
+  include Enumerable
+  
+  # Expects something in the form of PATH
+  #   --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 #{@svn_options}").each_line do |file|
+      file.chomp!
+      @files << file if File.fnmatch(@file_pattern, file)
+    end
+  end
+    
+  def each
+    @files.each do |file|
+      cat_path = File.join(@svn_options, file)
+      yield(svn("cat #{cat_path}"), file)
+    end
+  end
+
+
+  # issues a command to svn
+  def svn command
+    output = `svn #{command} 2>&1`.chomp
+    unless $?.success?
+      raise RuntimeError, output
+    end
+    output
+  end
+end

data/ruby_diff.gemspec

@@ -1,20 +1,38 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby_diff}
-  s.version = "0.0.1"
-  s.date = %q{2008-06-03}
-  s.summary = %q{a higher level diff application for analyzing changes to ruby code}
-  s.email = ["netghost@gmail.com"]
-  s.homepage = %q{RubyDiff does higher level comparisons of ruby code.}
-  s.rubyforge_project = %q{rubydiff}
-  s.description = %q{}
+  s.version = "0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Adam Sanderson"]
+  s.date = %q{2008-10-02}
   s.default_executable = %q{ruby_diff}
+  s.description = %q{}
+  s.email = ["netghost@gmail.com"]
+  s.executables = ["ruby_diff"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
+  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/ruby_diff", "lib/ruby_diff.rb", "lib/ruby_diff/code_comparison.rb", "lib/ruby_diff/file_feeder.rb", "lib/ruby_diff/git_feeder.rb", "lib/ruby_diff/git_support.rb", "lib/ruby_diff/git_working_dir_feeder.rb", "lib/ruby_diff/patterns.rb", "lib/ruby_diff/structure_processor.rb", "lib/ruby_diff/svn_feeder.rb", "ruby_diff.gemspec", "test/code_comparison_test.rb", "test/file_feeder_test.rb", "test/git_feeder_test.rb", "test/git_sample/README", "test/git_sample/book.rb", "test/git_sample/lib/chapter.rb", "test/git_working_dir_feeder_test.rb", "test/structure_processor_test.rb"]
   s.has_rdoc = true
-  s.authors = ["Adam Sanderson"]
-  s.files = [".gitignore", "README.txt", "Rakefile", "bin/ruby_diff", "lib/ruby_diff.rb", "lib/ruby_diff/code_comparison.rb", "lib/ruby_diff/file_feeder.rb", "lib/ruby_diff/git_feeder.rb", "lib/ruby_diff/patterns.rb", "lib/ruby_diff/structure_processor.rb", "ruby_diff.gemspec", "test/file_feeder_test.rb", "test/git_feeder_test.rb", "test/git_sample/README", "test/git_sample/book.rb", "test/git_sample/lib/chapter.rb", "test/structure_processor_test.rb"]
-  s.test_files = ["test/git_feeder_test.rb", "test/file_feeder_test.rb", "test/structure_processor_test.rb"]
+  s.homepage = %q{RubyDiff does higher level comparisons of ruby code.}
   s.rdoc_options = ["--main", "README.txt"]
-  s.extra_rdoc_files = ["README.txt"]
-  s.executables = ["ruby_diff"]
-  s.add_dependency(%q<ParseTree>, [">= 2.0.2"])
-  s.add_dependency(%q<hoe>, [">= 1.5.3"])
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rubydiff}
+  s.rubygems_version = %q{1.2.0}
+  s.summary = %q{a higher level diff application for analyzing changes to ruby code}
+  s.test_files = ["test/git_feeder_test.rb", "test/file_feeder_test.rb", "test/code_comparison_test.rb", "test/structure_processor_test.rb", "test/git_working_dir_feeder_test.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<ParseTree>, ["~> 2.1"])
+      s.add_development_dependency(%q<hoe>, [">= 1.7.0"])
+    else
+      s.add_dependency(%q<ParseTree>, ["~> 2.1"])
+      s.add_dependency(%q<hoe>, [">= 1.7.0"])
+    end
+  else
+    s.add_dependency(%q<ParseTree>, ["~> 2.1"])
+    s.add_dependency(%q<hoe>, [">= 1.7.0"])
+  end
 end

data/test/structure_processor_test.rb

@@ -79,13 +79,54 @@ class StructureProcessorTestCase < Test::Unit::TestCase
     CODE
   end
   
+  def test_simple_class
+    assert_signatures <<-CODE, ["A"], [ClassCode]
+      class A
+      end
+    CODE
+  end
+  
+  def test_class_in_module
+    assert_signatures <<-CODE, ["B", "B::A"], [ClassCode,ModuleCode]
+    module B
+      class A
+      end
+    end
+    CODE
+  end
+  
+  def test_namespaced_class
+    assert_signatures <<-CODE, ["C::B::A"], [ClassCode]
+    class C::B::A
+    end
+    CODE
+  end
+  
+  def test_namespaced_module
+    assert_signatures <<-CODE, ["C", "C::B", "C::B::A"], [ModuleCode]
+    module C::B::A
+    end
+    CODE
+  end
+  
+  # Lets just be nuts...
+  def test_nested_namespaced_class
+    assert_signatures <<-CODE, ["C", "C::B", "C::B::A", "C::B::A::D"], [ModuleCode, ClassCode]
+    module C::B::A
+      class D
+      end
+    end
+    CODE
+  end
+  
   def assert_signatures(code, signatures, types=[MethodCode])
     sexp = ParseTree.new.parse_tree_for_string(code)
+    serialized = sexp.pretty_inspect
     processor = StructureProcessor.new()
     processor.process(* sexp)
     
     found_signatures = processor.code_objects.values.select{|co| types.include?(co.class)}.map{|key| key.signature }.sort
-    assert_equal signatures.sort, found_signatures
+    assert_equal signatures.sort, found_signatures, "Sexp was:\n#{serialized}"
   end
   
-end
+end

metadata

@@ -1,34 +1,48 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: ruby_diff
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
-date: 2008-06-09 00:00:00 -07:00
-summary: a higher level diff application for analyzing changes to ruby code
-require_paths: 
-- lib
-email: 
-- netghost@gmail.com
-homepage: RubyDiff does higher level comparisons of ruby code.
-rubyforge_project: rubydiff
-description: ""
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "0.2"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Adam Sanderson
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-10-02 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
+description: ""
+email: 
+- netghost@gmail.com
+executables: 
+- ruby_diff
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - .gitignore
 - History.txt
@@ -44,6 +58,7 @@ files:
 - lib/ruby_diff/git_working_dir_feeder.rb
 - lib/ruby_diff/patterns.rb
 - lib/ruby_diff/structure_processor.rb
+- lib/ruby_diff/svn_feeder.rb
 - ruby_diff.gemspec
 - test/code_comparison_test.rb
 - test/file_feeder_test.rb
@@ -53,41 +68,36 @@ files:
 - test/git_sample/lib/chapter.rb
 - test/git_working_dir_feeder_test.rb
 - test/structure_processor_test.rb
+has_rdoc: true
+homepage: RubyDiff does higher level comparisons of ruby code.
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: rubydiff
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: a higher level diff application for analyzing changes to ruby code
 test_files: 
 - test/git_feeder_test.rb
 - test/file_feeder_test.rb
 - test/code_comparison_test.rb
 - test/structure_processor_test.rb
 - test/git_working_dir_feeder_test.rb
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: 
-- ruby_diff
-extensions: []
-
-requirements: []
-
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ParseTree
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.3
-    version: