treequel 1.3.2 → 1.4.0

data/ChangeLog

@@ -1,8 +1,87 @@
+2011-01-31  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.4.0 for changeset 9a29615cfb6d
+	[4826f3621e86] [master, tip]
+
+	* .hgsigs:
+	Added signature for changeset 63270598af6b
+	[9a29615cfb6d] [v1.4.0]
+
+	* History.md, lib/treequel.rb:
+	Bumped minor version and updated History file for release.
+	[63270598af6b]
+
+	* lib/treequel/constants.rb, lib/treequel/filter.rb,
+	spec/treequel/filter_spec.rb:
+	Escape filter metacharacters in simple filter components
+	[a4a5a436af47] [github/master]
+
+	* Rakefile, manual/resources/fonts/GraublauWeb.otf,
+	manual/resources/fonts/GraublauWebBold.otf,
+	manual/resources/fonts/Inconsolata.otf, manual/src/models.page:
+	More work on the 'Models' section of the manual.
+	[3029b8c183bf]
+
+2011-01-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/treequel/branch.rb:
+	Fixed a bug in Treequel::Branch#copy.
+	[7ddaabd492e4]
+
+	* bin/treequel:
+	Adding reconnect support to the treequel shell
+	[f4a3b207966d]
+
+	* lib/treequel/directory.rb, spec/treequel/directory_spec.rb:
+	Added a new method: Treequel::Directory#connected?
+	[d2c1559a6f28]
+
+	* spec/treequel/mixins_spec.rb:
+	Cleaned up cruft in mixins spec
+	[7706be6b8c4c]
+
+2011-01-19  Michael Granger  <ged@FaerieMUD.org>
+
+	* manual/layouts/default.page, manual/layouts/intro.page,
+	manual/resources/images/logo-small.png,
+	manual/resources/images/logo.png,
+	manual/resources/js/jquery-1.3.2.min.js,
+	manual/resources/js/jquery.ThickBox.js,
+	manual/resources/swf/clipboard.swf:
+	Merged with 411:ddbb3c3bdd00
+	[ba7895d4e64b]
+
 2011-01-18  Michael Granger  <ged@FaerieMUD.org>
 
+	* manual/layouts/default.erb, manual/resources/css/manual.css,
+	manual/src/index.page:
+	Updating the manual.
+	[ddbb3c3bdd00]
+
+	* LICENSE:
+	I meant the README.md file. NOW update the LICENSE file
+	[a81be935c179]
+
+	* README.md:
+	Updating the copyright date in the LICENSE file
+	[04a457302e85]
+
+	* .hgtags:
+	Added tag v1.3.2 for changeset c6f3bdc3bb57
+	[4dc62eaea468]
+
+	* .hgsigs:
+	Added signature for changeset a545351e8cce
+	[c6f3bdc3bb57] [v1.3.2]
+
+	* lib/treequel.rb, lib/treequel/model.rb:
+	Bump patch version; simplify Treequel::Model#apply_applicable_mixins
+	[a545351e8cce]
+
 	* Rakefile:
 	Merged with 400:4caac8976d00
-	[59944084d362] [github/master, master, tip]
+	[59944084d362]
 
 	* lib/treequel/model.rb:
 	Ensure the entry hash that's passed to
@@ -29,8 +108,18 @@
 	Adding missing dependency
 	[eaf742c5b836]
 
+2011-01-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* manual/src/models.page:
+	Fixed some invalid api links in the models section
+	[7759040905e0]
+
 2011-01-17  Michael Granger  <ged@FaerieMUD.org>
 
+	* History.md:
+	Updated History
+	[9c4db65b40d7]
+
 	* .hgtags:
 	Added tag v1.3.1 for changeset a6ea030fc88f
 	[4caac8976d00]
@@ -45,12 +134,6 @@
 	attributes to sometimes be doubled.
 	[fb7ec4e38f66]
 
-2011-01-14  Michael Granger  <ged@FaerieMUD.org>
-
-	* manual/src/models.page:
-	Fixed some invalid api links in the models section
-	[7759040905e0]
-
 2011-01-13  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
