diff --git a/Gemfile.lock b/Gemfile.lock index 6c388eb..5f20301 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - haiti-hash (2.0.0) + haiti-hash (2.1.0) docopt (~> 0.6) paint (~> 2.2) @@ -13,11 +13,9 @@ GEM base64 (0.1.1) commonmarker (0.23.10) docopt (0.6.1) - hpricot (0.8.6) json (2.6.3) language_server-protocol (3.17.0.3) minitest (5.20.0) - mustache (1.1.1) paint (2.3.0) parallel (1.23.0) parser (3.2.2.3) @@ -26,13 +24,8 @@ GEM racc (1.7.1) rainbow (3.1.1) rake (13.0.6) - rdiscount (2.2.7.1) regexp_parser (2.8.1) rexml (3.2.6) - ronn (0.7.3) - hpricot (>= 0.8.2) - mustache (>= 0.7.0) - rdiscount (>= 1.5.8) rubocop (1.56.3) base64 (~> 0.1.1) json (~> 2.3) @@ -63,7 +56,6 @@ DEPENDENCIES minitest (~> 5.18) paint (~> 2.3) rake (~> 13.0) - ronn (>= 0.7.3) rubocop (~> 1.50) yard (>= 0.9.27, < 0.10) diff --git a/docker-compose.yml b/docker-compose.yml index bd2b75d..96a963b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: haiti: - image: noraj/haiti:2.0.0 + image: noraj/haiti:2.1.0 user: noraj container_name: haiti read_only: false @@ -10,4 +10,4 @@ services: context: . dockerfile: Dockerfile args: - HAITI_VERSION: 2.0.0 + HAITI_VERSION: 2.1.0 diff --git a/docs/pages/install.md b/docs/pages/install.md index f20a357..cfecf00 100644 --- a/docs/pages/install.md +++ b/docs/pages/install.md @@ -78,7 +78,7 @@ $ git clone https://github.com/noraj/haiti.git $ cd haiti $ docker-compose build # alternatively without docker compose -$ docker build -f Dockerfile -t haiti:2.0.0 --build-arg HAITI_VERSION=2.0.0 . +$ docker build -f Dockerfile -t haiti:2.1.0 --build-arg HAITI_VERSION=2.1.0 . ``` Usage examples: @@ -98,7 +98,7 @@ host: `docker.io` $ docker pull noraj/haiti # specific tag -$ docker pull noraj/haiti:2.0.0 +$ docker pull noraj/haiti:2.1.0 ``` Usage examples: @@ -120,7 +120,7 @@ host: `ghcr.io` $ docker pull ghcr.io/noraj/haiti # specific tag -$ docker pull ghcr.io/noraj/haiti:2.0.0 +$ docker pull ghcr.io/noraj/haiti:2.1.0 ``` Usage examples: @@ -142,7 +142,7 @@ host: `registry-intl.eu-central-1.aliyuncs.com` $ docker pull registry-intl.eu-central-1.aliyuncs.com/noraj/haiti # specific tag -$ docker pull registry-intl.eu-central-1.aliyuncs.com/noraj/haiti:2.0.0 +$ docker pull registry-intl.eu-central-1.aliyuncs.com/noraj/haiti:2.1.0 ``` Usage examples: @@ -162,7 +162,7 @@ host: `quay.io` $ docker pull quay.io/noraj/haiti # specific tag -$ docker pull quay.io/noraj/haiti:2.0.0 +$ docker pull quay.io/noraj/haiti:2.1.0 ``` Usage examples: diff --git a/docs/pages/publishing.md b/docs/pages/publishing.md index b172069..00fe3c0 100644 --- a/docs/pages/publishing.md +++ b/docs/pages/publishing.md @@ -3,7 +3,7 @@ Edit the new version number in: - `lib/haiti/version.rb` -- `man/haiti.ronn` +- `man/haiti.adoc` (and other man pages) - `docker-compose.yml` - `docs/pages/install.md` - `docs/pages/publishing.md` @@ -49,7 +49,7 @@ $ bundle exec rake man Create an **annotated git tag**: ``` -$ git tag -a v2.0.0 +$ git tag -a v2.1.0 ``` Push the changes including the tags: @@ -69,7 +69,7 @@ $ bundle exec rake build Push the new gem release on **RubyGems** See https://guides.rubygems.org/publishing/. ``` -$ gem push haiti-hash-2.0.0.gem +$ gem push haiti-hash-2.1.0.gem ``` ## Docker container registries @@ -79,7 +79,7 @@ $ gem push haiti-hash-2.0.0.gem ### **Docker Hub** ``` -$ export HAITI_VERSION=2.0.0 +$ export HAITI_VERSION=2.1.0 $ docker build -f Dockerfile -t noraj/haiti:$HAITI_VERSION --build-arg HAITI_VERSION=$HAITI_VERSION . $ docker build -f Dockerfile -t noraj/haiti:latest --build-arg HAITI_VERSION=$HAITI_VERSION . @@ -95,7 +95,7 @@ $ docker push docker.io/noraj/haiti:latest GHCR = Github Container Registry ``` -$ export HAITI_VERSION=2.0.0 +$ export HAITI_VERSION=2.1.0 $ docker build -f Dockerfile -t ghcr.io/noraj/haiti:$HAITI_VERSION --build-arg HAITI_VERSION=$HAITI_VERSION . $ docker build -f Dockerfile -t ghcr.io/noraj/haiti:latest --build-arg HAITI_VERSION=$HAITI_VERSION . @@ -112,7 +112,7 @@ $ docker push ghcr.io/noraj/haiti:latest ACR = Alibaba Cloud Container Registry ``` -$ export HAITI_VERSION=2.0.0 +$ export HAITI_VERSION=2.1.0 $ docker build -f Dockerfile -t registry-intl.eu-central-1.aliyuncs.com/noraj/haiti:$HAITI_VERSION --build-arg HAITI_VERSION=$HAITI_VERSION . $ docker build -f Dockerfile -t registry-intl.eu-central-1.aliyuncs.com/noraj/haiti:latest --build-arg HAITI_VERSION=$HAITI_VERSION . @@ -126,7 +126,7 @@ $ docker push registry-intl.eu-central-1.aliyuncs.com/noraj/haiti:latest ### **Quay.io** ``` -$ export HAITI_VERSION=2.0.0 +$ export HAITI_VERSION=2.1.0 $ docker build -f Dockerfile -t quay.io/noraj/haiti:$HAITI_VERSION --build-arg HAITI_VERSION=$HAITI_VERSION . $ docker build -f Dockerfile -t quay.io/noraj/haiti:latest --build-arg HAITI_VERSION=$HAITI_VERSION . diff --git a/docs/pages/usage.md b/docs/pages/usage.md index ba9d168..ba78429 100644 --- a/docs/pages/usage.md +++ b/docs/pages/usage.md @@ -10,7 +10,7 @@ Main binary: identify hash types, list types and samples. ``` $ haiti -h -HAITI (HAsh IdenTifIer) v2.0.0 +HAITI (HAsh IdenTifIer) v2.1.0 Usage: haiti [options] list @@ -58,7 +58,7 @@ Wrapper for Hashcat where you can select the mode using haiti and fzf. ``` $ hashcat-haiti -h -HAITI (HAsh IdenTifIer) v2.0.0 +HAITI (HAsh IdenTifIer) v2.1.0 Usage: hashcat-haiti [options] -- ... @@ -92,7 +92,7 @@ Wrapper for John the Ripper where you can select the format using haiti and fzf. ``` $ john-haiti -h -HAITI (HAsh IdenTifIer) v2.0.0 +HAITI (HAsh IdenTifIer) v2.1.0 Usage: john-haiti [options] -- ... @@ -128,7 +128,7 @@ Note: mostly useful for `hashcat-haiti` and `john-haiti` or building another bin ``` $ haiti-fzf -h -HAITI (HAsh IdenTifIer) v2.0.0 +HAITI (HAsh IdenTifIer) v2.1.0 Usage: haiti-fzf hc [options] @@ -167,7 +167,7 @@ Note: mostly useful for `haiti-fzf` or building another binary or alias. ``` $ haiti-parsable -h -HAITI (HAsh IdenTifIer) v2.0.0 +HAITI (HAsh IdenTifIer) v2.1.0 Usage: haiti-parsable hc [options] diff --git a/docs/yard/HashIdentifier.html b/docs/yard/HashIdentifier.html index 260e192..96513e6 100644 --- a/docs/yard/HashIdentifier.html +++ b/docs/yard/HashIdentifier.html @@ -788,7 +788,7 @@

