# HG changeset patch
# User Michael Granger <ged@FaerieMUD.org>
# Date 1506473285 25200
#      Tue Sep 26 17:48:05 2017 -0700
# Node ID a172d9a98c0683dea06b849275abcef88361f422
# Parent  9dafb40969863b25a55d298c2dcf56755eb0517d
Update the wordnet-defaultdb gem to use the latest SqlUNet distro

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -7,8 +7,8 @@
 ^wordnet-defaultdb/pkg/
 ^wordnet-defaultdb/data/wordnet\-defaultdb/wordnet31\.sqlite$
 ^wordnet-defaultdb/commit\-msg\.txt$
-^wordnet-defaultdb/LICENSE-WORDNET.txt$
-^wordnet-defaultdb/sqlunet-sqlite-4\.0\.0-31-all\.zip$
+^wordnet-defaultdb/LICENSE-.*\.txt$
+^wordnet-defaultdb/.*\.zip$
 ^ChangeLog$
 ^doc/
 \.(pdf|svg)$
diff --git a/wordnet-defaultdb/.rvm.gems b/wordnet-defaultdb/.gems
rename from wordnet-defaultdb/.rvm.gems
rename to wordnet-defaultdb/.gems
--- a/wordnet-defaultdb/.rvm.gems
+++ b/wordnet-defaultdb/.gems
@@ -1,3 +1,3 @@
-hoe-deveiate -v0.1.1
-sqlite3 -v1.3.6
-rubyzip -v0.9.8
+hoe-deveiate
+sqlite3
+rubyzip
diff --git a/wordnet-defaultdb/.rvmrc b/wordnet-defaultdb/.ruby-gemset
rename from wordnet-defaultdb/.rvmrc
rename to wordnet-defaultdb/.ruby-gemset
--- a/wordnet-defaultdb/.rvmrc
+++ b/wordnet-defaultdb/.ruby-gemset
@@ -1,29 +1,1 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-environment_id="ruby-1.9.3@wordnet"
-
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-	&& -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]; then
-	echo "Using ${environment_id}"
-	. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-	if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]; then
-		. "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-	fi
-else
-	# If the environment file has not yet been created, use the RVM CLI to select.
-	if ! rvm --create use  "$environment_id"
-		then
-		echo "Failed to create RVM environment '${environment_id}'."
-		exit 1
-	fi
-fi
-
-filename=".rvm.gems"
-if [[ -s "$filename" ]]; then
-	rvm gemset import "$filename"
-fi
-
+wordnet-defaultdb
diff --git a/wordnet-defaultdb/.rvmrc b/wordnet-defaultdb/.ruby-version
copy from wordnet-defaultdb/.rvmrc
copy to wordnet-defaultdb/.ruby-version
--- a/wordnet-defaultdb/.rvmrc
+++ b/wordnet-defaultdb/.ruby-version
@@ -1,29 +1,1 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-environment_id="ruby-1.9.3@wordnet"
-
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-	&& -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]; then
-	echo "Using ${environment_id}"
-	. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-	if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]; then
-		. "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-	fi
-else
-	# If the environment file has not yet been created, use the RVM CLI to select.
-	if ! rvm --create use  "$environment_id"
-		then
-		echo "Failed to create RVM environment '${environment_id}'."
-		exit 1
-	fi
-fi
-
-filename=".rvm.gems"
-if [[ -s "$filename" ]]; then
-	rvm gemset import "$filename"
-fi
-
+2.4
diff --git a/wordnet-defaultdb/Manifest.txt b/wordnet-defaultdb/Manifest.txt
--- a/wordnet-defaultdb/Manifest.txt
+++ b/wordnet-defaultdb/Manifest.txt
@@ -1,5 +1,14 @@
 History.rdoc
-LICENSE-WORDNET.txt
+LICENSE-sqlunet.txt
+LICENSE-bnc.txt
+LICENSE-fn.txt
+LICENSE-legacy.txt
+LICENSE-pb.txt
+LICENSE-pm.txt
+LICENSE-sumo.txt
+LICENSE-vn.txt
+LICENSE-wn.txt
+LICENSE-xwn.txt
 Manifest.txt
 README.rdoc
 Rakefile