@@ -145,14 +228,14 @@
 	Automated merge with ssh://deveiate/Treequel
 	[62e7348050eb]
 
-	* bin/treequel, lib/treequel/model/objectclass.rb:
-	Aesthetic cleanup
-	[78e65cb8f30a]
-
 	* bin/treequel:
 	More logging constant fixes for the treequel shell.
 	[6e159f32ed07]
 
+	* bin/treequel, lib/treequel/model/objectclass.rb:
+	Aesthetic cleanup
+	[78e65cb8f30a]
+
 2011-01-04  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/treequel:
@@ -564,6 +647,13 @@
 	* Merging with 316:33a7dcde80a1
 	[72dd41272f6f]
 
+	* .hgsubstate, lib/treequel/model.rb, spec/treequel/branch_spec.rb,
+	spec/treequel/model_spec.rb, spec/treequel/monkeypatches_spec.rb:
+	Spec fixes for RSpec 2.0
+	 * Fix RSpec regex workaround for Treequel::Model#respond_to?
+	 * Fix monkeypatch Time tests for running outside of PST8PDT
+	[9f9460125077]
+
 2010-11-09  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgsub, .hgsubstate:
@@ -574,17 +664,6 @@
 	Fixing subrepo corruption caused by rollback
 	[fc9ae9f5b034]
 
-2010-11-11  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgsubstate, lib/treequel/model.rb, spec/treequel/branch_spec.rb,
-	spec/treequel/model_spec.rb, spec/treequel/monkeypatches_spec.rb:
-	Spec fixes for RSpec 2.0
-	 * Fix RSpec regex workaround for Treequel::Model#respond_to?
-	 * Fix monkeypatch Time tests for running outside of PST8PDT
-	[9f9460125077]
-
-2010-11-09  Michael Granger  <ged@FaerieMUD.org>
-
 	* README:
 	Merged with 310:cc7c63ff15a0
 	[c1b750e4e9fc]
@@ -600,18 +679,18 @@
 	test failure
 	[380662d385e0]
 
-2010-11-08  Michael Granger  <ged@FaerieMUD.org>
-
-	* bin/treequel:
-	Fixed treequel shell's cp to support relative and absolute DNs
-	[7f20ab74d6b1]
-
 2010-11-03  Michael Granger  <ged@FaerieMUD.org>
 
 	* README, README.md:
 	Converting the README to Markdown
 	[cc7c63ff15a0]
 
+2010-11-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/treequel:
+	Fixed treequel shell's cp to support relative and absolute DNs
+	[7f20ab74d6b1]
+
 2010-10-22  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/treequel/schema.rb, spec/lib/control_behavior.rb,
@@ -1283,12 +1362,6 @@
 	* Re-sorted the OID constants to be in OID order
 	[8b2fb7415412]
 
-2010-01-13  Michael Granger  <ged@FaerieMUD.org>
-
-	* bin/treequel:
-	Make treequel shell's 'cat' command error for non-existant entries
-	[84087b01d473]
-
 2010-01-24  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/treequel:
@@ -1297,6 +1370,10 @@
 
 2010-01-13  Michael Granger  <ged@FaerieMUD.org>
 
+	* bin/treequel:
+	Make treequel shell's 'cat' command error for non-existant entries
+	[84087b01d473]
+
 	* bin/treequel:
 	Fix the 'grep' command in the Treequel shell.
 	[669a09149f48]
@@ -1327,6 +1404,19 @@
 	Updated build system
 	[00ac1bc4e917]
 
+2009-12-22  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/treequel:
+	Reworked LDIF display colors in the shell to be more visible.
+	[d77a0bf26034]
+
+	* bin/treequel:
+	Make the treequel shell fall back to plain connect (with a warning)
+	if TLS fails.
+	[9aeccec1ee84]
+
+2010-01-07  Michael Granger  <ged@FaerieMUD.org>
+
 	* bin/treequel, lib/treequel/branch.rb, lib/treequel/constants.rb,
 	lib/treequel/utils.rb:
 	Improvements to the treequel shell, fixes for 1.9.1.
