dotgpg 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9809f26fb51e8fce8cce8bcbfb6656b1de07208f
4
- data.tar.gz: 98e7d6a9928c1a64de793e7e57729756949cdbf1
3
+ metadata.gz: 2b9ba3d4ad515844c56c7551eb3aa1ed26dc1dbf
4
+ data.tar.gz: 1780ac2133da851a289e4cfbed5ec2a249a7dae2
5
5
  SHA512:
6
- metadata.gz: 2133b5d5e87cc941c0aebed9e2e12680d56abaf62fa42fca66cd1822d828e0eca3478c7c81e5cb3069bec3c0057be59de42c7ee72be4894f638410d875f23cbe
7
- data.tar.gz: b8030f114a7fb96bdd9100f216529b566077a015f000f6d458f2b741d785d48b20e87cfcae7b22e55e04f8dcc1af1aba44eb2a63012a9bea7829423db0dd76fb
6
+ metadata.gz: 18d55e036791848055c9541506172dc13ffc648c13d7271af5e167d899514440a337d371c82d19687b6769aac0be209b18a02e27d250ac1beaa6fe53b808f9e2
7
+ data.tar.gz: 09ac5cad94532de3c7e3c83adb049883a9bd2d898f9809d7e6dd407687770ae49bd0db77d5c550b7cbfc4f839edadf791bf43ac20f9db9f9585a666150ce9c89
data/README.md CHANGED
@@ -176,12 +176,12 @@ Encrypted files don't work well with many git workflows because they are (basica
176
176
  Add the following lines to your [git config](http://git-scm.com/docs/git-config):
177
177
  ```
178
178
  [diff "gpg"]
179
- textconv = gpg -d -q --batch --no-tty 2>/dev/null
179
+ textconv = dotgpg unsafe_cat
180
180
  [merge "gpg"]
181
181
  name = dotgpg merge driver
182
182
  driver = "dotgpg merge %O %A %B"
183
183
  ```
184
- (you may need to use `bundle exec dotgpg merge %O %A %B` depending on how you've installed dotgpg and ruby)
184
+ (you may need to use `bundle exec dotgpg ...` depending on how you've installed dotgpg and ruby)
185
185
 
186
186
  Add the following lines to your [git attributes](http://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes)
187
187
  ```
data/dotgpg.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |gem|
2
2
  gem.name = 'dotgpg'
3
- gem.version = '0.6.0'
3
+ gem.version = '0.6.1'
4
4
 
5
5
  gem.summary = 'gpg-encrypted backup for your dotenv files'
6
6
  gem.description = "Easy management of gpg-encrypted backup files"
data/lib/dotgpg/cli.rb CHANGED
@@ -25,8 +25,8 @@ class Dotgpg
25
25
  FileUtils.mkdir_p(dir.dotgpg)
26
26
  unless File.exist? 'README.md'
27
27
  FileUtils.cp Pathname.new(__FILE__).dirname.join("template/README.md"), dir.path.join("README.md")
28
- dir.add_key(key)
29
28
  end
29
+ dir.add_key(key)
30
30
  end
31
31
 
32
32
  desc "key", "export your GPG public key in a format that `dotgpg add` will understand"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dotgpg
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Conrad Irwin
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain:
11
11
  - certs/gem-public_cert.pem
12
- date: 2015-04-24 00:00:00.000000000 Z
12
+ date: 2015-07-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thor
@@ -130,9 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
130
130
  version: '0'
131
131
  requirements: []
132
132
  rubyforge_project:
133
- rubygems_version: 2.2.2
133
+ rubygems_version: 2.4.5
134
134
  signing_key:
135
135
  specification_version: 4
136
136
  summary: gpg-encrypted backup for your dotenv files
137
137
  test_files: []
138
- has_rdoc: