hglib 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b890e1ab00998d1042bb8d586771adfcfe352679da65905af0efd0953368b66b
-  data.tar.gz: 0710da264e90e0fc3a4be8815ad313b5eff34523c7e070db3ecb1014dcf25efa
+  metadata.gz: 8c3e4ce0e0a5a9fae8575225359cc5b8e922cfd009b1ceade3a3ed4f4a9865a9
+  data.tar.gz: 5d1e25766012a16829958a194398394eed379555369e36e8c1617641e9ad6da8
 SHA512:
-  metadata.gz: 40377af3d802f96c7256e77aca8d6bce7d255aa2cc84e050166079649f16c3454bb5e6c8de2ad3f2086c5ccbf873634db9a071b3f6acf5eb0af9f5629349a0ff
-  data.tar.gz: e923e390dec969cfa4a5831d242fa0169458d64aafe1b365ab0422f1f85d135e58907cdbedc983391b5d06d55a801396ff9d3a6c35c60d0e93e0814dcf3ec45b
+  metadata.gz: 7f61ab1c13cea52539d27ed42837e58c0be53e4472881c8e5d4e08d9db43bdbf71fbaed4b2fc6b52ea75e14bcdf135121e430449d2953f9ce5c9ad3ee77201d8
+  data.tar.gz: 86e692ee3e36cc058266f644bb84ea2cceeacc2d2f19c6a5898719b67786ffda938843622dbdc28e232d09c4f50ac5785ac8fbe2ddf372a7c0b5b1e679ca0fa1

data/History.md

@@ -2,6 +2,16 @@
 
 ---
 
+## v0.5.0 [2019-10-14] Michael Granger <ged@FaerieMUD.org>
+
+Improvements:
+
+- Add a mechanism for defining methods that support Mercurial extensions
+- Move the version methods into a mixin and expose them on both Hglib and
+  Hglib::Repo instances.
+- Add an extension for gpg
+
+
 ## v0.4.0 [2019-10-12] Michael Granger <ged@FaerieMUD.org>
 
 Changes:

data/lib/hglib.rb

@@ -12,7 +12,7 @@ module Hglib
 	       Exception2MessageMapper
 
 	# Package version
-	VERSION = '0.4.0'
+	VERSION = '0.5.0'
 
 	# Version control revision
 	REVISION = %q$Revision$
@@ -30,15 +30,18 @@ module Hglib
 	# Base exception class for errors raised by this library
 	def_exception :Error, "hglib error"
 
-
+	# Specialized exception for handling errors returned by the command server.
 	class CommandError < Hglib::Error
 
-		def initialize( args )
-			@command = args.shift
-			@messages = args.flatten.map( &:chomp )
+		### Create a new CommandError with the given +args+.
+		def initialize( command, *messages, details: nil )
+			@command = command
+			@messages = messages.flatten.map( &:chomp )
 			@messages << "error in hg command" if @messages.empty?
+			@details = details
 		end
 
+
 		##
 		# The command that resulted in an error
 		attr_reader :command
@@ -47,6 +50,10 @@ module Hglib
 		# The Array of error messages generated by the command
 		attr_reader :messages
 
+		##
+		# Additional details of the error
+		attr_reader :details
+
 
 		### Returns +true+ if the command resulted in more than one error message.
 		def multiple?
@@ -54,7 +61,7 @@ module Hglib
 		end
 
 
-		### Overridden to for multi-message errors.
+		### Overridden to format multi-message errors in a more-readable way.
 		def message
 			msg = String.new( encoding: 'utf-8' )
 
@@ -69,12 +76,46 @@ module Hglib
 				msg << ' ' << self.messages.first
 			end
 
+			msg << "\n" << self.details if self.details
+
 			return msg
 		end
 
 	end # class CommandError
 
 
