configuration.rb in kafo-3.0.0

- old
+ new

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 require 'yaml'
 require 'tmpdir'
 require 'kafo/puppet_module'
-require 'kafo/password_manager'
 require 'kafo/color_scheme'
 require 'kafo/data_type_parser'
 require 'kafo/puppet_configurer'
 
 module Kafo
@@ -40,11 +39,11 @@
       @logger = KafoConfigure.logger
 
       @answer_file = app[:answer_file]
       begin
         @data = load_yaml_file(@answer_file)
-      rescue Errno::ENOENT => e
+      rescue Errno::ENOENT
         puts "No answer file at #{@answer_file} found, can not continue"
         KafoConfigure.exit(:no_answer_file)
       end
 
       @config_dir = File.dirname(@config_file)
@@ -70,16 +69,15 @@
 
     def app
       @app ||= begin
         begin
           configuration = load_yaml_file(@config_file)
-        rescue => e
+        rescue
           configuration = {}
         end
 
         result            = DEFAULT.merge(configuration || {})
-        result[:password] ||= PasswordManager.new.password
         result[:module_dirs] = result[:modules_dir] || result[:module_dirs]
         result.delete(:modules_dir)
         result
       end
     end
@@ -137,11 +135,11 @@
     end
 
     def migrate_configuration(from_config, options={})
       keys_to_skip = options.fetch(:skip, [])
       keys = [:log_dir, :log_name, :log_level, :no_prefix,
-        :colors, :color_of_background, :custom, :password, :verbose_log_level]
+        :colors, :color_of_background, :custom, :verbose_log_level]
       keys += options.fetch(:with, [])
       keys.each do |key|
         next if keys_to_skip.include?(key)
         app[key] = from_config.app[key]
       end
@@ -199,18 +197,18 @@
       !!value || value.is_a?(Hash)
     end
 
     def config_header
       files          = [app[:config_header_file], File.join(gem_root, '/config/config_header.txt')].compact
-      file           = files.select { |f| File.exists?(f) }.first
+      file           = files.find { |f| File.exist?(f) }
       @config_header ||= file.nil? ? '' : File.read(file)
     end
 
     def store(data, file = nil)
       filename = file || answer_file
       FileUtils.touch filename
       File.chmod 0600, filename
-      File.open(filename, 'w') { |file| file.write(config_header + format(YAML.dump(data))) }
+      File.open(filename, 'w') { |f| f.write(config_header + format(YAML.dump(data))) }
     end
 
     def params
       @params ||= modules.map(&:params).flatten
     end