Stop using Gem.datadir.
authorMahlon E. Smith <mahlon@martini.nu>
Thu, 29 Nov 2018 10:20:18 -0800
changeset 15 38ea95105574
parent 14 df6b0c7491b8
child 16 87b0a389b804
Stop using Gem.datadir.
lib/thingfish/metastore/pggraph.rb
--- a/lib/thingfish/metastore/pggraph.rb	Wed Jan 17 13:33:33 2018 -0800
+++ b/lib/thingfish/metastore/pggraph.rb	Thu Nov 29 10:20:18 2018 -0800
@@ -24,21 +24,20 @@
 
 
 	# Package version
-	VERSION = '0.3.0'
+	VERSION = '0.3.1'
 
 	# Version control revision
-	REVISION = %q$Revision$
+	REVISION = %q$Revision: 686fbfe638bd $
 
 	# The data directory that contains migration files.
 	#
 	DATADIR = if ENV['THINGFISH_METASTORE_PGGRAPH_DATADIR']
-			Pathname.new( ENV['THINGFISH_METASTORE_PGGRAPH_DATADIR'] )
-		elsif Gem.datadir( 'thingfish-metastore-pggraph' )
-			Pathname.new( Gem.datadir('thingfish-metastore-pggraph') )
-		else
-			Pathname.new( __FILE__ ).dirname.parent.parent.parent +
-				'data' + 'thingfish-metastore-pggraph'
-		end
+				   Pathname( ENV['PEDIA_DATADIR'] )
+			   elsif Gem.loaded_specs[ 'thingfish-metastore-pggraph' ] && File.exist?( Gem.loaded_specs['thingfish-metastore-pggraph'].datadir )
+				   Pathname( Gem.loaded_specs['thingfish-metastore-pggraph'].datadir )
+			   else
+				   Pathname( __FILE__ ).dirname.parent.parent.parent + 'data/thingfish-metastore-pggraph'
+			   end
 
 	log_as :thingfish_metastore_pggraph