hammer_cli 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb545eaee547129bde4d51c6ff709f7af30c61bd
-  data.tar.gz: 23f8915e5e2c306a2e194ebd7d42162d2f183b95
+  metadata.gz: aaf3be9933ac2bf33cd6a7bd3cd0f3d8fe3bf157
+  data.tar.gz: 3fd10d78572c35d887f0edc9b46d4382e4454006
 SHA512:
-  metadata.gz: 3c9f22f4c7b10e0282f96be42317f0ac2514dba8ad4c2881d46eedeb6ceb01361ba6139c57b51ab382ac255d6a5bc527bde0880ee06d332dc938b7f08317ce4d
-  data.tar.gz: cba3583a4dff8bf01a9bf1835eb9393ea99eae965e3156a9bb14dafbb8412e49bd59f2b13b717a24453080ff3faeb2c8151f79a4c91e14f1124e9a0b92c1601d
+  metadata.gz: 3f18891b02bd45efcddf967b97bc74b58a277c28cfa8d0d22e4e339ecb9f876565e111cdc9bf670d4f122ae68cf858f398a067c75daf147b694de98573947b62
+  data.tar.gz: e9dee591bf84da08b467a36f155c97068951d9937e128fbb2d7b42d97af1fdd7f03040321daf5457472d66ddba55fb8677981e6180695ee130bfb1f20c32f8ce

data/bin/hammer

@@ -12,7 +12,8 @@ require 'hammer_cli/options/normalizers'
 # Create fake command instance to use some global args before we start.
 # Option descriptions are never displayed and thus do not require translation.
 class PreParser < Clamp::Command
-  option ["-v", "--verbose"], :flag, "be verbose"
+  option ['-v', '--[no-]verbose'], :flag, _('Be verbose (or not). True by default')
+  option ['-q', '--quiet'], :flag, _('Completely silent')
   option ["-d", "--debug"], :flag, "show debugging output"
   option ["-c", "--config"], "CFG_FILE", "path to custom config file" do |path|
     File.expand_path path
