treequel 1.0.1 → 1.0.4

data/ChangeLog

@@ -1,4 +1,166 @@
-207[tip]   c5e4cb039999   2009-11-17 20:35 -0800   ged
+261[tip]   0188c2ba5b7e   2010-07-07 23:21 -0700   ged
+  Added tag 1.0.4 for changeset 0ec4ff0ce67f
+
+260[1.0.4]   0ec4ff0ce67f   2010-07-07 23:21 -0700   ged
+  Added signature for changeset c8534439a5bc
+
+259   c8534439a5bc   2010-07-07 23:20 -0700   ged
+  Bumping version to 1.0.4 because I'm an idiot and included some files that were intended for a future version in 1.0.3.
+
+258   47bb9cd7af3b   2010-07-07 22:32 -0700   ged
+  Added tag 1.0.3 for changeset 65be21a77bfe
+
+257[1.0.3]   65be21a77bfe   2010-07-07 22:32 -0700   ged
+  Added signature for changeset fd86e30957a6
+
+256   fd86e30957a6   2010-07-07 19:04 -0700   ged
+  Build system update, prep for 1.0.3 release.
+
+255   dd880dcd1b9a   2010-06-14 16:18 -0700   ged
+  Fix the 'parent' command in the treequel shell and the success message for the 'cp' command.
+
+254   c2a696248d22   2010-06-14 15:58 -0700   ged
+  Treequel shell cleanup, new subcommand, Treequel::Directory#bound_user
+
+253   61d5aae13b7e   2010-06-10 15:11 -0700   ged
+  Added 'cp' treequel shell command, removed FOLDED_LDIF_ATTRVAL_SPEC pattern.
+
+252   d9073c3a9f0e   2010-05-27 05:56 -0700   ged
+  Treequel shell cleanup, support config-loaded directory, Branch#move fixes
+
+251   0982bb19bfb9   2010-05-03 15:04 -0700   ged
+  Treequel shell work, made schema tables more Hash-like.
+
+250   b725e5424fa9   2010-04-14 14:33 -0700   ged
+  Fixed a bug in Treequel.read_opts_from_config which caused
+
+249   561646be1b80   2010-04-13 16:49 -0700   ged
+  More YARD docs
+
+248   94b428852c7a   2010-04-11 20:29 -0700   ged
+  Fixed LDIF and highlighting in treequel shell
+
+247   a42d7297577a   2010-04-10 09:24 -0700   ged
+  Updated build system.
+
+246   a039187fcbfd   2010-04-08 15:14 -0700   ged
+  Updated build system, more YARDificiation.
+
+245   b54fe9c1171d   2010-04-07 09:14 -0700   ged
+  Updated build system.
+
+244   96125f5e3297   2010-04-07 09:05 -0700   ged
+  More specs, more YARD docs.
+
+243   91486cbc9047   2010-04-06 18:52 -0700   ged
+  New method Treequel::Branch#values_at, rewrote #delete to be consistent with Hash#delete.
+
+242   bc24a82b0e9c   2010-03-23 15:11 -0700   ged
+  Added NSS-style ldap.conf support.
+
+241   2f756d5f12e2   2010-03-19 11:05 -0700   ged
+  Converted hash-based schema tables to a case-insensitive Table class (fixes #1)
+
+240   f8de798625ee   2010-03-18 15:18 -0700   ged
+  Adding system-config methods to the Treequel methods
+
+239   02660115ea46   2010-03-02 12:48 -0800   ged
+  Finished specs for BranchCollection#empty?
+
+238   cbdb4342dc46   2010-03-01 18:17 -0800   ged
+  Treequel shell bugfixes, #empty? on Branchsets and BranchCollections
+
+237   5af1ee6a7f6c   2010-02-17 18:18 -0800   ged
+  Added an 'irb' command to the treequel shell, fixed build-number parsing.
+
+236   8a43b642fd91   2010-02-09 16:37 -0800   ged
+  Implemented the `-b bind_dn` option.
+
+235:234,233   2a1bac85c038   2010-02-03 18:24 -0800   ged
+  Merged 233:1d06d28159a6
+
+234:232   e96bbf2e7325   2010-02-03 18:23 -0800   ged
+  Adding the beginnings of ActiveDirectory support, treequel shell options, server introspection.
+
+233:230,232   1d06d28159a6   2010-01-26 10:56 -0800   ged
+  Merged with 230:b994d8d9d608
+
+232   8b2fb7415412   2010-01-26 10:55 -0800   ged
+  Initial (untested) implementation of the sorted results control.
+
+231:229   84087b01d473   2010-01-13 20:12 -0800   ged
+  Make treequel shell's 'cat' command error for non-existant entries
+
+230   b994d8d9d608   2010-01-24 12:57 -0800   ged
+  Convert the option parsers to a class global instead of a constant
+
+229   669a09149f48   2010-01-13 11:36 -0800   ged
+  Fix the 'grep' command in the Treequel shell.
+
+228   ab2a2ff43b60   2010-01-12 10:12 -0800   ged
+  Operational attributes propagation and treequel shell fixes.
+
+227:226,223   14f5f723d0aa   2010-01-07 16:43 -0800   ged
+  Merged with d77a0bf26034
+
+226   00ac1bc4e917   2010-01-07 16:42 -0800   ged
+  Updated build system
+
+225   5afefa230ef0   2010-01-07 16:41 -0800   ged
+  Improvements to the treequel shell, fixes for 1.9.1.
+
+224:221   83b178f0850e   2010-01-06 19:24 -0800   ged
+  Eliminate duplicates when smushing RDN attributes on a Treequel::Directory#create
+
+223   d77a0bf26034   2009-12-22 15:13 -0800   ged
+  Reworked LDIF display colors in the shell to be more visible.
+
+222   9aeccec1ee84   2009-12-22 15:02 -0800   ged
+  Make the treequel shell fall back to plain connect (with a warning) if TLS fails.
+
+221:219,220   3bdd645530fe   2009-12-22 09:40 -0800   ged
+  Automated merge with ssh://hg@deveiate/Treequel
+
+220:217   31c326800cc6   2009-12-22 09:40 -0800   ged
+  Treequel shell fix, splitting off the LDAP monitor example, version bump.
+
+219:218,217   9571c9d8e4dd   2009-12-18 10:23 -0800   ged
+  Merged with 5fd4033e1556
+
+218:216   ffc2ebacdfd0   2009-12-17 21:50 -0800   ged
+  More controls work, started several more control modules.
+
+217   5fd4033e1556   2009-12-16 11:24 -0800   ged
+  Updated build system, normalized comments in mixins.rb.
+
+216   b04972837e63   2009-12-11 18:47 -0800   ged
+  More work on controls,
+
+215   d1ef2c0f53f2   2009-12-08 09:28 -0800   ged
+  Finished initial Controls implementation, added PagedResultsControl.
+
+214   b937fbec04ca   2009-12-07 17:11 -0800   mahlon
+  Add scaffolding for Treequel::Control.
+
+213   30f67c57d0bb   2009-12-07 16:41 -0800   ged
+  Law of Demeter fix and more work on the controls spike.
+
+212   014435b07b2d   2009-12-06 22:13 -0800   ged
+  Fixed the shell 'edit' command, cleaned up LDIF output, dependency fixes.
+
+211   b259ac7d021e   2009-12-06 14:59 -0800   ged
+  Adding '+' mode to 'cat' (stolen from shelldap)
+
+210   150d5cf819a9   2009-12-01 10:25 -0800   mahlon
+  Heh heh heh, he said 'fem'
+
+209   ff8226a744d8   2009-11-17 20:38 -0800   ged
+  Added tag 1.0.1 for changeset 9c9993ba908e
+
+208[1.0.1]   9c9993ba908e   2009-11-17 20:38 -0800   ged
+  Added signature for changeset c5e4cb039999
+
+207   c5e4cb039999   2009-11-17 20:35 -0800   ged
   Added Branchset#as, added 'yaml'/disabled 'edit' command in treequel shell
 
 206   67502a7b9224   2009-11-17 15:58 -0800   ged
@@ -334,36 +496,36 @@
 96   6b5358420802   2009-07-31 08:29 -0700   ged
   Updated build system
 
-95:94,92   a5e715f5f877   2009-07-31 08:13 -0700   ged
+95:93,94   a5e715f5f877   2009-07-31 08:13 -0700   ged
   Merged. Someday I'll get the hang of this.
 
-94:93,91   395b7bf6f248   2009-07-28 06:11 -0700   ged
+94:91   46e6dce0c011   2009-07-29 13:28 -0700   ged
+  * Adding coverage cache to the ignorefile.
+
+93:92,91   395b7bf6f248   2009-07-28 06:11 -0700   ged
   Merged with 34cc97817266
 
-93:89   89f74035c67d   2009-07-28 06:10 -0700   ged
+92:88   89f74035c67d   2009-07-28 06:10 -0700   ged
   Manual rewording, .hgignore updates
 
-92   46e6dce0c011   2009-07-29 13:28 -0700   ged
-  * Adding coverage cache to the ignorefile.
-
 91   34cc97817266   2009-07-27 12:06 -0700   ged
   Updated build system
 
-90:86,89   daf0e44c41ac   2009-07-27 11:58 -0700   ged
+90:89,88   daf0e44c41ac   2009-07-27 11:58 -0700   ged
   Merging work from gont
 
-89:83,88   b7a919b2ad5d   2009-07-24 21:07 -0700   ged
+89:83   fc3c3bac2c22   2009-07-24 17:27 -0700   ged
+  Unlinking the subrepo, as it doesn't behave well enough quite yet.
+
+88:83,87   b7a919b2ad5d   2009-07-24 21:07 -0700   ged
   Merging build system fixes
 
-88   620807d4c6d5   2009-07-24 21:05 -0700   ged
+87   620807d4c6d5   2009-07-24 21:05 -0700   ged
   Updated build system
 
-87:85   f631900a9ad8   2009-07-24 19:33 -0700   ged
+86   f631900a9ad8   2009-07-24 19:33 -0700   ged
   Removing subrepo, as it doesn't work quite the way I'd hoped.
 
-86:83   fc3c3bac2c22   2009-07-24 17:27 -0700   ged
-  Unlinking the subrepo, as it doesn't behave well enough quite yet.
-
 85   65236b2101e5   2009-07-24 11:22 -0700   ged
   Initial commit of Mercurial-based tasks
 

data/LICENSE

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

data/Rakefile

@@ -1,22 +1,22 @@
-#!rake
+#!rake -*- ruby -*-
 #
 # Treequel rakefile
 #
 # Based on various other Rakefiles, especially one by Ben Bleything
 #
-# Copyright (c) 2007-2009 The FaerieMUD Consortium
+# Copyright (c) 2007-2010 The FaerieMUD Consortium
 #
 # Authors:
 #  * Michael Granger <ged@FaerieMUD.org>
-#  * Mahlon E. Smith <mahlon@martini.nu>
 #
 
 BEGIN {
+	require 'rbconfig'
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname
 
 	libdir = basedir + "lib"
-	extdir = basedir + "ext"
+	extdir = libdir + Config::CONFIG['sitearch']
 
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
@@ -34,7 +34,7 @@ rescue LoadError
 end
 
 begin
-	require 'rubyfems'
+	require 'rubygems'
 rescue LoadError
 	module Gem
 		class Specification; end
@@ -74,10 +74,10 @@ if VERSION_FILE.exist? && buildrev = ENV['CC_BUILD_LABEL']
 	PKG_VERSION = VERSION_FILE.read[ /VERSION\s*=\s*['"](\d+\.\d+\.\d+)['"]/, 1 ] + '.' + buildrev
 elsif VERSION_FILE.exist?
 	PKG_VERSION = VERSION_FILE.read[ /VERSION\s*=\s*['"](\d+\.\d+\.\d+)['"]/, 1 ]
-else
-	PKG_VERSION = '0.0.0'
 end
 
+PKG_VERSION = '0.0.0' unless defined?( PKG_VERSION )
+
 PKG_FILE_NAME = "#{PKG_NAME.downcase}-#{PKG_VERSION}"
 GEM_FILE_NAME = "#{PKG_FILE_NAME}.gem"
 
@@ -91,7 +91,7 @@ EXTCONF       = EXTDIR + 'extconf.rb'
 
 ARTIFACTS_DIR = Pathname.new( CC_BUILD_ARTIFACTS )
 
-TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README LICENSE] )
+TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README* LICENSE] )
 BIN_FILES     = Rake::FileList.new( "#{BINDIR}/*" )
 LIB_FILES     = Rake::FileList.new( "#{LIBDIR}/**/*.rb" )
 EXT_FILES     = Rake::FileList.new( "#{EXTDIR}/**/*.{c,h,rb}" )
@@ -129,6 +129,10 @@ RELEASE_FILES = TEXT_FILES +
 
 RELEASE_FILES << LOCAL_RAKEFILE.to_s if LOCAL_RAKEFILE.exist?
 
+RELEASE_ANNOUNCE_ADDRESSES = [
+	"Ruby-Talk List <ruby-talk@ruby-lang.org>",
+]
+
 COVERAGE_MINIMUM = ENV['COVERAGE_MINIMUM'] ? Float( ENV['COVERAGE_MINIMUM'] ) : 85.0
 RCOV_EXCLUDES = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib'
 RCOV_OPTS = [
@@ -148,7 +152,7 @@ if !RAKE_TASKDIR.exist?
 
 	if ans =~ /^y/i
 		$stderr.puts "Okay, fetching #{RAKE_TASKLIBS_URL} into #{RAKE_TASKDIR}..."
-		system 'hg', 'clone', RAKE_TASKLIBS_URL, RAKE_TASKDIR
+		system 'hg', 'clone', RAKE_TASKLIBS_URL, "./#{RAKE_TASKDIR}"
 		if ! $?.success?
 			fail "Damn. That didn't work. Giving up; maybe try manually fetching?"
 		end
@@ -161,30 +165,41 @@ if !RAKE_TASKDIR.exist?
 end
 
 require RAKE_TASKDIR + 'helpers.rb'
+include RakefileHelpers
 
-# Define some constants that depend on the 'svn' tasklib
+# Set the build ID if the mercurial executable is available
 if hg = which( 'hg' )
 	id = IO.read('|-') or exec hg.to_s, 'id', '-n'
-	PKG_BUILD = id.chomp[ /^[[:xdigit:]]+/ ]
+	PKG_BUILD = "pre%03d" % [(id.chomp[ /^[[:xdigit:]]+/ ] || '1')]
 else
-	PKG_BUILD = 0
+	PKG_BUILD = 'pre000'
 end
 SNAPSHOT_PKG_NAME = "#{PKG_FILE_NAME}.#{PKG_BUILD}"
 SNAPSHOT_GEM_NAME = "#{SNAPSHOT_PKG_NAME}.gem"
 
 # Documentation constants
-RDOCDIR = DOCSDIR + 'api'
+API_DOCSDIR = DOCSDIR + 'api'
+README_FILE = TEXT_FILES.find {|path| path =~ /^README/ } || 'README'
 RDOC_OPTIONS = [
-	'-w', '4',
-	'-HN',
-	'-i', '.',
-	'-m', 'README',
-	'-t', PKG_NAME,
-	'-W', 'http://deveiate.org/projects/Treequel/browser/'
+	'--tab-width=4',
+	'--show-hash',
+	'--include', BASEDIR.to_s,
+	"--main=#{README_FILE}",
+	"--title=#{PKG_NAME}",
+  ]
+YARD_OPTIONS = [
+	'--use-cache',
+	'--no-private',
+	'--protected',
+	'-r', README_FILE,
+	'--exclude', 'extconf\\.rb',
+	'--files', 'ChangeLog,LICENSE',
+	'--output-dir', API_DOCSDIR.to_s,
+	'--title', "#{PKG_NAME} #{PKG_VERSION}",
   ]
 
 # Release constants
-SMTP_HOST = 'mail.faeriemud.org'
+SMTP_HOST = "mail.faeriemud.org"
 SMTP_PORT = 465 # SMTP + SSL
 
 # Project constants
@@ -194,31 +209,27 @@ PROJECT_DOCDIR = "#{PROJECT_PUBDIR}/#{PKG_NAME}"
 PROJECT_SCPPUBURL = "#{PROJECT_HOST}:#{PROJECT_PUBDIR}"
 PROJECT_SCPDOCURL = "#{PROJECT_HOST}:#{PROJECT_DOCDIR}"
 
-# Rubyforge stuff
-RUBYFORGE_GROUP = 'deveiate'
-RUBYFORGE_PROJECT = 'treequel'
-
 # Gem dependencies: gemname => version
 DEPENDENCIES = {
-	'termios' => '>= 0.9.4',
-	'columnize' => '>= 0.3.1',
-	'ruby-terminfo' => '>= 0.1.1',
 	'ruby-ldap' => '>= 0.9.9',
 }
 
 # Developer Gem dependencies: gemname => version
 DEVELOPMENT_DEPENDENCIES = {
-	'rake'        => '>= 0.8.7',
-	'rcodetools'  => '>= 0.7.0.0',
-	'rcov'        => '>= 0.8.1.2.0',
-	'rdoc'        => '>= 2.4.3',
-	'RedCloth'    => '>= 4.0.3',
-	'rspec'       => '>= 1.2.6',
-	'rubyforge'   => '>= 0',
-	'termios'     => '>= 0',
-	'text-format' => '>= 1.0.0',
-	'tmail'       => '>= 1.2.3.1',
-	'diff-lcs'    => '>= 1.1.2',
+	'rake'         => '>= 0.8.7',
+	'rcodetools'   => '>= 0.7.0.0',
+	'rcov'         => '>= 0.8.1.2.0',
+	'rdoc'         => '>= 2.4.3',
+	'RedCloth'     => '>= 4.0.3',
+	'rspec'        => '>= 1.2.6',
+	'ruby-termios' => '>= 0.9.6',
+	'text-format'  => '>= 1.0.0',
+	'tmail'        => '>= 1.2.3.1',
+	'diff-lcs'     => '>= 1.1.2',
+	'termios' => '>= 0.9.4',
+	'columnize' => '>= 0.3.1',
+	'diff-lcs' => '>= 1.1.2',
+	'ruby-terminfo' => '>= 0.1.1',
 }
 
 # Non-gem requirements: packagename => version
@@ -237,17 +248,22 @@ GEMSPEC   = Gem::Specification.new do |gem|
 		"the impedence mismatch of trying to treat LDAP as if it's a relational database, and",
 		"instead embrace its hierarchical, free-form nature.",
   	  ].join( "\n" )
+	gem.post_install_message = [
+		"If you want to use the included 'treequel' LDAP shell, you'll need to install",
+		"the following libraries as well:",
+		"    - termios",
+		"    - ruby-terminfo",
+		"    - columnize",
+		"    - diff-lcs",
+	  ].join( "\n" )
 
 	gem.authors           = "Michael Granger, Mahlon E. Smith"
 	gem.email             = ["mahlon@martini.nu", "ged@FaerieMUD.org"]
 	gem.homepage          = 'http://deveiate.org/projects/Treequel'
 
-	# Apparently this isn't actually the 'project'?
-	gem.rubyforge_project = RUBYFORGE_GROUP
-
 	gem.has_rdoc          = true
 	gem.rdoc_options      = RDOC_OPTIONS
-	gem.extra_rdoc_files  = %w[ChangeLog README LICENSE]
+	gem.extra_rdoc_files  = TEXT_FILES - [ 'Rakefile' ]
 
 	gem.bindir            = BINDIR.relative_path_from(BASEDIR).to_s
 	gem.executables       = BIN_FILES.select {|pn| File.executable?(pn) }.
@@ -301,14 +317,14 @@ import LOCAL_RAKEFILE if LOCAL_RAKEFILE.exist?
 #####################################################################
 
 ### Default task
-task :default  => [:clean, :local, :spec, :rdoc, :package]
+task :default  => [:clean, :local, :spec, :apidocs, :package]
 
 ### Task the local Rakefile can append to -- no-op by default
 task :local
 
 ### Task: clean
-CLEAN.include 'coverage'
-CLOBBER.include 'artifacts', 'coverage.info', PKGDIR
+CLEAN.include 'coverage', '**/*.orig', '**/*.rej'
+CLOBBER.include 'artifacts', 'coverage.info', 'ChangeLog', PKGDIR
 
 ### Task: changelog
 file 'ChangeLog' do |task|

data/Rakefile.local

@@ -14,6 +14,7 @@ require 'pp'
 MANUAL_PAGES = Pathname.glob( MANUALDIR + '**/*.page' )
 
 task :local => :check_manual
+task :manual => :check_manual
 
 # Check the manual for laika references before committing
 Rake::Task[ 'checkin' ].prerequisites.unshift( 'check_manual' )
@@ -40,4 +41,23 @@ task :check_manual => MANUAL_PAGES do
 	end
 end
 
+namespace :spec do
+	desc "Run specs under gdb"
+	task :gdb do |task|
+		require 'tempfile'
+
+	    cmd_parts = ['run']
+	    cmd_parts << '-Ilib:ext'
+	    cmd_parts << '/usr/bin/spec'
+	    cmd_parts += SPEC_FILES.collect { |fn| %["#{fn}"] }
+	    cmd_parts += COMMON_SPEC_OPTS + ['-f', 's', '-c']
+
+		script = Tempfile.new( 'spec-gdbscript' )
+		script.puts( cmd_parts.join(' ') )
+		script.flush
+
+		run 'gdb', '-x', script.path, RUBY
+	end
+end
+