+	# Exception raised when a command failed because the extension it belongs to was
+	# disabled.
+	class DisabledExtensionError < Hglib::Error
+
+		### Create a new instance for the given +command+ and the name of the
+		### +extension+ which defines it.
+		def initialize( command, extension )
+			@command = command
+			@extension = extension
+		end
+
+
+		##
+		# The command that failed
+		attr_reader :command
+
+		##
+		# The name of the extension which defines the #command
+		attr_reader :extension
+
+
+		### Return an message describing what the command and disabled extension were.
+		def message
+			return "`%s`: command is provided by disabled extension `%s`" % [
+				self.command,
+				self.extension,
+			]
+		end
+
+	end # class DisabledError
+
+
 	# Loggability API -- set up a Logger for Hglib objects
 	log_as :hglib
 
@@ -95,6 +136,8 @@ module Hglib
 	autoload :Config, 'hglib/config'
 	autoload :Server, 'hglib/server'
 	autoload :Repo, 'hglib/repo'
+	autoload :Extension, 'hglib/extension'
+	autoload :VersionInfo, 'hglib/version_info'
 
 
 	### Return an Hglib::Server started with no repository.
@@ -149,36 +192,8 @@ module Hglib
 	end
 
 
-	### Fetch a Hash of version information about the Mercurial that is being used.
-	def self::versions
-		response = self.server.run_with_json_template( :version )
-		self.logger.debug "Got a VERSION response: %p" % [ response ]
-
-		return response.first
-	end
-
-
-	### Fetch the version of Mercurial that's being used as a String.
-	def self::version
-		return self.versions[ :ver ]
-	end
-
-
-	### Fetch the version of the Mercurial extensions that're being used as a Hash.
-	def self::extension_versions
-		ext_info = self.versions[ :extensions ]
-		return ext_info.each_with_object({}) do |ext, hash|
-			ext = ext.dup
-			hash[ ext.delete(:name).to_sym ] = ext
-		end
-	end
-
-
-	### Returns +true+ if the extension with the given +name+ is enabled in the
-	### current (global) configuration.
-	def self::extension_enabled?( name )
-		return self.extension_versions.key?( name.to_sym )
-	end
+	extend Hglib::VersionInfo
+	Hglib::Extension.load_all
 
 end # module Hglib
 

data/lib/hglib/extension.rb

@@ -0,0 +1,50 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'pathname'
+require 'loggability'
+
+require 'hglib' unless defined?( Hglib )
+
+
+module Hglib::Extension
+	extend Loggability
+
+	# Loggability API -- log to the Hglib logger
+	log_to :hglib
+
+
+	### Load all of the extensions.
+	def self::load_all
+		# :TODO: Allow gem extensions?
+		extdir = Pathname( __FILE__ ).dirname + 'extension'
+		Pathname.glob( extdir + '*.rb' ).each do |extpath|
+			self.log.debug "Loading extensions from %s" % [ extpath ]
+			require( extpath )
+		end
+	end
+
+
+	### Define one or more commands that should be attached to Repo objects.
+	def repo_commands( &block )
+		raise LocalJumpError, "no block given" unless block
+
+		mod = Module.new
+		mod.class_eval( &block )
+
+		Hglib::Repo.include( mod )
+	end
+
+
+	### Define one or more commands that should be attached to the Hglib module.
+	def global_commands( &block )
+		raise LocalJumpError, "no block given" unless block
+
+		mod = Module.new
+		mod.class_eval( &block )
+
+		Hglib.extend( mod )
+	end
+
+end # module Hglib::Extension
+

data/lib/hglib/extension/gpg.rb

@@ -0,0 +1,36 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'hglib/extension' unless defined?( Hglib::Extension )
+
+
+module Hglib::Extension::GPG
+	extend Hglib::Extension
+
+
+	repo_commands do
+
+		### Sign the given +rev+ (or the current one if not specified).
+		def sign( rev=nil, **options )
+			response = self.server.run( :sign, rev, **options )
+			return response.chomp
+		end
+
+
+		### Check the signature of the given +rev+.
+		def sigcheck( rev, **options )
+			response = self.server.run( :sigcheck, rev, **options )
+			return response.chomp
+		end
+
+
+		### Return an Array describing all of the signed changesets.
+		def sigs( **options )
+			response = self.server.run( :sigs, **options )
+			return response.lines.map( &:chomp )
+		end
+
+	end
+
+end # module Hglib::Extension::GPG
+

