Commit Graph

358 Commits

Author SHA1 Message Date
Tim Byrne 00133032ef
Add minor improvements to template processing
* Determine envtpl using `command -v` instead of `which` (more portable)
* Anchor the end of template file names in regex
* Quote variables to allow for whitespace in file names
2017-03-30 23:51:23 -05:00
Tim Byrne aaa4152fac
Remove trailing whitespace 2017-03-30 21:58:26 -05:00
Tim Byrne 5f47794104
Add `envtpl` to testbed docker image 2017-03-30 21:45:16 -05:00
Tim Byrne fd6fa8c923
Merge pull request #58 from janschulz/jinja_processing
Excluding yadm.md changes (these will happen during a release)
2017-03-30 17:00:27 -05:00
Tim Byrne 73a931e920
Unify the capitalization of Git 2017-03-30 16:30:49 -05:00
Tim Byrne b4e73abc9f
Reformat `enter` documentation 2017-03-30 16:30:44 -05:00
Tim Byrne 6974e4ce8c
Add tests for `enter` command 2017-03-30 16:30:39 -05:00
Tim Byrne 4e05be7020
Set prompt for sub-shells 2017-03-30 16:30:22 -05:00
Tim Byrne 1c34bc8e7f
Merge pull request #57 from renard/enter-function 2017-03-30 16:28:31 -05:00
Jan Schulz ca849b50de Autogenerate yadm.md after new jinja functionality 2017-03-26 03:49:24 +02:00
Jan Schulz a479b70d8a Add jinja processing to alt command
With the new functionality, when the 'alt' command is called (or automatically
triggered), any file with a name ending in '##yadm_tmpl' is treated as a jinja
template. The template is processed by envtpl and the result is written to a
file without the '##yadm_tmpl' name. The variables passed into the template
processing are

  YADM_CLASS
  YADM_OS
  YADM_HOSTNAME
  YADM_USER

