mercurial-ruby 0.6.1 → 0.7.0

data/README.rdoc

@@ -16,7 +16,7 @@ Github doesn't support some YARd-specific syntax so this README can look broken.
  
 == Compatibility
 
-Tested with Mercurial 1.9 and 1.9.1 and Ruby 1.8.7.
+Tested with Mercurial versions 1.9, 1.9.1 and 2.1; Ruby version 1.8.7.
 
 == Configuration
 
@@ -89,6 +89,6 @@ Cache expires automatically when repository's mtime changes, and it's your job t
 
 == Copyright
 
-Copyright (c) 2011 Ilya Sabanin. See LICENSE.txt for
+Copyright (c) 2012 Ilya Sabanin. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/mercurial-ruby/branch.rb

@@ -22,14 +22,18 @@ module Mercurial
     # State of the branch: closed or active.
     attr_reader :status
     
-    # Mercurial changeset ID of the latest commit in the branch. 40-chars long SHA1 hash.
-    attr_reader :latest_commit
+    # ID of a commit associated with the branch. 40-chars long SHA1 hash.
+    attr_reader :hash_id
     
     def initialize(repository, name, options={})
       @repository    = repository
       @name          = name
       @status        = options[:status] == 'closed' ? 'closed' : 'active'
-      @latest_commit = options[:commit]
+      @hash_id       = options[:commit]
+    end
+
+    def commit
+      repository.commits.by_hash_id(hash_id)
     end
     
     def active?

data/lib/mercurial-ruby/commit.rb

@@ -36,8 +36,8 @@ module Mercurial
     # Array of {Mercurial::ChangedFile ChangedFile} objects.
     attr_reader :changed_files
     
-    # Array of commit's branches.
-    attr_reader :branches_names
+    # Name of a branch associated with the commit.
+    attr_reader :branch_name
     
     # Array of commit's tags.
     attr_reader :tags_names
@@ -55,8 +55,8 @@ module Mercurial
       @date           = Time.iso8601(opts[:date])
       @message        = opts[:message]
       @changed_files  = files_to_array(opts[:changed_files])
-      @branches_names = branches_or_tags_to_array(opts[:branches_names])
-      @tags_names     = branches_or_tags_to_array(opts[:tags_names])
+      @branch_name    = opts[:branch_name]
+      @tags_names     = tags_to_array(opts[:tags_names])
       @parents_ids    = parents_to_array(opts[:parents])
     end
     
@@ -75,6 +75,10 @@ module Mercurial
     def parents
       repository.commits.by_hash_ids(parents_ids)
     end
+
+    def ancestors
+      repository.commits.ancestors_of(hash_id)
+    end
     
     def parent_id
       parents_ids.first
@@ -92,7 +96,7 @@ module Mercurial
       {
         'id'       => hash_id,
         'parents'  => parents_ids.map { |p| { 'id' => p.id } },
-        'branches' => branches_names,
+        'branch'   => branch_name,
         'tags'     => tags_names,
         'message'  => message,
         'date'     => date,
@@ -123,9 +127,9 @@ module Mercurial
       Mercurial::ChangedFileFactory.delete_hg_artefacts(files)
     end
     
-    def branches_or_tags_to_array(branches_str)
-      string_to_array(branches_str) do |returning|
-        returning << branches_str
+    def tags_to_array(tags_str)
+      string_to_array(tags_str) do |returning|
+        returning << tags_str
       end
     end
     

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

@@ -23,6 +23,17 @@ module Mercurial
         build(line)
       end
     end
+
+    # Run a block for every {Mercurial::Branch Branch} instance of all branches in the repository.
+    #
+    # == Example:
+    #  repository.branches.each {|commit| ... }
+    #
+    def each(&block)
+      all.each do |branch|
+        block.call(branch)
+      end
+    end
     
     # Return an array of {Mercurial::Branch Branch} instances for all active branches in the repository.
     #

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

@@ -156,6 +156,18 @@ module Mercurial
       end
     end
     alias :latest :tip
+
+    # Return an array of {Mercurial::Commit Commit} instances that appear in hg log as ancestors of the specified commit ID.
+    #
+    # == Example:
+    #  repository.commits.ancestors_of('bf6386c0a0cc')
+    #
+    def ancestors_of(hash_id, options={}, cmd_options={})
+      cmd = command_with_limit(["log -r \"ancestors(?)\" --style ?", hash_id, style], options[:limit])
+      hg_to_array(cmd, {:separator => changeset_separator}, cmd_options) do |line|
+        build(line)
+      end
+    end
     
   protected
 
@@ -190,7 +202,7 @@ module Mercurial
         :date            => data[3],
         :message         => data[4],
         :changed_files   => [data[5], data[6], data[7], data[8]],
-        :branches_names  => data[9],
+        :branch_name     => data[9],
         :tags_names      => data[10],
         :parents         => data[11]
       )

