diff options
Diffstat (limited to 'config/bundler_helper.rb')
| -rw-r--r-- | config/bundler_helper.rb | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/config/bundler_helper.rb b/config/bundler_helper.rb index 6ca9d6ba1..29d3a6d3e 100644 --- a/config/bundler_helper.rb +++ b/config/bundler_helper.rb @@ -5,22 +5,31 @@ require "yaml" module BundlerHelper def self.rails_env @rails_env ||= ENV["RAILS_ENV"] || - parse_value_from_file("diaspora.yml", "configuration", "server", "rails_environment") || - parse_value_from_file("defaults.yml", "defaults", "server", "rails_environment") + parse_value_from_toml_file("diaspora.toml", "rails_environment") || + parse_value_from_yaml_file("diaspora.yml", "configuration", "server", "rails_environment") || + parse_value_from_yaml_file("defaults.yml", "defaults", "server", "rails_environment") end def self.database - @adapter ||= parse_value_from_file("database.yml", rails_env, "adapter") + @adapter ||= parse_value_from_yaml_file("database.yml", rails_env, "adapter") - raise "No database adapter found, please fix your config/database.yml!" unless @adapter + abort "No database adapter found, please fix your config/database.yml!" unless @adapter @adapter.sub("mysql2", "mysql") end - private_class_method def self.parse_value_from_file(file, *keys) + private_class_method def self.parse_value_from_yaml_file(file, *keys) + path = File.join(__dir__, file) + YAML.load_file(path).dig(*keys) if File.file?(path) + end + + private_class_method def self.parse_value_from_toml_file(file, key) path = File.join(__dir__, file) - return YAML.load_file(path).dig(*keys) if File.file?(path) - puts "Configuration file #{path} not found, ensure it's present" # rubocop:disable Rails/Output + if File.file?(path) + File.read(path)[/^\s*#{Regexp.escape(key)}\s*=\s*["']([^"']+)["']\s*$/, 1] + elsif !File.file? File.join(__dir__, "diaspora.yml") + warn "WARNING: Configuration file #{path} not found, ensure it's present" # rubocop:disable Rails/Output + end end end |