hammer_cli 3.5.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef4527d2b222db1e8a5c4cd4c1f1935d9434a4faca25b1d1e862958610f6a4e
-  data.tar.gz: 1dea2d3ade1019d4a00dfdecfc1ece96782c60e24d4561d96b8abd9eeeb03219
+  metadata.gz: 5c8ba63d251f23a5e6005d7adcab02b5045639060c1bd5a3a02741e6d5561945
+  data.tar.gz: b94fd6c3342e7c8b06efeb7dfe754f449cd0ce76b62cc7cafadf13031fbf2f94
 SHA512:
-  metadata.gz: bd18a75dc52b4185cf4d88d75c1cfb1c09881c7ce9fd5542038d64c11c8300c70cbdcc54e56993c9208834d645c64acd30ae72c374c5c0c58146f1b822c930d6
-  data.tar.gz: e1e115dc06bc8a02d3ea01c6dc2f63631111db1fcae58906c1216186cd9253f16da5522364d2b36be3dce970f4c5ae3172a1a57492e93a975da9e2afebdb2a19
+  metadata.gz: 26dc0d7d6b439aa97d1e5a01f003cc8c817ad522baa874b6cb8fc145e03246fce952ef96e0def406c614b3b4246fb85b69d3a6c7e10090cf7f7c152c53657715
+  data.tar.gz: 8f64e1a44462aa152f2f5aeb5af69f05160978651eaa9a2ba327ea1ceb6f77fffdcef3a436d113a5877edb05a2d0781bb3bce1329b8bb559856ba3ef6e159a75

data/config/cli_config.template.yml

@@ -7,7 +7,7 @@
   # Location of shell history file
   :history_file: '~/.hammer/history'
   # Mark translated strings with X characters (for developers)
-  #:mark_translated: false
+  # :mark_translated: false
   # Hide headers from output of list actions
   # :no_headers: true
   # Choose capitalization for JSON/YAML output.
@@ -17,7 +17,7 @@
 # Enable/disable color output of logger in Clamp commands
 :watch_plain: false
 
-# Forece relaod of Apipie cache with every Hammer invocation
+# Force reload of Apipie cache with every Hammer invocation
 :reload_cache: false
 
 # Directory where the logs are stored. The default is /var/log/hammer/ and the log file is named hammer.log
@@ -75,5 +75,5 @@
   # 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'
 
- # Allows setting the SSL version to use when making API calls
+  # Allows setting the SSL version to use when making API calls
   #:ssl_version: 'TLSv1_2'

data/doc/release_notes.md

@@ -1,7 +1,19 @@
 Release notes
 =============
