mercurial-ruby 0.7.0 → 0.7.1

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gem "open4", "~>1.3.0"
+
 group :development do
   gem "minitest", ">= 0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -11,6 +11,7 @@ GEM
       rbx-require-relative (> 0.0.4)
     minitest (2.3.1)
     mocha (0.9.12)
+    open4 (1.3.0)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
     rcov (0.9.9)
@@ -28,5 +29,6 @@ DEPENDENCIES
   jeweler (~> 1.6.4)
   minitest
   mocha (~> 0.9)
+  open4 (~> 1.3.0)
   rcov
   ruby-debug (~> 0.10)

data/README.rdoc

@@ -52,14 +52,21 @@ See Features section below for a full list of entities and their methods.
 
 === Mercurial Entities
 
+* {Mercurial::Repository Repository}
+* {Mercurial::ConfigFile .hgrc} — hooks and various settings
 * {Mercurial::Commit Commits}
 * {Mercurial::Node Nodes} — files and directories
 * {Mercurial::Branch Branches}
 * {Mercurial::Tag Tags}
 * {Mercurial::Diff Diffs}
+* {Mercurial::Blame Blame}
 * {Mercurial::Manifest Manifest}
 * {Mercurial::FileIndex File Index}
-* {Mercurial::ConfigFile Repository config} — hooks and various settings
+
+=== Custom Commands
+
+You can use {Mercurial::Shell Shell} class to execute custom shell commands that
+weren't added to the gem as first-class citizens yet.
 
 === Built-in Caching
 
@@ -77,6 +84,12 @@ Here's how you configure it:
 The gem is using a single method of the CacheStore called +fetch+.
 Cache expires automatically when repository's mtime changes, and it's your job to update it.
 
+=== Built-in Timeouts 
+
+You can provide a timeout for pretty much any command you are running. Do it like this:
+
+ repository.commits.all(:timeout => 5)
+
 == Contributing to mercurial-ruby
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/mercurial-ruby.rb

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

data/lib/mercurial-ruby/blame.rb

@@ -1,5 +1,12 @@
 module Mercurial
   
+  #
+  # The class represents Mercurial blame output. Obtained by running an +hg blame+ command.
+  #
+  # This is for the Blame object itself, {Mercurial::BlameFactory BlameFactory} is responsible
+  # for assembling instances of the Blame. For the list of all possible blame-related operations please 
+  # look documentation for {Mercurial::BlameFactory BlameFactory}.
+  #
   class Blame
     
     attr_reader :repository
@@ -9,7 +16,10 @@ module Mercurial
       @repository = repository
       @contents = data
     end
-    
+
+    #
+    # Returns an array of {Mercurial::BlameLine BlameLine} instances.
+    #
     def lines
       [].tap do |result|
         contents.each do |line|

data/lib/mercurial-ruby/blame_line.rb

@@ -1,10 +1,20 @@
 module Mercurial
-  
+
+  #
+  # The class represents a single line of the Mercurial blame output.
+  #  
   class BlameLine
     
+    # Commit author.
     attr_reader :author
+
+    # Line number.
     attr_reader :num
+
+    # ID of the commit associated with the line.
     attr_reader :revision
+
+    # Contents of the line.
     attr_reader :contents
     
     def initialize(attrs={})

data/lib/mercurial-ruby/command.rb

@@ -1,9 +1,14 @@
 require 'timeout'
 require 'digest/md5'
+require 'open4'
 
 module Mercurial
   class CommandError < Error; end
   
+  #
+  # This class represents a command that will be executed in a shell. You probably don't want to deal with this yourself, 
+  # use the {Mercurial::Shell Shell} class instead.
+  #
   class Command
     attr_accessor :command, :repository, :use_cache, :timeout
     
@@ -47,8 +52,8 @@ module Mercurial
     def execution_proc
       Proc.new do
         debug(command)
-        result, error = '', ''        
-        Open3.popen3(command) do |_, stdout, stderr|
+        result, error, = '', ''
+        status = Open4.popen4(command) do |pid, stdin, stdout, stderr|
           Timeout.timeout(timeout) do
             while tmp = stdout.read(102400)
               result += tmp
@@ -59,12 +64,13 @@ module Mercurial
             error += tmp
           end
         end