diff --git a/docs/yard/HashIdentifier/Chf.html b/docs/yard/HashIdentifier/Chf.html index 4441c52..c9469d3 100644 --- a/docs/yard/HashIdentifier/Chf.html +++ b/docs/yard/HashIdentifier/Chf.html @@ -656,7 +656,7 @@

diff --git a/docs/yard/Version.html b/docs/yard/Version.html index b1d4a4c..7a9b065 100644 --- a/docs/yard/Version.html +++ b/docs/yard/Version.html @@ -100,7 +100,7 @@

VERSION =
- 
'2.0.0'
+ 
'2.1.0'
@@ -116,7 +116,7 @@

diff --git a/docs/yard/_index.html b/docs/yard/_index.html index f04fb36..c895d3d 100644 --- a/docs/yard/_index.html +++ b/docs/yard/_index.html @@ -128,7 +128,7 @@

Namespace Listing A-Z

diff --git a/docs/yard/file.LICENSE.html b/docs/yard/file.LICENSE.html index 49981f9..c37e0d9 100644 --- a/docs/yard/file.LICENSE.html +++ b/docs/yard/file.LICENSE.html @@ -57,10 +57,10 @@
-
The MIT License (MIT)

Copyright (c) 2020-2022 Alexandre ZANNI (independent)
Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
The MIT License (MIT)