data/lib/hglib/mixins.rb

@@ -57,7 +57,10 @@ module Hglib
 		def attr_predicate( attrname )
 			attrname = attrname.to_s.chomp( '?' )
 			define_method( "#{attrname}?" ) do
-				instance_variable_get( "@#{attrname}" ) ? true : false
+				ivar = "@#{attrname}"
+				instance_variable_defined?( ivar ) && instance_variable_get( ivar ) ?
+					true :
+					false
 			end
 		end
 

data/lib/hglib/repo.rb

@@ -3,11 +3,14 @@
 
 require 'json'
 require 'loggability'
+
 require 'hglib' unless defined?( Hglib )
+require 'hglib/version_info'
 
 
 class Hglib::Repo
 	extend Loggability
+	include Hglib::VersionInfo
 
 	# Loggability API -- log to the hglib logger
 	log_to :hglib
@@ -48,7 +51,6 @@ class Hglib::Repo
 	### requested statuses.
 	def status( *args, **options )
 		response = self.server.run_with_json_template( :status, *args, **options )
-		self.logger.debug "Parsing status response: %p" % [ response ]
 
 		return response.map {|entry| Hglib::Repo::StatusEntry.new(entry) }
 	end
@@ -60,7 +62,6 @@ class Hglib::Repo
 	### of `.` identifies the working directory parent without uncommitted changes.
 	def identify( source=nil, **options )
 		response = self.server.run_with_json_template( :identify, source, **options )
-		self.logger.debug "Got ID response: %p" % [ response ]
 
 		data = response.first
 		return Hglib::Repo::Id.new( **data )
@@ -75,7 +76,6 @@ class Hglib::Repo
 		options[:graph] = false
 
 		entries = self.server.run_with_json_template( :log, *files, **options )
-		self.logger.debug "Got log response: %p" % [ entries ]
 
 		return entries.map {|entry| Hglib::Repo::LogEntry.new(entry) }
 	end
@@ -84,9 +84,7 @@ class Hglib::Repo
 	### Return a String showing differences between revisions for the specified
 	### +files+ in the unified diff format.
 	def diff( *files, **options )
-		response = self.server.run( :diff, *files, **options )
-		self.logger.debug "Got diff response: %p" % [ truncate(response) ]
-		return response
+		return self.server.run( :diff, *files, **options )
 	end
 
 
@@ -98,9 +96,7 @@ class Hglib::Repo
 	###
 	### Returns <code>true</code> if all files are successfully added.
 	def add( *files, **options )
-		response = self.server.run( :add, *files, **options )
-		self.logger.debug "Got ADD response: %p" % [ response ]
-
+		self.server.run( :add, *files, **options )
 		return true
 	end
 
@@ -122,9 +118,7 @@ class Hglib::Repo
 	###
 	### Returns <code>true</code> if all files are successfully added.
 	def addremove( *files, **options )
-		response = self.server.run( :addremove, *files, **options )
-		self.logger.debug "Got ADD response: %p" % [ response ]
-
+		self.server.run( :addremove, *files, **options )
 		return true
 	end
 	alias_method :add_remove, :addremove
@@ -133,9 +127,7 @@ class Hglib::Repo
 
 	### Commit the specified +files+ with the given +options+.
 	def commit( *files, **options )
-		response = self.server.run( :commit, *files, **options )
-		self.logger.debug "Got COMMIT response: %p" % [ response ]
-
+		self.server.run( :commit, *files, **options )
 		return true
 	end
 
@@ -143,9 +135,7 @@ class Hglib::Repo
 	### Pull changes from the specified +source+ (which defaults to the +default+
 	### path) into the local repository.
 	def pull( source=nil, **options )
-		response = self.server.run( :pull, source, **options )
-		self.logger.debug "Got PULL response: %p" % [ response ]
-
+		self.server.run( :pull, source, **options )
 		return true
 	end
 