@@ -80,7 +81,7 @@ HammerCLI::Settings.load({
     :password => preparser.password,
     :host => preparser.server,
     :interactive => preparser.interactive,
-    :verbose => preparser.verbose? || preparser.debug?,
+    :debug => preparser.debug?,
     :no_headers => preparser.no_headers?,
     :reload_cache => preparser.reload_cache?,
     :verify_ssl => preparser.verify_ssl,
@@ -99,10 +100,10 @@ end
 require 'hammer_cli/logger'
 logger = Logging.logger['Init']
 
-if preparser.verbose? || preparser.debug?
+if preparser.debug?
   root_logger = Logging.logger.root
   root_logger.appenders = root_logger.appenders << ::Logging.appenders.stderr(:layout => HammerCLI::Logger::COLOR_LAYOUT)
-  root_logger.level = 'debug' if preparser.debug?
+  root_logger.level = 'debug'
 end
 
 require 'hammer_cli/version'

data/config/cli_config.template.yml

@@ -10,6 +10,9 @@
   #:mark_translated: false
   # Hide headers from output of list actions
   # :no_headers: true
+  # Choose capitalization for JSON/YAML output.
+  # One of: 'downcase', 'capitalize', 'upcase'
+  # :capitalization: 'downcase'
 
 # Enable/disable color output of logger in Clamp commands
 :watch_plain: false
@@ -23,6 +26,12 @@
 # Logging level. One of debug, info, warning, error, fatal
 :log_level: 'error'
 
+# Verbosity of the commands. Possible values:
+#   0 - completely silent, errors to stderr. Equals to --quiet.
+#   1 - data, interactive I/O. Equals to --no-verbose.
+#   2 - data, messages, interactive I/O, progress bars. Equals to --verbose.
+:verbosity: 2
+
 #:log_owner: 'foreman'
 #:log_group: 'foreman'
 

data/doc/creating_commands.md

@@ -244,18 +244,18 @@ option "--attributes", "ATTRIBUTES", "Values of various attributes",
 
 ### Advanced option evaluation
 
-Sometimes it is necessary to tune the option values based on other parameters given on CLI. 
+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::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. 
+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 
+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
@@ -545,6 +545,22 @@ def adapter
 end
 ```
 
+#### Verbosity
+Currently Hammer [defines](https://github.com/theforeman/hammer-cli/blob/master/lib/hammer_cli/verbosity.rb) three basic verbose modes:
+  * __QUIET__ - Prints nothing
+  * __UNIX__ - Prints data only
+  * __VERBOSE__ - Prints data and other messages
+
+By default Hammer works in `VERBOSE` mode, but it can be changed with specific option (see `hammer --help`) or in the configuration file.
+
+If you want to force some messages to be printed with `print_message` in `UNIX` mode for example, you can specify `verbosity` of this message:
+```ruby
+class MyCommand < HammerCLI::Apipie::Command
+  def execute
+    print_message("Hello, %{name}!", { name: 'Jason' }, verbosity: HammerCLI::V_UNIX)
+  end
+end
+```
 
 Other useful command features
 -----------------------------
@@ -631,4 +647,3 @@ The best practice is to place module's configuration into a separate file named
 the module. In this example it would be `~/.hammer/cli.modules.d/hello_world.yml`.
 
 Read more about configuration locations in [the settings howto](installation.md#configuration).
-

data/doc/release_notes.md

@@ -1,5 +1,14 @@
 Release notes
 =============
+### 0.14.0 (2018-10-24)
+* Correct the gemspec ([PR #286](https://github.com/theforeman/hammer-cli/pull/286))
+* Use the tty for the interactive output ([PR #289](https://github.com/theforeman/hammer-cli/pull/289)) ([#6935](http://projects.theforeman.org/issues/6935))
+* Remove legacy code for ruby < 2.0 ([#21359](http://projects.theforeman.org/issues/21359))
+* Verbose mode does not work and is inconsistent ([#14725](http://projects.theforeman.org/issues/14725))
+* Enable formatters in json structured output ([PR #288](https://github.com/theforeman/hammer-cli/pull/288)) ([#24980](http://projects.theforeman.org/issues/24980))
+* Hammer JSON output uses inconsistent capitalization ([#17010](http://projects.theforeman.org/issues/17010))
+* Bump clamp dep to >=1.1 ([PR #282](https://github.com/theforeman/hammer-cli/pull/282))
+
 ### 0.14.0 (2018-08-27)
 * Restore help building ([PR #280](https://github.com/theforeman/hammer-cli/pull/280)) ([#24488](http://projects.theforeman.org/issues/24488))
 * Shouldn't translate the bool values in description ([#21381](http://projects.theforeman.org/issues/21381))

data/lib/hammer_cli.rb

@@ -1,4 +1,5 @@
 require 'hammer_cli/i18n'
+require 'hammer_cli/verbosity'
 require 'hammer_cli/exceptions'
 require 'hammer_cli/utils'
 require 'hammer_cli/version'

data/lib/hammer_cli/abstract.rb

@@ -165,8 +165,8 @@ module HammerCLI
       output.print_collection(definition, collection)
     end
 
-    def print_message(msg, msg_params={})
-      output.print_message(msg, msg_params)
+    def print_message(msg, msg_params = {}, options = {})
+      output.print_message(msg, msg_params, options)
     end
 
     def self.logger(name=self)

data/lib/hammer_cli/context.rb

@@ -1,16 +1,14 @@
 require 'hammer_cli/defaults'
 
 module HammerCLI
-
   def self.context
     @context ||= {
       :defaults => HammerCLI.defaults,
       :is_tty? => HammerCLI.tty?,
       :api_connection => HammerCLI::Connection.new(Logging.logger['Connection']),
-      :no_headers => HammerCLI::Settings.get(:ui, :no_headers)
+      :no_headers => HammerCLI::Settings.get(:ui, :no_headers),
+      :capitalization => HammerCLI.capitalization,
+      :verbosity => (HammerCLI::Settings.get(:verbosity) || HammerCLI::V_VERBOSE).to_i
     }
   end
-
 end
-
-

data/lib/hammer_cli/exception_handler.rb

@@ -49,8 +49,8 @@ module HammerCLI
       end
     end
 
-    def print_message(msg)
-      output.print_message(msg)
+    def print_message(msg, options = {})
+      output.print_message(msg, nil, options)
     end
 
     def log_full_error(e, message = e.message)
@@ -75,7 +75,7 @@ module HammerCLI
     end
 
     def handle_help_wanted(e)
-      print_message e.command.help
+      print_message e.command.help, verbosity: HammerCLI::V_QUIET
       HammerCLI::EX_OK
     end
 

data/lib/hammer_cli/main.rb

@@ -4,7 +4,12 @@ module HammerCLI
 
   class MainCommand < AbstractCommand
 
-    option ["-v", "--verbose"], :flag, _("Be verbose"), :context_target => :verbose
+    option ['-v', '--[no-]verbose'], :flag, _('Be verbose (or not). True by default') do |value|
+      context[:verbosity] = value == true ? HammerCLI::V_VERBOSE : HammerCLI::V_UNIX
+    end
+    option ['-q', '--quiet'], :flag, _('Completely silent') do
+      context[:verbosity] = HammerCLI::V_QUIET
+    end
     option ["-d", "--debug"], :flag, _("Show debugging output"), :context_target => :debug
     option ["-r", "--reload-cache"], :flag, _("Force reload of Apipie cache")
 

data/lib/hammer_cli/output/adapter/abstract.rb

@@ -7,6 +7,7 @@ module HammerCLI::Output::Adapter
     end
 
     def initialize(context={}, formatters={})
+      context[:verbosity] ||= HammerCLI::V_VERBOSE
       @context = context
       @formatters = HammerCLI::Output::Formatters::FormatterLibrary.new(filter_formatters(formatters))
       @paginate_by_default = true

data/lib/hammer_cli/output/adapter/csv.rb

@@ -1,13 +1,4 @@
 require 'csv'
-if CSV.const_defined? :Reader
-  # Ruby 1.8 compatible
-  require 'fastercsv'
-  Object.send(:remove_const, :CSV)
-  CSV = FasterCSV
-else
-  # CSV is now FasterCSV in ruby 1.9
-end
-
 require File.join(File.dirname(__FILE__), 'wrapper_formatter')
 
 module HammerCLI::Output::Adapter

data/lib/hammer_cli/output/adapter/json.rb

@@ -12,15 +12,7 @@ module HammerCLI::Output::Adapter
     end
 
     def print_message(msg, msg_params={})
-      id = msg_params["id"] || msg_params[:id]
-      name = msg_params["name"] || msg_params[:name]
-
-      data = {
-        :message => msg.format(msg_params)
-      }
-      data[:id] = id unless id.nil?
-      data[:name] = name unless name.nil?
-
+      data = prepare_message(msg, msg_params)
       puts JSON.pretty_generate(data)
     end
 

data/lib/hammer_cli/output/adapter/table.rb

@@ -53,8 +53,10 @@ module HammerCLI::Output::Adapter
       # and there is no --no-headers option
       output_stream.puts line unless formatted_collection.empty? || @context[:no_headers]
 
-      if collection.respond_to?(:meta) && collection.meta.pagination_set? && collection.count < collection.meta.subtotal
-        pages = (collection.meta.subtotal.to_f/collection.meta.per_page).ceil
+      if @context[:verbosity] >= collection.meta.pagination_verbosity &&
+         collection.respond_to?(:meta) && collection.meta.pagination_set? &&
+         collection.count < collection.meta.subtotal
+        pages = (collection.meta.subtotal.to_f / collection.meta.per_page).ceil
         puts _("Page %{page} of %{total} (use --page and --per-page for navigation).") % {:page => collection.meta.page, :total => pages}
       end
     end

data/lib/hammer_cli/output/adapter/tree_structure.rb

@@ -6,12 +6,30 @@ module HammerCLI::Output::Adapter
       @paginate_by_default = false
     end
 
+    def tags
+      [
+        :data
+      ]
+    end
+
     def prepare_collection(fields, collection)
       collection.map do |element|
         render_fields(fields, element)
       end
     end
 
+    def prepare_message(msg, msg_params = {})
+      id = msg_params['id'] || msg_params[:id]
+      name = msg_params['name'] || msg_params[:name]
+
+      data = {
+        capitalize(:message) => msg.format(msg_params)
+      }
+      data[capitalize(:id)] = id unless id.nil?
+      data[capitalize(:name)] = name unless name.nil?
+      data
+    end
+
     protected
 
     def field_filter
@@ -26,7 +44,7 @@ module HammerCLI::Output::Adapter
       fields.reduce({}) do |hash, field|
         field_data = data_for_field(field, data)
         next unless field.display?(field_data)
-        hash.update(field.label => render_field(field, field_data))
+        hash.update(capitalize(field.label) => render_field(field, field_data))
       end
     end
 
@@ -38,15 +56,24 @@ module HammerCLI::Output::Adapter
         end
         render_data(field, map_data(fields_data))
       else
-        data
+        formatter = @formatters.formatter_for_type(field.class)
+        parameters = field.parameters
+        parameters[:context] = @context
+        if formatter
+          data = formatter.format(data, field.parameters)
+        end
+
+        return data unless data.is_a?(Hash)
+        data.transform_keys { |key| capitalize(key) }
       end
     end
 
     def render_data(field, data)
+      data = data.map! { |d| d.transform_keys { |key| capitalize(key) } if d.is_a?(Hash) }
       if field.is_a?(Fields::Collection)
-        if(field.parameters[:numbered])
+        if field.parameters[:numbered]
           numbered_data(data)
-        else # necislovana kolekce je pole
+        else
           data
         end
       else
@@ -69,5 +96,10 @@ module HammerCLI::Output::Adapter
       end
     end
 
+    def capitalize(string)
+      capitalization = @context[:capitalization]
+      return string if capitalization.nil?
+      string.send(@context[:capitalization]) unless string.nil?
+    end
   end
 end

data/lib/hammer_cli/output/adapter/yaml.rb

@@ -12,15 +12,7 @@ module HammerCLI::Output::Adapter
     end
 
     def print_message(msg, msg_params={})
-      id = msg_params["id"] || msg_params[:id]
-      name = msg_params["name"] || msg_params[:name]
-
-      data = {
-        :message => msg.format(msg_params)
-      }
-      data[:id] = id unless id.nil?
-      data[:name] = name unless name.nil?
-
+      data = prepare_message(msg, msg_params)
       puts YAML.dump(data)
     end
 

data/lib/hammer_cli/output/output.rb

@@ -8,29 +8,30 @@ module HammerCLI::Output
   class Output
 
     def initialize(context={}, options={})
+      context[:verbosity] ||= HammerCLI::V_VERBOSE
       self.context = context
       self.default_adapter = options[:default_adapter]
     end
 
     attr_accessor :default_adapter
 
-    def print_message(msg, msg_params={})
-      adapter.print_message(msg.to_s, msg_params)
+    def print_message(msg, msg_params = {}, options = {})
+      adapter.print_message(msg.to_s, msg_params) if appropriate_verbosity?(:message, options)
     end
 
-    def print_error(msg, details=nil, msg_params={})
-      adapter.print_error(msg.to_s, details, msg_params)
+    def print_error(msg, details=nil, msg_params = {}, options = {})
+      adapter.print_error(msg.to_s, details, msg_params) if appropriate_verbosity?(:error, options)
     end
 
     def print_record(definition, record)
-      adapter.print_record(definition.fields, record)
+      adapter.print_record(definition.fields, record) if appropriate_verbosity?(:record)
     end
 
     def print_collection(definition, collection)
       unless collection.class <= HammerCLI::Output::RecordCollection
         collection = HammerCLI::Output::RecordCollection.new([collection].flatten(1))
       end
-      adapter.print_collection(definition.fields, collection)
+      adapter.print_collection(definition.fields, collection) if appropriate_verbosity?(:collection)
     end
 
     def adapter
@@ -66,6 +67,21 @@ module HammerCLI::Output
       end
     end
 
+    protected
+
+    def appropriate_verbosity?(msg_type, options = {})
+      default = case msg_type
+                when :message
+                  HammerCLI::V_VERBOSE
+                when :error
+                  HammerCLI::V_QUIET
+                when :record, :collection
+                  HammerCLI::V_UNIX
+                end
+      msg_verbosity = options[:verbosity] || default
+      context[:verbosity] >= msg_verbosity
+    end
+
     private
 
     attr_accessor :context

data/lib/hammer_cli/output/record_collection.rb

@@ -3,7 +3,7 @@ module HammerCLI::Output
 
   class MetaData
 
-    attr_accessor :total, :subtotal, :page, :per_page, :search, :sort_by, :sort_order
+    attr_accessor :total, :subtotal, :page, :per_page, :search, :sort_by, :sort_order, :pagination_verbosity
 
     def initialize(options={})
       @total = options[:total].to_i if options[:total]
@@ -13,6 +13,7 @@ module HammerCLI::Output
       @search = options[:search]
       @sort_by = options[:sort_by]
       @sort_order = options[:sort_order]
+      @pagination_verbosity = options[:pagination_verbosity] || HammerCLI::V_VERBOSE
     end
 
     def pagination_set?

data/lib/hammer_cli/utils.rb

@@ -1,7 +1,6 @@
+require 'highline'
 
 class String
-
-  # string formatting for ruby 1.8
   def format(params)
     if params.is_a? Hash
       array_params = self.scan(/%[<{]([^>}]*)[>}]/).collect do |name|
@@ -42,6 +41,18 @@ class String
 
 end
 
+class Hash
+  # for ruby < 2.5.0
+  def transform_keys
+    result = {}
+    each do |key, value|
+      new_key = yield key
+      result[new_key] = value
+    end
+    result
+  end
+end
+
 module HammerCLI
 
   def self.tty?
@@ -49,7 +60,6 @@ module HammerCLI
   end
 
   def self.interactive?
-    return false unless tty?
     return HammerCLI::Settings.get(:_params, :interactive) unless HammerCLI::Settings.get(:_params, :interactive).nil?
     HammerCLI::Settings.get(:ui, :interactive) != false
   end
@@ -62,4 +72,16 @@ module HammerCLI
     path
   end
 
+  def self.capitalization
+    supported = %w[downcase capitalize upcase]
+    capitalization = HammerCLI::Settings.get(:ui, :capitalization).to_s
+    return nil if capitalization.empty?
+    return capitalization if supported.include?(capitalization)
+    warn _("Cannot use such capitalization. Try one of %s.") % supported.join(', ')
+    nil
+  end
+
+  def self.interactive_output
+    @interactive_output ||= HighLine.new($stdin, IO.new(IO.sysopen('/dev/tty', 'w'), 'w'))
+  end
 end

data/lib/hammer_cli/verbosity.rb

@@ -0,0 +1,5 @@
+module HammerCLI
+  V_QUIET   = 0
+  V_UNIX    = 1
+  V_VERBOSE = 2
+end

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new '0.14.0'
+    @version ||= Gem::Version.new '0.15.0'
   end
 end

data/test/unit/apipie/command_test.rb

@@ -128,4 +128,51 @@ describe HammerCLI::Apipie::Command do
 
   end
 
+  context 'verbosity' do
+    class MessagesCommand < HammerCLI::Apipie::Command
+      def execute
+        messages = %w[quiet unix verbose very_verbose]
+        print_message(messages[0], {}, verbosity: HammerCLI::V_QUIET)
+        print_message(messages[1], {}, verbosity: HammerCLI::V_UNIX)
+        print_message(messages[2], {}, verbosity: HammerCLI::V_VERBOSE)
+        print_message(messages[3], {}, verbosity: HammerCLI::V_VERBOSE + 1)
+        HammerCLI::EX_OK
+      end
+    end
+
+    let(:messages) { %w[quiet unix verbose very_verbose] }
+
+    it 'should print quiet messages only when hammer verbosity level is V_QUIET' do
+      expected_messages = [
+        messages[0],
+        ''
+      ].join("\n")
+      expected_result = success_result(expected_messages)
+      result = run_cmd([], { :verbosity => HammerCLI::V_QUIET }, MessagesCommand)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'should print quiet + no-verbose messages only when hammer verbosity level is V_UNIX' do
+      expected_messages = [
+        messages[0],
+        messages[1],
+        ''
+      ].join("\n")
+      expected_result = success_result(expected_messages)
+      result = run_cmd([], { :verbosity => HammerCLI::V_UNIX }, MessagesCommand)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'should print quiet + no-verbose + verbose messages only when hammer verbosity level is V_VERBOSE' do
+      expected_messages = [
+        messages[0],
+        messages[1],
+        messages[2],
+        ''
+      ].join("\n")
+      expected_result = success_result(expected_messages)
+      result = run_cmd([], { :verbosity => HammerCLI::V_VERBOSE }, MessagesCommand)
+      assert_cmd(expected_result, result)
+    end
+  end
 end

data/test/unit/apipie/test_helper.rb

@@ -0,0 +1,4 @@
+require File.join(File.dirname(__FILE__), '../test_helper')
+
+require 'hammer_cli/testing/command_assertions'
+require 'hammer_cli/testing/output_matchers'

data/test/unit/exception_handler_test.rb

@@ -30,7 +30,7 @@ describe HammerCLI::ExceptionHandler do
   end
 
   it "should handle help request" do
-    output.expects(:print_message).with(cmd.help)
+    output.expects(:print_message).with(cmd.help, nil, verbosity: HammerCLI::V_QUIET)
     handler.handle_exception(Clamp::HelpWanted.new(cmd), :heading => heading)
 
   end
@@ -56,4 +56,3 @@ describe HammerCLI::ExceptionHandler do
   end
 
 end
-

data/test/unit/history_test.rb

@@ -1,12 +1,8 @@
 require 'tempfile'
 
 describe HammerCLI::ShellHistory do
-
   before :each do
-    # Readline::HISOTRY does not implement #clear in Ruby 1.8
-    while not Readline::HISTORY.empty?
-      Readline::HISTORY.pop
-    end
+    Readline::HISTORY.clear
   end
 
   let :history_file do
@@ -68,4 +64,3 @@ describe HammerCLI::ShellHistory do
   end
 
 end
-

data/test/unit/i18n_test.rb

@@ -40,52 +40,23 @@ describe HammerCLI::I18n do
   let(:domain2) { TestLocaleDomain.new('domain2', true) }
   let(:unavailable_domain) { TestLocaleDomain.new('domain3', false) }
 
-  # skip the tests on older versions of fast_gettext (ruby 2.0)
-  if FastGettext::VERSION >= '1.2.0'
-    describe "with fast_gettext >= 1.2.0" do
-      it "creates base merge repository" do
-        HammerCLI::I18n.translation_repository.class.must_equal FastGettext::TranslationRepository::Merge
-      end
-
-      it "registers available domains at gettext" do
-        repo = mock
-        FastGettext::TranslationRepository.expects(:build).with(domain1.domain_name,
-          :path => domain1.locale_dir,
-          :type => domain1.type,
-          :report_warning => false).returns(repo)
-
-        HammerCLI::I18n.translation_repository.expects(:add_repo).with(repo)
-        HammerCLI::I18n.add_domain(domain1)
-      end
-
-      it "skips registering domains that are not available" do
-        HammerCLI::I18n.add_domain(domain1)
-        HammerCLI::I18n.add_domain(domain2)
-        HammerCLI::I18n.add_domain(unavailable_domain)
-        HammerCLI::I18n.domains.must_equal [domain1, domain2]
-      end
-    end
-  end
-
-  describe "with fast_gettext < 1.2.0" do
-    let(:fast_gettext_version) { '1.1.0' }
-
-    it "creates base chain repository" do
-      HammerCLI::I18n.translation_repository.class.must_equal FastGettext::TranslationRepository::Chain
+  describe 'with fast_gettext >= 1.2.0' do
+    it 'creates base merge repository' do
+      HammerCLI::I18n.translation_repository.class.must_equal FastGettext::TranslationRepository::Merge
     end
 
-    it "registers available domains at gettext" do
+    it 'registers available domains at gettext' do
       repo = mock
       FastGettext::TranslationRepository.expects(:build).with(domain1.domain_name,
         :path => domain1.locale_dir,
         :type => domain1.type,
         :report_warning => false).returns(repo)
 
-      HammerCLI::I18n.translation_repository.chain.expects(:<<).with(repo)
+      HammerCLI::I18n.translation_repository.expects(:add_repo).with(repo)
       HammerCLI::I18n.add_domain(domain1)
     end
 
-    it "skips registering domains that are not available" do
+    it 'skips registering domains that are not available' do
       HammerCLI::I18n.add_domain(domain1)
       HammerCLI::I18n.add_domain(domain2)
       HammerCLI::I18n.add_domain(unavailable_domain)
@@ -93,4 +64,3 @@ describe HammerCLI::I18n do
     end
   end
 end
-

data/test/unit/main_test.rb

@@ -41,16 +41,15 @@ describe HammerCLI::MainCommand do
     end
 
 
-    describe "verbose" do
-
-      it "stores into context" do
-        cmd.run(["-v"])
-        context[:verbose].must_equal true
+    describe 'verbose' do
+      it 'stores verbosity level into context' do
+        cmd.run(['-v'])
+        context[:verbosity].must_equal HammerCLI::V_VERBOSE
+        cmd.run(['--no-verbose'])
+        context[:verbosity].must_equal HammerCLI::V_UNIX
+        cmd.run(['--quiet'])
+        context[:verbosity].must_equal HammerCLI::V_QUIET
       end
-
     end
-
   end
-
 end
-

data/test/unit/output/adapter/json_test.rb

@@ -245,6 +245,65 @@ describe HammerCLI::Output::Adapter::Json do
       proc { adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
+    context 'capitalization' do
+      let(:fields)   { [name, surname] }
+      let(:raw_hash) { { 'Name' => 'John', 'Surname' => 'Doe' } }
+      let(:settings) { HammerCLI::Settings }
+      let(:context) { { :capitalization => HammerCLI.capitalization } }
+
+      it 'should respect selected downcase capitalization' do
+        settings.load({ :ui => { :capitalization => :downcase } })
+        hash = [raw_hash.transform_keys(&:downcase)]
+        expected_output = JSON.pretty_generate(hash) + "\n"
+        out, = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+      end
+
+      it 'should respect selected capitalize capitalization' do
+        settings.load({ :ui => { :capitalization => :capitalize } })
+        hash = [raw_hash.transform_keys(&:capitalize)]
+        expected_output = JSON.pretty_generate(hash) + "\n"
+        out, = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+      end
+
+      it 'should respect selected upcase capitalization' do
+        settings.load({ :ui => { :capitalization => :upcase } })
+        hash = [raw_hash.transform_keys(&:upcase)]
+        expected_output = JSON.pretty_generate(hash) + "\n"
+        out, = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+      end
+
+      it 'should print a warn for not supported capitalization' do
+        settings.load({ :ui => { :capitalization => :unsupported } })
+        hash = [raw_hash]
+        expected_error = "Cannot use such capitalization. Try one of downcase, capitalize, upcase.\n"
+        expected_output = JSON.pretty_generate(hash) + "\n"
+        out, err = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+        err.must_equal(expected_error)
+      end
+
+      it "shouldn't change capitalization if wasn't selected" do
+        settings.load({ :ui => { :capitalization => nil } })
+        hash = [raw_hash]
+        expected_output = JSON.pretty_generate(hash) + "\n"
+        out, = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+      end
+    end
+
     context "show ids" do
 
       let(:context) { {:show_ids => true} }

data/test/unit/output/adapter/yaml_test.rb

@@ -242,6 +242,65 @@ describe HammerCLI::Output::Adapter::Yaml do
       proc { adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
+    context 'capitalization' do
+      let(:fields)   { [name, surname] }
+      let(:raw_hash) { { 'Name' => 'John', 'Surname' => 'Doe' } }
+      let(:settings) { HammerCLI::Settings }
+      let(:context) { { :capitalization => HammerCLI.capitalization } }
+
+      it 'should respect selected downcase capitalization' do
+        settings.load({ :ui => { :capitalization => :downcase } })
+        hash = [raw_hash.transform_keys(&:downcase)]
+        expected_output = YAML.dump(hash)
+        out, = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+      end
+
+      it 'should respect selected capitalize capitalization' do
+        settings.load({ :ui => { :capitalization => :capitalize } })
+        hash = [raw_hash.transform_keys(&:capitalize)]
+        expected_output = YAML.dump(hash)
+        out, = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+      end
+
+      it 'should respect selected upcase capitalization' do
+        settings.load({ :ui => { :capitalization => :upcase } })
+        hash = [raw_hash.transform_keys(&:upcase)]
+        expected_output = YAML.dump(hash)
+        out, = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+      end
+
+      it 'should print a warn for not supported capitalization' do
+        settings.load({ :ui => { :capitalization => :unsupported } })
+        hash = [raw_hash]
+        expected_error = "Cannot use such capitalization. Try one of downcase, capitalize, upcase.\n"
+        expected_output = YAML.dump(hash)
+        out, err = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+        err.must_equal(expected_error)
+      end
+
+      it "shouldn't change capitalization if wasn't selected" do
+        settings.load({ :ui => { :capitalization => nil } })
+        hash = [raw_hash]
+        expected_output = YAML.dump(hash)
+        out, = capture_io do
+          adapter.print_collection(fields, data)
+        end
+        out.must_equal(expected_output)
+      end
+    end
+
     context "show ids" do
 
       let(:context) { {:show_ids => true} }

data/test/unit/output/output_test.rb

@@ -112,5 +112,177 @@ describe HammerCLI::Output::Output do
     end
   end
 
-end
+  describe 'verbosity' do
+    let(:msg) { "Some message\n" }
+    let(:quiet_opts)        { { :verbosity => HammerCLI::V_QUIET } }
+    let(:no_verbose_opts)   { { :verbosity => HammerCLI::V_UNIX } }
+    let(:verbose_opts)      { { :verbosity => HammerCLI::V_VERBOSE } }
+    let(:very_verbose_opts) { { :verbosity => HammerCLI::V_VERBOSE + 1 } }
+    let(:data) do
+      HammerCLI::Output::RecordCollection.new(
+        [{
+          :id => 112,
+          :name => 'John',
+          :surname => 'Doe'
+        }]
+      )
+    end
+    let(:id)         { Fields::Id.new(:path => [:id], :label => 'Id') }
+    let(:name)       { Fields::Field.new(:path => [:name], :label => 'Name') }
+    let(:surname)    { Fields::Field.new(:path => [:surname], :label => 'Surname') }
+    let(:definition) { HammerCLI::Output::Definition.new }
+    let(:expected_record_output) do
+      [
+        "Name:    John",
+        "Surname: Doe",
+        "\n"
+      ].join("\n")
+    end
+
+    context 'quiet' do
+      let(:context) { quiet_opts }
+      let(:output) { HammerCLI::Output::Output.new(context) }
+
+      it 'should not print info messages with higher verbosity level' do
+        assert_output('', nil) do
+          output.print_message(msg)
+        end
+        assert_output('', nil) do
+          output.print_message(msg, {}, no_verbose_opts)
+        end
+        assert_output('', nil) do
+          output.print_message(msg, {}, verbose_opts)
+        end
+      end
+
+      it 'should print message with lower or equal verbosity level' do
+        assert_output(msg, nil) do
+          output.print_message(msg, {}, quiet_opts)
+        end
+      end
+
+      it 'should print error message even when hammer verbosity is level 0' do
+        assert_output(nil, msg) do
+          output.print_error(msg)
+        end
+      end
+
+      it 'should not print error messages with higher verbosity level' do
+        assert_output(nil, '') do
+          output.print_error(msg, nil, {}, verbose_opts)
+        end
+      end
+
+      it 'should not print record data' do
+        definition.append([id, name, surname])
+        assert_output('', nil) do
+          output.print_record(definition, data.first)
+        end
+      end
+
+      it 'should not print collection data' do
+        definition.append([id, name, surname])
+        assert_output('', nil) do
+          output.print_record(definition, data)
+        end
+      end
+    end
+
+    context 'no-verbose' do
+      let(:context) { no_verbose_opts }
+      let(:output) { HammerCLI::Output::Output.new(context) }
+
+      it 'should not print info messages with higher verbosity level' do
+        assert_output('', nil) do
+          output.print_message(msg)
+        end
+        assert_output('', nil) do
+          output.print_message(msg, {}, verbose_opts)
+        end
+      end
+
+      it 'should print message with lower or equal verbosity level' do
+        assert_output(msg, nil) do
+          output.print_message(msg, {}, quiet_opts)
+        end
+        assert_output(msg, nil) do
+          output.print_message(msg, {}, no_verbose_opts)
+        end
+      end
 
+      it 'should print error message' do
+        assert_output(nil, msg) do
+          output.print_error(msg)
+        end
+      end
+
+      it 'should not print error messages with higher verbosity level' do
+        assert_output(nil, '') do
+          output.print_error(msg, nil, {}, verbose_opts)
+        end
+      end
+
+      it 'should print record data' do
+        definition.append([id, name, surname])
+        assert_output(expected_record_output, nil) do
+          output.print_record(definition, data.first)
+        end
+      end
+
+      it 'should print collection data' do
+        definition.append([id, name, surname])
+        assert_output(expected_record_output, nil) do
+          output.print_record(definition, data)
+        end
+      end
+    end
+
+    context 'verbose' do
+      let(:context) { verbose_opts }
+      let(:output) { HammerCLI::Output::Output.new(context) }
+      it 'should not print info messages with higher verbosity level' do
+        assert_output('', nil) do
+          output.print_message(msg, {}, very_verbose_opts)
+        end
+      end
+
+      it 'should print message with lower or equal verbosity level' do
+        assert_output(msg, nil) do
+          output.print_message(msg, {}, quiet_opts)
+        end
+        assert_output(msg, nil) do
+          output.print_message(msg, {}, no_verbose_opts)
+        end
+        assert_output(msg, nil) do
+          output.print_message(msg, {}, verbose_opts)
+        end
+      end
+
+      it 'should print error message' do
+        assert_output(nil, msg) do
+          output.print_error(msg)
+        end
+      end
+
+      it 'should not print error messages with higher verbosity level' do
+        assert_output(nil, '') do
+          output.print_error(msg, nil, {}, very_verbose_opts)
+        end
+      end
+
+      it 'should print record data' do
+        definition.append([id, name, surname])
+        assert_output(expected_record_output, nil) do
+          output.print_record(definition, data.first)
+        end
+      end
+
+      it 'should print collection data' do
+        definition.append([id, name, surname])
+        assert_output(expected_record_output, nil) do
+          output.print_record(definition, data)
+        end
+      end
+    end
+  end
+end

data/test/unit/utils_test.rb

@@ -9,41 +9,32 @@ module Constant
 end
 
 describe String do
+  context 'formatting' do
+    let(:str) { 'AA%<a>s BB%<b>s' }
+    let(:curly_str) { 'AA%{a} BB%{b}' }
+    let(:pos_str) { 'AA%s BB%s' }
+    let(:str_with_percent) { 'Error: AA%<a>s BB%<b>s <%# template error %> verify this %>' }
 
-  context "formatting" do
-
-    let(:str) { "AA%<a>s BB%<b>s" }
-    let(:curly_str) { "AA%{a} BB%{b}" }
-    let(:pos_str) { "AA%s BB%s" }
-    let(:str_with_percent) { "Error: AA%<a>s BB%<b>s <%# template error %> verify this %>" }
-
-    it "should not fail without expected parameters" do
+    it 'should not fail without expected parameters' do
       str.format({}).must_equal 'AA BB'
     end
-
-    it "should replace positional parameters" do
+    it 'should replace positional parameters' do
       pos_str.format(['A', 'B']).must_equal 'AAA BBB'
     end
-
-    it "should replace named parameters" do
+    it 'should replace named parameters' do
       str.format(:a => 'A', :b => 'B').must_equal 'AAA BBB'
     end
-
-    it "should replace named parameters with string keys" do
+    it 'should replace named parameters with string keys' do
       str.format('a' => 'A', 'b' => 'B').must_equal 'AAA BBB'
     end
-
-    it "should replace named parameters marked with curly brackets" do
+    it 'should replace named parameters marked with curly brackets' do
       curly_str.format(:a => 'A', :b => 'B').must_equal 'AAA BBB'
     end
-
-    it "should not fail due to presence of percent chars in string" do
+    it 'should not fail due to presence of percent chars in string' do
       str_with_percent.format({}).must_equal 'Error: AA BB <%# template error %> verify this %>'
     end
-
   end
 
-
   context "camelize" do
 
     it "should camelize string with underscores" do
@@ -110,7 +101,16 @@ describe String do
 
 end
 
-
+describe Hash do
+  context 'transform_keys' do
+    let(:hash) { { :one => 'one', :two => 'two', 'three' => 3 } }
+    let(:transformed_hash) { { :ONE => 'one', :TWO => 'two', 'THREE' => 3 } }
+    it 'should return a new hash with new keys' do
+      new_hash = hash.transform_keys(&:upcase)
+      new_hash.must_equal transformed_hash
+    end
+  end
+end
 
 describe HammerCLI do
 
@@ -170,4 +170,3 @@ describe HammerCLI do
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.2.0
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.2.0
@@ -260,6 +260,7 @@ files:
 - lib/hammer_cli/testing/output_matchers.rb
 - lib/hammer_cli/utils.rb
 - lib/hammer_cli/validator.rb
+- lib/hammer_cli/verbosity.rb
 - lib/hammer_cli/version.rb
 - locale/ca/LC_MESSAGES/hammer-cli.mo
 - locale/de/LC_MESSAGES/hammer-cli.mo
@@ -422,6 +423,7 @@ files:
 - test/unit/apipie/command_test.rb
 - test/unit/apipie/option_builder_test.rb
 - test/unit/apipie/option_definition_test.rb
+- test/unit/apipie/test_helper.rb
 - test/unit/ca_cert_manager_test.rb
 - test/unit/completer_test.rb
 - test/unit/connection_test.rb
@@ -468,9 +470,9 @@ files:
 - test/unit/test_helper.rb
 - test/unit/utils_test.rb
 - test/unit/validator_test.rb
-homepage: http://github.com/theforeman/hammer-cli
+homepage: https://github.com/theforeman/hammer-cli
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -661,6 +663,7 @@ test_files:
 - test/unit/apipie/option_definition_test.rb
 - test/unit/apipie/command_test.rb
 - test/unit/apipie/option_builder_test.rb
+- test/unit/apipie/test_helper.rb
 - test/unit/validator_test.rb
 - test/unit/options/option_collector_test.rb
 - test/unit/options/sources/saved_defaults_test.rb