diff --git a/wordnet-defaultdb/Rakefile b/wordnet-defaultdb/Rakefile
--- a/wordnet-defaultdb/Rakefile
+++ b/wordnet-defaultdb/Rakefile
@@ -12,19 +12,21 @@
 
 $trace = Rake.application.options.trace
 
-WNSQL_VERSION  = '1.0.1'
+SQLUNET_VERSION = '5.2.0-31'
+SQLUNET_SHORT_VERSION = SQLUNET_VERSION[ /\A([^-]+)/ ]
 
-# http://downloads.sourceforge.net/project/wnsql/wnsql-1.0.1/wordnet30-sqlite-1.0.1.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fwnsql%2Ffiles%2Fwnsql-1.0.1%2F&ts=1335825137&use_mirror=cdnetworks-us-1
+# https://versaweb.dl.sourceforge.net/project/sqlunet/5.2.0/sqlite/sqlite-5.2.0-31-all.zip
 
-WNSQL_BASE_URI = 'http://downloads.sourceforge.net/project/wnsql'
-WNSQL_ZIPFILE  = "wordnet30-sqlite-#{WNSQL_VERSION}.zip"
-WNSQL_URI      = "#{WNSQL_BASE_URI}/wnsql-#{WNSQL_VERSION}/#{WNSQL_ZIPFILE}"
+SQLUNET_BASE_URI = 'https://versaweb.dl.sourceforge.net/project/sqlunet'
+SQLUNET_ZIPFILE  = "sqlite-#{SQLUNET_VERSION}-all.zip"
+SQLUNET_URI      = "#{SQLUNET_BASE_URI}/#{SQLUNET_SHORT_VERSION}/#{SQLUNET_ZIPFILE}"
 
-BASEDIR        = Pathname( __FILE__ ).dirname.relative_path_from( Pathname.pwd )
-DATADIR        = BASEDIR + 'data'
-DBDIR          = DATADIR + 'wordnet-defaultdb'
-WNSQL_DB_FILE  = DBDIR + 'wordnet30.sqlite'
-WNSQL_LICENSE  = BASEDIR + 'LICENSE-WORDNET.txt'
+BASEDIR = Pathname( __FILE__ ).dirname.relative_path_from( Pathname.pwd )
+DATADIR = BASEDIR + 'data'
+DBDIR   = DATADIR + 'wordnet-defaultdb'
+
+ORIGINAL_DBFILE = 'sqlite-31.db'
+DEST_DBFILE     = DBDIR + 'wordnet31.sqlite'
 
 Hoe.plugin :mercurial
 Hoe.plugin :signing
@@ -35,15 +37,16 @@
 	self.readme_file = 'README.rdoc'
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = FileList[ '*.rdoc' ]
+	self.license 'BSD-3-Clause'
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'wordnet', '~> 1.0'
+	self.dependency 'wordnet', '~> 1.1'
 	self.dependency 'sqlite3', '~> 1.3'
-	self.dependency 'rubyzip', '~> 0.9', :developer
 
-	self.spec_extras[:licenses] = ["BSD"]
-	self.require_ruby_version( '>=1.9.3' )
+	self.dependency 'rubyzip', '~> 1.2', :developer
+
+	self.require_ruby_version( '>=2.3' )
 end
 
 ENV['VERSION'] ||= hoespec.spec.version.to_s
@@ -103,43 +106,39 @@
 end
 
 
-### Extract the contents of the specified +zipfile+ into the given +targetdir+.
-def unzip( zipfile, targetdir, *files )
-	require 'zip/zip'
-	targetdir = Pathname( targetdir )
-	raise "No such directory: #{targetdir}" unless targetdir.directory?
+### Extract the given +sourcepath+ of the specified +zipfile+ into the given +destpath+.
+def unzip( zipfile, sourcepath, destpath )
+	require 'zip'
 