@@ -160,18 +150,14 @@ class Hglib::Repo
 
 	### Update the working directory or switch revisions.
 	def update( rev=nil, **options )
-		response = self.server.run( :update, rev, **options )
-		self.logger.debug "Got UPDATE response: %p" % [ response ]
-
+		self.server.run( :update, rev, **options )
 		return true
 	end
 
 
 	### Push changes to the specified +destination+.
 	def push( destination=nil, **options )
-		response = self.server.run( :push, destination, **options )
-		self.logger.debug "Got PUSH response: %p" % [ response ]
-
+		self.server.run( :push, destination, **options )
 		return true
 	end
 
@@ -190,8 +176,6 @@ class Hglib::Repo
 	### Return a Hglib::Repo::Tag object for each tag in the repo.
 	def tags
 		response = self.server.run_with_json_template( :tags )
-		self.logger.debug "Got a TAGS response: %p" % [ response ]
-
 		return response.flatten.map {|tag| Hglib::Repo::Tag.new(self, **tag) }
 	end
 
@@ -200,9 +184,7 @@ class Hglib::Repo
 	def bookmark( *names, **options )
 		raise "expected at least one bookmark name" if names.empty?
 
-		response = self.server.run( :bookmark, *names, **options )
-		self.logger.debug "Got BOOKMARK response: %p" % [ response ]
-
+		self.server.run( :bookmark, *names, **options )
 		return true
 	end
 
@@ -211,8 +193,6 @@ class Hglib::Repo
 	def bookmarks
 		options = { list: true }
 		response = self.server.run_with_json_template( :bookmarks, **options )
-		self.logger.debug "Got a BOOKMARKS response: %p" % [ response ]
-
 		return response.map {|bk| Hglib::Repo::Bookmark.new(self, **bk) }
 	end
 
@@ -221,7 +201,6 @@ class Hglib::Repo
 	### object.
 	def config( untrusted: false )
 		options = { untrusted: untrusted }
-
 		config = self.server.run_with_json_template( :showconfig, **options )
 		return Hglib::Config.new( config )
 	end
@@ -230,23 +209,12 @@ class Hglib::Repo
 	### Fetch a Hash of aliases for remote repositories.
 	def paths
 		response = self.server.run_with_json_template( :paths )
-		self.logger.debug "Got a PATHS response: %p" % [ response ]
-
 		return response.each_with_object({}) do |entry, hash|
 			hash[ entry[:name].to_sym ] = URI( entry[:url] )
 		end
 	end
 
 
-	### Sign the given +rev+ (or the current one if not specified).
-	def sign( rev=nil, **options )
-		response = self.server.run( :sign, rev, **options )
-		self.logger.debug "Got a SIGN response: %p" % [ response ]
-
-		return response.chomp
-	end
-
-
 	### Set or show the current phase name for a +revset+.
 	###
 	### With no +revset+, operates on the current changeset.
@@ -263,7 +231,6 @@ class Hglib::Repo
 	### setting the phase.
 	def phase( revset=nil, **options )
 		response = self.server.run( :phase, revset, **options )
-		self.logger.debug "Got a PHASE response: %p" % [ response ]
 
 		return {} if response.empty?
 

data/lib/hglib/repo/status_entry.rb

