hammer_cli 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f466081646f301304855a180aec480a3c90e1653
-  data.tar.gz: b33e6d9d98d4746890ffd72080cd6f3bf272dd3b
+  metadata.gz: 0aa589ebe2589ead222c05b6b8a1de324f3efdb5
+  data.tar.gz: 1068b381dbe8685c2a1d7bc0168513f5e48ccce9
 SHA512:
-  metadata.gz: 659186808832cd2531ef847a046eded3270789a73a052c8565c0cadbde7de977fe3b3d18bfb2d362ed2458dc4dd8f4ce826a828f78eafceb2815f727b5ee2395
-  data.tar.gz: dceeed449044ee96e0fe969bdf4ed2906c6b27b6de91988f70a83ec72a65d218d7e3ef720ced4195420a5697ca9369e1786afc992bac6020d9f7fae597295297
+  metadata.gz: c7153a9ebaab813ef8ea1061461efd60c1e357f5445187762203aed5055bb1e38eac86d787f4bec013e5cc78e84afd40fbb3ac81cef8a3b1844732356a7f864f
+  data.tar.gz: ff4d24d0067d7e500ee573bfb82531637c67f557d1ef9745d4b2587ed31e9edbac0aa6d47eb79778e97658627495f3327b5cac0626d56ea04dfd8a27c7c1b8ba

data/bin/hammer

@@ -29,6 +29,7 @@ class PreParser < Clamp::Command
   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|
@@ -52,15 +53,8 @@ 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/']
 
