hammer_cli 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0702e6ad522b20708785e9393b33010612d7a3f6875197e90796751d3b297f4e
-  data.tar.gz: cde2f105edd783de0e47539ead825a294971ddc5366dd8edc866f3765048c96a
+  metadata.gz: a6293c3d040b5065886e9b590864901ce167d8599cb09e1d2acb4c0f941aae0f
+  data.tar.gz: e5f30fd542b84ca83f3bed8748d0914cc44efeccf6c85c22a17c6ef1895b5d0f
 SHA512:
-  metadata.gz: f8c663c5ab346b8dc1043e54c61dbaa1f981123ddef7cc6a03a871928b8398a2491912a5e859e94dd258459e1bc044574ed41fff1508cd66ee077459236d5d68
-  data.tar.gz: 19b0ae03079285868c832bfbedd6f50ade0f544fe5b93397fa772b88b0a823c6f07093d31aba758dc2b57aa5fa3ba1eb2a4daf0ba0e993f4ac8261a5e9be3c98
+  metadata.gz: e137dc396915144be972cae6b0824862d68536084d7d2670829e7f895f711e7d214e15f1214f0722657898bc45654284689ed98858f23d022472747bec05500e
+  data.tar.gz: e48ab29d2b54d9ef05bfc89839597dd9ecff9f2538509a638420cf487f971f7919b51a7720200c7a0fdf1904445f1c52bdd01a1e0d9eadad4199251870db0fbc

data/doc/release_notes.md

@@ -1,5 +1,11 @@
 Release notes
 =============
+### 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/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new "3.5.0"
+    @version ||= Gem::Version.new "3.6.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/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'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Martin Bačovský
 - Tomáš Strachota
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -135,47 +135,47 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 description: 'Hammer cli provides universal extendable CLI interface for ruby apps
 
-  '
+'
 email: mbacovsk@redhat.com
 executables:
 - hammer
 - hammer-complete
 extensions: []
 extra_rdoc_files:
+- doc/commands_extension.md
+- doc/commands_modification.md
 - doc/creating_apipie_commands.md
+- doc/creating_commands.md
 - doc/design.png
 - doc/design.uml
+- doc/developer_docs.md
 - doc/development_tips.md
+- doc/help_modification.md
 - doc/i18n.md
+- doc/installation.md
 - doc/installation_deb.md
 - doc/installation_gem.md
+- doc/installation_rpm.md
+- doc/installation_source.md
 - doc/option_builders.md
 - doc/option_normalizers.md
-- doc/writing_a_plugin.md
-- doc/installation_source.md
-- doc/creating_commands.md
-- doc/release_notes.md
-- doc/commands_extension.md
-- doc/commands_modification.md
-- doc/developer_docs.md
-- doc/help_modification.md
-- doc/installation.md
-- doc/installation_rpm.md
 - doc/output.md
 - doc/review_checklist.md
+- doc/writing_a_plugin.md
+- doc/release_notes.md
 - config/cli.modules.d/module_config_template.yml
-- config/hammer.completion
 - config/cli_config.template.yml
+- config/hammer.completion
 - 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
@@ -379,7 +380,7 @@ homepage: https://github.com/theforeman/hammer-cli
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -394,8 +395,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Universal command-line interface
 test_files:
@@ -404,32 +405,36 @@ test_files:
 - test/functional/nil_values_test.rb
 - test/functional/test_helper.rb
 - test/test_helper.rb
+- test/unit/abstract_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/apipie/api_connection_test.rb
-- test/unit/apipie/option_builder_test.rb
+- test/unit/bash_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/fixtures/apipie/documented.json
+- 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
 - test/unit/fixtures/certs/non_ca_cert.pem
 - test/unit/fixtures/defaults/defaults.yml
 - 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/section_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/definition_test.rb
 - test/unit/help/text_builder_test.rb
-- test/unit/help/builder_test.rb
 - test/unit/history_test.rb
 - test/unit/i18n_test.rb
 - test/unit/logger_test.rb
@@ -438,31 +443,27 @@ test_files:
 - 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/options/option_family_test.rb
-- test/unit/options/option_definition_test.rb
-- test/unit/options/normalizers_test.rb
 - test/unit/output/adapter/abstract_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/dsl_test.rb
-- test/unit/output/fields_test.rb
-- test/unit/output/record_collection_test.rb
 - test/unit/output/definition_test.rb
+- test/unit/output/dsl_test.rb
 - test/unit/output/field_filter_test.rb
+- test/unit/output/fields_test.rb
 - 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/utils_test.rb
-- test/unit/bash_test.rb
-- test/unit/exception_handler_test.rb
-- test/unit/abstract_test.rb
-- test/unit/command_extensions_test.rb