lib/symmetric_encryption/railtie.rb in symmetric-encryption-4.0.0 vs lib/symmetric_encryption/railtie.rb in symmetric-encryption-4.0.1

@@ -1,9 +1,7 @@
-# encoding: utf-8
 module SymmetricEncryption #:nodoc:
   class Railtie < Rails::Railtie #:nodoc:
-
     # Exposes Symmetric Encryption's configuration to the Rails application configuration.
     #
     # @example Set up configuration in the Rails app.
     #   module MyApplication
     #     class Application < Rails::Application
@@ -29,25 +27,24 @@
     # Loaded before Active Record initializes since database.yml can have encrypted
     # passwords in it
     config.before_configuration do
       # Check if already configured
       unless ::SymmetricEncryption.cipher?
-        app_name = Rails::Application.subclasses.first.parent.to_s.underscore
+        app_name    = Rails::Application.subclasses.first.parent.to_s.underscore
         config_file = Rails.root.join('config', 'symmetric-encryption.yml')
         if config_file.file?
           begin
-            ::SymmetricEncryption::Config.load!(file_name: config_file, env: Rails.env)
+            ::SymmetricEncryption::Config.load!(file_name: config_file, env: ENV['SYMMETRIC_ENCRYPTION_ENV'] || Rails.env)
           rescue ArgumentError => exc
             puts "\nSymmetric Encryption not able to read keys."
             puts "#{exc.class.name} #{exc.message}"
-            puts "To generate a new config file and key files: symmetric-encryption --generate --key-path /etc/#{app_name} --app_name #{app_name}\n\n"
+            puts "To generate a new config file and key files: symmetric-encryption --generate --key-path /etc/#{app_name} --app-name #{app_name}\n\n"
             raise(exc)
           end
         else
           puts "\nSymmetric Encryption config not found."
-          puts "To generate a new config file and key files: symmetric-encryption --generate --key-path /etc/#{app_name} --app_name #{app_name}\n\n"
+          puts "To generate a new config file and key files: symmetric-encryption --generate --key-path /etc/#{app_name} --app-name #{app_name}\n\n"
         end
       end
     end
-
   end
 end