-        raise_error_if_needed(error)
+        raise_error_if_needed(status, error)
         result
       end
     end
     
-    def raise_error_if_needed(error)
+    def raise_error_if_needed(status, error)
+      return if status.exitstatus == 0
       if error && error != ''
         raise CommandError, error
       end
@@ -77,7 +83,7 @@ module Mercurial
     def debug(msg)
       if Mercurial.configuration.debug_mode
         puts msg
-      end 
+      end
     end
     
   end

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

@@ -1,14 +1,26 @@
 module Mercurial
   
+  #
+  # This class represents a factory for {Mercurial::Blame Blame} instances.
+  #
   class BlameFactory
     include Mercurial::Helper
     
+    # Instance of a {Mercurial::Repository Repository}.
     attr_reader :repository
     
     def initialize(repository)
       @repository = repository
     end
-    
+
+    # Finds a blame for a specified file path at a specified revision.
+    # Returns an instance of {Mercurial::Blame Blame}.
+    #
+    # Omit +revision+ if you want the latest blame.
+    #
+    # === Example:
+    #  repository.blames.for_path('some-fancy-directory/all-blame-is-on-me.rb')
+    #
     def for_path(path, revision=nil, cmd_options={})
       revision ||= 'tip'
       build do

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

@@ -15,7 +15,7 @@ module Mercurial
     
     # Return an array of {Mercurial::Branch Branch} instances for all branches in the repository.
     #
-    # == Example:
+    # === Example:
     #  repository.branches.all 
     #
     def all(cmd_options={})
@@ -26,44 +26,44 @@ module Mercurial
 
     # Run a block for every {Mercurial::Branch Branch} instance of all branches in the repository.
     #
-    # == Example:
+    # === Example:
     #  repository.branches.each {|commit| ... }
     #
-    def each(&block)
-      all.each do |branch|
+    def each(cmd_options={}, &block)
+      all(cmd_options).each do |branch|
         block.call(branch)
       end
     end
     
     # Return an array of {Mercurial::Branch Branch} instances for all active branches in the repository.
     #
-    # == Example:
+    # === Example:
     #  repository.branches.active
     #
-    def active
-      all.find_all do |b|
+    def active(cmd_options={})
+      all(cmd_options).find_all do |b|
         b.active?
       end
     end
     
     # Return an array of {Mercurial::Branch Branch} instances for all closed branches in the repository.
     #
-    # == Example:
+    # === Example:
     #  repository.branches.closed
     #
-    def closed
-      all.find_all do |b|
+    def closed(cmd_options={})
+      all(cmd_options).find_all do |b|
         b.closed?
       end
     end
     
     # Return a {Mercurial::Branch Branch} instance for a branch with a specified name.
     #
-    # == Example:
+    # === Example:
     #  repository.branches.by_name('branchname')
     #
-    def by_name(name)
-      all.find do |b|
+    def by_name(name, cmd_options={})
+      all(cmd_options).find do |b|
         b.name == name
       end
     end
@@ -71,7 +71,7 @@ module Mercurial
     # Return an array of {Mercurial::Branch Branch} instances where a specified commit exists.
     # Experimental, doesn't always return a correct list of branches.
     #
-    # == Example:
+    # === Example:
     #  repository.branches.for_commit('291a498f04e9')
     #
     def for_commit(hash_id, cmd_options={})

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

@@ -15,7 +15,7 @@ module Mercurial
 
     # Return a parent commit for this working copy.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.parent
     #
     def parent(cmd_options={})
@@ -27,7 +27,7 @@ module Mercurial
     # Return an array of {Mercurial::Commit Commit} instances for all changesets in the repository.
     # Accept a :limit setting.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.all
     #  repository.commits.all(:limit => 15)
     #
@@ -41,18 +41,18 @@ module Mercurial
     
     # Run a block for every {Mercurial::Commit Commit} instance of all changesets in the repository.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.each {|commit| ... }
     #
-    def each(&block)
-      all.each do |commit|
+    def each(cmd_options={}, &block)
+      all(cmd_options).each do |commit|
         block.call(commit)
       end
     end
     
     # Count all changesets in the repository.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.count
     #
     def count(cmd_options={})