-### 3.5.1 (2023-02-28)
+### 3.7.0 (2023-05-23)
+* Honor tz in datetime normalizer ([PR #369](https://github.com/theforeman/hammer-cli/pull/369)), [#36418](http://projects.theforeman.org/issues/36418)
+* Remove unused code, [#36337](http://projects.theforeman.org/issues/36337)
+* Fix ambiguous operator warnings, [#36337](http://projects.theforeman.org/issues/36337)
+* Update rake and clamp deps, [#36337](http://projects.theforeman.org/issues/36337)
+* Fix config template typos ([PR #365](https://github.com/theforeman/hammer-cli/pull/365))
+* Load ssl key using openssl::pkey.read ([PR #364](https://github.com/theforeman/hammer-cli/pull/364)), [#34853](http://projects.theforeman.org/issues/34853)
+* Bump to 3.7.0-develop
+
+### 3.6.0 (2023-02-23)
 * Update apipie-bindings to 0.6.0
+* Include makefile.def in the gem
+* Correct mocha inclusion in tests
+* Bump to 3.6.0-develop
 
 ### 3.5.0 (2022-10-31)
 * Bump to 3.5.0-develop

data/lib/hammer_cli/abstract.rb

@@ -192,7 +192,7 @@ module HammerCLI
 
     def self.output(definition=nil, &block)
       dsl = HammerCLI::Output::Dsl.new
-      dsl.build &block if block_given?
+      dsl.build(&block) if block_given?
       output_definition.append definition.fields unless definition.nil?
       output_definition.append dsl.fields
     end

data/lib/hammer_cli/defaults_commands.rb

@@ -1,4 +1,3 @@
-require 'hammer_cli'
 require 'yaml'
 module HammerCLI
   class BaseDefaultsProvider

data/lib/hammer_cli/help/builder.rb

@@ -14,7 +14,7 @@ module HammerCLI
       def add_usage(invocation_path, usage_descriptions)
         heading(Clamp.message(:usage_heading))
         usage_descriptions.each do |usage|
-          puts "    #{HammerCLI.expand_invocation_path(invocation_path)} #{usage}".rstrip
+          line "    #{HammerCLI.expand_invocation_path(invocation_path)} #{usage}".rstrip
         end
       end
 
@@ -24,7 +24,7 @@ module HammerCLI
         end
         items.reject! {|item| item.respond_to?(:hidden?) && item.hidden?}
 
-        puts
+        line
         heading(heading)
 
         label_width = DEFAULT_LABEL_INDENT
@@ -47,15 +47,15 @@ module HammerCLI
                                  item.help
                                end
           description.gsub(/^(.)/) { Unicode.capitalize(Regexp.last_match(1)) }.wrap.each_line do |line|
-            puts " %-#{label_width}s %s" % [label, line]
+            line " %-#{label_width}s %s" % [label, line]
             label = ''
           end
         end
       end
 
       def add_text(content)
-        puts
-        puts content
+        line
+        line content
       end
 
       protected
@@ -63,7 +63,7 @@ module HammerCLI
       def heading(label)
         label = "#{label}:"
         label = HighLine.color(label, :bold) if @richtext
-        puts label
+        line label
       end
     end
   end

data/lib/hammer_cli/logger.rb

@@ -54,7 +54,7 @@ module HammerCLI
       log_dir = File.expand_path(HammerCLI::Settings.get(:log_dir) || DEFAULT_LOG_DIR)
       begin
         FileUtils.mkdir_p(log_dir, :mode => 0750)
-      rescue Errno::EACCES => e
+      rescue Errno::EACCES
         $stderr.puts _("No permissions to create log dir %s.") % log_dir
       end
 
@@ -68,7 +68,7 @@ module HammerCLI
                                                             :size     => (HammerCLI::Settings.get(:log_size) || 1)*1024*1024) # 1MB
         # set owner and group (it's ignored if attribute is nil)
         FileUtils.chown HammerCLI::Settings.get(:log_owner), HammerCLI::Settings.get(:log_group), filename
-      rescue ArgumentError => e
+      rescue ArgumentError
         $stderr.puts _("File %s not writeable, won't log anything to the file!") % filename
       end
 

data/lib/hammer_cli/modules.rb

@@ -67,7 +67,7 @@ module HammerCLI
 
     def self.load(name)
       load! name
-    rescue Exception => e
+    rescue Exception
       false
     end
 

data/lib/hammer_cli/options/normalizers.rb

@@ -298,7 +298,7 @@ module HammerCLI
           json_string = ::File.exist?(::File.expand_path(val)) ? super(val) : val
           ::JSON.parse(json_string)
 
-        rescue ::JSON::ParserError => e
+        rescue ::JSON::ParserError
           raise ArgumentError, _("Unable to parse JSON input.")
         end
 
@@ -368,7 +368,7 @@ module HammerCLI
 
         def format(date)
           raise ArgumentError unless date
-          ::DateTime.parse(date).to_s
+          ::Time.parse(date).iso8601
         rescue ArgumentError
           raise ArgumentError, _("'%s' is not a valid date.") % date
         end

data/lib/hammer_cli/options/validators/dsl.rb

@@ -152,7 +152,7 @@ module HammerCLI
         end
 
         def run(&block)
-          self.instance_eval &block
+          self.instance_eval(&block)
         end
       end
     end

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

@@ -94,7 +94,6 @@ module HammerCLI::Output::Adapter
         @name = nil
         @prefixes = []
         @suffixes = []
-        @data
       end
 
       def append_suffix(suffix)

data/lib/hammer_cli/output/dsl.rb

@@ -12,7 +12,7 @@ module HammerCLI::Output
     end
 
     def build(&block)
-      self.instance_eval &block
+      self.instance_eval(&block)
     end
 
     protected

data/lib/hammer_cli/output/fields.rb

@@ -72,7 +72,7 @@ module Fields
     def initialize(options={}, &block)
       super(options)
       dsl = HammerCLI::Output::Dsl.new
-      dsl.build &block if block_given?
+      dsl.build(&block) if block_given?
       dsl.fields.each { |f| f.parent = self }
       self.output_definition.append dsl.fields
     end

data/lib/hammer_cli/output/formatters.rb

@@ -13,7 +13,7 @@ module HammerCLI::Output
 
       def register_formatter(type, *formatters)
         if @_formatters[type].nil?
-          @_formatters[type] = FormatterContainer.new *formatters
+          @_formatters[type] = FormatterContainer.new(*formatters)
         else
           formatters.each { |f| @_formatters[type].add_formatter(f) }
         end
@@ -84,8 +84,8 @@ module HammerCLI::Output
         tags.map { |t| HammerCLI::Output::Utils.tag_to_feature(t) }
       end
 
-      def format(data, field_params={})
-        c = HighLine.color(data.to_s, @color)
+      def format(data, _={})
+        HighLine.color(data.to_s, @color)
       end
     end
 
@@ -97,7 +97,7 @@ module HammerCLI::Output
         tags.map { |t| HammerCLI::Output::Utils.tag_to_feature(t) }
       end
 
-      def format(string_date, field_params={})
+      def format(string_date, _={})
         t = DateTime.parse(string_date.to_s)
         t.strftime("%Y/%m/%d %H:%M:%S")
       rescue ArgumentError

data/lib/hammer_cli/ssloptions.rb

@@ -68,13 +68,13 @@ module HammerCLI
 
     def read_certificate(path)
       OpenSSL::X509::Certificate.new(File.read(path)) unless path.nil?
-    rescue SystemCallError => e
+    rescue SystemCallError
       warn _("Could't read SSL client certificate %s.") % path
     end
 
     def read_key(path)
-      OpenSSL::PKey::RSA.new(File.read(path)) unless path.nil?
-    rescue SystemCallError => e
+      OpenSSL::PKey.read(File.read(path)) unless path.nil?
+    rescue SystemCallError
       warn _("Could't read SSL client key %s.") % path
     end
   end

data/lib/hammer_cli/subcommand.rb

@@ -11,6 +11,7 @@ module HammerCLI
         @subcommand_class = subcommand_class
         @hidden = options[:hidden]
         @warning = options[:warning]
+        super(@names, @description, @subcommand_class)
       end
 
       def hidden?

data/lib/hammer_cli/utils.rb

@@ -48,18 +48,6 @@ class String
   end
 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?

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new "3.5.1"
+    @version ||= Gem::Version.new "3.7.0"
   end
 end

data/locale/Makefile.def

@@ -0,0 +1,77 @@
+#
+# Definition of common Makefile tasks for PO merging and MO generation.
+#
+# Run make help to list available targets
+#
+
+POTFILE = $(DOMAIN).pot
+MOFILE = $(DOMAIN).mo
+POFILES = $(shell find . -name '$(DOMAIN).po')
+MOFILES = $(patsubst %.po,%.mo,$(POFILES))
+POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
+TIMESTAMPFILES = $(patsubst %.po,%.po.time_stamp,$(POFILES))
+
+%.mo: %.po
+	mkdir -p $(shell dirname $@)/LC_MESSAGES
+	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
+
+.PHONY: all-mo
+all-mo: $(MOFILES) ## Generate MO files from PO files (default)
+
+# Check for malformed strings
+%.pox: %.po
+	@command -v pofilter >/dev/null 2>&1 || { echo "Command pofilter not found. Make sure you have translate-toolkit installed." >&2; exit 1; }
+	msgfmt -c $<
+	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
+		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@;
+	cat $@
+	! grep -q msgid $@
+
+.PHONY: check
+check: $(POXFILES) ## Check translations using translate-tool, run make with -k to skip errors and execute for all languages
+
+.PHONY: uniq-po
+uniq-po: ## Unify duplicate translations in .po files
+	for f in $(shell find ./ -name "*.po") ; do \
+		msguniq $$f -o $$f ; \
+	done
+
+%.edit.po:
+	touch $@
+
+# Pull translaions from transifex
+.PHONY: tx-pull
+tx-pull: $(EDITFILES)
+	@command -v tx >/dev/null 2>&1 || { echo "Command tx not found. Make sure you have transifex-client installed and configured." >&2; exit 1; }
+	tx pull -f
+	for f in $(EDITFILES); do \
+		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
+	done
+
+# Merge .edit.po into .po
+.PHONY: update-po
+update-po:
+	for f in $(EDITFILES); do \
+		msgcat --use-first --no-location $$f $${f//.edit/} > $${f//.edit/}; \
+	done
+
+# Extract strings and update the .pot, prepare .edit.po files
+.PHONY: extract-strings
+extract-strings:
+	bundle exec rake gettext:find
+
+.PHONY: tx-update
+tx-update: extract-strings tx-pull update-po $(MOFILES) ## Download and merge translations from Transifex
+	git add ../locale
+	git commit -m "i18n - extracting new, pulling from tx"
+	@echo Changes commited!
+
+.PHONY: clean
+clean: ## Clean everything, removes *.edit.po, *.po.timestamp and *.pox files
+	rm -f $(EDITFILES) $(TIMESTAMPFILES) $(POXFILES)
+
+.PHONY: help
+help: ## This help message
+	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"
+

data/test/functional/defaults_test.rb

@@ -24,7 +24,6 @@ describe 'commands' do
     let(:cmd) { ['defaults', 'list'] }
 
     it 'prints all defaults' do
-      header = 'Parameter,Value'
       default_values = {
         :organization_id => {
           :value => 3,

data/test/test_helper.rb

@@ -11,7 +11,7 @@ SimpleCov.root Pathname.new(File.dirname(__FILE__) + "../../../")
 require 'minitest/autorun'
 require 'minitest/spec'
 require "minitest-spec-context"
-require "mocha/setup"
+require "mocha/minitest"
 
 require 'hammer_cli'
 require 'hammer_cli/logger'

data/test/unit/apipie/command_test.rb

@@ -42,7 +42,7 @@ describe HammerCLI::Apipie::Command do
     let(:cmd_class) { CommandUnsupp.dup }
     let(:cmd) { cmd_class.new("unsupported", ctx) }
     it "should print help for unsupported command" do
-      assert_match /.*Unfortunately the server does not support such operation.*/, cmd.help
+      assert_match(/.*Unfortunately the server does not support such operation.*/, cmd.help)
     end
 
   end

data/test/unit/apipie/option_definition_test.rb

@@ -23,7 +23,7 @@ describe HammerCLI::Apipie::OptionDefinition do
 
   end
 
-  let(:opt2) { HammerCLI::Apipie::OptionDefinition.new("--opt2", "OPT2", "'OPT2'", :referenced_resource => @referenced_resource) }
+  let(:opt2) { HammerCLI::Apipie::OptionDefinition.new("--opt2", "OPT2", "'OPT2'") }
 
   describe "Option Description should be converted" do
     it "should be converted" do

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, {}, verbosity: HammerCLI::V_QUIET)
+    output.expects(:print_message).with(cmd.help, {}, { verbosity: HammerCLI::V_QUIET })
     handler.handle_exception(Clamp::HelpWanted.new(cmd), :heading => heading)
 
   end
@@ -51,8 +51,8 @@ describe HammerCLI::ExceptionHandler do
     ex = RestClient::ResourceNotFound.new
     output.default_adapter = :silent
     handler.handle_exception(ex)
-    assert_match /Using exception handler HammerCLI::ExceptionHandler#handle_not_found/, @log_output.readline.strip
-    assert_match /ERROR  Exception : (Resource )?Not Found/, @log_output.readline.strip
+    assert_match(/Using exception handler HammerCLI::ExceptionHandler#handle_not_found/, @log_output.readline.strip)
+    assert_match(/ERROR  Exception : (Resource )?Not Found/, @log_output.readline.strip)
   end
 
   it "should print default prompts for standard missing arguments" do

data/test/unit/history_test.rb

@@ -20,13 +20,13 @@ describe HammerCLI::ShellHistory do
   describe "loading old history" do
 
     it "skips loading if the file does not exist" do
-      history = HammerCLI::ShellHistory.new(new_file.path)
+      HammerCLI::ShellHistory.new(new_file.path)
 
       Readline::HISTORY.to_a.must_equal []
     end
 
     it "preseeds readline's history" do
-      history = HammerCLI::ShellHistory.new(history_file.path)
+      HammerCLI::ShellHistory.new(history_file.path)
 
       Readline::HISTORY.to_a.must_equal ["line 1", "line 2"]
     end

data/test/unit/logger_test.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 describe Logging::LogEvent do
 
   describe '#initialize_logger' do
-    let (:logger) { Logging::Logger.new(File.open('/dev/null')) }
+    let(:logger) { Logging::Logger.new(File.open('/dev/null')) }
 
     it "prints message to stderr when log dir can't be created" do
         log_dir = "/nonexistant/dir/logs"
@@ -12,7 +12,7 @@ describe Logging::LogEvent do
 
         HammerCLI::Settings.load({:log_dir => log_dir})
 
-        out, err = capture_io do
+        _, err = capture_io do
           HammerCLI::Logger::initialize_logger(logger)
         end
 

data/test/unit/options/option_definition_test.rb

@@ -63,8 +63,8 @@ describe HammerCLI::Options::OptionDefinition do
       context = {}
       cmd = TestDeprecatedOptionCmd.new("", context)
 
-      out, err = capture_io { cmd.run(["--another-deprecated=VALUE"]) }
-      err.must_match /Warning: Option --another-deprecated is deprecated. It is going to be removed/
+      _, err = capture_io { cmd.run(["--another-deprecated=VALUE"]) }
+      err.must_match(/Warning: Option --another-deprecated is deprecated. It is going to be removed/)
       context[:old_option].must_equal "VALUE"
     end
 
@@ -72,8 +72,8 @@ describe HammerCLI::Options::OptionDefinition do
       context = {}
       cmd = TestDeprecatedOptionCmd.new("", context)
 
-      out, err = capture_io { cmd.run(["--deprecated=VALUE"]) }
-      err.must_match /Warning: Option --deprecated is deprecated. Use --test-option instead/
+      _, err = capture_io { cmd.run(["--deprecated=VALUE"]) }
+      err.must_match(/Warning: Option --deprecated is deprecated. Use --test-option instead/)
       context[:test_option].must_equal "VALUE"
     end
 

data/test/unit/options/sources/saved_defaults_test.rb

@@ -20,10 +20,6 @@ describe HammerCLI::Options::Sources::SavedDefaults do
       @defaults.expects(:get_defaults).with('--test-multi1').returns(:first_value)
 
       current_result = {}
-      expected_result = {
-        :different_attr_name => 1,
-        :multiple_switches_option => :first_value
-      }
 
       @logger.expects(:info).with('Custom default value 1 was used for attribute --test')
       @logger.expects(:info).with('Custom default value first_value was used for attribute --test-multi1')

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

@@ -27,7 +27,7 @@ describe HammerCLI::Output::Adapter::Abstract do
   it "should filter formatters with incompatible features" do
 
     HammerCLI::Output::Formatters::FormatterLibrary.expects(:new).with({ :type => [] })
-    adapter = adapter_class.new({}, {:type => [UnknownTestFormatter.new]})
+    adapter_class.new({}, {:type => [UnknownTestFormatter.new]})
   end
 
   it "should keep compatible formatters" do
@@ -35,7 +35,7 @@ describe HammerCLI::Output::Adapter::Abstract do
     HammerCLI::Output::Formatters::FormatterLibrary.expects(:new).with({ :type => [formatter] })
     # set :unknown tag to abstract
     adapter_class.any_instance.stubs(:features).returns([:unknown])
-    adapter = adapter_class.new({}, {:type => [formatter]})
+    adapter_class.new({}, {:type => [formatter]})
   end
 
   it "should put serializers first" do
@@ -46,7 +46,7 @@ describe HammerCLI::Output::Adapter::Abstract do
     HammerCLI::Output::Formatters::FormatterLibrary.expects(:new).with({ :type => [formatter2, formatter1] })
     # set :unknown tag to abstract
     adapter_class.any_instance.stubs(:features).returns([:serialized])
-    adapter = adapter_class.new({}, {:type => [formatter1, formatter2]})
+    adapter_class.new({}, {:type => [formatter1, formatter2]})
   end
 
 

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

@@ -24,28 +24,28 @@ describe HammerCLI::Output::Adapter::CSValues do
 
     it "should print column name" do
       out, err = capture_io { adapter.print_collection(fields, data) }
-      out.must_match /.*Name,Started At.*/
-      err.must_match //
+      out.must_match(/.*Name,Started At.*/)
+      err.must_match(//)
     end
 
     it "should print field value" do
       out, err = capture_io { adapter.print_collection(fields, data) }
-      out.must_match /.*John Doe.*/
-      err.must_match //
+      out.must_match(/.*John Doe.*/)
+      err.must_match(//)
     end
 
     it "does not print fields which data are missing from api by default" do
       fields << field_login
       out, err = capture_io { adapter.print_collection(fields, data) }
-      out.wont_match /.*Login.*/
-      err.must_match //
+      out.wont_match(/.*Login.*/)
+      err.must_match(//)
     end
 
     it "prints fields which data are missing from api when field has hide_missing flag set to false" do
       fields << field_missing
       out, err = capture_io { adapter.print_collection(fields, data) }
-      out.must_match /.*Missing.*/
-      err.must_match //
+      out.must_match(/.*Missing.*/)
+      err.must_match(//)
     end
 
     context "handle ids" do
@@ -59,14 +59,14 @@ describe HammerCLI::Output::Adapter::CSValues do
       }]}
 
       it "should ommit column of type Id by default" do
-        out, err = capture_io { adapter.print_collection(fields, data) }
+        out, _ = capture_io { adapter.print_collection(fields, data) }
         out.wont_match(/.*Id.*/)
         out.wont_match(/.*2000,.*/)
       end
 
       it "should print column of type Id when --show-ids is set" do
         adapter = HammerCLI::Output::Adapter::CSValues.new( { :show_ids => true } )
-        out, err = capture_io { adapter.print_collection(fields, data) }
+        out, _ = capture_io { adapter.print_collection(fields, data) }
         out.must_match(/.*Id.*/)
       end
     end
@@ -75,12 +75,12 @@ describe HammerCLI::Output::Adapter::CSValues do
       let(:empty_data) { HammerCLI::Output::RecordCollection.new [] }
 
       it "should print headers by default" do
-        out, err = capture_io { adapter.print_collection(fields, data) }
+        out, _ = capture_io { adapter.print_collection(fields, data) }
         out.must_match(/.*Name.*/)
       end
 
       it "should print headers by default even if there is no data" do
-        out, err = capture_io { adapter.print_collection(fields, empty_data) }
+        out, _ = capture_io { adapter.print_collection(fields, empty_data) }
         out.must_match(/.*Name.*/)
       end
 
@@ -127,14 +127,14 @@ describe HammerCLI::Output::Adapter::CSValues do
 
       it "should print column names" do
         out, err = capture_io { adapter.print_collection(fields, data) }
-        out.must_match /.*Demographics::Age,Demographics::Gender,Biometrics::Weight,Biometrics::Height*/
-        err.must_match //
+        out.must_match(/.*Demographics::Age,Demographics::Gender,Biometrics::Weight,Biometrics::Height*/)
+        err.must_match(//)
       end
 
       it "should print data" do
         out, err = capture_io { adapter.print_collection(fields, data) }
-        out.must_match /.*2000,22,m,123,155*/
-        err.must_match //
+        out.must_match(/.*2000,22,m,123,155*/)
+        err.must_match(//)
       end
     end
 
@@ -169,7 +169,7 @@ describe HammerCLI::Output::Adapter::CSValues do
         lines = out.split("\n")
         lines[0].must_equal 'Name,Started At,Items::Item Name::1,Items::Item Quantity::1,Items::Item Name::2,Items::Item Quantity::2'
 
-        err.must_match //
+        err.must_match(//)
       end
 
       it "should print collection data" do
@@ -179,7 +179,7 @@ describe HammerCLI::Output::Adapter::CSValues do
         lines[1].must_equal 'John Doe,2000,hammer,100,"",""'
         lines[2].must_equal 'Jane Roe,2001,cleaver,1,sledge,50'
 
-        err.must_match //
+        err.must_match(//)
       end
 
       it "should handle empty collection" do
@@ -188,7 +188,7 @@ describe HammerCLI::Output::Adapter::CSValues do
 
         lines[0].must_equal 'Name,Started At,Items'
 
-        err.must_match //
+        err.must_match(//)
       end
 
     end
@@ -202,7 +202,7 @@ describe HammerCLI::Output::Adapter::CSValues do
         end
 
         adapter = HammerCLI::Output::Adapter::CSValues.new({}, { :Field => [ DotFormatter.new ]})
-        out, err = capture_io { adapter.print_collection(fields, data) }
+        out, _ = capture_io { adapter.print_collection(fields, data) }
         out.must_match(/.*-DOT-.*/)
       end
 
@@ -215,7 +215,7 @@ describe HammerCLI::Output::Adapter::CSValues do
 
         adapter = HammerCLI::Output::Adapter::CSValues.new({}, { :Field => [ NilFormatter.new ]})
         nil_data = HammerCLI::Output::RecordCollection.new [{ :name => nil }]
-        out, err = capture_io { adapter.print_collection([field_name], nil_data) }
+        out, _ = capture_io { adapter.print_collection([field_name], nil_data) }
         out.must_match(/.*NIL.*/)
       end
     end

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

@@ -94,7 +94,7 @@ describe HammerCLI::Output::Adapter::Table do
       }
 
       it "should ommit column of type Id by default" do
-        out, err = capture_io { adapter.print_collection(fields, data) }
+        out, _ = capture_io { adapter.print_collection(fields, data) }
         out.wont_match(/.*ID.*/)
       end
 
@@ -110,7 +110,7 @@ describe HammerCLI::Output::Adapter::Table do
 
       it "should print column of type Id when --show-ids is set" do
         adapter = HammerCLI::Output::Adapter::Table.new( { :show_ids => true } )
-        out, err = capture_io { adapter.print_collection(fields, data) }
+        out, _ = capture_io { adapter.print_collection(fields, data) }
         out.must_match(/.*ID.*/)
       end
 
@@ -128,12 +128,12 @@ describe HammerCLI::Output::Adapter::Table do
 
     context "handle headers" do
       it "should print headers by default" do
-        out, err = capture_io { adapter.print_collection(fields, data) }
+        out, _ = capture_io { adapter.print_collection(fields, data) }
         out.must_match(/.*NAME.*/)
       end
 
       it "should print headers by default even if there is no data" do
-        out, err = capture_io { adapter.print_collection(fields, empty_data) }
+        out, _ = capture_io { adapter.print_collection(fields, empty_data) }
         out.must_match(/.*NAME.*/)
       end
 
@@ -353,7 +353,7 @@ describe HammerCLI::Output::Adapter::Table do
         end
 
         adapter = HammerCLI::Output::Adapter::Table.new({}, { :Field => [ DotFormatter.new ]})
-        out, err = capture_io { adapter.print_collection(fields, data) }
+        out, _ = capture_io { adapter.print_collection(fields, data) }
         out.must_match(/.*-DOT-.*/)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +174,8 @@ extra_rdoc_files:
 - doc/writing_a_plugin.md
 - doc/release_notes.md
 - config/cli.modules.d/module_config_template.yml
-- config/cli_config.template.yml
 - config/hammer.completion
+- config/cli_config.template.yml
 - README.md
 files:
 - LICENSE
@@ -294,6 +294,7 @@ files:
 - lib/hammer_cli/utils.rb
 - lib/hammer_cli/verbosity.rb
 - lib/hammer_cli/version.rb
+- locale/Makefile.def
 - locale/ca/LC_MESSAGES/hammer-cli.mo
 - locale/de/LC_MESSAGES/hammer-cli.mo
 - locale/en/LC_MESSAGES/hammer-cli.mo
@@ -387,7 +388,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -399,24 +400,17 @@ signing_key:
 specification_version: 4
 summary: Universal command-line interface
 test_files:
-- test/functional/defaults_test.rb
-- test/functional/help_test.rb
 - test/functional/nil_values_test.rb
 - test/functional/test_helper.rb
-- test/unit/abstract_test.rb
+- test/functional/help_test.rb
+- test/functional/defaults_test.rb
 - test/unit/apipie/api_connection_test.rb
-- 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/bash_test.rb
+- test/unit/apipie/command_test.rb
+- test/unit/apipie/option_definition_test.rb
 - test/unit/ca_cert_manager_test.rb
-- test/unit/command_extensions_test.rb
-- test/unit/completer_test.rb
 - test/unit/connection_test.rb
-- test/unit/csv_parser_test.rb
-- test/unit/defaults_test.rb
-- test/unit/exception_handler_test.rb
 - test/unit/fixtures/apipie/architectures.json
 - test/unit/fixtures/apipie/documented.json
 - test/unit/fixtures/certs/ca_cert.pem
@@ -425,36 +419,30 @@ test_files:
 - test/unit/fixtures/defaults/defaults_dashed.yml
 - test/unit/fixtures/json_input/invalid.json
 - test/unit/fixtures/json_input/valid.json
-- test/unit/help/builder_test.rb
 - test/unit/help/definition/abstract_item_test.rb
 - test/unit/help/definition/list_test.rb
 - test/unit/help/definition/note_test.rb
 - test/unit/help/definition/section_test.rb
 - test/unit/help/definition/text_test.rb
+- test/unit/help/builder_test.rb
 - test/unit/help/definition_test.rb
 - test/unit/help/text_builder_test.rb
-- test/unit/history_test.rb
-- test/unit/i18n_test.rb
-- test/unit/logger_test.rb
-- test/unit/main_test.rb
 - test/unit/messages_test.rb
-- test/unit/modules_test.rb
-- test/unit/option_builder_test.rb
-- test/unit/options/matcher_test.rb
-- test/unit/options/normalizers_test.rb
 - test/unit/options/option_collector_test.rb
-- test/unit/options/option_definition_test.rb
-- test/unit/options/option_family_test.rb
 - test/unit/options/processor_list_test.rb
 - test/unit/options/sources/command_line_test.rb
 - test/unit/options/sources/saved_defaults_test.rb
 - test/unit/options/validators/dsl_test.rb
-- test/unit/output/adapter/abstract_test.rb
+- test/unit/options/matcher_test.rb
+- test/unit/options/normalizers_test.rb
+- test/unit/options/option_family_test.rb
+- test/unit/options/option_definition_test.rb
 - test/unit/output/adapter/base_test.rb
-- test/unit/output/adapter/csv_test.rb
 - test/unit/output/adapter/json_test.rb
-- test/unit/output/adapter/table_test.rb
 - test/unit/output/adapter/yaml_test.rb
+- test/unit/output/adapter/abstract_test.rb
+- test/unit/output/adapter/csv_test.rb
+- test/unit/output/adapter/table_test.rb
 - test/unit/output/definition_test.rb
 - test/unit/output/dsl_test.rb
 - test/unit/output/field_filter_test.rb
@@ -462,7 +450,20 @@ test_files:
 - test/unit/output/formatters_test.rb
 - test/unit/output/output_test.rb
 - test/unit/output/record_collection_test.rb
-- test/unit/settings_test.rb
 - test/unit/test_helper.rb
+- test/unit/abstract_test.rb
+- test/unit/command_extensions_test.rb
+- test/unit/defaults_test.rb
+- test/unit/i18n_test.rb
+- test/unit/main_test.rb
+- test/unit/modules_test.rb
+- test/unit/settings_test.rb
+- test/unit/exception_handler_test.rb
+- test/unit/history_test.rb
+- test/unit/logger_test.rb
+- test/unit/bash_test.rb
+- test/unit/completer_test.rb
+- test/unit/csv_parser_test.rb
+- test/unit/option_builder_test.rb
 - test/unit/utils_test.rb
 - test/test_helper.rb