@@ -86,6 +80,7 @@ HammerCLI::Settings.load({
     :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,

data/config/cli_config.template.yml

@@ -8,7 +8,8 @@
   :history_file: '~/.hammer/history'
   # Mark translated strings with X characters (for developers)
   #:mark_translated: false
-
+  # Hide headers from output of list actions
+  # :no_headers: true
 
 # Enable/disable color output of logger in Clamp commands
 :watch_plain: false
@@ -34,23 +35,28 @@
 
 # SSL auth options
 #:ssl:
-  # Path to a ca file
+  # Path to a CA file in PEM format, mutually exclusive with :ssl_ca_path:
   #:ssl_ca_file: '/path/to/ca_certificate.pem'
 
-  # Path to a direcotry with ca file
+  # Path to a direcotry with CA files, mutually exclusive with :ssl_ca_file:
+  # The directory should contain one certificate per file in PEM format, with a file name of the form hash.N
+  # The hash can be obtained via the -hash option of the openssl x509 command. See the OpenSSL documentation
+  # for more information.
   #:ssl_ca_path: '/path/to/ca'
 
   # Turn SSL verification on/off
   #:verify_ssl: true
 
-  # Path to a client certificate
+  # Path to a client certificate, DER- or PEM-encoded certificates are supported
   #:ssl_client_cert: '/path/to/cert.crt'
 
   # Path to a client key
   #:ssl_client_key: '/path/to/cert.key'
 
-  # Enable standard authentication in addition to client certificate authentication
+  # Enable standard authentication in addition to client certificate authentication.
+  # Switch to false if you want to rely on certificates only.
   #:ssl_with_basic_auth: true
 
-  # local CA cert store path
+  # Local CA cert store path where hammer stores certificates fetched from the server.
+  # Certs from the local storage are used only when neither :ssl_ca_file: nor :ssl_ca_path: is cofigured.
   #:local_ca_store_path: '~/.hammer/certs'

data/doc/creating_commands.md

@@ -129,6 +129,22 @@ $ hammer hello --name 'Foreman'
 Hello Foreman!
 ```
 
+#### Nil values ####
+To unset some option (i.e. to set it to nil value) use preset value `NIL`:
+```
+$ hammer hello --name NIL
+Hello World!
+```
+
+When the `NIL` value collides with a real value being used it can be redefined using
+environment variable `HAMMER_NIL`:
+```
+$ HAMMER_NIL=NULL hammer hello --name NIL
+Hello NIL!
+```
+
+Note that the normalizers are not called for a NIL values even when defined for the option.
+
 #### Deprecated options
 To mark an option as deprecated use the `:deprecated` option as follows:
 ```ruby
@@ -226,6 +242,28 @@ option "--attributes", "ATTRIBUTES", "Values of various attributes",
 ```
 `--attributes="material=unoptanium,thickness=3"` -> `{'material' => 'unoptanium', 'thickness' => '3'}`
 
+### Advanced option evaluation
+
+Sometimes it is necessary to tune the option values based on other parameters given on CLI. 
+An example could be setting default values based on other options, values lookup in a DB, etc.
+The right place for this are `OptionSources`. Abstract Hammer command uses two default option sources -
+`HammerCLI::Options::Sources::CommandLine` responsible for intial population of the options, 
+`HammerCLI::Options::Sources::SavedDefaults` adding defaults managed by the `defaults` command.
+
+By overriding `option_sources` method in a command it is possible to add custom option sources 
+for various tasks to the list. The option sources are evaluated one by one each being given output 
+of the previous one as its input so the order in which the sources are listed matters. 
+
+Option sources are collected only once per command call. The collection is triggered by first call 
+to the `options` or `all_options` method, but at latest right after the option validation 
+(before the command's `execute` method is invoked). The order is as follows:
+ 1. parse
+ 1. option normalization
+ 1. option validation (run against normalized raw options as given on CLI)
+ 1. option sources execution
+ 1. `execute` invocation
+
+
 ### Adding subcommands
 Commands in the CLI can be structured into a tree of parent commands (nodes) and subcommands (leaves).
 Neither the number of subcommands nor the nesting is limited. Please note that no parent command

data/doc/i18n.md

@@ -46,7 +46,6 @@ HammerCLI::I18n.add_domain(HammerCLIAwesomePlugin::I18n::LocaleDomain.new)
 ```
 
 Then you have to export strings, translate them and place the files in a directory structure.
-Inspiration on how to export the translations can be found in hammer's [Rakefile](../Rakefile).
 
 Typical directory structure for translation files look like this:
 ```
@@ -62,6 +61,29 @@ locale
 └── hammer-cli-awesome.pot
 ```
 
+You can re-use Rake tasks and Makefile targets for extracting translations and integration with transifex that hammer provides.
+To do that, add following lines to the plugin's Rakefile:
+```ruby
+require "hammer_cli_awesome/version"
+require "hammer_cli_awesome/i18n"
+require "hammer_cli/i18n/find_task"
+HammerCLI::I18n::FindTask.define(HammerCLIAwesome::I18n::LocaleDomain.new, HammerCLIAwesome.version)
+```
+
+and create `locale/Makefile` with following content:
+```make
+DOMAIN = hammer-cli-awesome
+VERSION = $(shell bundle exec ruby -e 'require "rubygems"; spec = Gem::Specification::load("../hammer_cli_awesome.gemspec"); puts spec.version')
+MAIN_MAKEFILE = $(shell bundle exec ruby -e 'require "hammer_cli"; puts HammerCLI::I18n.main_makefile')
+
+include $(MAIN_MAKEFILE)
+```
+
+Make sure you have a project created in [transifex](www.transifex.com) and correct configuration stored in your plugins repository ([example config file](../.tx/config)).
+
+
+Calling `make -C ./locale tx-update` will then extract new strings, update `.po` and `.mo` files and commit the changes.
+
 
 ### Translation tips
 
@@ -96,5 +118,14 @@ puts _("TODO:") +
 ```
 
 
-4) Try setting `:mark_translated: true` to identify gaps in your translations.
+4) It's recommended to use punctuation at the end of sentences.
+```ruby
+# CORRECT
+puts _("Hello %s") % name
+# RECOMMENDED
+puts _("Hello %s.") % name
+```
+
+
+5) Try setting `:mark_translated: true` to identify gaps in your translations.
 This will wrap all translated strings with angle brackets '>message<'.

data/doc/option_normalizers.md

@@ -47,6 +47,8 @@ def format(bool)
 end
 ```
 
+Note: the `format` is not called when `NIL` (value reserved for nil) is used.
+
 
 #### Value completion
 

data/doc/release_notes.md

@@ -1,6 +1,24 @@
 Release notes
 =============
 
+### 0.12.0 (2018-02-19)
+* Tests for message formats ([PR #266](https://github.com/theforeman/hammer-cli/pull/266)) ([#7451](http://projects.theforeman.org/issues/7451))
+* Pin clamp version to < 1.2.0 ([#22554](http://projects.theforeman.org/issues/22554))
+* Fix "unknown version" message ([#7451](http://projects.theforeman.org/issues/7451))
+* Remove legacy Gemfile code for Ruby < 2.0 ([#22549](http://projects.theforeman.org/issues/22549))
+* Allow hiding headers from output of list actions ([PR #253](https://github.com/theforeman/hammer-cli/pull/253)) ([#20978](http://projects.theforeman.org/issues/20978))
+* Review whitespace in extracted strings ([#7451](http://projects.theforeman.org/issues/7451))
+* Matches user prefix in output messages for CA certs ([#21707](http://projects.theforeman.org/issues/21707))
+* Make option sources overridable ([#21768](http://projects.theforeman.org/issues/21768))
+* Allow empty parameters in hammer ([PR #260](https://github.com/theforeman/hammer-cli/pull/260)) ([#17252](http://projects.theforeman.org/issues/17252))
+* Shareable locale Makefile and Rakefile definitions ([PR #249](https://github.com/theforeman/hammer-cli/pull/249)) ([#20513](http://projects.theforeman.org/issues/20513))
+* Support for deprecating commands ([#20804](http://projects.theforeman.org/issues/20804))
+* Remove legacy config code ([#20611](http://projects.theforeman.org/issues/20611))
+* Number normalizers for Integer params ([#21013](http://projects.theforeman.org/issues/21013))
+* More detailed description of ssl options ([PR #248](https://github.com/theforeman/hammer-cli/pull/248)) ([#12401](http://projects.theforeman.org/issues/12401))
+* Consistant capitalization in hammer help ([#19511](http://projects.theforeman.org/issues/19511))
+* Saving defaults from hammer shell ([PR #244](https://github.com/theforeman/hammer-cli/pull/244)) ([#19676](http://projects.theforeman.org/issues/19676))
+
 ### 0.11.0 (2017-08-01)
 * Add full-help command ([#20181](http://projects.theforeman.org/issues/20181))
 * Replace CSV parser in List Normalizer ([#17135](http://projects.theforeman.org/issues/17135))

data/lib/hammer_cli/abstract.rb

@@ -240,10 +240,15 @@ module HammerCLI
     end
 
     def option_collector
-      @option_collector ||= HammerCLI::Options::OptionCollector.new(self.class.recognised_options, [
+      @option_collector ||= HammerCLI::Options::OptionCollector.new(self.class.recognised_options, option_sources)
+    end
+
+
+    def option_sources
+      [
         HammerCLI::Options::Sources::CommandLine.new(self),
         HammerCLI::Options::Sources::SavedDefaults.new(context[:defaults], logger)
-      ])
+      ]
     end
 
     private

data/lib/hammer_cli/apipie/option_builder.rb

@@ -71,7 +71,7 @@ module HammerCLI::Apipie
       elsif param.validator =~ /Must be one of: (.*)\./
         allowed = $1.split(/,\ ?/).map { |val| val.gsub(/<[^>]*>/i,'') }
         opts[:format] = HammerCLI::Options::Normalizers::Enum.new(allowed)
-      elsif param.expected_type.to_s == 'number' || param.validator =~ /Number/i
+      elsif param.expected_type.to_s == 'numeric' || param.validator =~ /Number/i || param.validator =~ /Integer/i
         opts[:format] = HammerCLI::Options::Normalizers::Number.new
       end
       opts[:attribute_name] = HammerCLI.option_accessor_name(param.name)

data/lib/hammer_cli/ca_cert_fetcher.rb

@@ -4,7 +4,7 @@ module HammerCLI
     def fetch_ca_cert(service_uri, ca_store_path)
       begin
         uri = URI.parse(service_uri)
-        raise URI::InvalidURIError.new(_("Unable to find hostname in #{service_uri}")) if uri.host.nil?
+        raise URI::InvalidURIError.new(_("Unable to find hostname in %s.") % service_uri) if uri.host.nil?
         raise URI::InvalidURIError.new(scheme_error(uri)) unless uri.scheme == 'https'
         ca_cert_manager = HammerCLI::CACertManager.new(ca_store_path)
         raw_cert = HammerCLI::CertDownloader.new.download(uri)
@@ -17,7 +17,7 @@ module HammerCLI
         deb_update_cmd = "update-ca-certificates"
         cert_file = ca_cert_manager.cert_file_name(uri)
 
-        puts _("CA certificate for %{uri} was stored to %{file}") % {:uri => service_uri, :file => cert_file}
+        puts _("CA certificate for %{uri} was stored to %{file}.") % {:uri => service_uri, :file => cert_file}
         puts _("Now hammer can use the downloaded certificate to verify SSL connection to the server.")
         puts _("It will be used automatically when ssl_ca_path and ssl_ca_file options are not set.")
         puts
@@ -31,12 +31,12 @@ module HammerCLI
 
         if File.directory?(rh_install_path)
           puts cert_install_msg
-          puts "  $ install #{cert_file} #{rh_install_path}"
-          puts "  $ #{rh_update_cmd}"
+          puts "  # install #{cert_file} #{rh_install_path}"
+          puts "  # #{rh_update_cmd}"
         elsif File.directory?(deb_install_path)
           puts cert_install_msg
-          puts "  $ install #{cert_file} #{deb_install_path}"
-          puts "  $ #{deb_update_cmd}"
+          puts "  # install #{cert_file} #{deb_install_path}"
+          puts "  # #{deb_update_cmd}"
         end
         puts
         return HammerCLI::EX_OK
@@ -52,7 +52,7 @@ module HammerCLI
         $stderr.puts _("To see the actual chain you can use openssl command")
         $stderr.puts "  $ openssl s_client -showcerts -connect #{uri.host}:#{uri.port} </dev/null"
         $stderr.puts
-        $stderr.puts _("You can also download the certificate manually and store it as #{cert_file}")
+        $stderr.puts _("You can also download the certificate manually and store it as %s.") % cert_file
         $stderr.puts _("If you choose any other location set the ssl_ca_path or ssl_ca_file configuration options appropriately.")
         return HammerCLI::EX_SOFTWARE
       rescue StandardError => e
@@ -60,7 +60,7 @@ module HammerCLI
         msg = [_('Fetching the CA certificate failed:')]
 
         if e.is_a?(OpenSSL::SSL::SSLError) && e.message.include?('unknown protocol')
-          msg << _('The service at the given URI does not accept SSL connections')
+          msg << _('The service at the given URI does not accept SSL connections.')
           msg << scheme_error if uri.scheme == 'http'
         else
           msg << e.message

data/lib/hammer_cli/clamp.rb

@@ -2,14 +2,14 @@ require 'clamp'
 
 if Clamp.respond_to?(:messages=)
   Clamp.messages = {
-    :too_many_arguments =>       _("too many arguments"),
-    :option_required =>          _("option '%<option>s' is required"),
-    :option_or_env_required =>   _("option '%<option>s' (or env %<env>s) is required"),
-    :option_argument_error =>    _("option '%<switch>s': %<message>s"),
-    :parameter_argument_error => _("parameter '%<param>s': %<message>s"),
-    :env_argument_error =>       _("%<env>s: %<message>s"),
-    :unrecognised_option =>      _("Unrecognised option '%<switch>s'"),
-    :no_such_subcommand =>       _("No such sub-command '%<name>s'"),
-    :no_value_provided =>        _("no value provided")
+    :too_many_arguments =>       _("Too many arguments."),
+    :option_required =>          _("Option '%s' is required.") % "%<option>s",
+    :option_or_env_required =>   _("Option '%{opt}' (or env %{env}) is required.") % {:opt => "%<option>s", :env => "%<env>s"},
+    :option_argument_error =>    _("Option '%{swt}': %{msg}.") % {:swt => "%<switch>s", :msg => "%<message>s"},
+    :parameter_argument_error => _("Parameter '%{pmt}': %{msg}.") % {:pmt => "%<param>s", :msg => "%<message>s"},
+    :env_argument_error =>       _("%{env}: %{msg}.") % {:env => "%<env>s", :msg => "%<message>s"},
+    :unrecognised_option =>      _("Unrecognised option '%s'.") % "%<switch>s",
+    :no_such_subcommand =>       _("No such sub-command '%s'.") % "%<name>s",
+    :no_value_provided =>        _("No value provided.")
   }
 end

data/lib/hammer_cli/context.rb

@@ -6,7 +6,8 @@ module HammerCLI
     @context ||= {
       :defaults => HammerCLI.defaults,
       :is_tty? => HammerCLI.tty?,
-      :api_connection => HammerCLI::Connection.new(Logging.logger['Connection'])
+      :api_connection => HammerCLI::Connection.new(Logging.logger['Connection']),
+      :no_headers => HammerCLI::Settings.get(:ui, :no_headers)
     }
   end
 

data/lib/hammer_cli/defaults.rb

@@ -23,20 +23,18 @@ module HammerCLI
     end
 
     def delete_default_from_conf(param)
-      update_defaults_file do |defaults|
-        defaults.delete_if { |k,| defaults_match?(k, param) }
-      end
+      @defaults_settings.delete_if { |k,| defaults_match?(k, param) }
+      update_defaults_file
     end
 
     def add_defaults_to_conf(default_options, provider)
       create_default_file if defaults_settings.empty?
-      update_defaults_file do |defaults|
-        default_options.each do |key, value|
-          key = switch_to_name(key).to_sym
-          defaults.delete_if { |k,| defaults_match?(k, key) }
-          defaults[key] = (value ? {:value => value} : {:provider => provider})
-        end
+      default_options.each do |key, value|
+        key = switch_to_name(key).to_sym
+        @defaults_settings.delete_if { |k,| defaults_match?(k, key) }
+        @defaults_settings[key] = (value ? {:value => value.to_s} : {:provider => provider.to_s})
       end
+      update_defaults_file
     end
 
     def defaults_set?(param)
@@ -79,11 +77,11 @@ module HammerCLI
     end
 
     def update_defaults_file
-      conf_file = YAML.load_file(@path)
-      conf_file[:defaults] ||= {}
-      yield conf_file[:defaults]
-      write_to_file conf_file
-      conf_file
+      conf_file_content = {
+        :defaults => @defaults_settings
+      }
+      write_to_file(conf_file_content)
+      conf_file_content
     end
 
     private

data/lib/hammer_cli/defaults_commands.rb

@@ -101,9 +101,9 @@ module HammerCLI
       command_name 'add'
 
       desc _('Add a default parameter to config')
-      option "--param-name", "OPTION_NAME", _("The name of the default option (e.g. organization_id)."), :required => true
+      option "--param-name", "OPTION_NAME", _("The name of the default option (e.g. organization_id)"), :required => true
       option "--param-value", "OPTION_VALUE", _("The value for the default option")
-      option "--provider", "OPTION_PROVIDER", _("The name of the provider providing the value. For list available providers see `hammer defaults providers`.")
+      option "--provider", "OPTION_PROVIDER", _("The name of the provider providing the value. For list available providers see `hammer defaults providers`")
 
       def execute
         if option_provider.nil? && option_param_value.nil? || !option_provider.nil? && !option_param_value.nil?

data/lib/hammer_cli/exception_handler.rb

@@ -69,7 +69,7 @@ module HammerCLI
 
     def handle_usage_exception(e)
       print_error (_("Error: %{message}") + "\n\n" +
-                   _("See: '%{path} --help'")) % {:message => e.message, :path => e.command.invocation_path}
+                   _("See: '%{path} --help'.")) % {:message => e.message, :path => e.command.invocation_path}
       log_full_error e
       HammerCLI::EX_USAGE
     end

data/lib/hammer_cli/help/builder.rb

@@ -1,3 +1,4 @@
+require 'unicode'
 module HammerCLI
   module Help
     class Builder < Clamp::Help::Builder
@@ -34,7 +35,7 @@ module HammerCLI
 
         items.each do |item|
           label, description = item.help
-          description.each_line do |line|
+          description.gsub(/^(.)/) { Unicode::capitalize($1) }.each_line do |line|
             puts " %-#{label_width}s %s" % [label, line]
             label = ''
           end

data/lib/hammer_cli/i18n/find_task.rb

@@ -0,0 +1,41 @@
+require 'rake'
+
+module HammerCLI
+  module I18n
+    class FindTask
+      include Rake::DSL
+
+      def initialize(domain, version)
+        @domain = domain
+        @version = version
+      end
+
+      def define
+        namespace :gettext do
+          task :setup do
+            require 'gettext/tools/task'
+
+            GetText::Tools::Task.define do |task|
+              task.package_name = @domain.domain_name
+              task.package_version = @version.to_s
+              task.domain = @domain.domain_name
+              task.mo_base_directory = @domain.locale_dir
+              task.po_base_directory = @domain.locale_dir
+              task.files = @domain.translated_files
+              task.msgmerge_options='--no-fuzzy-matching'
+            end
+          end
+
+          desc "Update pot file"
+          task :find => [:setup] do
+            Rake::Task["gettext:po:update"].invoke
+          end
+        end
+      end
+
+      def self.define(domain, version)
+        new(domain, version).define
+      end
+    end
+  end
+end

data/lib/hammer_cli/i18n.rb

@@ -133,6 +133,10 @@ module HammerCLI
       end
     end
 
+    def self.main_makefile
+      File.expand_path(File.join(File.dirname(__FILE__), '../../locale/Makefile.def'))
+    end
+
     init
   end
 end

data/lib/hammer_cli/logger.rb

@@ -55,7 +55,7 @@ module HammerCLI
       begin
         FileUtils.mkdir_p(log_dir, :mode => 0750)
       rescue Errno::EACCES => e
-        $stderr.puts _("No permissions to create log dir %s") % log_dir
+        $stderr.puts _("No permissions to create log dir %s.") % log_dir
       end
 
       filename = "#{log_dir}/hammer.log"

data/lib/hammer_cli/main.rb

@@ -4,17 +4,17 @@ module HammerCLI
 
   class MainCommand < AbstractCommand
 
-    option ["-v", "--verbose"], :flag, _("be verbose"), :context_target => :verbose
-    option ["-d", "--debug"], :flag, _("show debugging output "), :context_target => :debug
-    option ["-r", "--reload-cache"], :flag, _("force reload of Apipie cache")
+    option ["-v", "--verbose"], :flag, _("Be verbose"), :context_target => :verbose
+    option ["-d", "--debug"], :flag, _("Show debugging output"), :context_target => :debug
+    option ["-r", "--reload-cache"], :flag, _("Force reload of Apipie cache")
 
-    option ["-c", "--config"], "CFG_FILE", _("path to custom config file")
+    option ["-c", "--config"], "CFG_FILE", _("Path to custom config file")
 
-    option ["-u", "--username"], "USERNAME", _("username to access the remote system"),
+    option ["-u", "--username"], "USERNAME", _("Username to access the remote system"),
       :context_target => :username
-    option ["-p", "--password"], "PASSWORD", _("password to access the remote system"),
+    option ["-p", "--password"], "PASSWORD", _("Password to access the remote system"),
       :context_target => :password
-    option ["-s", "--server"], "SERVER", _("remote system address"),
+    option ["-s", "--server"], "SERVER", _("Remote system address"),
       :context_target => :uri
     option ["--verify-ssl"], "VERIFY_SSL", _("Configure SSL verification of remote system"),
       :format => HammerCLI::Options::Normalizers::Bool.new
@@ -25,7 +25,7 @@ module HammerCLI
     option ["--ssl-with-basic-auth"], :flag, _("Use standard authentication in addition to client certificate authentication")
     option ["--fetch-ca-cert"], "SERVER", _("Fetch CA certificate from server and exit")
 
-    option "--version", :flag, _("show version") do
+    option "--version", :flag, _("Show version") do
       puts "hammer (%s)" % HammerCLI.version
       HammerCLI::Modules.names.each do |m|
         module_version = HammerCLI::Modules.find_by_name(m).version rescue _("unknown version")
@@ -39,7 +39,7 @@ module HammerCLI
     option ["--interactive"], "INTERACTIVE", _("Explicitly turn interactive mode on/off"),
       :format => HammerCLI::Options::Normalizers::Bool.new,
       :context_target => :interactive
-
+    option ["--no-headers"], :flag, _("Hide headers from output")
     option ["--csv"], :flag, _("Output as CSV (same as --output=csv)")
     option ["--output"], "ADAPTER", _("Set output format. One of [%s]") %
       HammerCLI::Output::Output.adapters.keys.join(', '),
@@ -61,8 +61,9 @@ module HammerCLI
       context[:adapter] = :csv
     end
 
+    def option_no_headers=(no_headers)
+      context[:no_headers] = :no_headers
+    end
   end
 
 end
-
-

data/lib/hammer_cli/modules.rb

@@ -7,10 +7,7 @@ module HammerCLI
     end
 
     def self.enabled_modules
-      # legacy modules config
-      modules = HammerCLI::Settings.get(:modules) || []
-      logger.warn _("Legacy configuration of modules detected. Check section about configuration in user manual") unless modules.empty?
-
+      modules = []
       HammerCLI::Settings.dump.inject(modules) do |names, (mod_name, mod_config)|
         if is_module_config?(mod_config)
           mod = ["hammer_cli_#{mod_name}"]
@@ -56,15 +53,15 @@ module HammerCLI
       begin
         require_module(name)
       rescue Exception => e
-        logger.error "Error while loading module #{name}"
-        puts _("Warning: An error occured while loading module %s") % name
+        logger.error "Error while loading module #{name}."
+        puts _("Warning: An error occured while loading module %s.") % name
         # with ModuleLoadingError we assume the error is already logged by the issuer
         logger.error e unless e.is_a?(HammerCLI::ModuleLoadingError)
         raise e
       end
 
       version = find_by_name(name).version
-      logger.info "Extension module #{name} (#{version}) loaded"
+      logger.info "Extension module #{name} (#{version}) loaded."
       true
     end
 
@@ -84,7 +81,7 @@ module HammerCLI
       end
       loaded_for_deps = loaded_modules & disabled_modules
       unless loaded_for_deps.empty?
-        message = _("Error: Some of the required modules are disabled in configuration: %s ") % loaded_for_deps.join(', ')
+        message = _("Error: Some of the required modules are disabled in configuration: %s.") % loaded_for_deps.join(', ')
         raise HammerCLI::ModuleDisabledButRequired.new(message)
       end
     end