@@ -63,7 +63,7 @@ module Mercurial
 
     # Count changesets in the range from hash_a to hash_b in the repository.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.count_range(hash_a, hash_b)
     #
     def count_range(hash_a, hash_b, cmd_options={})
@@ -74,7 +74,7 @@ module Mercurial
     
     # Return an array of {Mercurial::Commit Commit} instances for changesets in a specific branch.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.by_branch('brancname')
     #
     def by_branch(branch, cmd_options={})
@@ -85,7 +85,7 @@ module Mercurial
     
     # Return an instance of {Mercurial::Commit Commit} for a changeset with a specified id.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.by_hash_id('291a498f04e9')
     #
     def by_hash_id(hash, cmd_options={})
@@ -96,7 +96,7 @@ module Mercurial
     
     # Return an array of {Mercurial::Commit Commit} instances for changesets with specified ids.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.by_hash_ids('291a498f04e9', '63f70b2314ed')
     #
     def by_hash_ids(*args)
@@ -117,7 +117,7 @@ module Mercurial
     
     # Return an array of {Mercurial::Commit Commit} instances for a specified range of changeset ids.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.for_range('bf6386c0a0cc', '63f70b2314ed')
     #
     def for_range(hash_a, hash_b, options={}, cmd_options={})
@@ -129,7 +129,7 @@ module Mercurial
 
     # Return an array of {Mercurial::Commit Commit} instances that appear in hg log before the specified revision id.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.before('bf6386c0a0cc')
     #
     def before(hash_id, options={}, cmd_options={})
@@ -138,7 +138,7 @@ module Mercurial
 
     # Return an array of {Mercurial::Commit Commit} instances that appear in hg log after the specified revision id.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.after('bf6386c0a0cc')
     #
     def after(hash_id, options={}, cmd_options={})
@@ -147,7 +147,7 @@ module Mercurial
     
     # Return an instance of {Mercurial::Commit Commit} for a repository's tip changeset (latest).
     #
-    # == Example:
+    # === Example:
     #  repository.commits.tip
     #
     def tip(cmd_options={})
@@ -159,7 +159,7 @@ module Mercurial
 
     # Return an array of {Mercurial::Commit Commit} instances that appear in hg log as ancestors of the specified commit ID.
     #
-    # == Example:
+    # === Example:
     #  repository.commits.ancestors_of('bf6386c0a0cc')
     #
     def ancestors_of(hash_id, options={}, cmd_options={})

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

@@ -16,7 +16,7 @@ module Mercurial
     # Returns an array of {Mercurial::Diff Diff} instances for a specified
     # instance of {Mercurial::Commit Commit}. Represents changeset's diffs.
     #
-    # == Example:
+    # === Example:
     #  commit = repository.commits.by_hash_id('291a498f04e9')
     #  repository.diffs.for_commit(commit)
     #

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

@@ -1,13 +1,23 @@
 module Mercurial
   
+  #
+  # This class is a handy way to manage hooks in your repository.
+  #
   class HookFactory
     
+    # Instance of {Mercurial::Repository Repository}.
     attr_reader :repository
     
     def initialize(repository)
       @repository = repository
     end
     
+    #
+    # Finds all repository hooks. Returns an array of {Mercurial::Hook Hook} instances.
+    #
+    # === Example:
+    #  repository.hooks.all
+    #
     def all
       [].tap do |returning|
         repository.config.find_header('hooks').each_pair do |name, value|
@@ -16,18 +26,36 @@ module Mercurial
       end
     end
     
+    #
+    # Finds a specific hook by it's name. Returns an instance of {Mercurial::Hook Hook}.
+    #
+    # === Example:
+    #  repository.hooks.by_name('changegroup')
+    #
     def by_name(name)
       all.find do |h|
         h.name == name.to_s
       end
     end
     
+    #
+    # Adds a new hook to the repository.
+    #
+    # === Example:
+    #  repository.hooks.add('changegroup', 'do_something')
+    #
     def add(name, value)
       build(name, value).tap do |hook|
         hook.save
       end
     end
     
+    #
+    # Removes a hook from the repository.
+    #
+    # === Example:
+    #  repository.hooks.remove('changegroup')
+    #
     def remove(name)
       if hook = by_name(name)
         hook.destroy!

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

