lib/ronin/database/database.rb in ronin-1.1.0.rc3 vs lib/ronin/database/database.rb in ronin-1.1.0

@@ -20,11 +20,10 @@
 require 'ronin/database/exceptions/invalid_config'
 require 'ronin/database/exceptions/unknown_repository'
 require 'ronin/database/migrations'
 require 'ronin/config'
 
-require 'addressable/uri'
 require 'yaml'
 require 'dm-core'
 
 module Ronin
   #
@@ -41,22 +40,22 @@
 
     # Database log level
     DEFAULT_LOG_LEVEL = :info
 
     # Default database repository
-    DEFAULT_REPOSITORY = Addressable::URI.new(
-      :scheme => 'sqlite3',
-      :path => File.join(Config::PATH,'database.sqlite3')
-    )
+    DEFAULT_REPOSITORY = {
+      :adapter => 'sqlite3',
+      :database => File.join(Config::PATH,'database.sqlite3')
+    }
 
     @repositories = {}
     @log = nil
 
     #
     # Returns the Database repositories to use.
     #
-    # @return [Hash{Symbol => Addressable::URI}]
+    # @return [Hash{Symbol => Hash}]
     #   The database repository names and URIs.
     #
     # @raise [InvalidConfig]
     #   The config file did not contain a YAML Hash.
     #
@@ -67,18 +66,18 @@
     def Database.repositories
       if @repositories.empty?
         @repositories[:default] = DEFAULT_REPOSITORY
 
         if File.file?(CONFIG_FILE)
-          conf = YAML.load_file(CONFIG_FILE)
+          config = YAML.load_file(CONFIG_FILE)
 
-          unless conf.kind_of?(Hash)
+          unless config.kind_of?(Hash)
             raise(InvalidConfig,"#{CONFIG_FILE} must contain a YAML Hash of repositories")
           end
 
-          conf.each do |name,uri|
-            @repositories[name.to_sym] = Addressable::URI.parse(uri)
+          config.each do |name,uri|
+            @repositories[name.to_sym] = uri
           end
         end
       end
 
       return @repositories
@@ -119,11 +118,11 @@
 
       File.open(CONFIG_FILE,'w') do |file|
         hash = {}
         
         repositories.each do |name,value|
-          hash[name.to_s] = value.to_s
+          hash[name.to_sym] = value
         end
 
         YAML.dump(hash,file)
       end
 
@@ -203,11 +202,11 @@
     # @api semipublic
     #
     def Database.setup
       # setup the database log
       unless @log
-        if ENV['DEBUG']
-          setup_log(:stream => STDERR, :level => :debug)
+        if ($DEBUG || ENV['DEBUG'])
+          setup_log(:stream => $stderr, :level => :debug)
         else
           setup_log
         end
       end