lib/aptly_load.rb in aptly_cli-0.2.3 vs lib/aptly_load.rb in aptly_cli-0.2.4

- old
+ new

@@ -1,44 +1,47 @@ require 'aptly_cli/version' require 'yaml' require 'logger' module AptlyCli + # Load aptly-cli configuration class AptlyLoad - def initialize @log = Logger.new(STDOUT) @log.level = Logger::WARN - + # Configuration defaults @config = { - :server => "127.0.0.1", - :port => 8082 - } - + server: '127.0.0.1', + port: 8082 + } + @valid_config_keys = @config.keys end - + # Configure through hash def configure(opts = {}) - opts.each {|k,v| config[k.to_sym] = v if @valid_config_keys.include? k.to_sym} + opts.each do |k, v| + config[k.to_sym] = v if @valid_config_keys.include? k.to_sym + end end - + # Configure through yaml file def configure_with(path_to_yaml_file) begin - config = YAML::load(IO.read(path_to_yaml_file)) + config = YAML.load(IO.read(path_to_yaml_file)) rescue Errno::ENOENT - @log.warn("YAML configuration file couldn't be found at /etc/aptly-cli.conf. Using defaults.") + @log.warn('YAML configuration file couldn\'t be found at + /etc/aptly-cli.conf. Using defaults.') return @config rescue Psych::SyntaxError - @log.warn("YAML configuration file contains invalid syntax. Using defaults.") - return @config + @log.warn( + 'YAML configuration file contains invalid syntax. Using defaults.') + return @config end - configure(config) end - + def config @config end end end