@@ -0,0 +1,77 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'pathname'
+
+require 'hglib/repo' unless defined?( Hglib::Repo )
+
+
+# An entry in a repository's status list.
+class Hglib::Repo::StatusEntry
+	extend Loggability
+
+
+	# Loggability API -- output to the hglib logger
+	log_to :hglib
+
+
+	# {
+	#   :path=>"Rakefile",
+	#   :status=>"M"
+	# }
+
+	### Create a new log entry from the raw +entryhash+.
+	def initialize( entryhash )
+		@path   = Pathname( entryhash[:path] )
+		@source = Pathname( entryhash[:source] ) if entryhash.key?( :source )
+		@status = entryhash[ :status ]
+	end
+
+
+	######
+	public
+	######
+
+	##
+	# Return the Pathname of the file the status applies to
+	attr_reader :path
+
+	##
+	# The Pathname of the file the status applies to was copied from (if the status
+	# is `A`/`added`) and the addition was via a copy/move operation.
+	attr_reader :source
+
+	##
+	# Return the character that denotes the file's status
+	attr_reader :status
+
+
+	### Return the human-readable status.
+	def status_description
+		return case self.status
+			when 'M' then 'modified'
+			when 'A' then 'added'
+			when 'R' then 'removed'
+			when 'C' then 'clean'
+			when '!' then 'missing'
+			when '?' then 'not tracked'
+			when 'I' then 'ignored'
+			else
+				raise "unknown status %p" % [ self.status ]
+			end
+	end
+
+
+	### Return a human-readable representation of the StatusEntry as a String.
+	def inspect
+		return "#<%p:#%x %s: %s%s>" % [
+			self.class,
+			self.object_id * 2,
+			self.path,
+			self.status_description,
+			self.source ? " via copy/move from #{self.source}" : '',
+		]
+	end
+
+end # class Hglib::Repo::StatusEntry
+

data/lib/hglib/server.rb

@@ -26,6 +26,14 @@ class Hglib::Server
 	# Array#pack template for plain messages sent to the command server
 	MESSAGE_TEMPLATE = 'I>A*'
 
+	# A Regexp to match the detail message when a command belongs to a disabled
+	# extension.
+	EXTENSION_DISABLED_DETAILS = %r{
+		(?-x:is provided by the following extension:)
+		\s+
+		(?<extension_name>\w+)
+	}x
+
 
 	# Loggability API -- send logs to the logger in the top-level module
 	log_to :hglib
@@ -147,7 +155,7 @@ class Hglib::Server
 	### callbacks is not registered, an IOError will be raised.
 	def run( command, *args, **options )
 		args = args.compact
-		self.log.debug "Running command: %p" % [ Shellwords.join([command.to_s] + args) ]
+		self.log.debug { "Running command: %p" % [ Shellwords.join([command.to_s] + args) ] }
 		self.start unless self.started?
 
 		done = false
@@ -184,12 +192,28 @@ class Hglib::Server
 			end
 		end
 
-		raise Hglib::CommandError, [command, *errors] unless errors.empty?
+		self.handle_errors( command, errors, output ) unless errors.empty?
 
+		self.log.debug { "Got %s response: %p" % [ command.to_s.upcase, output ] }
 		return output
 	end
 
 
+	### Form and raise an exception for the given +errors+ resulting from running
+	### +command+.
+	def handle_errors( command, errors, details )
+		err = nil
+
+		if details && (m = details.match(EXTENSION_DISABLED_DETAILS) )
+			err = Hglib::DisabledExtensionError.new( command, m[:extension_name] )
+		else
+			err = Hglib::CommandError.new( command, errors, details: details )
+		end
+
+		raise( err, nil, caller(2) )
+	end
+
+
 	### Run the specified +command+ with the given +args+ with the JSON template and
 	### return the result.
 	def run_with_json_template( command, *args, symbolize: true, **options )
@@ -318,7 +342,7 @@ class Hglib::Server
 
 		self.log.debug "Reading %d more bytes of the message" % [ bytes ]
 		message = self.reader.read( bytes ) unless bytes.zero?
-		self.log.debug "  read message: %p" % [ message ]
+		self.log.debug { "  read message: %p" % [ message ] }
 		return channel, message
 	end
 

data/lib/hglib/version_info.rb