@@ -6,7 +6,7 @@ module Mercurial
   #
   class NodeFactory
     
-    # Instance of {Mercurial::Repository Repository}.
+    # Instance of a {Mercurial::Repository Repository}.
     attr_reader :repository
     
     def initialize(repository)
@@ -19,7 +19,7 @@ module Mercurial
     # Will find node in the latest version of repo if revision is ommitted.
     # Will return nil if node wasn't found.
     #
-    # == Example:
+    # === Example:
     #  repository.nodes.find('/')
     #  repository.nodes.find('some-fancy-directory/Weird File Name.pdf', '291a498f04e9')
     #  repository.nodes.find('some-fancy-directory/subdirectory/', '291a498f04e9')
@@ -58,7 +58,7 @@ module Mercurial
     #
     # Will find node in the latest version of repo if revision is ommitted.
     #
-    # == Example:
+    # === Example:
     #  repository.nodes.entries_for('/')
     #  repository.nodes.entries_for('some-fancy-directory/subdirectory/', '291a498f04e9')
     #

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

@@ -15,7 +15,7 @@ module Mercurial
     
     # Return an array of {Mercurial::Tag Tag} instances for all tags in the repository.
     #
-    # == Example:
+    # === Example:
     #  repository.tags.all 
     #
     def all(cmd_options={})
@@ -26,11 +26,11 @@ module Mercurial
     
     # Return a {Mercurial::Tag Tag} instance for a tag with a specified name.
     #
-    # == Example:
+    # === Example:
     #  repository.tags.by_name('tagname')
     #
-    def by_name(name)
-      all.find do |b|
+    def by_name(name, cmd_options={})
+      all(cmd_options).find do |b|
         b.name == name
       end
     end

data/lib/mercurial-ruby/file_index.rb

@@ -2,7 +2,7 @@ module Mercurial
 
   # This class was ported from grit.
   #
-  # This implements a file-based 'file index', an simple index of
+  # It implements a file-based 'file index', a simple index of
   # all of the reachable commits in a repo, along with the parents
   # and which files were modified during each commit.
   #

data/lib/mercurial-ruby/manifest.rb

@@ -21,7 +21,7 @@ module Mercurial
     # Returns contents of the manifest as a String at a specified revision.
     # Latest version of the manifest is used if +revision+ is ommitted.
     #
-    # == Example:
+    # === Example:
     #  repository.manifest.contents
     #
     def contents(revision=nil, cmd_options={})
@@ -32,7 +32,7 @@ module Mercurial
     # Returns an array of file paths from manifest that start with the specified +path+ at a specified +revision+.
     # Latest version of the manifest is used if +revision+ is ommitted.
     #
-    # == Example:
+    # === Example:
     #  repository.manifest.scan_for_path('/')
     #  repository.manifest.scan_for_path('some-interesting-directory/', '2d32410d9629')
     #

data/lib/mercurial-ruby/node.rb

@@ -1,13 +1,9 @@
 module Mercurial
   
   #
-  # The class represents Mercurial file or directory. Data obtained by scanning +hg manifest+ output.
+  # This class represents a file or a directory stored inside a repository. The data is provided by {Mercurial::Manifest Manifest}.
   #
-  # The class represents Node object itself, {Mercurial::NodeFactory NodeFactory} is responsible
-  # for assembling instances of Node. For the list of all possible branch-related operations please 
-  # look documentation for {Mercurial::NodeFactory NodeFactory}.
-  #
-  # Additionally {Mercurial::Manifest Manifest} is responsible for reading and scanning the manifest.
+  # To see how Node instances are assembled, check the {Mercurial::NodeFactory NodeFactory}.
   #
   class Node
     include Mercurial::Helper

data/lib/mercurial-ruby/repository.rb

@@ -1,12 +1,28 @@
 module Mercurial  
   class RepositoryNotFound < Error; end
   
+  #
+  # This class represents a Mercurial repository. Most of the time you will use this as a proxy for
+  # all your hg operations.
+  #
   class Repository
     
+    #
+    # Creates a new repository on disk. Returns a {Mercurial::Repository Repository} instance.
+    #
+    # === Example:
+    #  Mercurial::Repository.create("/Users/ilya/Desktop/cool_repository")
+    #
     def self.create(destination)
       init_repository(destination)      
     end
     
