Merge pull request #412 from zonemaster/develop

Merge develop branch into master (CLI)

Author: matsduf

.travis.yml

@@ -1,4 +1,5 @@
 dist: jammy
+group: previous
 
 language: perl
 
@@ -17,11 +18,13 @@ addons:
     - cpanminus
     - libclone-perl
     - libdevel-checklib-perl
+    - libextutils-pkgconfig-perl
     - libfile-sharedir-perl
     - libfile-slurp-perl
     - libidn2-dev
     - libintl-perl
     - libjson-pp-perl
+    - liblist-compare-perl
     - liblist-moreutils-perl
     - liblocale-msgfmt-perl
     - libmail-rfc822-address-perl
@@ -39,7 +42,6 @@ addons:
     - libtool
     - m4
       # From Zonemaster CLI installation instruction for Ubuntu
-    # libmoosex-getopt-perl, see cpan-install below
     # libmodule-install-perl, see cpan-install below
     - libtry-tiny-perl
 
@@ -54,9 +56,6 @@ before_install:
   # Zonemaster LDNS needs a newer version of Module::Install
 - cpan-install Module::Install Module::Install::XSUtil
 
-  # Moose installed from OS package depends on a newer version of Devel::OverloadInfo
-- cpan-install Devel::OverloadInfo Moose MooseX::Getopt
-
   # IO::Socket::INET6 can't find Socket6 installed from OS package
 - cpan-install Socket6 IO::Socket::INET6
 

Changes

@@ -1,4 +1,27 @@
-Release history for Zonemaster component Zonemaster-CLI 
+Release history for Zonemaster component Zonemaster-CLI
+
+
+v7.1.0 2024-12-09 (part of Zonemaster v2024.2 release)
+
+ [Release information]
+ - Translations have not been fully updated in this release. They will
+   be updated in an upcoming extra release.
+
+ [Features]
+ - Corrects display when running 'zonemaster-cli' with '--ns' or '--ds'
+   (#382)
+ - Allows explicitly setting '--stop-level' to empty string (#395)
+
+ [Fixes]
+ - Provides a useful link in man page (#401)
+ - Write “AS” in uppercase in Dockerfile (#400)
+ - Corrects gettext code (#398)
+ - Organizes "zonemaster-cli --help" text (#389)
+ - Make "zonemaster-cli" usage documentation consistent and also remove
+   dependency on the Moose library (#371)
+ - Fixes the handling of invalid --hints argument (#386)
+ - Moves the "zonemaster-info" utility from this repository (#385)
+ - Clean-up exit statuses (#381)
 
 
 v7.0.0 2024-07-01 (part of Zonemaster v2024.1 release)

Dockerfile

@@ -1,41 +1,29 @@
-FROM zonemaster/engine:local as build
+FROM zonemaster/engine:local AS build
 
 RUN apk add --no-cache \
-    build-base \
     make \
     perl-app-cpanminus \
-    perl-cpan-meta-check \
-    perl-data-dump \
-    perl-dev \
-    perl-doc \
     perl-json-xs \
     perl-lwp-protocol-https \
-    perl-module-build \
-    perl-module-build-tiny \
-    perl-module-install \
-    perl-moose \
-    perl-namespace-autoclean \
-    perl-params-validate \
-    perl-path-tiny \
+    perl-mojolicious \
     perl-test-deep \
-    perl-test-needs \
- && cpanm --no-wget --from https://cpan.metacpan.org/ \
-    MooseX::Getopt
+    perl-test-differences \
+    perl-try-tiny \
+ && cpanm --notest --no-wget --from https://cpan.metacpan.org/ \
+    JSON::Validator
 
 ARG version
 
 COPY ./Zonemaster-CLI-${version}.tar.gz ./Zonemaster-CLI-${version}.tar.gz
 
-RUN cpanm --no-wget \
+RUN cpanm --notest --no-wget \
     ./Zonemaster-CLI-${version}.tar.gz
 
 FROM zonemaster/engine:local
 
 RUN apk add --no-cache \
-    perl-namespace-autoclean \
-    perl-params-validate \
     perl-json-xs \
-    perl-moose
+    perl-try-tiny
 
 COPY --from=build /usr/local/bin/zonemaster-cli /usr/local/bin/zonemaster-cli
 # Include all the Perl modules we built

MANIFEST

@@ -18,7 +18,6 @@ MANIFEST			This list of files
 META.yml
 README.md
 script/zonemaster-cli
-script/zonemaster-info
 share/GNUmakefile
 share/Makefile
 share/locale/da/LC_MESSAGES/Zonemaster-CLI.mo
@@ -28,3 +27,11 @@ share/locale/fr/LC_MESSAGES/Zonemaster-CLI.mo
 share/locale/nb/LC_MESSAGES/Zonemaster-CLI.mo
 share/locale/sv/LC_MESSAGES/Zonemaster-CLI.mo
 t/00-load.t
+t/pod.t
+t/usage.fake-data.data
+t/usage.fake-root.data
+t/usage.hints
+t/usage.normal.data
+t/usage.profile
+t/usage.t
+t/usage.wrapper.pl

MANIFEST.SKIP

@@ -78,3 +78,6 @@ t/po-files.t
 
 # Development mode aid for File::ShareDir
 ^lib/auto/share/dist/Zonemaster-CLI
+
+# Avoid MANIFEST test
+t/manifest.t

Makefile.PL

@@ -22,10 +22,14 @@ requires(
     'Net::IP::XS'        => 0,
     'JSON::XS'           => 0,
     'Locale::TextDomain' => 1.23,
-    'MooseX::Getopt'     => 0,
     'Try::Tiny'          => 0,
-    'Zonemaster::LDNS'   => 4.000002,  # v4.0.2
-    'Zonemaster::Engine' => 6.000000,  # v6.0.0
+    'Zonemaster::LDNS'   => 4.001000,  # v4.1.0
+    'Zonemaster::Engine' => 7.000000,  # v7.0.0
+);
+
+test_requires(
+    'JSON::Validator'   => 0,
+    'Test::Differences' => 0,
 );
 
 # Make all platforms include inc/Module/Install/External.pm

README.md

@@ -38,8 +38,13 @@ To build your own Docker image, see the [Docker Image Creation] documentation.
 
 ## Documentation
 
-Other than the installation documentation, no specific documentation is needed.
-The [USING] document provides an overview on how to use the CLI.
+Run `zonemaster-cli --help` to get brief descriptions of a selection of the most
+important command line options.
+For complete reference documentation, see the manual page by running `man
+zonemaster-cli`.
+Additional end-user documentation is available in the [USING] document.
+
+When developing Zonemaster-CLI, refer to the [development documentation].
 
 
 ## Participation, Contact and Bug reporting
@@ -54,6 +59,7 @@ This is free software under a 2-clause BSD license. The full text of the license
 be found in the [LICENSE](LICENSE) file included in this respository.
 
 
+[Development documentation]:         https://github.com/zonemaster/zonemaster/blob/master/docs/public/development/cli.md
 [Docker Image Creation]:             https://github.com/zonemaster/zonemaster/blob/master/docs/internal/maintenance/ReleaseProcess-create-docker-image.md
 [Docker Hub]:                        https://hub.docker.com/u/zonemaster
 [Installation]:                      https://github.com/zonemaster/zonemaster/blob/master/docs/public/installation/zonemaster-cli.md