bin/hammer in hammer_cli-0.11.0 vs bin/hammer in hammer_cli-0.12.0
- old
+ new
@@ -27,10 +27,11 @@
end
option ["--version"], :flag, "show version"
option ["--show-ids"], :flag, "Show ids of associated resources"
option ["--csv"], :flag, "Output as CSV (same as --output=csv)"
option ["--output"], "ADAPTER", "Set output format"
+ option ["--no-headers"], :flag, "Hide headers from output"
option ["--csv-separator"], "SEPARATOR", "Character to separate the values"
option ["--autocomplete"], "LINE", "Get list of possible endings"
option ["--verify-ssl"], "VERIFY_SSL", "Configure SSL verification of remote system" do |value|
bool_normalizer = HammerCLI::Options::Normalizers::Bool.new
bool_normalizer.format(value)
@@ -50,19 +51,12 @@
end
# load user's settings
require 'hammer_cli/settings'
-CFG_PATH_LEGACY = ['~/.foreman/', '/etc/foreman/', "#{::RbConfig::CONFIG['sysconfdir']}/foreman/"].uniq
-HammerCLI::Settings.load_from_paths CFG_PATH_LEGACY
-if HammerCLI::Settings.path_history.empty?
- CFG_PATH = ['~/.hammer/', '/etc/hammer/', "#{::RbConfig::CONFIG['sysconfdir']}/hammer/"].uniq
- HammerCLI::Settings.load_from_paths CFG_PATH
-else
- warn _("Warning: Legacy config paths detected, move the following files")
- HammerCLI::Settings.path_history.each { |p| warn " #{p} -> #{p.gsub('hammer.modules.d', 'cli.modules.d').gsub('foreman/', 'hammer/')}"}
-end
+CFG_PATH = ['~/.hammer/', '/etc/hammer/', "#{::RbConfig::CONFIG['sysconfdir']}/hammer/"].uniq
+HammerCLI::Settings.load_from_paths CFG_PATH
CFG_PATH_LOCAL = ['./config/']
HammerCLI::Settings.load_from_paths CFG_PATH_LOCAL
@@ -84,9 +78,10 @@
:username => preparser.username,
:password => preparser.password,
:host => preparser.server,
:interactive => preparser.interactive,
:verbose => preparser.verbose? || preparser.debug?,
+ :no_headers => preparser.no_headers?,
:reload_cache => preparser.reload_cache?,
:verify_ssl => preparser.verify_ssl,
:ssl_ca_file => preparser.ssl_ca_file,
:ssl_ca_path => preparser.ssl_ca_path,
:ssl_client_cert => preparser.ssl_client_cert,