@@ -1348,15 +1438,6 @@
 
 2009-12-22  Michael Granger  <ged@FaerieMUD.org>
 
-	* bin/treequel:
-	Reworked LDIF display colors in the shell to be more visible.
-	[d77a0bf26034]
-
-	* bin/treequel:
-	Make the treequel shell fall back to plain connect (with a warning)
-	if TLS fails.
-	[9aeccec1ee84]
-
 	* examples/ldap-monitor.rb, examples/ldap-
 	monitor/public/css/master.css, examples/ldap-
 	monitor/public/images/card_small.png, examples/ldap-
@@ -1377,6 +1458,27 @@
 	Automated merge with ssh://hg@deveiate/Treequel
 	[3bdd645530fe]
 
+2009-12-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* Merged with 5fd4033e1556
+	[9571c9d8e4dd]
+
+2009-12-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* docs/openldap-oids.txt, lib/treequel/constants.rb,
+	lib/treequel/controls/contentsync.rb,
+	lib/treequel/controls/persistentsearch.rb,
+	lib/treequel/directory.rb:
+	More controls work, started several more control modules.
+	* Adding a breakdown of all the controls the OpenLDAP server I have
+	has, so I know which controls I can test against.
+	* Added some control constants.
+	* Added the ContentSyncControl and the PersistentSearchControl.
+	* Added a Directory#supported_controls method.
+	[ffc2ebacdfd0]
+
+2009-12-22  Michael Granger  <ged@FaerieMUD.org>
+
 	* bin/treequel, examples/ldap-monitor.rb, examples/ldap-
 	monitor/public/css/master.css, examples/ldap-
 	monitor/public/images/card_small.png, examples/ldap-
@@ -1405,25 +1507,6 @@
 	* Bumped the version to 1.0.2.
 	[31c326800cc6]
 
-2009-12-18  Michael Granger  <ged@FaerieMUD.org>
-
-	* Merged with 5fd4033e1556
-	[9571c9d8e4dd]
-
-2009-12-17  Michael Granger  <ged@FaerieMUD.org>
-
-	* docs/openldap-oids.txt, lib/treequel/constants.rb,
-	lib/treequel/controls/contentsync.rb,
-	lib/treequel/controls/persistentsearch.rb,
-	lib/treequel/directory.rb:
-	More controls work, started several more control modules.
-	* Adding a breakdown of all the controls the OpenLDAP server I have
-	has, so I know which controls I can test against.
-	* Added some control constants.
-	* Added the ContentSyncControl and the PersistentSearchControl.
-	* Added a Directory#supported_controls method.
-	[ffc2ebacdfd0]
-
 2009-12-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* Rakefile, lib/treequel/mixins.rb, project.yml:
@@ -2518,16 +2601,6 @@
 	Merged. Someday I'll get the hang of this.
 	[a5e715f5f877]
 
-2009-07-29  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgignore, Rakefile, docs/manual/src/index.page,
-	lib/treequel/filter.rb, project.yml, spec/treequel/filter_spec.rb:
-	* Adding coverage cache to the ignorefile.
-	 * Added ruby-ldap dependency. Yay!
-	 * More work on the manual.
-	 * Made Treequel::Branch#filter treat a Hash like an array of tuples.
-	[46e6dce0c011]
-
 2009-07-28  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Rakefile:
@@ -2538,6 +2611,16 @@
 	Manual rewording, .hgignore updates
 	[89f74035c67d]
 
+2009-07-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore, Rakefile, docs/manual/src/index.page,
+	lib/treequel/filter.rb, project.yml, spec/treequel/filter_spec.rb:
+	* Adding coverage cache to the ignorefile.
+	 * Added ruby-ldap dependency. Yay!
+	 * More work on the manual.
+	 * Made Treequel::Branch#filter treat a Hash like an array of tuples.
+	[46e6dce0c011]
+
 2009-07-27  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Rakefile:
@@ -2549,10 +2632,6 @@
 
 2009-07-24  Michael Granger  <ged@FaerieMUD.org>
 
