mercurial-ruby 0.7.11 → 0.7.12

data/VERSION

@@ -1 +1 @@
-0.7.11
+0.7.12

data/lib/mercurial-ruby.rb

@@ -6,7 +6,7 @@ require 'time'
 #
 module Mercurial
   
-  VERSION = '0.7.11'
+  VERSION = '0.7.12'
   
   class Error < RuntimeError; end
   

data/lib/mercurial-ruby/branch.rb

@@ -27,8 +27,8 @@ module Mercurial
     
     def initialize(repository, name, options={})
       @repository    = repository
-      @name          = name
-      @status        = options[:status] == 'closed' ? 'closed' : 'active'
+      @name          = name.strip
+      @status        = ['closed', 'inactive'].include?(options[:status]) ? options[:status] : 'active'
       @hash_id       = options[:commit]
     end
 
@@ -39,6 +39,10 @@ module Mercurial
     def active?
       status == 'active'
     end
+
+    def inactive?
+      status == 'inactive'
+    end
     
     def closed?
       status == 'closed'

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

@@ -45,7 +45,18 @@ module Mercurial
         b.active?
       end
     end
-    
+
+    # Return an array of {Mercurial::Branch Branch} instances for all inactive branches in the repository.
+    #
+    # === Example:
+    #  repository.branches.inactive
+    #
+    def inactive(cmd_options={})
+      all(cmd_options).find_all do |b|
+        b.inactive?
+      end
+    end
+
     # Return an array of {Mercurial::Branch Branch} instances for all closed branches in the repository.
     #
     # === Example:
@@ -83,7 +94,7 @@ module Mercurial
   private
   
     def build(data)
-      name, last_commit, status = *data.scan(/([\w-]+)\s+\d+:(\w+)\s*\(*(\w*)\)*/).first
+      name, last_commit, status = *data.scan(/([\w\- ]+)\s+\d+:(\w+)\s*\(*(\w*)\)*/).first
       Mercurial::Branch.new(
         repository,
         name,

data/mercurial-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercurial-ruby}
-  s.version = "0.7.11"
+  s.version = "0.7.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2013-08-08}
+  s.date = %q{2013-11-21}
   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

@@ -1,58 +1,69 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe Mercurial::BranchFactory do
-  
+
   before do
     @repository = Mercurial::Repository.open(Fixtures.test_repo)
   end
-  
+
   it "should find all branches" do
     branches = @repository.branches.all
-    branches.size.must_equal 5
-    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
+    branches.size.must_equal 6
+    branches.map(&:name).sort.must_equal ['another-branch', 'branch-from-remote', 'default', 'my branch', 'new-branch', 'old-branch']
+    branches.map(&:status).sort.must_equal %w(active active active active closed inactive)
   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)
+    names.size.must_equal 6
+    names.must_equal ['default', 'my branch', 'another-branch', 'branch-from-remote', 'new-branch', 'old-branch']
   end
-  
+
   it "should find active branches" do
     branches = @repository.branches.active
     branches.size.must_equal 4
-    branches.map(&:name).sort.must_equal %w(another-branch new-branch default branch-from-remote).sort
+    branches.map(&:name).sort.must_equal ['another-branch', 'default', 'branch-from-remote', 'my branch'].sort
     branches.map(&:status).must_equal %w(active active active active)
   end
-  
+
+  it "should find inactive branches" do
+    branches = @repository.branches.inactive
+    branches.size.must_equal 1
+    branches.map(&:name).must_equal %w(new-branch)
+    branches.map(&:status).must_equal %w(inactive)
+  end
+
   it "should find closed branches" do
     branches = @repository.branches.closed
     branches.size.must_equal 1
     branches.map(&:name).must_equal %w(old-branch)
     branches.map(&:status).must_equal %w(closed)
   end
-  
+
   it "should find branch by name" do
-    branch = @repository.branches.by_name('new-branch')
+    branch = @repository.branches.by_name('default')
     branch.must_be_kind_of(Mercurial::Branch)
     branch.status.must_equal 'active'
+
+    branch = @repository.branches.by_name('new-branch')
+    branch.must_be_kind_of(Mercurial::Branch)
+    branch.status.must_equal 'inactive'
   end
-  
+
   it "should not find a branch by inexistent name" do
     @repository.branches.by_name('bla-branch-f').must_equal nil
   end
-  
+
   it "should return branches for commit" do
     branches = @repository.branches.for_commit('bf6386c0a0cc')
-    branches.size.must_equal 5
-    branches.map(&:name).sort.must_equal %w(old-branch new-branch branch-from-remote another-branch default).sort
+    branches.size.must_equal 6
+    branches.map(&:name).sort.must_equal ['old-branch', 'new-branch', 'branch-from-remote', 'another-branch', 'default', 'my branch'].sort
   end
 
   it "should find branch's full hash_id" do
     branch = @repository.branches.all.first
-    branch.hash_id.must_equal '2b03a87dbf4cb1a95b2417d8e2eac801c450b624'
+    branch.hash_id.must_equal '7ac2dcb09643805a97549210e5d0e5511d091c31'
   end
-  
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mercurial-ruby
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 7
-  - 11
-  version: 0.7.11
+  - 12
+  version: 0.7.12
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-08 00:00:00 -04:00
+date: 2013-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency