Changeset 87 for trunk/convertdb.rb

Timestamp:

07/08/08 08:07:04 (6 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)
• convertdb.rb (modified) (4 diffs, 1 prop)

trunk

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

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

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

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