hammer_cli 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef4527d2b222db1e8a5c4cd4c1f1935d9434a4faca25b1d1e862958610f6a4e
-  data.tar.gz: 1dea2d3ade1019d4a00dfdecfc1ece96782c60e24d4561d96b8abd9eeeb03219
+  metadata.gz: a6293c3d040b5065886e9b590864901ce167d8599cb09e1d2acb4c0f941aae0f
+  data.tar.gz: e5f30fd542b84ca83f3bed8748d0914cc44efeccf6c85c22a17c6ef1895b5d0f
 SHA512:
-  metadata.gz: bd18a75dc52b4185cf4d88d75c1cfb1c09881c7ce9fd5542038d64c11c8300c70cbdcc54e56993c9208834d645c64acd30ae72c374c5c0c58146f1b822c930d6
-  data.tar.gz: e1e115dc06bc8a02d3ea01c6dc2f63631111db1fcae58906c1216186cd9253f16da5522364d2b36be3dce970f4c5ae3172a1a57492e93a975da9e2afebdb2a19
+  metadata.gz: e137dc396915144be972cae6b0824862d68536084d7d2670829e7f895f711e7d214e15f1214f0722657898bc45654284689ed98858f23d022472747bec05500e
+  data.tar.gz: e48ab29d2b54d9ef05bfc89839597dd9ecff9f2538509a638420cf487f971f7919b51a7720200c7a0fdf1904445f1c52bdd01a1e0d9eadad4199251870db0fbc

data/doc/release_notes.md

@@ -1,7 +1,10 @@
 Release notes
 =============
-### 3.5.1 (2023-02-28)
+### 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.1"
+    @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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.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-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -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
@@ -403,6 +404,7 @@ test_files:
 - test/functional/help_test.rb
 - 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
@@ -465,4 +467,3 @@ test_files:
 - test/unit/settings_test.rb
 - test/unit/test_helper.rb
 - test/unit/utils_test.rb
-- test/test_helper.rb