Skip to content

Commit 7628a1b

Browse files
Release 2.5.0
Update version number and update documentation * Support for transcrypt (yadm-dev#197) * Support ESH templates (yadm-dev#220) * Preserve file mode of template (yadm-dev#193) * Fish shell completions (yadm-dev#224) * Fix alt processing when worktree is `/` (yadm-dev#198) * Assert config directory if missing (yadm-dev#226, yadm-dev#227) * Documentation improvements (yadm-dev#229)
1 parent 4ff12c7 commit 7628a1b

File tree

7 files changed

+71
-30
lines changed

7 files changed

+71
-30
lines changed

CHANGES

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2.5.0
2+
* Support for transcrypt (#197)
3+
* Support ESH templates (#220)
4+
* Preserve file mode of template (#193)
5+
* Fish shell completions (#224)
6+
* Fix alt processing when worktree is `/` (#198)
7+
* Assert config directory if missing (#226, #227)
8+
* Documentation improvements (#229)
19
2.4.0
210
* Support multiple keys in `yadm.gpg-recipient` (#139)
311
* Ensure all templates are written atomically (#142)

CONTRIBUTORS

+19-15
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,32 @@ CONTRIBUTORS
22

33
Tim Byrne
44
Martin Zuther
5-
Ross Smith II
5+
Jan Schulz
6+
Jonathan Daigle
7+
Tin Lai
68
Espen Henriksen
79
Cameron Eagans
810
Klas Mellbourn
11+
Ross Smith II
12+
Tomas Cernaj
13+
jonasc
14+
Sébastien Gross
915
David Mandelberg
1016
Daniel Gray
11-
Jan Schulz
17+
Paraplegic Racehorse
18+
japm48
1219
Siôn Le Roux
13-
Stig Palmquist
14-
Sébastien Gross
15-
Thomas Luzat
16-
Tomas Cernaj
20+
Mateusz Piotrowski
1721
Uroš Golja
18-
con-f-use
19-
japm48
20-
Brayden Banks
21-
jonasc
22-
Daniel Wagenknecht
22+
Satoshi Ohki
2323
Franciszek Madej
24-
Mateusz Piotrowski
25-
Paraplegic Racehorse
24+
Daniel Wagenknecht
25+
Stig Palmquist
2626
Patrick Hof
27-
Russ Allbery
28-
Satoshi Ohki
27+
con-f-use
2928
Sheng Yang
29+
Tim Condit
30+
Thomas Luzat
31+
Russ Allbery
32+
Brayden Banks
33+
Alexandre GV

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Features, usage, examples and installation instructions can be found on the
4242
[master-badge]: https://img.shields.io/travis/com/TheLocehiliosan/yadm/master.svg?label=master
4343
[master-commits]: https://github.com/TheLocehiliosan/yadm/commits/master
4444
[master-date]: https://img.shields.io/github/last-commit/TheLocehiliosan/yadm/master.svg?label=master
45-
[obs-badge]: https://img.shields.io/badge/OBS-v2.4.0-blue
45+
[obs-badge]: https://img.shields.io/badge/OBS-v2.5.0-blue
4646
[obs-link]: https://software.opensuse.org//download.html?project=home%3ATheLocehiliosan%3Ayadm&package=yadm
4747
[releases-badge]: https://img.shields.io/github/tag/TheLocehiliosan/yadm.svg?label=latest+release
4848
[releases-link]: https://github.com/TheLocehiliosan/yadm/releases

yadm

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -z "$BASH_VERSION" ]; then
2020
[ "$YADM_TEST" != 1 ] && exec bash "$0" "$@"
2121
fi
2222

23-
VERSION=2.4.0
23+
VERSION=2.5.0
2424

2525
YADM_WORK="$HOME"
2626
YADM_DIR=

yadm.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" vim: set spell so=8:
2-
.TH yadm 1 "6 February 2020" "2.4.0"
2+
.TH yadm 1 "9 August 2020" "2.5.0"
33

44
.SH NAME
55

yadm.md

+40-11
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
yadm git-crypt [ options ]
3636

37+
yadm transcrypt [ options ]
38+
3739
yadm upgrade
3840

3941
yadm introspect category
@@ -101,8 +103,8 @@
101103
user.
102104

103105
config This command manages configurations for yadm. This command
104-
works exactly they way git-config(1) does. See the CONFIGURA-
105-
TION section for more details.
106+
works exactly the way git-config(1) does. See the CONFIGURATION
107+
section for more details.
106108

107109
decrypt
108110
Decrypt all files stored in $HOME/.config/yadm/files.gpg. Files
@@ -185,6 +187,15 @@
185187
can be disabled by setting the configuration yadm.auto-perms to
186188
"false".
187189

190+
transcrypt options
191+
If transcrypt is installed, this command allows you to pass
192+
options directly to transcrypt, with the environment configured
193+
to use the yadm repository.
194+
195+
transcrypt enables transparent encryption and decryption of
196+
files in a git repository. You can read
197+
https://github.com/elasticdog/transcrypt for details.
198+
188199
upgrade
189200
Version 2 of yadm uses a different directory for storing your
190201
configurations. When you start to use version 2 for the first
@@ -495,23 +506,32 @@
495506
most *nix systems. To use this processor, specify the value of
496507
"default" or just leave the value off (e.g. "##template").
497508

498-
j2cli To use the j2cli Jinja template processor, specify the value of
509+
ESH ESH is a template processor written in POSIX compliant shell. It
510+
allows executing shell commands within templates. This can be
511+
used to reference your own configurations within templates, for
512+
example:
513+
514+
<% yadm config mysection.myconfig %>
515+
516+
To use the ESH template processor, specify the value of "esh"
517+
518+
j2cli To use the j2cli Jinja template processor, specify the value of
499519
"j2" or "j2cli".
500520

501521
envtpl To use the envtpl Jinja template processor, specify the value of
502522
"j2" or "envtpl".
503523

504524

505-
NOTE: Specifying "j2" as the processor will attempt to use j2cli or
525+
NOTE: Specifying "j2" as the processor will attempt to use j2cli or
506526
envtpl, whichever is available.
507527

508-
If the template processor specified is available, templates will be
528+
If the template processor specified is available, templates will be
509529
processed to create or overwrite files.
510530

511-
During processing, the following variables are available in the tem-
531+
During processing, the following variables are available in the tem-
512532
plate:
513533

514-
Default Jinja Description
534+
Default Jinja or ESH Description
515535
------------- ------------- --------------------------
516536
yadm.class YADM_CLASS Locally defined yadm class
517537
yadm.distro YADM_DISTRO lsb_release -si
@@ -520,10 +540,10 @@
520540
yadm.user YADM_USER id -u -n
521541
yadm.source YADM_SOURCE Template filename
522542

523-
NOTE: The OS for "Windows Subsystem for Linux" is reported as "WSL",
543+
NOTE: The OS for "Windows Subsystem for Linux" is reported as "WSL",
524544
even though uname identifies as "Linux".
525545

526-
NOTE: If lsb_release is not available, DISTRO will be the ID specified
546+
NOTE: If lsb_release is not available, DISTRO will be the ID specified
527547
in /etc/os-release.
528548

529549
Examples:
@@ -536,7 +556,7 @@
536556
config=dev-whatever
537557
{% endif %}
538558

539-
would output a file named whatever with the following content if the
559+
would output a file named whatever with the following content if the
540560
user is "harvey":
541561

542562
config=work-Linux
@@ -545,7 +565,7 @@
545565

546566
config=dev-whatever
547567

548-
An equivalent Jinja template named whatever##template.j2 would look
568+
An equivalent Jinja template named whatever##template.j2 would look
549569
like:
550570

551571
{% if YADM_USER == 'harvey' -%}
@@ -554,6 +574,15 @@
554574
config=dev-whatever
555575
{% endif -%}
556576

577+
An equivalent ESH templated named whatever##template.esh would look
578+
like:
579+
580+
<% if [ "$YADM_USER" = "harvey" ]; then -%>
581+
config=<%= $YADM_CLASS %>-<%= $YADM_OS %>
582+
<% else -%>
583+
config=dev-whatever
584+
<% fi -%>
585+
557586

558587
## ENCRYPTION
559588
It can be useful to manage confidential files, like SSH or GPG keys,

yadm.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
22
Name: yadm
33
Summary: Yet Another Dotfiles Manager
4-
Version: 2.4.0
4+
Version: 2.5.0
55
Group: Development/Tools
66
Release: 1%{?dist}
77
URL: https://yadm.io

0 commit comments

Comments
 (0)