+    #
+    # Opens an existing repository on disk. Returns a {Mercurial::Repository Repository} instance.
+    #
+    # === Example:
+    #  Mercurial::Repository.open("/Users/ilya/Desktop/existing-repo")
+    #
     def self.open(destination)
       if File.exists?(destination)
         new(destination)
@@ -15,6 +31,12 @@ module Mercurial
       end
     end
 
+    #
+    # Creates a clone of an existing repository via URL.
+    #
+    # === Example:
+    #  Mercurial::Repository.clone("file:///Users/ilya/Desktop/existing-repo", "/path/to/the/clone")
+    #
     def self.clone(url, destination, cmd_options)
       create_destination(destination)
       opts = cmd_options.merge(:append_hg => true)
@@ -26,50 +48,86 @@ module Mercurial
       @path = source
     end
     
+    #
+    # Returns an instance of {Mercurial::Shell Shell} attached to the repository.
+    #
     def shell
       @_shell ||= Mercurial::Shell.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::ConfigFile ConfigFile} attached to the repository.
+    #
     def config
       @_config ||= Mercurial::ConfigFile.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::HookFactory HookFactory} attached to the repository.
+    #
     def hooks
       @_hook_factory ||= Mercurial::HookFactory.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::CommitFactory CommitFactory} attached to the repository.
+    #
     def commits
       @_commits ||= Mercurial::CommitFactory.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::BranchFactory BranchFactory} attached to the repository.
+    #
     def branches
       @_branches ||= Mercurial::BranchFactory.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::TagFactory TagFactory} attached to the repository.
+    #
     def tags
       @_tags ||= Mercurial::TagFactory.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::DiffFactory DiffFactory} attached to the repository.
+    #
     def diffs
       @_diffs ||= Mercurial::DiffFactory.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::NodeFactory NodeFactory} attached to the repository.
+    #
     def nodes
       @_nodes ||= Mercurial::NodeFactory.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::BlameFactory BlameFactory} attached to the repository.
+    #
     def blames
       @_blames ||= Mercurial::BlameFactory.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::Manifest Manifest} attached to the repository.
+    #
     def manifest
       @_manifest ||= Mercurial::Manifest.new(self)
     end
     
+    #
+    # Returns an instance of {Mercurial::FileIndex FileIndex} attached to the repository.
+    #
     def file_index
       @_file_index ||= Mercurial::FileIndex.new(self)
     end
     
+    #
+    # Shortcut for +nodes.find+.
+    #
     def node(name, hash_id)
       nodes.find(name, hash_id)
     end
@@ -78,17 +136,29 @@ module Mercurial
       self.class.clone(file_system_url, destination_path, cmd_options)
     end
     
+    #
+    # Pull from an origin.
+    #
+    # === Example:
+    #  repository.pull
+    #
     def pull(origin='default', cmd_options={})
       shell.hg(['pull ?', origin], cmd_options)
     end
     
+    #
+    # Run +hg verify+ on the repository. Returns +true+ if verified, +false+ otherwise.
+    #
     def verify
       shell.hg('verify')
       true
     rescue Mercurial::CommandError
       false
     end
-    
+
+    #
+    # Returns an array of repository's paths (as remotes).
+    #
     def paths
       {}.tap do |result|
         shell.hg('paths').each do |line|
@@ -98,6 +168,9 @@ module Mercurial
       end
     end
     
+    #
+    # Deletes the repository from disk.
+    #
     def destroy!
       FileUtils.rm_rf(path)
     end
@@ -118,6 +191,21 @@ module Mercurial
       File.mtime(dothg_path).to_i
     end
     
+    #
+    # Accepts a block, executes all commands inside the block with caching disabled.
+    #
+    # === Example:
+    #
+    #  repository.no_cache do
+    #    repository.commits.all
+    #    repository.branches.all
+    #  end
+    #
+    # Same as:
+    #
+    #  repository.commits.all :cache => false
+    #  repository.branches.all :cache => false
+    #
     def no_cache
       @cache_disabled_by_override = true
       yield

data/lib/mercurial-ruby/shell.rb

@@ -1,9 +1,56 @@
 module Mercurial
   