@@ -0,0 +1,40 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'hglib' unless defined?( Hglib )
+
+
+# Version information methods for Repos and the top-level module.
+module Hglib::VersionInfo
+
+	### Fetch a Hash of version information about the Mercurial that is being used.
+	def versions
+		response = self.server.run_with_json_template( :version )
+		return response.first
+	end
+
+
+	### Fetch the version of Mercurial that's being used as a String.
+	def version
+		return self.versions[ :ver ]
+	end
+
+
+	### Fetch the version of the Mercurial extensions that're being used as a Hash.
+	def extension_versions
+		ext_info = self.versions[ :extensions ]
+		return ext_info.each_with_object({}) do |ext, hash|
+			ext = ext.dup
+			hash[ ext.delete(:name).to_sym ] = ext
+		end
+	end
+
+
+	### Returns +true+ if the extension with the given +name+ is enabled in the
+	### current (global) configuration.
+	def extension_enabled?( name )
+		return self.extension_versions.key?( name.to_sym )
+	end
+
+end # module Hglib::VersionInfo
+

data/spec/hglib/extension/gpg_spec.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../../spec_helper'
+
+require 'hglib/extension/gpg'
+
+
+RSpec.describe Hglib::Extension::GPG do
+
+	let( :repo_dir ) do
+		Dir.mktmpdir( ['hglib', 'repodir'] )
+	end
+
+	let( :server ) { instance_double(Hglib::Server) }
+
+	let( :repo ) { Hglib::Repo.new( repo_dir ) }
+
+	before( :each ) do
+		allow( Hglib::Server ).to receive( :new ).and_return( server )
+	end
+
+
+
+	it "can sign a revision" do
+		expect( server ).to receive( :run ).
+			with( :sign, nil, {} ).
+			and_return( "signing 2:2b937981802a\n" )
+
+		expect( repo.sign ).to eq( "signing 2:2b937981802a" )
+	end
+
+end
+

data/spec/hglib/extension_spec.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../spec_helper'
+
+require 'hglib'
+require 'hglib/extension'
+require 'hglib/repo'
+
+
+RSpec.describe Hglib::Extension do
+
+	it "adds methods to support Mercurial extensions when loaded" do
+		described_class.load_all
+		expect( Hglib::Repo.instance_methods ).to include( :sign )
+	end
+
+end
+

data/spec/hglib/repo/status_entry_spec.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby -S rspec -cfd
+
+require_relative '../../spec_helper'
+
+require 'hglib/repo/status_entry'
+
+
+RSpec.describe Hglib::Repo::StatusEntry do
+
+	RAW_STATUS_ENTRY = {
+		path: 'Rakefile',
+		status: 'M',
+	}.freeze
+
+	RAW_COPY_STATUS_ENTRY = {
+		path: "AnotherRakefile",
+		source: "Rakefile",
+		status: "A"
+	}
+
+	it "can be created from the JSON status hash" do
+		entry = described_class.new( RAW_STATUS_ENTRY )
+
+		expect( entry ).to be_a( described_class )
+		expect( entry.path ).to eq( Pathname('Rakefile') )
+		expect( entry.status ).to eq( 'M' )
+		expect( entry.status_description ).to eq( 'modified' )
+	end
+
+
+	it "can be created from the JSON status hash run with --copies enabled" do
+		entry = described_class.new( RAW_COPY_STATUS_ENTRY )
+
+		expect( entry ).to be_a( described_class )
+		expect( entry.path ).to eq( Pathname('AnotherRakefile') )
+		expect( entry.status ).to eq( 'A' )
+		expect( entry.source ).to eq( Pathname('Rakefile') )
+		expect( entry.status_description ).to eq( 'added' )
+	end
+
+end
+

data/spec/hglib/version_info_spec.rb

