mercurial-ruby 0.5.0 → 0.6.0

data/README.rdoc

@@ -2,6 +2,14 @@
 
 Ruby API for Mercurial DVCS. Uses command line interface to communicate with Mercurial repositories.
 
+== Documentation
+
+Please refer to YARD documentation here:
+
+http://rubydoc.info/gems/mercurial-ruby/file/README.rdoc
+
+Github doesn't support some YARd-specific syntax so this README can look broken.
+
 == Installation
 
  gem install mercurial-ruby

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/mercurial-ruby.rb

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

data/lib/mercurial-ruby/command.rb

@@ -5,12 +5,13 @@ module Mercurial
   class CommandError < Error; end
   
   class Command
-    attr_accessor :command, :repository, :use_cache
+    attr_accessor :command, :repository, :use_cache, :timeout
     
     def initialize(cmd, options={})
       @command    = cmd
       @repository = options[:repository]
-      @use_cache  = options[:cache]
+      @use_cache  = options[:cache].nil? || options[:cache] == false ? false : true
+      @timeout    = options[:timeout] ? options[:timeout].to_i : global_execution_timeout.to_i
     end
 
     def execute
@@ -24,14 +25,14 @@ module Mercurial
   private
   
     def cache_commands?
-      repository && use_cache && cache_store
+      repository && !repository.cache_disabled_by_override? && cache_store && use_cache
     end
     
     def cache_store
       Mercurial.configuration.cache_store
     end
   
-    def execution_timeout
+    def global_execution_timeout
       Mercurial.configuration.shell_timeout
     end
     
@@ -45,9 +46,10 @@ module Mercurial
     
     def execution_proc
       Proc.new do
-        result, error = '', ''
+        debug(command)
+        result, error = '', ''        
         Open3.popen3(command) do |_, stdout, stderr|
-          Timeout.timeout(execution_timeout) do
+          Timeout.timeout(timeout) do
             while tmp = stdout.read(102400)
               result += tmp
             end
@@ -71,7 +73,13 @@ module Mercurial
     def cache_key
       "hg.#{ repository.mtime }." + Digest::MD5.hexdigest(command)
     end
+
+    def debug(msg)
+      if Mercurial.configuration.debug_mode
+        puts msg
+      end 
+    end
     
   end
   
-end
+end

data/lib/mercurial-ruby/commit.rb

@@ -83,6 +83,10 @@ module Mercurial
     def exist_in_branches
       repository.branches.for_commit(hash_id)
     end