-	* .hgsub, .hgsubstate:
-	Unlinking the subrepo, as it doesn't behave well enough quite yet.
-	[fc3c3bac2c22]
-
 	* .hgsub, .hgsubstate:
 	Merging build system fixes
 	[b7a919b2ad5d]
@@ -2565,6 +2644,10 @@
 	Removing subrepo, as it doesn't work quite the way I'd hoped.
 	[f631900a9ad8] <build-system-fixes>
 
+	* .hgsub, .hgsubstate:
+	Unlinking the subrepo, as it doesn't behave well enough quite yet.
+	[fc3c3bac2c22]
+
 	* .hgignore, .hgsubstate, Rakefile, Rakefile.local, project.yml:
 	Initial commit of Mercurial-based tasks
 	[65236b2101e5] <build-system-fixes>

data/History.md

@@ -1,3 +1,28 @@
+## 1.4.0 [2011-01-31] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+* Added a new method: Treequel::Directory#connected?
+* Adding reconnect support to the treequel shell
+
+Bugfixes:
+
+* Fixed a bug in Treequel::Branch#copy.
+* Escape filter metacharacters in simple filter components
+
+
+## 1.3.2
+
+Bugfix:
+
+* Ensure the entry hash that's passed to Treequel::Model#apply_applicable_mixins isn't modified; fixes a bug when modifying a new unsaved Model object.
+
+
+## 1.3.1 [2011-01-17] Michael Granger <ged@FaerieMUD.org>
+
+Fixed a bug that caused DN attributes in objects created via Treequel::Model.new_from_entry to be doubled.
+
+
 ## 1.3.0 [2011-01-13] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2010, Michael Granger and Mahlon E. Smith
+Copyright (c) 2008-2011, Michael Granger and Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -47,7 +47,7 @@ You can submit bug reports, suggestions, and read more about future plans at
 
 ## License
 
-Copyright (c) 2008-2010, Michael Granger and Mahlon E. Smith
+Copyright (c) 2008-2011, Michael Granger and Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -40,7 +40,7 @@ hoespec = Hoe.spec 'treequel' do
 		"    - columnize",
 		"    - sysexits",
 		'',
-		"You can install those automatically if you use the --development flag when",
+		"You can install them automatically if you use the --development flag when",
 		"installing Treequel."
 	  ].join( "\n" )
 	self.spec_extras[:signing_key] = '/Volumes/Keys/ged-private_gem_key.pem'

data/bin/treequel

@@ -256,6 +256,13 @@ class Treequel::Shell
 		self.save_history
 
 		message "done."
+
+	rescue => err
+		error_message( err.class.name, err.message )
+		err.backtrace.each do |frame|
+			self.log.debug "  " + frame
+		end
+
 	ensure
 		system( 'stty', @original_tty_settings.chomp )
 	end
@@ -292,15 +299,28 @@ class Treequel::Shell
 		else
 			self.handle_missing_cmd( command )
 		end
+	rescue LDAP::ResultError => err
+		case err.message
+		when /can't contact ldap server/i
+			if @dir.connected?
+				error_message( "LDAP connection went away." )
+			else
+				error_message( "Couldn't connect to the server." )
+			end
+			ask_for_confirmation( "Attempt to reconnect?" ) do
+				@dir.reconnect
+			end
+			retry
 
-	rescue => err
-		error_message( err.class.name, err.message )
-		err.backtrace.each do |frame|
-			self.log.debug "  " + frame
+		when /invalid credentials/i
+			error_message( "Authentication failed." )
+		else
+			raise # Re-raise if it's something else
 		end
 	end
 
 
+
 	#########
 	protected
 	#########

data/lib/treequel/branch.rb

@@ -440,7 +440,7 @@ class Treequel::Branch
 		self.log.debug "Creating a copy of %p at %p" % [ self.dn, newdn ]
 		newbranch = self.class.new( self.directory, newdn )
 
-		attributes = self.entry.merge( attributes )
+		attributes = self.entry.merge( stringify_keys(attributes) )
 
 		self.log.debug "  merged attributes: %p" % [ attributes ]
 		self.directory.create( newbranch, attributes )

