Skip to content

Commit

Permalink
prepare v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@noraj
noraj committed Nov 12, 2023
1 parent a258f61 commit 45d7098
Show file tree
Hide file tree
Showing 27 changed files with 56 additions and 64 deletions.
10 changes: 1 addition & 9 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
haiti-hash (2.0.0)
haiti-hash (2.1.0)
docopt (~> 0.6)
paint (~> 2.2)

Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
version: '3'
services:
haiti:
image: noraj/haiti:2.0.0
image: noraj/haiti:2.1.0
user: noraj
container_name: haiti
read_only: false
build:
context: .
dockerfile: Dockerfile
args:
HAITI_VERSION: 2.0.0
HAITI_VERSION: 2.1.0
10 changes: 5 additions & 5 deletions docs/pages/install.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions docs/pages/publishing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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 .
Expand All @@ -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 .
Expand All @@ -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 .
Expand All @@ -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 .
Expand Down
10 changes: 5 additions & 5 deletions docs/pages/usage.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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] <hash> -- <hashcat_options>...
Expand Down Expand Up @@ -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] <hash> -- <john_options>...
Expand Down Expand Up @@ -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] <hash>
Expand Down Expand Up @@ -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] <hash>
Expand Down
2 changes: 1 addition & 1 deletion docs/yard/HashIdentifier.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ <h3 class="signature " id="samples-class_method">
</div>

<div id="footer">
Generated on Sat Oct 28 17:53:39 2023 by
Generated on Sun Nov 12 17:03:44 2023 by
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.34 (ruby-3.2.2).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/yard/HashIdentifier/Chf.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ <h3 class="signature " id="samples-instance_method">
</div>

<div id="footer">
Generated on Sat Oct 28 17:53:39 2023 by
Generated on Sun Nov 12 17:03:44 2023 by
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.34 (ruby-3.2.2).
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/yard/Version.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h2>
<dt id="VERSION-constant" class="">VERSION =

</dt>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>2.0.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>2.1.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>

</dl>

Expand All @@ -116,7 +116,7 @@ <h2>
</div>

<div id="footer">
Generated on Sat Oct 28 17:53:39 2023 by
Generated on Sun Nov 12 17:03:44 2023 by
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.34 (ruby-3.2.2).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/yard/_index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ <h2>Namespace Listing A-Z</h2>
</div>

<div id="footer">
Generated on Sat Oct 28 17:53:39 2023 by
Generated on Sun Nov 12 17:03:44 2023 by
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.34 (ruby-3.2.2).
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/yard/file.LICENSE.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<div class="clear"></div>
</div>

<div id="content"><div id='filecontents'>The MIT License (MIT)<br/><br/>Copyright (c) 2020-2022 Alexandre ZANNI (independent)<br/>Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense<br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy<br/>of this software and associated documentation files (the &quot;Software&quot;), to deal<br/>in the Software without restriction, including without limitation the rights<br/>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell<br/>copies of the Software, and to permit persons to whom the Software is<br/>furnished to do so, subject to the following conditions:<br/><br/>The above copyright notice and this permission notice shall be included in<br/>all copies or substantial portions of the Software.<br/><br/>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br/>IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br/>FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE<br/>AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br/>LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,<br/>OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN<br/>THE SOFTWARE.</div></div>
<div id="content"><div id='filecontents'>The MIT License (MIT)<br/><br/>Copyright (c) 2020-2023 Alexandre ZANNI (independent)<br/>Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense<br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy<br/>of this software and associated documentation files (the &quot;Software&quot;), to deal<br/>in the Software without restriction, including without limitation the rights<br/>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell<br/>copies of the Software, and to permit persons to whom the Software is<br/>furnished to do so, subject to the following conditions:<br/><br/>The above copyright notice and this permission notice shall be included in<br/>all copies or substantial portions of the Software.<br/><br/>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br/>IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br/>FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE<br/>AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br/>LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,<br/>OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN<br/>THE SOFTWARE.</div></div>

<div id="footer">
Generated on Sat Oct 28 17:53:39 2023 by
Generated on Sun Nov 12 17:03:44 2023 by
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.34 (ruby-3.2.2).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/yard/file.README.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ <h2>Author</h2>
</div></div>

<div id="footer">
Generated on Sat Oct 28 17:53:39 2023 by
Generated on Sun Nov 12 17:03:44 2023 by
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.34 (ruby-3.2.2).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/yard/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ <h2>Author</h2>
</div></div>

<div id="footer">
Generated on Sat Oct 28 17:53:39 2023 by
Generated on Sun Nov 12 17:03:44 2023 by
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.34 (ruby-3.2.2).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/yard/top-level-namespace.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h2>Defined Under Namespace</h2>
</div>

<div id="footer">
Generated on Sat Oct 28 17:53:39 2023 by
Generated on Sun Nov 12 17:03:44 2023 by
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.34 (ruby-3.2.2).
</div>
Expand Down
2 changes: 1 addition & 1 deletion lib/haiti/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Version
VERSION = '2.0.0'
VERSION = '2.1.0'
end
6 changes: 3 additions & 3 deletions man/haiti-fzf.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/haiti-fzf.adoc
View file
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
6 changes: 3 additions & 3 deletions man/haiti-parsable.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/haiti-parsable.adoc
View file
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
6 changes: 3 additions & 3 deletions man/haiti.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/haiti.adoc
View file
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
Loading

3 comments on commit 45d7098

@chenrui333
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this is not part of 2.1.0 releasee, you might need either re-tag or make a new release.

@noraj
Copy link
Owner Author

@noraj noraj commented on 45d7098 Nov 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chenrui333 The gem seems to be ok:

➜ wget https://rubygems.org/downloads/haiti-hash-2.1.0.gem
➜ tar xaf haiti-hash-2.1.0.gem
➜ tar xaf data.tar.gz
➜ cat lib/haiti/version.rb
# frozen_string_literal: true

module Version
  VERSION = '2.1.0'
end

I think the issue is that I first tagged v2.1.0 to a258f61, then saw my error and retagged to 45d7098.
The force retag has worked locally but after your comment I checked and the tag change has not been reflected on remote with git push --follow-tags --force. I used the wrong command, I just re-forced push the tags with git push --tags --force and now the tag is on the right commit.

I checked that this is reflected on the archive as well (that you use in the bottle, which is why you had the issue that was not impacting the gem):

➜ wget https://github.com/noraj/haiti/archive/refs/tags/v2.1.0.tar.gz
➜ tar xaf v2.1.0.tar.gz
➜ cat haiti-2.1.0/lib/haiti/version.rb 
# frozen_string_literal: true

module Version
  VERSION = '2.1.0'
end

The hash of the archive changed and is no longer 3aaf22e5d918c3d1498a96129f12fa559ccbe8a29cd89ee4a59c12132de35871:

➜ sha256sum v2.1.0.tar.gz 
ee1fee20c891db567abe753de25e7f1f1d4c7c59d92b6ce28f2e96606f247828  v2.1.0.tar.gz

You should be able to re-build without the patch now.

@chenrui333
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, make sense. Thanks!

Please sign in to comment.