+
+    def short_hash_id
+      hash_id.to_s[0,12]
+    end
     
     def to_hash
       {
@@ -149,4 +153,4 @@ module Mercurial
     
   end
   
-end
+end

data/lib/mercurial-ruby/config_file.rb

@@ -1,5 +1,5 @@
 module Mercurial
-  
+
   #
   # Represents +.hg/hgrc+ configuration file stored in the repository.
   # Useful for adding/removing various settings.
@@ -9,6 +9,8 @@ module Mercurial
   # http://www.selenic.com/mercurial/hgrc.5.html
   #
   class ConfigFile
+
+    class DuplicateSetting < Error; end
     
     attr_reader :repository
     
@@ -51,6 +53,8 @@ module Mercurial
     #  kdiff3.executable = ~/bin/kdiff3
     #
     def add_setting(header, name, value)
+      raise DuplicateSetting if setting_exists?(header, name)
+
       new_setting = %Q{[#{ header }]\n#{ name } = #{ value }\n}
       write do
         if contents.nil?
@@ -73,6 +77,15 @@ module Mercurial
         contents.gsub(find_setting(header, name), '')
       end
     end
+
+    #
+    # Returns true if specified setting exists in specified group.
+    #
+    #  config.setting_exists?('hooks', 'changegroup')
+    #
+    def setting_exists?(header, name)
+      !!find_setting(header, name)
+    end
     
     #
     # Returns content of the specified section of hgrc.
@@ -90,6 +103,7 @@ module Mercurial
     # Returns content of the specified setting from a section.
     #
     def find_setting(header, setting) #:nodoc:
+      return nil if contents.nil?
       contents.scan(setting_regexp(header, setting)).flatten.first
     end
     
@@ -116,4 +130,4 @@ module Mercurial
     
   end
   
-end
+end

data/lib/mercurial-ruby/configuration.rb

@@ -1,14 +1,32 @@
 module Mercurial
   
+  #
+  # Use this class to setup various internal settings of the gem.
+  #
+  # Example:
+  #
+  #  Mercurial.configure do |conf|
+  #   conf.cache_store = Rails.cache
+  #   conf.debug_mode = true
+  #  end
+  #
+  # Currently only the following settings are supported:
+  #
+  # * hg_binary_path — path to hg binary in your system. Default is /usr/local/bin/hg.
+  # * shell_timeout — default execution timeout for all hg shell commands. Default is 3000.
+  # * cache_store — Rails's CacheStore compatible class for caching results of successful hg commands. Default is nil.
+  # * debug_mode — send all hg commands to stdout before execution. Default is false.
+  #  
   class Configuration
     
-    attr_accessor :hg_binary_path, :shell_timeout, :cache_store
+    attr_accessor :hg_binary_path, :shell_timeout, :cache_store, :debug_mode
     
     def initialize
       @hg_binary_path = '/usr/local/bin/hg'
       @shell_timeout  = 3000
+      @debug_mode     = false
     end
     
   end
   
-end
+end

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

@@ -9,10 +9,10 @@ module Mercurial
       @repository = repository
     end
     
-    def for_path(path, revision=nil)
+    def for_path(path, revision=nil, cmd_options={})
       revision ||= 'tip'
       build do
-        hg(["blame ? -ucl -r ?", path, revision])
+        hg(["blame ? -ucl -r ?", path, revision], cmd_options)
       end
     end
   

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

@@ -18,8 +18,8 @@ module Mercurial
     # == Example:
     #  repository.branches.all 
     #
-    def all
-      hg_to_array "branches -c" do |line|
+    def all(cmd_options={})
+      hg_to_array("branches -c", {}, cmd_options) do |line|
         build(line)
       end
     end
@@ -63,8 +63,8 @@ module Mercurial
     # == Example:
     #  repository.branches.for_commit('291a498f04e9')
     #
-    def for_commit(hash_id)
-      hg_to_array ["log -r 'descendants(?) and head()' --template '\n{branches}'", hash_id] do |line|
+    def for_commit(hash_id, cmd_options={})
+      hg_to_array(["log -r 'descendants(?) and head()' --template '\n{branches}'", hash_id], {}, cmd_options) do |line|
         build_with_name_only(line)
       end.compact.uniq
     end

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

@@ -12,14 +12,29 @@ module Mercurial
     def initialize(repository) #:nodoc:
       @repository = repository
     end
+
+    # Return a parent commit for this working copy.
+    #
+    # == Example:
+    #  repository.commits.parent
+    #
+    def parent(cmd_options={})
+      build do
+        hg(["parent --style ?", style], cmd_options)
+      end
+    end
     
     # Return an array of {Mercurial::Commit Commit} instances for all changesets in the repository.
+    # Accept a :limit setting.
     #
     # == Example:
-    #  repository.commits.all 
+    #  repository.commits.all
+    #  repository.commits.all(:limit => 15)
     #
-    def all
-      hg_to_array ["log --style ?", style], changeset_separator do |line|
+    def all(options={}, cmd_options={})
+      cmd = command_with_limit(["log --style ?", style], options[:limit])
+
+      hg_to_array(cmd, {:separator => changeset_separator}, cmd_options) do |line|
         build(line)
       end
     end
@@ -40,8 +55,19 @@ module Mercurial
     # == Example:
     #  repository.commits.count
     #
-    def count
-      hg_to_array %Q[log --template "{node}\n"], "\n" do |line|
+    def count(cmd_options={})
+      hg_to_array(%Q[log --template "{node}\n"], {}, cmd_options) do |line|
+        line
+      end.size
+    end
+
+    # Count changesets in the range from hash_a to hash_b in the repository.
+    #
+    # == Example:
+    #  repository.commits.count_range(hash_a, hash_b)
+    #
+    def count_range(hash_a, hash_b, cmd_options={})
+      hg_to_array([%Q[log -r ?:? --template "{node}\n"], hash_a, hash_b], {}, cmd_options) do |line|
         line
       end.size
     end
@@ -51,8 +77,8 @@ module Mercurial
     # == Example:
     #  repository.commits.by_branch('brancname')
     #
-    def by_branch(branch)
-      hg_to_array ["log -b ? --style ?", branch, style], changeset_separator do |line|
+    def by_branch(branch, cmd_options={})
+      hg_to_array(["log -b ? --style ?", branch, style], {:separator => changeset_separator}, cmd_options) do |line|
         build(line)
       end
     end
@@ -62,9 +88,9 @@ module Mercurial
     # == Example:
     #  repository.commits.by_hash_id('291a498f04e9')
     #
-    def by_hash_id(hash)
+    def by_hash_id(hash, cmd_options={})
       build do
-        hg(["log -r ? --style ?", hash, style])
+        hg(["log -r ? --style ?", hash, style], cmd_options)
       end
     end
     
@@ -74,6 +100,8 @@ module Mercurial
     #  repository.commits.by_hash_ids('291a498f04e9', '63f70b2314ed')
     #
     def by_hash_ids(*args)
+      cmd_options = args.last.kind_of?(Hash) ? args.last : {}
+      
       if args.size == 1 && args.first.kind_of?(Array)
         array = args.first
       else
@@ -82,7 +110,7 @@ module Mercurial
       return [] if array.empty?
 
       args = array.map{|hash| " -r#{ hash }"}
-      hg_to_array ["log#{ args } --style ?", style], changeset_separator do |line|
+      hg_to_array ["log#{ args } --style ?", style], {:separator => changeset_separator}, cmd_options do |line|
         build(line)
       end
     end
@@ -92,25 +120,54 @@ module Mercurial
     # == Example:
     #  repository.commits.for_range('bf6386c0a0cc', '63f70b2314ed')
     #
-    def for_range(hash_a, hash_b)
-      hg_to_array ["log -r ?:? --style ?", hash_a, hash_b, style], changeset_separator do |line|
+    def for_range(hash_a, hash_b, options={}, cmd_options={})
+      cmd = command_with_limit(["log -r ?:? --style ?", hash_a, hash_b, style], options[:limit])
+      hg_to_array(cmd, {:separator => changeset_separator}, cmd_options) do |line|
         build(line)
       end
     end
+
+    # Return an array of {Mercurial::Commit Commit} instances that appear in hg log before the specified revision id.
+    #
+    # == Example:
+    #  repository.commits.before('bf6386c0a0cc')
+    #
+    def before(hash_id, options={}, cmd_options={})
+      in_direction(:before, hash_id, options, cmd_options)
+    end
+
+    # Return an array of {Mercurial::Commit Commit} instances that appear in hg log after the specified revision id.
+    #
+    # == Example:
+    #  repository.commits.after('bf6386c0a0cc')
+    #
+    def after(hash_id, options={}, cmd_options={})
+      in_direction(:after, hash_id, options, cmd_options)
+    end
     
     # Return an instance of {Mercurial::Commit Commit} for a repository's tip changeset (latest).
     #
     # == Example:
     #  repository.commits.tip
     #
-    def tip
+    def tip(cmd_options={})
       build do
-        hg(["tip --style ?", style])
+        hg(["tip --style ?", style], cmd_options)
       end
     end
     alias :latest :tip
     
   protected
+
+    def in_direction(direction, hash_id, options={}, cmd_options={})
+      query = direction.to_sym == :before ? '"reverse(:?)"' : '?:'
+      cmd = command_with_limit(["log -r #{ query } --style ?", hash_id, style], options[:limit])
+
+      hg_to_array(cmd, {:separator => changeset_separator}, cmd_options) do |line|
+        c = build(line)
+        c.short_hash_id == hash_id[0,12] ? next : c
+      end
+    end
   
     def changeset_separator
       Mercurial::Style::CHANGESET_SEPARATOR
@@ -148,7 +205,15 @@ module Mercurial
     def style
       Mercurial::Style.changeset
     end
+
+    def command_with_limit(cmd, limit)
+      if limit
+        cmd[0] << ' --limit ?'
+        cmd << limit
+      end
+      cmd
+    end
     
   end
   
-end
+end

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

@@ -20,9 +20,9 @@ module Mercurial
     #  commit = repository.commits.by_hash_id('291a498f04e9')
     #  repository.diffs.for_commit(commit)
     #
-    def for_commit(commit)
+    def for_commit(commit, cmd_options={})
       [].tap do |returning|
-        data = hg(["diff -c ?", commit.hash_id])
+        data = hg(["diff -c ?", commit.hash_id], cmd_options)
         chunks = data.split(/^diff/)[1..-1]
         unless chunks.nil?
           chunks.map do |piece| 
@@ -33,8 +33,8 @@ module Mercurial
       end
     end
     
-    def for_path(path, revision_a, revision_b)
-      build(hg(["diff ? -r ? -r ?", path, revision_a, revision_b]))
+    def for_path(path, revision_a, revision_b, cmd_options={})
+      build(hg(["diff ? -r ? -r ?", path, revision_a, revision_b], cmd_options))
     end
     
   private

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

@@ -18,7 +18,7 @@ module Mercurial
     
     def by_name(name)
       all.find do |h|
-        h.name == name
+        h.name == name.to_s
       end
     end
     
@@ -42,4 +42,4 @@ module Mercurial
     
   end
   
-end
+end

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

@@ -5,7 +5,6 @@ module Mercurial
   # This class represents a factory for {Mercurial::Node Node} instances.
   #
   class NodeFactory
-    include Mercurial::Helper
     
     # Instance of {Mercurial::Repository Repository}.
     attr_reader :repository

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

@@ -18,8 +18,8 @@ module Mercurial
     # == Example:
     #  repository.tags.all 
     #
-    def all
-      hg_to_array "tags" do |line|
+    def all(cmd_options={})
+      hg_to_array("tags", {}, cmd_options) do |line|
         build(line)
       end
     end

data/lib/mercurial-ruby/file_index.rb

@@ -11,11 +11,9 @@ module Mercurial
   class FileIndex
     include Mercurial::Helper
 
-    class IndexFileNotFound < StandardError
-    end
-
-    class UnsupportedRef < StandardError
-    end
+    class IndexFileNotFound < StandardError;end
+    class IndexFileTooBig < StandardError;end
+    class UnsupportedRef < StandardError;end
 
     class << self
       attr_accessor :max_file_size
@@ -169,9 +167,19 @@ module Mercurial
         end
       end
     end
+    
+    def validate_index_file
+      if File.file?(path)
+        if File.size(path) > Mercurial::FileIndex.max_file_size
+          raise IndexFileTooBig, "#{ path } is bigger than #{ Mercurial::FileIndex.max_file_size }"
+        end
+      else
+        raise IndexFileNotFound, path unless index_file_valid?
+      end      
+    end
 
     def read_index
-      raise IndexFileNotFound unless index_file_valid?
+      validate_index_file      
       f = File.new(path)
       @sha_count = 0
       @commit_index = {}

data/lib/mercurial-ruby/helper.rb

@@ -2,17 +2,18 @@ module Mercurial
   
   module Helper
     
-    def hg(cmd)
-      repository.shell.hg(cmd)
+    def hg(cmd, options={})
+      repository.shell.hg(cmd, options)
     end
     
-    def shell(cmd)
-      repository.shell.run(cmd)
+    def shell(cmd, options={})
+      repository.shell.run(cmd, options)
     end
     
-    def hg_to_array(cmd, separator="\n", &block)
+    def hg_to_array(cmd, options={}, cmd_options={}, &block)
+      separator = options[:separator] || "\n"
       [].tap do |returning|
-        hg(cmd).split(separator).each do |line|
+        hg(cmd, cmd_options).split(separator).each do |line|
           returning << block.call(line)
         end
       end.compact

data/lib/mercurial-ruby/manifest.rb

@@ -24,9 +24,9 @@ module Mercurial
     # == Example:
     #  repository.manifest.contents
     #
-    def contents(revision=nil)
+    def contents(revision=nil, cmd_options={})
       revision ||= 'tip'
-      hg(manifest_cmd(revision))
+      hg(manifest_cmd(revision), cmd_options)
     end
     
     # Returns an array of file paths from manifest that start with the specified +path+ at a specified +revision+.

data/lib/mercurial-ruby/node.rb

@@ -65,6 +65,14 @@ module Mercurial
       @_entries ||= repository.nodes.entries_for(path, revision, self)
     end
     
+    def diff_to(revision_b)
+      repository.diffs.for_path(path, revision, revision_b)
+    end
+    
+    def blame
+      repository.blames.for_path(path, revision)
+    end
+    
     def has_entry?(name)
       entries.find do |e|
         e.name == name

data/lib/mercurial-ruby/repository.rb

@@ -14,6 +14,13 @@ module Mercurial
         raise Mercurial::RepositoryNotFound.new(destination)
       end
     end
+
+    def self.clone(url, destination, cmd_options)
+      create_destination(destination)
+      opts = cmd_options.merge(:append_hg => true)
+      Mercurial::Shell.run(["clone ? ?", url, destination], opts)
+      open(destination)      
+    end
     
     def initialize(source)
       @path = source
@@ -67,10 +74,38 @@ module Mercurial
       nodes.find(name, hash_id)
     end
     
+    def clone(destination_path, cmd_options={})
+      self.class.clone(file_system_url, destination_path, cmd_options)
+    end
+    
+    def pull(origin='default', cmd_options={})
+      shell.hg(['pull ?', origin], cmd_options)
+    end
+    
+    def verify
+      shell.hg('verify')
+      true
+    rescue Mercurial::CommandError
+      false
+    end
+    
+    def paths
+      {}.tap do |result|
+        shell.hg('paths').each do |line|
+          path, url = *line.strip.split(" = ")
+          result[path] = url
+        end
+      end
+    end
+    
     def destroy!
       FileUtils.rm_rf(path)
     end
     
+    def file_system_url
+      %Q[file://#{ path }]
+    end
+    
     def path
       File.expand_path(@path)
     end
@@ -83,10 +118,24 @@ module Mercurial
       File.mtime(dothg_path).to_i
     end
     
+    def no_cache
+      @cache_disabled_by_override = true
+      yield
+      @cache_disabled_by_override = false
+    end
+    
+    def cache_disabled_by_override?
+      @cache_disabled_by_override || false
+    end
+    
   protected
+
+    def self.create_destination(path)
+      Mercurial::Shell.run("mkdir -p #{ path }")
+    end
   
     def self.init_repository(destination)
-      Mercurial::Shell.run("mkdir -p #{ destination }")
+      create_destination(destination)
       open(destination).tap do |repo|
         repo.shell.hg('init', :cache => false)
         repo.shell.hg('update null', :cache => false)
@@ -95,4 +144,4 @@ module Mercurial
     
   end
   
-end
+end

data/lib/mercurial-ruby/shell.rb

@@ -5,11 +5,14 @@ module Mercurial
     attr_reader :repository
     
     def self.run(cmd, options={})
-      options[:cache] = true if options[:cache].nil?
       build = []
 
-      if options[:in]
-        build << "cd #{ options[:in] }"
+      if options[:append_hg]
+        cmd = append_command_with(hg_binary_path, cmd)
+      end
+
+      if dir = options.delete(:in)
+        build << "cd #{ dir }"
       end
       
       if cmd.kind_of?(Array)
@@ -18,7 +21,7 @@ module Mercurial
 
       build << cmd
       to_run = build.join(' && ')
-      Mercurial::Command.new(to_run, :repository => options[:repository], :cache => options[:cache]).execute
+      Mercurial::Command.new(to_run, options).execute
     end
     
     def initialize(repository)
@@ -28,7 +31,7 @@ module Mercurial
     def hg(cmd, options={})
       options[:in] ||= repository.path
       options[:repository] = repository
-      cmd = append_command_with(hg_binary_path, cmd)
+      options[:append_hg] = true
       run(cmd, options)
     end
     
@@ -38,7 +41,7 @@ module Mercurial
     
   private
   
-    def hg_binary_path
+    def self.hg_binary_path
       Mercurial.configuration.hg_binary_path
     end
     
@@ -50,7 +53,7 @@ module Mercurial
       end
     end
     
-    def append_command_with(append, cmd)
+    def self.append_command_with(append, cmd)
       if cmd.kind_of?(Array)
         cmd[0].insert(0, "#{ append } ")
         cmd
@@ -61,4 +64,4 @@ module Mercurial
     
   end
   
-end
+end

data/mercurial-ruby.gemspec

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

data/test/test_command.rb

@@ -20,7 +20,13 @@ describe Mercurial::Command do
   it "should execute commands with timeout" do
     Mercurial.configuration.stubs(:shell_timeout).returns(1)
     lambda{
-      Mercurial::Command.new("sleep 5").execute
+      Mercurial::Command.new("sleep 6").execute
+    }.must_raise Timeout::Error
+  end
+  
+  it "should support custom timeout settings" do
+    lambda{
+      Mercurial::Command.new("sleep 3", :timeout => 1).execute
     }.must_raise Timeout::Error
   end
   
@@ -58,5 +64,23 @@ describe Mercurial::Command do
     cache_store.expects(:fetch).never
     command.execute
   end
+
+  it "should not cache command when caching was specifically disabled" do
+    command = Mercurial::Command.new("hg version", :cache => false, :repository => @repository)
+    cache_store = mock('cache_store')
+    Mercurial.configuration.stubs(:cache_store).returns(cache_store)
+    cache_store.expects(:fetch).never
+    command.execute
+  end
+  
+  it "should not use caching it it was overridden by repository" do
+    command = Mercurial::Command.new("cd #{ @repository.path } && hg log -v", :repository => @repository)
+    cache_store = mock('cache_store')
+    cache_store.expects(:fetch).never
+    Mercurial.configuration.stubs(:cache_store).returns(cache_store)
+    @repository.no_cache do
+      command.execute
+    end
+  end
   
-end
+end

data/test/test_commit.rb

@@ -6,6 +6,10 @@ describe Mercurial::Commit do
     @repository = Mercurial::Repository.open(Fixtures.test_repo)
     @commit = @repository.commits.by_hash_id('34f85a44acf1')
   end
+
+  it "should have short version of it's id" do
+    @commit.short_hash_id.must_equal '34f85a44acf1'
+  end
   
   it "should parse date to Ruby format" do 
     @commit.date.must_be_kind_of Time
@@ -63,4 +67,4 @@ describe Mercurial::Commit do
     commit.exist_in_branches.map(&:name).sort.must_equal %w(default another-branch).sort
   end
   
-end
+end

data/test/test_commit_factory.rb

@@ -6,6 +6,28 @@ describe Mercurial::CommitFactory do
     @repository = Mercurial::Repository.open(Fixtures.test_repo)
   end
 
+  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)
+  end
+
+  it "should find commits before specific revision" do
+    commits = @repository.commits.before('63f70b2314ed')
+    commits.size.must_equal 2
+    commits.map(&:hash_id).must_equal %w(bc729b15e2b556065dd4f32c161f54be5dd92776 bf6386c0a0ccd1282dbbe51888f52fe82b1806e3)
+  end
+
+  it "should find commits with limit" do
+    commits = @repository.commits.all(:limit => 1)
+    commits.size.must_equal 1
+  end
+
+  it "should find parent commit" do
+    commit = @repository.commits.parent
+    commit.must_be_kind_of Mercurial::Commit
+  end
+
   it "should find commit by hash" do
     commit = @repository.commits.by_hash_id('bc729b15e2b5')
     commit.author.must_equal 'Ilya Sabanin'
@@ -62,13 +84,18 @@ describe Mercurial::CommitFactory do
     count = @repository.commits.count
     count.must_equal 40
   end
-  
+
+  it "should count range of commits" do
+    count = @repository.commits.count_range('63f70b2314ed', '3cdad3d3ca00')
+    count.must_equal 4
+  end
+
   it "should iterate through commits" do
     @repository.commits.each do |c|
       c.must_be_kind_of Mercurial::Commit
     end
   end
-  
+
   it "should find commits for range" do
     commits = @repository.commits.for_range('bc729b15e2b5', 'a07263ded072')
     commits.map(&:hash_id).sort.must_equal ['bc729b15e2b556065dd4f32c161f54be5dd92776', '63f70b2314ede1e12813cae87f6f303ee8d5c09a', '6157254a442343181939c7af1a744cf2a16afcce', 'a07263ded0729d146062e6ec076cf1e6af214218'].sort
@@ -98,4 +125,4 @@ getting a reasonable exception.
 [1] http://docs.python.org/dev/whatsnew/3.2.html]
   end
   
-end
+end

data/test/test_config_file.rb

@@ -48,6 +48,25 @@ describe Mercurial::ConfigFile do
     repository.config.add_setting("something", "super", "True")
     repository.config.contents.must_equal "[something]\nsuper = True\n"
   end
+
+  it "should detect if setting was already added" do
+    @config.add_setting('hooks', 'incoming', 'hg update')
+    @config.add_setting('somethingelse', 'shikaka', 'True')
+    @config.add_setting('somethingelse', 'monster', 'False')
+    @config.delete_setting!('somethingelse', 'shikaka')
+
+    assert @config.setting_exists?('hooks', 'incoming')
+    assert @config.setting_exists?('somethingelse', 'monster')
+    assert !@config.setting_exists?('somethingelse', 'shikaka')
+    assert !@config.setting_exists?('merge-tools', 'kdiff')
+  end
+
+  it "should raise an error when trying to add a duplicating setting" do
+    @config.add_setting('hooks', 'incoming', 'hg update')
+    assert_raises Mercurial::ConfigFile::DuplicateSetting do
+      @config.add_setting('hooks', 'incoming', 'hg update')
+    end
+  end
   
 private
 
@@ -102,4 +121,4 @@ shikaka = True
 ]
   end
 
-end
+end

data/test/test_file_index.rb

@@ -94,6 +94,16 @@ describe Mercurial::FileIndex do
     @file_index.instance_variable_get('@commit_index').keys.sort.must_equal(['bf6386c0a0ccd1282dbbe51888f52fe82b1806e3', 'bc729b15e2b556065dd4f32c161f54be5dd92776', '63f70b2314ede1e12813cae87f6f303ee8d5c09a', '6157254a442343181939c7af1a744cf2a16afcce', 'a07263ded0729d146062e6ec076cf1e6af214218', '3cdad3d3ca0054ebfcd2652cc83442bd0d272bbb', '25bb5c51fd613b8b58d88ef1caf99da559af51f3', '63e18640e83af60196334f16cc31f4f99c419918', '8fc3d59965d71a9b83308c53a76f3af0235b6eb6', '0f41dd2ec1667518741da599db7264943c9ed472', '16fac694db0a52edfd266576acafb475f7f8420f', '34f85a44acf11c3386f771a65445d6c39e5261d6', '4474d1ddaf653cb7fbf18bb62ff1e39a4e571969', 'cd9fa0c59c7f189fa1d70edea564e534ac9478d0', '611407bf9b369e061eaf0bee1a261c9e62ad713d', 'd14b0c16b21d9d3e08101ef264959a7d91a8b5db', '3e1ea66bdd04dbfb8d91e4f2de3baca218cd4cca', 'bbfe40f4a56961bdfc6b497a19cc35e18f2d40a3', '4e9f11e95eade74c55fc785e3159015f8a472f4b', '11998206a49ca9a55b4065508ce6ca10945e3e73', '1b99d0243f8e5542c1b33a013b63130f9009ac52', '612af4851a6c483f499cadf1dd28040d7996aa78', '54d96f4b1a260dc5614e89c1ed8c2d2edaa4942f', '207476112e024921b1538a096e5f6812d0698cab', 'ea1e37a728e989176e9e7b33f0d0e035fd347623', 'a8b39838302fc5aad12bb6b043331b9ef50149ed'].sort)
   end
   
+  it "should raise error if file_index not found" do
+    @file_index.stubs(:path).returns('/tmp/blablabla')
+    lambda{ @file_index.send(:read_index) }.must_raise Mercurial::FileIndex::IndexFileNotFound
+  end
+  
+  it "should raise error if file_index is too big" do
+    Mercurial::FileIndex.stubs(:max_file_size).returns(1)
+    lambda{ @file_index.send(:read_index) }.must_raise Mercurial::FileIndex::IndexFileTooBig
+  end
+  
 private
 
   # contains two oldest commits only

data/test/test_hook.rb

@@ -36,4 +36,4 @@ describe Mercurial::Hook do
     @repository.hooks.by_name('commit').value.must_equal '/Users/ilya/work/beanstalk/script/mercurial/commit.rb'
   end
 
-end
+end

data/test/test_repository.rb

@@ -6,9 +6,13 @@ describe Mercurial::Repository do
     lambda{ Mercurial::Repository.open('/shikaka/bambucha') }.must_raise Mercurial::RepositoryNotFound
   end
   
-  describe "creating" do
+  describe "when created" do
     before do
       @repository = Mercurial::Repository.create('/tmp/test-hg-repo')
+      File.open(File.join(@repository.dothg_path, 'hgrc'), 'w') do |f|
+        f << "[paths]
+default = #{@repository.file_system_url}"
+      end
     end
     
     after do
@@ -42,6 +46,35 @@ describe Mercurial::Repository do
     it "should respond to diffs" do
       @repository.must_respond_to :diffs
     end
+    
+    it "should have file system url" do
+      @repository.file_system_url.must_equal "file:///tmp/test-hg-repo"
+    end
+    
+    it "should clone" do
+      result = @repository.clone('/tmp/test-hg-repo-clone')
+      assert_kind_of Mercurial::Repository, result
+      assert_equal '/tmp/test-hg-repo-clone', result.path
+      assert FileTest.directory?('/tmp/test-hg-repo-clone/.hg')
+      FileUtils.rm_rf('/tmp/test-hg-repo-clone')
+    end
+    
+    it "should pull" do
+      assert @repository.pull
+    end
+    
+    it "should return paths" do
+      assert_equal({'default' => 'file:///tmp/test-hg-repo'}, @repository.paths)
+    end
+    
+    it "should treat working repository as verified" do
+      assert @repository.verify
+    end
+    
+    it "should treat broken repository as not verified" do
+      FileUtils.rm_rf("#{@repository.dothg_path}/store")
+      assert !@repository.verify
+    end
   end
   
   describe "destroying" do
@@ -55,4 +88,4 @@ describe Mercurial::Repository do
     end
   end
 
-end
+end

data/test/test_shell.rb

@@ -9,13 +9,13 @@ describe Mercurial::Shell do
   
   it "should compile commands" do    
     command_mock = mock('command', :execute => true)
-    Mercurial::Command.expects(:new).with("cd #{ @repository.path } && /usr/local/bin/hg log", :repository => @repository, :cache => true).returns(command_mock).once
+    Mercurial::Command.expects(:new).with("cd #{ @repository.path } && /usr/local/bin/hg log", :repository => @repository, :append_hg => true).returns(command_mock).once
     @shell.hg('log')
   end
   
   it "should sanitize command arguments" do
     command_mock = mock('command', :execute => true)
-    Mercurial::Command.expects(:new).with(%Q[ls 'file with nasty '\\''quote'], :repository => nil, :cache => true).returns(command_mock).once
+    Mercurial::Command.expects(:new).with(%Q[ls 'file with nasty '\\''quote'], {}).returns(command_mock).once
     @shell.run(["ls ?", "file with nasty 'quote"])
   end
   
@@ -26,8 +26,8 @@ describe Mercurial::Shell do
   
   it "should execute commands without cache" do
     command_mock = mock('command', :execute => true)
-    Mercurial::Command.expects(:new).with('ls -l /', :repository => nil, :cache => false).returns(command_mock).once
+    Mercurial::Command.expects(:new).with('ls -l /', :cache => false).returns(command_mock).once
     Mercurial::Shell.run('ls -l /', :cache => false)
   end
   
-end
+end

metadata

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