mercurial-ruby 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/mercurial-ruby/commit.rb

@@ -68,8 +68,8 @@ module Mercurial
       hash_id == '0'*40
     end
     
-    def diffs
-      repository.diffs.for_commit(self)
+    def diffs(cmd_options={})
+      repository.diffs.for_commit(self, cmd_options)
     end
     
     def parents

data/lib/mercurial-ruby/factories/diff_factory.rb

@@ -33,8 +33,10 @@ module Mercurial
       end
     end
     
-    def for_path(path, revision_a, revision_b, cmd_options={})
-      build(hg(["diff ? -r ? -r ?", path, revision_a, revision_b], cmd_options))
+    def for_path(path, revision_a, revision_b, options={}, cmd_options={})
+      cmd = "diff ? -r ? -r ?"
+      cmd << ' -w' if options[:ignore_whitespace]
+      build(hg([cmd, path, revision_a, revision_b], cmd_options))
     end
     
   private
@@ -47,8 +49,8 @@ module Mercurial
         file_a = binary_file
         body = 'Binary files differ'
       else
-        file_a = data.scan(/^--- (?:a\/(.+)|\/dev\/null)\t/).flatten.first
-        file_b = data.scan(/^\+\+\+ (?:b\/(.+)|\/dev\/null)\t/).flatten.first
+        file_a = data.scan(/^\[?--- (?:a\/([^\+]+)|\/dev\/null)-?\]?\t/).flatten.first
+        file_b = data.scan(/^\{?\+\+\+ (?:b\/([^\+]+)|\/dev\/null)\+?\}?\t/).flatten.first
         body = data[data.index("\n")+1..-1]
       end
 
@@ -64,4 +66,4 @@ module Mercurial
     
   end
   
-end
+end

data/lib/mercurial-ruby/node.rb

@@ -65,8 +65,8 @@ module Mercurial
       @_entries ||= repository.nodes.entries_for(path, revision, self)
     end
     
-    def diff_to(revision_b)
-      repository.diffs.for_path(path, revision, revision_b)
+    def diff_to(revision_b, options={})
+      repository.diffs.for_path(path, revision, revision_b, options)
     end
     
     def blame
@@ -105,4 +105,4 @@ module Mercurial
     
   end
   
-end
+end

data/lib/mercurial-ruby/shell.rb

@@ -21,6 +21,11 @@ module Mercurial
 
       build << cmd
       to_run = build.join(' && ')
+
+      if pipe_cmd = options[:pipe]
+        to_run << " | #{ pipe_cmd }"
+      end
+
       Mercurial::Command.new(to_run, options).execute
     end
     

data/lib/mercurial-ruby.rb

@@ -4,7 +4,7 @@
 #
 module Mercurial
   
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
   
   class Error < RuntimeError; end
   

data/mercurial-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercurial-ruby}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2011-11-25}
+  s.date = %q{2011-12-08}
   s.description = %q{Ruby API for Mercurial DVCS.}
   s.email = %q{ilya.sabanin@gmail.com}
   s.extra_rdoc_files = [

data/test/test_commit_factory.rb

@@ -8,8 +8,8 @@ describe Mercurial::CommitFactory do
 
   it "should find commits after specific revision" do
     commits = @repository.commits.after('2d32410d9629')
-    commits.size.must_equal 4
-    commits.map(&:hash_id).must_equal %w(88b5cc7860153671b0d3aa3c16d01ecad987490e 57a6efe309bfa6c8054084de8c26490fca8a6104 f67625ea8586cd5c4d43c883a273db3ef7f38716 9f76ea916c5100bf61f533c33a6aa9f22532d526)
+    commits.size.must_equal 6
+    commits.map(&:hash_id).must_equal %w(88b5cc7860153671b0d3aa3c16d01ecad987490e 57a6efe309bfa6c8054084de8c26490fca8a6104 f67625ea8586cd5c4d43c883a273db3ef7f38716 9f76ea916c5100bf61f533c33a6aa9f22532d526 b6f6f764b939fc4be234574010247d40c683c322 e47455b9a2383085b400d649af4360b943c6d3cf)
   end
 
   it "should find commits before specific revision" do
@@ -82,7 +82,7 @@ describe Mercurial::CommitFactory do
   
   it "should count commits" do
     count = @repository.commits.count
-    count.must_equal 40
+    count.must_equal 42
   end
 
   it "should count range of commits" do

data/test/test_diff_factory.rb

@@ -5,7 +5,7 @@ describe Mercurial::DiffFactory do
   before do
     @repository = Mercurial::Repository.open(Fixtures.test_repo)
   end
-  
+
   it "should find diffs for commit" do
     commit = @repository.commits.by_hash_id('54d96f4b1a26')
     diffs = @repository.diffs.for_commit(commit)
@@ -44,6 +44,11 @@ describe Mercurial::DiffFactory do
     diff.file_b.must_equal 'diff-test.rb'
     diff.body.must_equal diff_sample
   end
+
+  it "should ignore whitespace" do
+    diff = @repository.diffs.for_path('superman.txt', 'b6f6f764b939', 'e47455b9a238', :ignore_whitespace => true)
+    diff.body.must_equal diff_sample_2
+  end
   
 private
 
@@ -74,5 +79,16 @@ private
      @changesets         = find_changesets_for_current_scope
 ]
   end
+
+  def diff_sample_2
+    %Q[--- a/superman.txt	Thu Dec 01 15:52:30 2011 -0500
++++ b/superman.txt	Thu Dec 01 15:57:43 2011 -0500
+@@ -1,3 +1,3 @@
+ 
+-^ whitespace change above
++^ whitespace change above and below
+ This is a superman file.
+]
+  end
   
-end
+end

data/test/test_file_index.rb

@@ -24,7 +24,7 @@ describe Mercurial::FileIndex do
   end
   
   it "should count all commits" do
-    @file_index.count_all.must_equal 40
+    @file_index.count_all.must_equal 42
   end
   
   it "should count commits reachable by specific hash id" do
@@ -120,4 +120,4 @@ directory_1/specification.rb
 directory_1/tasks.rb]
   end
   
-end
+end

data/test/test_shell.rb

@@ -6,6 +6,10 @@ describe Mercurial::Shell do
     @repository = Mercurial::Repository.open(Fixtures.test_repo)
     @shell = @repository.shell
   end
+
+  it "should accept piping" do
+    assert_equal '1', @shell.hg('log', :pipe => "grep '9:0f41dd2ec166' -wc").strip
+  end
   
   it "should compile commands" do    
     command_mock = mock('command', :execute => true)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mercurial-ruby
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 +08:00
+date: 2011-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency