Changeset 87

Timestamp:

07/08/08 08:07:04 (5 months ago)

Author:

deveiant

Message:

Checkpoint commit:

• started work on integrating dict conversion into the Rakefile. Not quite done yet.
• removed the coverage check from the svn:ci task until I get all the specs converted.
• started cleaning up the distribution
• updated the included bdb library to the latest release
• added support for conversion of the dict files directly from a WordNet?-x.x.tar.bz2 tarball extracted in the top-level directory

Location:

trunk

Files:

• . (modified) (1 prop)
• Rakefile (modified) (3 diffs, 1 prop)
• convertdb.rb (modified) (4 diffs, 1 prop)
• docs/makedocs.rb (modified) (1 prop)
• examples/addLacedBoots.rb (modified) (1 prop)
• examples/clothesWithCollars.rb (modified) (1 prop)
• examples/clothesWithTongues.rb (modified) (1 prop)
• examples/distance.rb (modified) (1 prop)
• examples/domainTree.rb (modified) (1 prop)
• examples/gcs.rb (modified) (1 prop)
• examples/holonymTree.rb (modified) (1 prop)
• examples/hypernymTree.rb (modified) (1 prop)
• examples/hyponymTree.rb (modified) (1 prop)
• examples/memberTree.rb (modified) (1 prop)
• examples/meronymTree.rb (modified) (1 prop)
• experiments/unhandled_pointer_types.rb (modified) (1 prop)
• install.rb (deleted)
• lib/wordnet.rb (modified) (1 prop)
• lib/wordnet/constants.rb (modified) (1 prop)
• lib/wordnet/lexicon.rb (modified) (1 prop)
• lib/wordnet/synset.rb (modified) (1 prop)
• makedist.rb (modified) (2 diffs, 1 prop)
• rake/svn.rb (modified) (1 diff)
• redist/bdb-0.5.9.tar.bz2 (deleted)
• redist/bdb-0.6.5.tar.gz (added)
• spec/linguawordnet.tests.rb (copied) (copied from trunk/tests/linguawordnet.tests.rb) (1 prop)
• spec/wordnet/lexicon_spec.rb (modified) (1 prop)
• spec/wordnet/synset.tests.rb (copied) (copied from trunk/tests/synset.tests.rb) (1 prop)
• test.rb (deleted)
• tests (deleted)
• utils.rb (modified) (1 prop)

trunk

@@ -4 +4 @@
 Ruby-WordNet-*
 commit-msg.txt
+WordNet-*

@@ -4 +4 @@
 Ruby-WordNet-*
 commit-msg.txt
+WordNet-*

trunk/Rakefile

@@ -35 +35 @@
 PKGDIR        = BASEDIR + 'pkg'
 
+RAKE_TASKDIR  = BASEDIR + 'rake'
 ARTIFACTS_DIR = Pathname.new( ENV['CC_BUILD_ARTIFACTS'] || '' )
 
-TEXT_FILES    = %w( Rakefile README LICENSE LICENSE.txt ).
+TEXT_FILES    = %w( Rakefile ChangeLog INSTALL README LICENSE ).
     collect {|filename| BASEDIR + filename }
+
+BUILD_FILES   = %w( convertdb.rb utils.rb )
 
 SPECDIR       = BASEDIR + 'spec'
@@ -51 +54 @@
 RELEASE_FILES = TEXT_FILES + LIB_FILES + SPEC_FILES
 
-require RAKEDIR + 'helpers'
+require RAKE_TASKDIR + 'helpers.rb'
 
 ### Package constants
@@ -60 +63 @@
 RELEASE_NAME  = "REL #{PKG_VERSION}"
 