@@ -0,0 +1,88 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../spec_helper'
+
+require 'loggability'
+require 'hglib/version_info'
+
+
+RSpec.describe Hglib::VersionInfo do
+
+	let( :version_info ) {[{
+		extensions: [
+			{bundled: true,  name: "churn",    ver: nil},
+			{bundled: true,  name: "convert",  ver: nil},
+			{bundled: false, name: "evolve",   ver: "9.2.0"},
+			{bundled: true,  name: "extdiff",  ver: nil},
+			{bundled: true,  name: "gpg",      ver: nil},
+			{bundled: false, name: "hggit",    ver: "0.8.12 (dulwich 0.19.10)"},
+			{bundled: true,  name: "strip",    ver: nil},
+			{bundled: true,  name: "mq",       ver: nil},
+			{bundled: false, name: "prompt",   ver: nil},
+			{bundled: true,  name: "purge",    ver: nil},
+			{bundled: true,  name: "rebase",   ver: nil},
+			{bundled: false, name: "topic",    ver: "0.17.0"},
+			{bundled: true,  name: "histedit", ver: nil}
+		],
+		ver: "5.1.1"
+	}]}
+
+	let( :including_class ) do
+		cls = Class.new do
+			extend Loggability
+			log_to :hglib
+			def initialize( server )
+				@server = server
+			end
+			attr_reader :server
+		end
+		cls.include( described_class )
+		cls
+	end
+
+	let( :server ) { instance_double(Hglib::Server, stop: nil) }
+
+	let( :extended_object ) { including_class.new(server) }
+
+	before( :each ) do
+		expect( server ).to receive( :run_with_json_template ).
+			with( :version ).
+			and_return( version_info ).
+			at_least( :once )
+	end
+
+
+	it "can fetch the versions of Mercurial and loaded extensions" do
+		result = extended_object.versions
+
+		expect( result ).to eq( version_info.first )
+	end
+
+
+	it "can fetch the simple version of Mercurial" do
+		result = extended_object.version
+
+		expect( result ).to eq( version_info.first[:ver] )
+	end
+
+
+	it "can fetch the versions of all loaded Mercurial extensions" do
+		result = extended_object.extension_versions
+
+		expect( result ).to be_a( Hash )
+		expect( result ).to include(
+			churn: {bundled: true, ver: nil},
+			evolve: {bundled: false, ver: '9.2.0'},
+			topic: {bundled: false, ver: '0.17.0'},
+			hggit: {bundled: false, ver: "0.8.12 (dulwich 0.19.10)"}
+		)
+	end
+
+
+	it "knows if a given extension is enabled" do
+		expect( extended_object.extension_enabled?('topic') ).to be_truthy
+		expect( extended_object.extension_enabled?('keyword') ).to be_falsey
+	end
+
+end
+

data/spec/hglib_spec.rb

@@ -86,9 +86,10 @@ RSpec.describe Hglib do
 
 
 		it "can be created with a single error message" do
-			exception = rescued {
-				raise Hglib::CommandError, [:status, "no_status: No such file or directory\n"]
-			}
+			exception = rescued do
+				exc = Hglib::CommandError.new( :status, "no_status: No such file or directory\n" )
+				raise( exc, nil, caller(2) )
+			end
 
 			expect( exception ).to_not be_multiple
 			expect( exception.message ).to eq( "`status`: no_status: No such file or directory" )
@@ -96,13 +97,14 @@ RSpec.describe Hglib do
 
 
 		it "can be created with multiple error messages" do
-			exception = rescued {
-				raise Hglib::CommandError, [
+			exception = rescued do
+				exc = Hglib::CommandError.new(
 					:status,
 					"no_status: No such file or directory\n",
 					"unknown: No such file or directory\n"
-				]
-			}
+				)
+				raise( exc, nil, caller(2) )
+			end
 
 			expect( exception ).to be_multiple
 			expect( exception.message ).to eq( <<~ERROR_MESSAGE )
@@ -112,80 +114,24 @@ RSpec.describe Hglib do
 			ERROR_MESSAGE
 		end
 