-	Zip::ZipFile.foreach( zipfile ) do |entry|
-		# $stderr.puts "  entry is: %p, looking for: %p" % [ entry.name, files ]
-		next unless files.empty? || files.include?( entry.name )
-		target_path = targetdir + entry.name
-		$stderr.puts "  extracting: %s" % [ target_path ]
-		entry.extract( target_path ) { true }
-		files.delete( entry.name )
-		break if files.empty?
-	end
+	zf = Zip::File.open( zipfile )
+	ent = zf.get_entry( sourcepath )
 
-	raise "Couldn't unzip: %p: not found in %s" % [ files, zipfile ] unless files.empty?
+	ent.extract( destpath )
 end
 
 
 # Download the database zipfile
-file WNSQL_ZIPFILE.to_s do |task|
-	download WNSQL_URI, task.name
+file SQLUNET_ZIPFILE.to_s do |task|
+	download SQLUNET_URI, task.name
 end
-CLOBBER.include( WNSQL_ZIPFILE.to_s )
+CLOBBER.include( SQLUNET_ZIPFILE.to_s )
 
 # Extract the database from the downloaded zipfile
-file WNSQL_DB_FILE.to_s => [WNSQL_ZIPFILE.to_s] do |task|
-	mkdir_p( WNSQL_DB_FILE.dirname, :verbose => $trace )
-	unzip task.prerequisites.first, WNSQL_DB_FILE.dirname.to_s, WNSQL_DB_FILE.basename.to_s
+file DEST_DBFILE.to_s => [SQLUNET_ZIPFILE.to_s] do |task|
+	mkdir_p( DEST_DBFILE.dirname, :verbose => $trace )
+	unzip task.prerequisites.first, ORIGINAL_DBFILE, DEST_DBFILE.to_s
 end
-CLOBBER.include( WNSQL_DB_FILE.to_s, DATADIR.to_s )
+CLEAN.include( DEST_DBFILE.to_s )
+CLOBBER.include( DATADIR.to_s )
 
-# Extract the license file from the downloaded zipfile
-file WNSQL_LICENSE.to_s => [WNSQL_ZIPFILE.to_s] do |task|
-	mkdir_p( WNSQL_LICENSE.dirname, :verbose => $trace )
-	unzip task.prerequisites.first, WNSQL_LICENSE.dirname.to_s, WNSQL_LICENSE.basename.to_s
+# Extract the license files from the downloaded zipfile
+rule( /^LICENSE-(\w+)\.txt$/ => [ SQLUNET_ZIPFILE.to_s ]) do |task|
+	if task.name.include?( 'sqlunet' )
+		unzip task.prerequisites.first, "legal/LICENSE", task.name
+	else
+		unzip task.prerequisites.first, "legal/#{task.name}", task.name
+	end
 end
-CLOBBER.include( WNSQL_LICENSE.to_s )
 
+CLOBBER.include( 'LICENSE-*.txt' )
+
diff --git a/wordnet-defaultdb/lib/wordnet-defaultdb.rb b/wordnet-defaultdb/lib/wordnet-defaultdb.rb
--- a/wordnet-defaultdb/lib/wordnet-defaultdb.rb
+++ b/wordnet-defaultdb/lib/wordnet-defaultdb.rb
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'pathname'
+
 # This gem is a container for the default WordNetSQL database files required for
 # the 'wordnet' gem. It's mostly just a wrapper around the Sqlite database from:
 #
@@ -13,11 +15,26 @@
 	module DefaultDB
 
 		# Library version constant
-		VERSION = '1.0.0'
+		VERSION = '2.0.0'
 
 		# Version-control revision constant
 		REVISION = %q$Revision$
 
+		# The data directory which contains the database file
+		DATA_DIR = if ENV['WORDNET_DEFAULTDB_DATADIR']
+				Pathname( ENV['WORDNET_DEFAULTDB_DATADIR'] )
+			elsif Gem.datadir( 'wordnet-defaultdb' ) && File.directory?( Gem.datadir('wordnet-defaultdb') )
+				Pathname( Gem.datadir('wordnet-defaultdb') )
+			else
+				Pathname( __FILE__ ).dirname.parent + 'data/wordnet-defaultdb'
+			end
+
+
+		### The Sequel URI for the database
+		def self::uri
+			
+		end
+
 	end # module DefaultDB
 end # module Wordnet