data/lib/treequel/constants.rb

@@ -240,7 +240,7 @@ module Treequel::Constants
 
 		### These are inlined for simplicity
 		#	NULL    = %x00 ; null (0)
-		NULL = '\x00'
+		NUL = NULL = '\x00'
 
 		#	SPACE   = %x20 ; space (" ")
 		SPACE = '\x20'
@@ -588,6 +588,9 @@ module Treequel::Constants
 		# escaped        = ESC HEX HEX
 		ESCAPED = %r{ #{ESC} [[:xdigit:]]{2} }x
 
+		# characters which must be escaped in filter values
+		UNESCAPED = %r{[#{NUL}#{LPAREN}#{RPAREN}#{ASTERISK}#{ESC}]}
+
 		# valueencoding  = 0*(normal / escaped)
 		VALUEENCODING = %r{ (?:#{NORMAL} | #{ESCAPED})* }x
 

data/lib/treequel/directory.rb

@@ -237,6 +237,15 @@ class Treequel::Directory
 	end
 
 
+	### Returns +true+ if a connection has been established. This does not necessarily mean
+	### that the connection is still valid, it just means it successfully established one
+	### at some point.
+	### @return [Boolean]
+	def connected?
+		return @conn ? true : false
+	end
+
+
 	### Drop the existing connection and establish a new one.
 	### @return [Boolean]  +true+ if the connection was re-established
 	### @raise [RuntimeError]  if the re-connection failed

data/lib/treequel/filter.rb

@@ -196,6 +196,7 @@ class Treequel::Filter
 	###   greater    = ">="
 	###   less       = "<="
 	class SimpleItemComponent < Treequel::Filter::ItemComponent
+		include Treequel::Constants::Patterns
 
 		# The valid values for +filtertype+ and the equivalent operator
 		FILTERTYPE_OP = {
@@ -277,7 +278,12 @@ class Treequel::Filter
 
 		### Stringify the component
 		def to_s
-			return [ self.attribute, self.filtertype_op, self.value ].join
+			# Escape all the filter metacharacters
+			escaped_val = self.value.to_s.gsub( UNESCAPED ) do |char|
+				'\\' + char.unpack('C*').first.to_s(16)
+			end
+
+			return [ self.attribute, self.filtertype_op, escaped_val ].join
 		end
 
 	end # class SimpleItemComponent
@@ -330,7 +336,8 @@ class Treequel::Filter
 		###	I N S T A N C E   M E T H O D S
 		#############################################################
 
-		### Create a new 'presence' item filter component for the given +attribute+.
+		### Create a new 'substring' item filter component that will match the specified +pattern+ 
+		### against the given +attribute+.
 		def initialize( attribute, pattern, options=nil )
 			@attribute = attribute
 			@pattern   = pattern
@@ -591,10 +598,16 @@ class Treequel::Filter
 				attribute, value = *expression.args
 
 				# Turn :sn.like( 'bob' ) into (cn~=bob) 'cause it has no asterisks
-				if op == :like && value !~ /\*/
-					Treequel.logger.debug \
-						"    turning a LIKE expression with no wildcards into an 'approx' filter"
-					equivalent = :approx
+				if op == :like 
+					if value.index( '*' )
+						Treequel.logger.debug \
+							"    turning a LIKE expression with an asterisk into a substring filter"
+						return Treequel::Filter::SubstringItemComponent.new( attribute, value )
+					else
+						Treequel.logger.debug \
+							"    turning a LIKE expression with no wildcards into an 'approx' filter"
+						equivalent = :approx
+					end
 				end
 
 				return Treequel::Filter::SimpleItemComponent.new( attribute, value, equivalent )
@@ -604,20 +617,17 @@ class Treequel::Filter
 				return Treequel::Filter::NotComponent.new( contents )
 
 			elsif op == :'not like'
-				equivalent = nil
-				attribute, value = *expression.args
 				Treequel.logger.debug "  making a NOT LIKE expression out of: %p" % [ expression ]
+				attribute, value = *expression.args
+				component = nil
 
-				if value !~ /\*/
-					Treequel.logger.debug \
-						"    turning a NOT LIKE expression with no wildcards into an 'approx' filter"
-					equivalent = :approx
+				if value.index( '*' )
+					component = Treequel::Filter::SubstringItemComponent.new( attribute, value )
 				else
-					equivalent = :equal
+					component = Treequel::Filter::SimpleItemComponent.new( attribute, value, :approx )
 				end
 
-				comp = Treequel::Filter::SimpleItemComponent.new( attribute, value, equivalent )
-				filter = Treequel::Filter.new( comp )
+				filter = Treequel::Filter.new( component )
 				return Treequel::Filter::NotComponent.new( filter )
 
 			elsif LOGICAL_COMPONENTS.key?( op )

data/lib/treequel.rb

@@ -53,10 +53,10 @@ end
 module Treequel
 
 	# Library version
-	VERSION = '1.3.2'
+	VERSION = '1.4.0'
 
 	# VCS revision
-	REVISION = %q$Revision: a545351e8cce $
+	REVISION = %q$Revision: 63270598af6b $
 
 	# Common paths for ldap.conf
 	COMMON_LDAP_CONF_PATHS = %w[

data/spec/treequel/directory_spec.rb

@@ -351,6 +351,12 @@ describe Treequel::Directory do
 		end
 
 
+		it "knows if a connection has been established" do
+			@dir.should be_connected()
+			@dir.instance_variable_set( :@conn, nil )
+			@dir.should_not be_connected()
+		end
+
 		it "can reconnect if its underlying connection goes away" do
 			@conn.stub( :search_ext2 ).and_raise( LDAP::ResultError.new("Can't contact LDAP server") )
 

data/spec/treequel/filter_spec.rb

@@ -70,6 +70,11 @@ describe Treequel::Filter do
 		Treequel::Filter.new( :uid, 'bigthung' ).to_s.should == '(uid=bigthung)'
 	end
 
+	it "escapes filter metacharacters in simple item equal filters" do
+		Treequel::Filter.new( :nisNetgroupTriple, '(blarney.acme.org,,)' ).to_s.
+			should == '(nisNetgroupTriple=\28blarney.acme.org,,\29)'
+	end
+
 	it "parses a String+value hash as a simple item equal filter" do
 		Treequel::Filter.new( 'uid' => 'bigthung' ).to_s.should == '(uid=bigthung)'
 	end

data/spec/treequel/mixins_spec.rb

@@ -29,7 +29,6 @@ include Treequel::Constants
 #####################################################################
 
 describe Treequel, "mixin" do
-	include Treequel::SpecHelpers
 
 	describe Treequel::Loggable, "mixed into a class" do
 		before(:each) do
@@ -64,10 +63,6 @@ describe Treequel, "mixin" do
 		end
 	end
 
-	#################################################################
-	###	E X A M P L E S
-	#################################################################
-
 	describe Treequel::HashUtilities do
 		it "includes a function for stringifying Hash keys" do
 			testhash = {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-01-18 00:00:00 -08:00
+date: 2011-01-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,35 +72,35 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe-mercurial
+  name: hoe-yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 31
         segments: 
+        - 0
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        version: 0.1.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe-yard
+  name: hoe-manualgen
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
+        - 0
         - 1
-        - 2
-        version: 0.1.2
+        version: 0.0.1
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -285,7 +285,7 @@ files:
 - spec/treequel/schema/table_spec.rb
 - spec/treequel/schema_spec.rb
 - spec/treequel_spec.rb
-has_rdoc: yard
+has_rdoc: true
 homepage: http://deveiate.org/projects/Treequel
 licenses: 
 - BSD
@@ -298,7 +298,7 @@ post_install_message: |-
       - columnize
       - sysexits
   
-  You can install those automatically if you use the --development flag when
+  You can install them automatically if you use the --development flag when
   installing Treequel.
 rdoc_options: 
 - --use-cache
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: treequel
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Treequel is an LDAP toolkit for Ruby