-# Load task plugins
-Pathname.glob( RAKEDIR + '*.rb' ).each do |tasklib|
-    next if tasklib =~ %r{/helpers.rb$}
-    require tasklib
-end
+### Load task libraries
+require RAKE_TASKDIR + 'svn.rb'
+require RAKE_TASKDIR + 'verifytask.rb'
+Pathname.glob( RAKE_TASKDIR + '*.rb' ).each do |tasklib|
+    next if tasklib =~ %r{/(helpers|svn|verifytask)\.rb$}
+    begin
+        require tasklib
+    rescue ScriptError => err
+        fail "Task library '%s' failed to load: %s: %s" %
+            [ tasklib, err.class.name, err.message ]
+        trace "Backtrace: \n  " + err.backtrace.join( "\n  " )
+    rescue => err
+        log "Task library '%s' failed to load: %s: %s. Some tasks may not be available." %
+            [ tasklib, err.class.name, err.message ]
+        trace "Backtrace: \n  " + err.backtrace.join( "\n  " )
+    end
+end
+
 
 if Rake.application.options.trace

trunk/convertdb.rb

@@ -75 +75 @@
 # Temporary location for the lexicon data files
 BuildDir = Pathname.new( __FILE__ ).expand_path.dirname + 
-           Pathname.new( WordNet::Lexicon::DefaultDbEnv ).basename
+           Pathname.new( WordNet::Lexicon::DEFAULT_DB_ENV ).basename
 
 
@@ -90 +90 @@
         "used by Ruby-WordNet. This will not affect existing WordNet files,\n"\
         "but will require up to 40Mb of disk space.\n"
-    exit unless /^y/i =~ promptWithDefault("Continue?", "y")
+    exit unless /^y/i =~ prompt_with_default("Continue?", "y")
 
     # Open the database and check to be sure it's empty. Confirm overwrite if
@@ -98 +98 @@
             "will be overwritten.\n"
         abort( "user cancelled." ) unless 
-            /^y/i =~ promptWithDefault( "Continue?", "n" )
+            /^y/i =~ prompt_with_default( "Continue?", "n" )
         BuildDir.rmtree
     end
@@ -104 +104 @@
     # Find the source data files
     if ARGV.empty?
+        default = nil
+        
+        if wndirs = Pathname.glob( Pathname.getwd + 'WordNet-*' )
+            default = wndirs.first
+        else
+            default = '/usr/local/WordNet-3.0'
+        end
 
         # :TODO: Do some more intelligent searching here
         message "Where can I find the WordNet data files?\n"
-        datadir = promptWithDefault( "Data directory", "/usr/local/WordNet-2.1/dict" )
+        datadir = prompt_with_default( "Data directory", default + "dict" )
     else
         datadir = ARGV.shift
     end
-
-    abort( "Directory '#{datadir}' does not exist" ) unless File::exists?( datadir )
-    abort( "'#{datadir}' is not a directory" ) unless File::directory?( datadir )
-    testfile = File::join(datadir, "data.noun")
-    abort( "'#{datadir}' doesn't seem to contain the necessary files.") unless
-        File::exists?( testfile )
+    datadir = Pathname.new( datadir )
+
+    abort( "Directory '#{datadir}' does not exist" ) unless datadir.exist?
+    abort( "'#{datadir}' is not a directory" ) unless datadir.directory?
+    testfile = datadir + "data.noun"
+    abort( "'#{datadir}' doesn't seem to contain the necessary files.") unless testfile.exist?
 
     # Open the lexicon readwrite into the temporary datadir

trunk/makedist.rb

@@ -24 +24 @@
 
 # SVN Revision
-SVNRev = %q$Rev: 13 $
+SVNRev = %q$Rev$
 
 # SVN Id
@@ -30 +30 @@
 
 # SVN URL
-SVNURL = %q$URL: svn+ssh://svn.FaerieMUD.org/usr/local/svn/project-utils/trunk/makedist.rb $
+SVNURL = %q$URL$
 
 $Programs = {

trunk/rake/svn.rb

@@ -260 +260 @@
 
     desc "Check in all the changes in your current working copy"
-    task :checkin => ['svn:update', 'coverage:verify', 'svn:fix_keywords', COMMIT_MSG_FILE] do
+    task :checkin => ['svn:update', 'svn:fix_keywords', COMMIT_MSG_FILE] do
         targets = get_target_args()
         $deferr.puts '---', File.read( COMMIT_MSG_FILE ), '---'

@@ -4 +4 @@
 Ruby-WordNet-*
 commit-msg.txt
+WordNet-*