Commit Graph

414 Commits

Author SHA1 Message Date
joshr
332aa1f5d5 fix typo 2018-06-12 16:19:50 -04:00
Josh Rabinowitz
ab58461f8e more error checking around decryption 2018-06-12 15:35:33 -04:00
Josh Rabinowitz
b268ddf226 more careful error checking running gpg 2018-06-12 15:27:02 -04:00
Josh Rabinowitz
cb93e20fbf
Merge branch 'master' into docs 2018-06-12 14:46:54 -04:00
Josh Rabinowitz
5873865899
Merge pull request #203 from sobolevn/revert-193-bats-core3
Revert "migrate from bats to bats-core "
2018-06-12 14:38:03 -04:00
Josh Rabinowitz
86bdaf8702 regenerate man page 2018-06-12 12:09:43 -04:00
Josh Rabinowitz
860afe0e83 text change as per PR commants 2018-06-12 12:08:00 -04:00
Josh Rabinowitz
bfa3015394
Revert "migrate from bats to bats-core " 2018-06-12 11:24:47 -04:00
Josh Rabinowitz
9a23e588c7
Merge branch 'master' into docs 2018-06-11 08:10:14 -04:00
Josh Rabinowitz
3aa923f03c fix typos, regenerate man pages 2018-06-11 08:07:03 -04:00
Simon Massey
3eb06b8e31
Merge pull request #199 from sobolevn/issue185
Steps to get CI builds running on macOS
2018-06-11 08:02:54 +01:00
simbo1905
1045c2a71e Steps to get CI builds running on macOS 2018-06-10 21:06:47 +01:00
Josh Rabinowitz
c3434683ef more about gnupg, and .gitsecret contents. whitespace changes. 2018-06-10 10:05:49 -04:00
Josh Rabinowitz
dec31f016e
Merge pull request #196 from joshrabinowitz/changelog-update
CHANGELOG.md updates
2018-06-10 09:24:22 -04:00
joshr
93e7dac2af CHANGELOG.md updates 2018-06-10 08:36:04 -04:00
Josh Rabinowitz
4a45f8091d
Merge pull request #193 from joshrabinowitz/bats-core3
migrate from bats to bats-core
2018-06-09 17:19:59 -04:00
joshr
84f9605519 use bats-core 2018-06-09 08:15:32 -04:00
joshr
ce70cbbd72 fix typo 2018-06-09 08:15:17 -04:00
Simon Massey
dc57c4285f
Merge pull request #191 from simbo1905/master
rpm skip_cleanup: true
2018-06-09 12:30:51 +01:00
Simon Massey
1b8a8e7a6e
rpm skip_cleanup: true 2018-06-09 10:58:26 +01:00
Simon Massey
71fcc22a51 Man pages (#188)
* deploy skip_cleanup: true

* need to deploy when '! -z KITCHEN_REGEXP'

* rsync missing on gnupg1-ubuntu-latest

* fixes missing man pages on gnupg2-ubuntu-rolling

* replace yum with dnf

* ansible comments out dpkg.cfg.d excludes path-exclude=/usr/share/man/.*

* gem 'rspec'

* Install rspec in /usr/local/bin for RedHat based distros

* whitespace in Gemfile.
2018-06-09 07:55:50 +03:00
Nikita Sobolev
c328723f2b
Removes duplicate git version, closes #177 [ci skip] 2018-05-10 22:05:21 +03:00
Josh Rabinowitz
dff1aaf924
Merge pull request #170 from joshrabinowitz/detect-gpg-error-136
Detect gpg error 136
2018-04-25 06:42:15 -04:00
joshr
75c5ea168c fix 2018-04-24 08:27:29 -04:00
joshr
5ab26e6707 improve messaging, add comment 2018-04-24 08:24:40 -04:00
joshr
1d32cd0650 check that gpg -n --list-keys reported no error 2018-04-24 08:09:27 -04:00
joshr
8233f3a1de Merge branch 'master' into detect-gpg-error-136 2018-04-24 07:58:32 -04:00
joshr
4661b725df abort if unable to decrypt hidden file 2018-04-24 07:57:13 -04:00
Josh Rabinowitz
d92390b118
Merge pull request #167 from joshrabinowitz/deploy-dists-120
set GITSECRET_DIST once per gpg source/distribution type combination
2018-04-22 16:00:12 -04:00
joshr
67788a9f05 fix 2018-04-22 09:26:59 -04:00
joshr
ae504a6035 one GITSECRET_DIST per gpg/type combination. 2018-04-22 09:18:48 -04:00
Josh Rabinowitz
c2081514d6 fixes for git secret changes (#160)
* fixes for git secret changes

check that we can find filenames passed on command line, and that
we can find the unencrypted versions of hidden files.

* new test

* add tests
2018-04-21 18:25:38 +03:00
Josh Rabinowitz
7884a51f18
Merge pull request #162 from joshrabinowitz/update-readme2
update changelog
2018-04-20 08:25:54 -04:00
joshr
ac1aad2984 update CHANGELOG 2018-04-19 11:57:00 -04:00
Josh Rabinowitz
07f471de93 Fix deploys (#161)
* set GITSECRET_DIST for bintray deploy

* add GITSECRET_DIST=rpm too

* set more GITSECRET_DIST vars
2018-04-19 09:28:28 +03:00
Josh Rabinowitz
deae0d1cd5 'git secret hide' without source files gives appropriate error (#158)
* don't hide files that don't exist decrypted.

and change related error message to 'file not found: filename'.

* ensure all source files are present before hiding

* test for 'add' while unencrypted file missing
2018-04-18 20:56:54 +03:00
Josh Rabinowitz
5572894af7
Merge pull request #156 from joshrabinowitz/add-tracked-file-126
improve error message when trying to 'git secret add' a file tracked by git
2018-04-18 09:25:33 -04:00
Josh Rabinowitz
52bbc20162
Merge branch 'master' into add-tracked-file-126 2018-04-17 18:09:43 -04:00
joshr
13170c313f check if file is tracked before adding
and tell user useful information in case they want to
hide a file that's tracked.
2018-04-17 18:00:18 -04:00
joshr
ffa89ceaa2 fix 2018-04-17 17:03:43 -04:00
Josh Rabinowitz
5b626fcb08
Merge pull request #155 from sobolevn/document-version2
document 'git secret --version'
2018-04-17 16:57:51 -04:00
joshr
a78e0172bc check that added files are not tracked by git 2018-04-17 15:53:40 -04:00
Josh Rabinowitz
97fa9e6e7b fix quoting and phrasing 2018-04-17 15:34:19 -04:00
Josh Rabinowitz
114f4c7c6c document git secret --version 2018-04-17 15:27:24 -04:00
Josh Rabinowitz
91492539ac
Merge pull request #149 from joshrabinowitz/improve-docs
Improve docs
2018-04-17 12:12:21 -04:00
joshr
fe0c9c71e7 fix typo and update man pages 2018-04-17 11:23:10 -04:00
joshr
ef5596aa42 improve CHANGELOG.md and git-secret man page 2018-04-17 11:20:01 -04:00
joshr
2bc42f2655 mention 'git secret list' not mapping.cfg in usage 2018-04-17 11:18:21 -04:00
joshr
55f2b83320 fix typo 2018-04-17 09:10:44 -04:00
joshr
8b2a1eab1d Merge branch 'master' into improve-docs 2018-04-17 08:42:44 -04:00