Copyright (c) 2020-2023 Alexandre ZANNI (independent)
Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
diff --git a/docs/yard/file.README.html b/docs/yard/file.README.html index 4db645c..cc6f3ce 100644 --- a/docs/yard/file.README.html +++ b/docs/yard/file.README.html @@ -99,7 +99,7 @@

Author

diff --git a/docs/yard/index.html b/docs/yard/index.html index bc97154..ed4da16 100644 --- a/docs/yard/index.html +++ b/docs/yard/index.html @@ -99,7 +99,7 @@

Author

diff --git a/docs/yard/top-level-namespace.html b/docs/yard/top-level-namespace.html index 87d503d..12e7222 100644 --- a/docs/yard/top-level-namespace.html +++ b/docs/yard/top-level-namespace.html @@ -102,7 +102,7 @@

Defined Under Namespace

diff --git a/lib/haiti/version.rb b/lib/haiti/version.rb index 2fa7b3b..e204bf5 100644 --- a/lib/haiti/version.rb +++ b/lib/haiti/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Version - VERSION = '2.0.0' + VERSION = '2.1.0' end diff --git a/man/haiti-fzf.1 b/man/haiti-fzf.1 index d5c2c83..88e0f4d 100644 --- a/man/haiti-fzf.1 +++ b/man/haiti-fzf.1 @@ -4,10 +4,10 @@ .\" Generator: Asciidoctor 2.0.20 .\" Date: 2023-11-12 .\" Manual: haiti-fzf manual -.\" Source: haiti-fzf 2.0.0 +.\" Source: haiti-fzf 2.1.0 .\" Language: English .\" -.TH "HAITI\-FZF" "1" "2023-11-12" "haiti\-fzf 2.0.0" "haiti\-fzf manual" +.TH "HAITI\-FZF" "1" "2023-11-12" "haiti\-fzf 2.1.0" "haiti\-fzf manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -94,7 +94,7 @@ This software is distributed under the terms of the MIT License. You may freely redistribute copies of it, subject to the conditions of the license. .SH "VERSION" .sp -2.0.0 +2.1.0 .SH "REPORTING BUGS" .sp Report bugs to \c diff --git a/man/haiti-fzf.adoc b/man/haiti-fzf.adoc index 01a6361..738e265 100644 --- a/man/haiti-fzf.adoc +++ b/man/haiti-fzf.adoc @@ -1,7 +1,7 @@ = haiti-fzf(1) Alexandre ZANNI (@noraj) :doctype: manpage -:release-version: 2.0.0 +:release-version: 2.1.0 :manmanual: haiti-fzf manual :mansource: haiti-fzf {release-version} :manversion: {release-version} diff --git a/man/haiti-parsable.1 b/man/haiti-parsable.1 index 7e8aedd..72d2313 100644 --- a/man/haiti-parsable.1 +++ b/man/haiti-parsable.1 @@ -4,10 +4,10 @@ .\" Generator: Asciidoctor 2.0.20 .\" Date: 2023-11-12 .\" Manual: haiti-parsable manual -.\" Source: haiti-parsable 2.0.0 +.\" Source: haiti-parsable 2.1.0 .\" Language: English .\" -.TH "HAITI\-PARSABLE" "1" "2023-11-12" "haiti\-parsable 2.0.0" "haiti\-parsable manual" +.TH "HAITI\-PARSABLE" "1" "2023-11-12" "haiti\-parsable 2.1.0" "haiti\-parsable manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -93,7 +93,7 @@ This software is distributed under the terms of the MIT License. You may freely redistribute copies of it, subject to the conditions of the license. .SH "VERSION" .sp -2.0.0 +2.1.0 .SH "REPORTING BUGS" .sp Report bugs to \c diff --git a/man/haiti-parsable.adoc b/man/haiti-parsable.adoc index 77c9dd9..1b5e0fd 100644 --- a/man/haiti-parsable.adoc +++ b/man/haiti-parsable.adoc @@ -1,7 +1,7 @@ = haiti-parsable(1) Alexandre ZANNI (@noraj) :doctype: manpage -:release-version: 2.0.0 +:release-version: 2.1.0 :manmanual: haiti-parsable manual :mansource: haiti-parsable {release-version} :manversion: {release-version} diff --git a/man/haiti.1 b/man/haiti.1 index 5e0e39b..84e6986 100644 --- a/man/haiti.1 +++ b/man/haiti.1 @@ -4,10 +4,10 @@ .\" Generator: Asciidoctor 2.0.20 .\" Date: 2023-11-12 .\" Manual: haiti manual -.\" Source: haiti 2.0.0 +.\" Source: haiti 2.1.0 .\" Language: English .\" -.TH "HAITI" "1" "2023-11-12" "haiti 2.0.0" "haiti manual" +.TH "HAITI" "1" "2023-11-12" "haiti 2.1.0" "haiti manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -134,7 +134,7 @@ This software is distributed under the terms of the MIT License. You may freely redistribute copies of it, subject to the conditions of the license. .SH "VERSION" .sp -2.0.0 +2.1.0 .SH "REPORTING BUGS" .sp Report bugs to \c diff --git a/man/haiti.adoc b/man/haiti.adoc index 5206942..5d28e2e 100644 --- a/man/haiti.adoc +++ b/man/haiti.adoc @@ -1,7 +1,7 @@ = haiti(1) Alexandre ZANNI (@noraj) :doctype: manpage -:release-version: 2.0.0 +:release-version: 2.1.0 :manmanual: haiti manual :mansource: haiti {release-version} :manversion: {release-version} diff --git a/man/hashcat-haiti.1 b/man/hashcat-haiti.1 index 1170a67..81362d7 100644 --- a/man/hashcat-haiti.1 +++ b/man/hashcat-haiti.1 @@ -4,10 +4,10 @@ .\" Generator: Asciidoctor 2.0.20 .\" Date: 2023-11-12 .\" Manual: hashcat-haiti manual -.\" Source: hashcat-haiti 2.0.0 +.\" Source: hashcat-haiti 2.1.0 .\" Language: English .\" -.TH "HASHCAT\-HAITI" "1" "2023-11-12" "hashcat\-haiti 2.0.0" "hashcat\-haiti manual" +.TH "HASHCAT\-HAITI" "1" "2023-11-12" "hashcat\-haiti 2.1.0" "hashcat\-haiti manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -82,7 +82,7 @@ This software is distributed under the terms of the MIT License. You may freely redistribute copies of it, subject to the conditions of the license. .SH "VERSION" .sp -2.0.0 +2.1.0 .SH "REPORTING BUGS" .sp Report bugs to \c diff --git a/man/hashcat-haiti.adoc b/man/hashcat-haiti.adoc index d7a6863..11c88cd 100644 --- a/man/hashcat-haiti.adoc +++ b/man/hashcat-haiti.adoc @@ -1,7 +1,7 @@ = hashcat-haiti(1) Alexandre ZANNI (@noraj) :doctype: manpage -:release-version: 2.0.0 +:release-version: 2.1.0 :manmanual: hashcat-haiti manual :mansource: hashcat-haiti {release-version} :manversion: {release-version} diff --git a/man/john-haiti.1 b/man/john-haiti.1 index 018c7d3..aef1750 100644 --- a/man/john-haiti.1 +++ b/man/john-haiti.1 @@ -4,10 +4,10 @@ .\" Generator: Asciidoctor 2.0.20 .\" Date: 2023-11-12 .\" Manual: john-haiti manual -.\" Source: john-haiti 2.0.0 +.\" Source: john-haiti 2.1.0 .\" Language: English .\" -.TH "JOHN\-HAITI" "1" "2023-11-12" "john\-haiti 2.0.0" "john\-haiti manual" +.TH "JOHN\-HAITI" "1" "2023-11-12" "john\-haiti 2.1.0" "john\-haiti manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -82,7 +82,7 @@ This software is distributed under the terms of the MIT License. You may freely redistribute copies of it, subject to the conditions of the license. .SH "VERSION" .sp -2.0.0 +2.1.0 .SH "REPORTING BUGS" .sp Report bugs to \c diff --git a/man/john-haiti.adoc b/man/john-haiti.adoc index 19d6baa..c2961c7 100644 --- a/man/john-haiti.adoc +++ b/man/john-haiti.adoc @@ -1,7 +1,7 @@ = john-haiti(1) Alexandre ZANNI (@noraj) :doctype: manpage -:release-version: 2.0.0 +:release-version: 2.1.0 :manmanual: john-haiti manual :mansource: john-haiti {release-version} :manversion: {release-version} diff --git a/packages/debian/haiti/.fpm b/packages/debian/haiti/.fpm index 23371a5..b7667b2 100644 --- a/packages/debian/haiti/.fpm +++ b/packages/debian/haiti/.fpm @@ -1,7 +1,7 @@ --output-type deb --name haiti --license MIT ---version 2.0.0 +--version 2.1.0 --architecture all --depends ruby-paint --depends ruby-docopt @@ -9,7 +9,7 @@ --description "Hash type identifier (CLI & lib)" --url "https://noraj.github.io/haiti/" --maintainer "noraj