+  #
+  # This is a tiny helper class that makes it simple for you to execute shell commands.
+  # Use it to execute hg commands that don't have a proper wrappers yet. 
+  #
   class Shell
     
     attr_reader :repository
     
+    #
+    # Creates a {Mercurial::Command Command} instance and executes it. Supports a few neat options:
+    #
+    # ==== :append_hg
+    #
+    # You don't have to worry about specifying a correct path to your hg binary every time you want to execute a command:
+    #
+    #   Shell.run("help", :append_hg => true)
+    #
+    # ==== Arguments interpolation
+    #
+    # Interpolation make your commands secure by escaping dangerous characters and wrapping everything in quotes:
+    #
+    #  Shell.run(["clone ? ?", url, destination], :append_hg => true)
+    #
+    # ==== :in
+    #
+    # Allows you to execute commands in a specific directory:
+    #
+    #  Shell.run('log', :in => repository_path)
+    #
+    # ==== :pipe
+    #
+    # Gives you piping flexibility:
+    #
+    #  Shell.run('log', :pipe => "grep '9:0f41dd2ec166' -wc", :in => repository_path)
+    #
+    # Same as running +hg log | grep '9:0f41dd2ec166' -wc+
+    #
+    # ==== :timeout
+    #
+    # Specify a timeout in seconds for your command:
+    #
+    #  Shell.run("/usr/bin/long-running-task", :timeout => 5)
+    #
+    # +Timeout::Error+ will be raised on timeout.
+    #
+    # ==== :cache
+    #
+    # Caching is enabled by default for all commands. Use this setting to avoid it:
+    #
+    #  Shell.run("init", :append_hg => true, :cache => false)
+    # 
     def self.run(cmd, options={})
       build = []
 
@@ -33,13 +80,16 @@ module Mercurial
       @repository = repository
     end
     
+    #
+    # This method is a shortcut to +Shell.run(cmd, :append_hg => true, :in => repository.path)+.
+    #
     def hg(cmd, options={})
       options[:in] ||= repository.path
       options[:repository] = repository
       options[:append_hg] = true
       run(cmd, options)
     end
-    
+
     def run(cmd, options={})
       self.class.run(cmd, options)
     end

data/mercurial-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercurial-ruby}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2012-03-02}
+  s.date = %q{2012-03-05}
   s.description = %q{Ruby API for Mercurial DVCS.}
   s.email = %q{ilya.sabanin@gmail.com}
   s.extra_rdoc_files = [
@@ -92,6 +92,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<open4>, ["~> 1.3.0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -99,6 +100,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["~> 0.9"])
       s.add_development_dependency(%q<ruby-debug>, ["~> 0.10"])
     else
+      s.add_dependency(%q<open4>, ["~> 1.3.0"])
       s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -107,6 +109,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-debug>, ["~> 0.10"])
     end
   else
+    s.add_dependency(%q<open4>, ["~> 1.3.0"])
     s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/test/test_command.rb

@@ -16,6 +16,16 @@ describe Mercurial::Command do
       Mercurial::Command.new("cd #{ @repository.path } && hg shikaka").execute
     }.must_raise Mercurial::CommandError
   end
+
+  it "should not translate exit status of zero with shell errors to ruby exceptions" do
+    Mercurial::Command.new("echo stderr >&2 && echo stdout && exit 0").execute.strip.must_equal "stdout"
+  end
+
+  it "should translate exit status of non-zero with shell errors to ruby exceptions" do
+    lambda{
+      Mercurial::Command.new("echo stderr >&2 && echo stdout && exit 1").execute
+    }.must_raise Mercurial::CommandError
+  end
   
   it "should execute commands with timeout" do
     Mercurial.configuration.stubs(:shell_timeout).returns(1)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mercurial-ruby
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -15,14 +15,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 -05:00
+date: 2012-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: open4
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: minitest
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +47,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +63,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +79,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +93,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: mocha
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,12 +108,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: ruby-debug
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,7 +123,7 @@ dependencies:
         - 0
         - 10
         version: "0.10"
-  requirement: *id006
+  requirement: *id007
 description: Ruby API for Mercurial DVCS.
 email: ilya.sabanin@gmail.com
 executables: []