-	end
-
-
-
-	describe "version info" do
-
-		let( :version_info ) {[{
-			extensions: [
-				{bundled: true,  name: "churn",    ver: nil},
-				{bundled: true,  name: "convert",  ver: nil},
-				{bundled: false, name: "evolve",   ver: "9.2.0"},
-				{bundled: true,  name: "extdiff",  ver: nil},
-				{bundled: true,  name: "gpg",      ver: nil},
-				{bundled: false, name: "hggit",    ver: "0.8.12 (dulwich 0.19.10)"},
-				{bundled: true,  name: "strip",    ver: nil},
-				{bundled: true,  name: "mq",       ver: nil},
-				{bundled: false, name: "prompt",   ver: nil},
-				{bundled: true,  name: "purge",    ver: nil},
-				{bundled: true,  name: "rebase",   ver: nil},
-				{bundled: false, name: "topic",    ver: "0.17.0"},
-				{bundled: true,  name: "histedit", ver: nil}
-			],
-			ver: "5.1.1"
-		}]}
-
-		let( :server ) { instance_double(Hglib::Server, stop: nil) }
-
-
-		before( :each ) do
-			described_class.reset_server
-			allow( Hglib::Server ).to receive( :new ).and_return( server )
-			expect( server ).to receive( :run_with_json_template ).
-				with( :version ).
-				and_return( version_info ).
-				at_least( :once )
-		end
-		after( :each ) do
-			described_class.reset_server
-		end
-
 
-		it "can fetch the versions of Mercurial and loaded extensions" do
-			result = described_class.versions
+		it "can be created with additional details" do
+			exception = rescued do
+				exc = Hglib::CommandError.new(
+					:sigs,
+					"hg sigs: option -T not recognized\n",
+					details: "hg sigs\n\nlist signed changesets\n\noptions:\n\n" +
+						"  --mq operate on patch repository\n\n(use 'hg sigs -h'" +
+						" to show more help)\n"
+				)
+				raise( exc, nil, caller(2) )
+			end
 
-			expect( result ).to eq( version_info.first )
-		end
-
-
-		it "can fetch the simple version of Mercurial" do
-			result = described_class.version
-
-			expect( result ).to eq( version_info.first[:ver] )
-		end
-
-
-		it "can fetch the versions of all loaded Mercurial extensions" do
-			result = described_class.extension_versions
-
-			expect( result ).to be_a( Hash )
-			expect( result ).to include(
-				churn: {bundled: true, ver: nil},
-				evolve: {bundled: false, ver: '9.2.0'},
-				topic: {bundled: false, ver: '0.17.0'},
-				hggit: {bundled: false, ver: "0.8.12 (dulwich 0.19.10)"}
-			)
-		end
-
-
-		it "knows if a given extension is enabled" do
-			expect( described_class.extension_enabled?('topic') ).to be_truthy
-			expect( described_class.extension_enabled?('keyword') ).to be_falsey
+			expect( exception.details ).to match( /list signed changesets/i )
 		end
 
 	end
 
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hglib
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
   XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -79,19 +79,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: rdoc-generator-sixfish
+  name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 description: |-
   This is a client library for the Mercurial distributed revision control tool
   that uses the {Command Server}[https://www.mercurial-scm.org/wiki/CommandServer] for efficiency.
@@ -106,19 +106,27 @@ files:
 - README.md
 - lib/hglib.rb
 - lib/hglib/config.rb
+- lib/hglib/extension.rb
+- lib/hglib/extension/gpg.rb
 - lib/hglib/mixins.rb
 - lib/hglib/repo.rb
 - lib/hglib/repo/bookmark.rb
 - lib/hglib/repo/id.rb
 - lib/hglib/repo/log_entry.rb
+- lib/hglib/repo/status_entry.rb
 - lib/hglib/repo/tag.rb
 - lib/hglib/server.rb
+- lib/hglib/version_info.rb
 - spec/hglib/config_spec.rb
+- spec/hglib/extension/gpg_spec.rb
+- spec/hglib/extension_spec.rb
 - spec/hglib/mixins_spec.rb
 - spec/hglib/repo/id_spec.rb
 - spec/hglib/repo/log_entry_spec.rb
+- spec/hglib/repo/status_entry_spec.rb
 - spec/hglib/repo_spec.rb
 - spec/hglib/server_spec.rb
+- spec/hglib/version_info_spec.rb
 - spec/hglib_spec.rb
 - spec/spec_helper.rb
 homepage: https://hg.sr.ht/~ged/hglib
@@ -140,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This is a client library for the Mercurial distributed revision control tool