data/lib/mercurial-ruby.rb

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

data/lib/styles/changeset.style

@@ -1,4 +1,4 @@
-changeset = "{node}|><|{author|person}|><|{author|email}|><|{date|rfc3339date}|><|{desc}|><|{file_mods}|><|{file_adds}|><|{file_dels}|><|{file_copies}|><|{branches}|><|{tags}|><|{parents}||$||\n"
+changeset = "{node}|><|{author|person}|><|{author|email}|><|{date|rfc3339date}|><|{desc}|><|{file_mods}|><|{file_adds}|><|{file_dels}|><|{file_copies}|><|{branch}|><|{tags}|><|{parents}||$||\n"
 file_add  = "A {file_add};"
 file_mod  = "M {file_mod};"
 file_del  = "D {file_del};"

data/mercurial-ruby.gemspec

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

data/test/test_branch_factory.rb

@@ -12,6 +12,13 @@ describe Mercurial::BranchFactory do
     branches.map(&:name).sort.must_equal %w(branch-from-remote another-branch new-branch old-branch default).sort
     branches.map(&:status).sort.must_equal %w(active active closed active active).sort
   end
+
+  it "should iterate through branches" do
+    names = []
+    @repository.branches.each{|b| names << b.name }
+    names.size.must_equal 5
+    names.must_equal %w(default another-branch branch-from-remote new-branch old-branch)
+  end
   
   it "should find active branches" do
     branches = @repository.branches.active

data/test/test_commit.rb

@@ -15,13 +15,9 @@ describe Mercurial::Commit do
     @commit.date.must_be_kind_of Time
   end
   
-  it "should represent branches as Array" do
-    @commit.branches_names.must_be_kind_of Array
-  end
-  
-  it "branches array should be empty if there are no branches" do
+  it "branch name should be 'default' by default" do
     @commit = @repository.commits.by_hash_id('4474d1ddaf65')
-    @commit.branches_names.must_equal []
+    @commit.branch_name.must_equal 'default'
   end
   
   it "should represent tags as Array" do

data/test/test_commit_factory.rb

@@ -106,6 +106,11 @@ describe Mercurial::CommitFactory do
     Mercurial::Repository.create('/tmp/new-crazy-repo').commits.latest.must_equal nil
   end
 
+  it "should return array of commit's ancestors" do
+    expected_ancestors = %w(bf6386c0a0ccd1282dbbe51888f52fe82b1806e3 bc729b15e2b556065dd4f32c161f54be5dd92776 63f70b2314ede1e12813cae87f6f303ee8d5c09a 6157254a442343181939c7af1a744cf2a16afcce 25bb5c51fd613b8b58d88ef1caf99da559af51f3 63e18640e83af60196334f16cc31f4f99c419918 34f85a44acf11c3386f771a65445d6c39e5261d6 4474d1ddaf653cb7fbf18bb62ff1e39a4e571969 cd9fa0c59c7f189fa1d70edea564e534ac9478d0 611407bf9b369e061eaf0bee1a261c9e62ad713d d14b0c16b21d9d3e08101ef264959a7d91a8b5db 3e1ea66bdd04dbfb8d91e4f2de3baca218cd4cca)
+    @repository.commits.ancestors_of('3e1ea66bdd04').map(&:hash_id).must_equal(expected_ancestors)
+  end
+
 private
 
   def really_long_commit_message

metadata

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