lib/ronin/database/database.rb in ronin-1.5.0 vs lib/ronin/database/database.rb in ronin-1.5.1

@@ -1,9 +1,9 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin.
+# This file is part of ronin.
 #
 # Ronin is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
@@ -12,11 +12,11 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
+# along with Ronin.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'ronin/database/exceptions/invalid_config'
 require 'ronin/database/exceptions/unknown_repository'
 require 'ronin/database/migrations'
@@ -194,15 +194,13 @@
     #   not setup.
     #
     # @api semipublic
     #
     def self.upgrade!
-      if setup?
-        Migrations.migrate_up!
-      else
-        false
-      end
+      return false unless setup?
+
+      Migrations.migrate_up!
     end
 
     #
     # Sets up the Database.
     #
@@ -214,13 +212,11 @@
     # @api semipublic
     #
     def self.setup(uri=nil)
       # setup the database log
       unless @log
-        if $DEBUG
-          log(:stream => $stderr, :level => :debug)
-        else
-          log
+        if $DEBUG then log(:stream => $stderr, :level => :debug)
+        else           log
         end
       end
 
       if uri
         # only setup the default database repositories