These variables are set according to the normal rules for
CLASS, OS, HOSTNAME, and USER during the alt processing.
2017-03-26 03:49:24 +02:00
Tim Byrne 5678e383d8
Give priority to CLASS by processing those patterns separately (#51) 2017-03-25 12:55:46 -05:00
Tim Byrne 297df5d231
Add tests for classes with a range of names (#51) 2017-03-25 11:32:06 -05:00
Tim Byrne 5141433776
Support encrypt globs and paths with space (#53, #54) 2017-03-24 17:37:40 -05:00
Tim Byrne d80bbff2b9
Acceptance tests for encrypt globs and paths with space (#53, #54) 2017-03-24 17:37:40 -05:00
Sébastien Gross 831461e91e Add `enter` function for easier interaction with git repo.
Run a subshell with all git variables set. This can be used to easily
interact with your git repository. This is also useful if you are using
Emacs Tramp and magit to manage your directory.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
2017-03-21 11:53:13 +01:00
Tim Byrne a78fe20c5d
Add notes about common release steps 2017-02-11 11:36:58 -06:00
Tim Byrne def7e732db
Release 1.07
Update version number and update documentation

* Add `CLASS` to supported alt-link patterns (#21)
* Add bootstrap command (#42)
* Support wildcards for alt-links (#43)
* Stash conflicting data during clone (#44)
* Offer bootstrap after successful clone (#45)
* Display supported configs for `yadm config` (#46)
* Add "curl-pipe" program to clone without installation (#48)
* Fix bug in alt-link regular expressions (#49)
2017-02-10 14:53:52 -08:00
Tim Byrne e1cb4944e4
Use generic example 2017-02-08 21:06:00 -08:00
Tim Byrne 3253743939
Fix syntax for "source via url" 2017-02-08 21:05:42 -08:00
Tim Byrne d8d13ce47e
Add disclaimer about curl-pipe safety 2017-02-08 20:39:16 -08:00
Tim Byrne 63836c5e40
Add choice for GitLab 2017-02-03 07:40:00 -06:00
Tim Byrne f2b2b64750
Bring man page up-to-date with new features 2017-02-03 07:36:53 -06:00
Tim Byrne 2a7203a67b
Unset `GIT_DIR` prior to executing bootstrap 2017-01-30 21:20:37 -06:00
Tim Byrne 97b784d55d
Process bootstrap with Shellcheck 2017-01-27 17:25:30 -06:00
Tim Byrne 08427328f9
Add initial version of bootstrap script (#48) 2017-01-27 17:09:48 -06:00
Tim Byrne a612a98136
Explicitly read answers from `/dev/tty`
This is necessary if **yadm** is started by piping it into `bash`.
2017-01-27 17:08:07 -06:00
Tim Byrne 7f6fe24280
Indicate `stash` should be run from within `$HOME` 2017-01-27 08:23:15 -06:00
Tim Byrne e90ebd67be
Add `curl` to docker testbed image 2017-01-26 23:32:07 -06:00
Tim Byrne d28df86494
Store class/os/host/user overrides in the local repo config
Overrides are meant to be local to each system, unlike other
configurations which are often added to a user's dotfiles repository.

With this change, the configurations change names:

  alt.class => local.class
  alt.os    => local.os
  alt.host  => local.host
  alt.user  => local.user
2017-01-26 10:48:40 -06:00
Tim Byrne 76d90db627
Replace "TODO text" for `yadm config` (#46) 2017-01-25 17:31:56 -06:00
Tim Byrne 671b5c6ec6
Support both gpg1 and gpg2 missing key error messages 2017-01-25 09:13:59 -06:00
Tim Byrne 08e6cd40cb
Offer bootstrap after clone (#45) 2017-01-25 08:41:17 -06:00
Tim Byrne 12a23178d8
Tests for offering bootstrap during clone (#45) 2017-01-25 08:31:40 -06:00
Tim Byrne e82c4dac4c
Add bootstrap command (#42) 2017-01-23 17:53:40 -06:00
Tim Byrne 3f1a8364ae
Add tests for bootstrap command (#42) 2017-01-23 17:53:40 -06:00
Tim Byrne 7d3c9e1cb5
Run auto-alt after `yadm config` 2017-01-23 17:53:40 -06:00
Tim Byrne e2d8742a40
Support stashing of conflicting data during clone (#44) 2017-01-20 17:11:23 -06:00
Tim Byrne 02107c35d9
Add tests for stashed conflicting data during clone (#44) 2017-01-20 16:50:14 -06:00
Tim Byrne ce4ed41f10
Support custom classes for alt-links (#21)
Class can be set using `yadm config alt.class <class>`
2017-01-20 00:14:10 -06:00
Tim Byrne d7abc7ff41
Create tests for class support in alt-links (#21) 2017-01-20 00:13:56 -06:00
Tim Byrne 3b4c405d7f
Allow override of OS/Host/User (#21) 2017-01-18 19:51:28 -06:00
Tim Byrne 1534420106
Acceptance tests for overriding OS/Host/User (#21) 2017-01-18 19:51:13 -06:00
Tim Byrne eaa252f721
Implement alt-link wildcards (#43) 2017-01-18 01:46:51 -06:00
Tim Byrne 3ea710317a
Add acceptance tests for alt-link wildcards (#43) 2017-01-18 01:46:51 -06:00
Tim Byrne 02bf83c5ef
Restrict alt-link delimiter to a period (#49) 2017-01-16 17:52:04 -06:00
Tim Byrne a25a180b88
Add acceptance tests for alt-link delimiters (#49)
Delimiters other than `.` should not be used.
This adds some test with delimiter `_`.
2017-01-16 17:51:48 -06:00
Tim Byrne 3f7e8b148e
Add make target `parallel` 2017-01-16 17:01:53 -06:00
Tim Byrne 672c985e88
Release 1.06
Update version number and update documentation

* Improve portability of `hostname` (#23)
* Fix incompatibilities between Cygwin and Git for Windows (#26)
* Allow Git program to be configured via yadm.git-program (#30)
* Support alt-links for encrypted files (#34)
* Exit with the same return value as Git (#35)
* Support spaces in alt-link paths (#36)
* Ignore empty lines in .yadm/encrypt (#40)
* Fix typos (#41)
2017-01-12 17:15:46 -06:00
Tim Byrne a09738616d
Expand branches used for generating CONTRIBUTORS 2017-01-12 17:11:30 -06:00