shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

M #-: make onedb code more readable (#4625)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2020-04-29 10:30:23 +02:00 committed by GitHub
parent 6cd6f0d802
commit 68fced73fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/onedb/onedb.rb
View File

@ -22,10 +22,12 @@ LOG_TIME = false
class OneDB
attr_accessor :backend
CONNECTION_PARAMETERS = %i[server port user password db_name]
def initialize(ops)
if ops[:backend].nil? && ops[:server].nil? && ops[:port].nil? && ops[:user].nil? && ops[:password].nil? && ops[:db_name].nil?
if ops[:backend].nil? && CONNECTION_PARAMETERS.all? {|s| ops[s].nil? }
ops = read_credentials(ops)
elsif ops[:backend].nil? and (!ops[:server].nil? || !ops[:port].nil? || !ops[:user].nil? || !ops[:password].nil? || !ops[:db_name].nil? || !ops[:encoding].nil?)
elsif ops[:backend].nil? && CONNECTION_PARAMETERS.one? {|s| !ops[s].nil? }
# Set MySQL backend as default if any connection option is provided and --type is not
ops[:backend] = :mysql
end
@ -100,7 +102,7 @@ class OneDB
end
def read_credentials(ops)
begin
begin
gem 'augeas', '~> 0.6'
require 'augeas'
rescue Gem::LoadError