dotgpg 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9809f26fb51e8fce8cce8bcbfb6656b1de07208f
-  data.tar.gz: 98e7d6a9928c1a64de793e7e57729756949cdbf1
+  metadata.gz: 2b9ba3d4ad515844c56c7551eb3aa1ed26dc1dbf
+  data.tar.gz: 1780ac2133da851a289e4cfbed5ec2a249a7dae2
 SHA512:
-  metadata.gz: 2133b5d5e87cc941c0aebed9e2e12680d56abaf62fa42fca66cd1822d828e0eca3478c7c81e5cb3069bec3c0057be59de42c7ee72be4894f638410d875f23cbe
-  data.tar.gz: b8030f114a7fb96bdd9100f216529b566077a015f000f6d458f2b741d785d48b20e87cfcae7b22e55e04f8dcc1af1aba44eb2a63012a9bea7829423db0dd76fb
+  metadata.gz: 18d55e036791848055c9541506172dc13ffc648c13d7271af5e167d899514440a337d371c82d19687b6769aac0be209b18a02e27d250ac1beaa6fe53b808f9e2
+  data.tar.gz: 09ac5cad94532de3c7e3c83adb049883a9bd2d898f9809d7e6dd407687770ae49bd0db77d5c550b7cbfc4f839edadf791bf43ac20f9db9f9585a666150ce9c89

data/README.md

@@ -176,12 +176,12 @@ Encrypted files don't work well with many git workflows because they are (basica
 Add the following lines to your [git config](http://git-scm.com/docs/git-config):
 ```
 [diff "gpg"]
-  textconv = gpg -d -q --batch --no-tty 2>/dev/null
+  textconv = dotgpg unsafe_cat
 [merge "gpg"]
   name = dotgpg merge driver
   driver = "dotgpg merge %O %A %B"
 ```
-(you may need to use `bundle exec dotgpg merge %O %A %B` depending on how you've installed dotgpg and ruby)
+(you may need to use `bundle exec dotgpg ...` depending on how you've installed dotgpg and ruby)
 
 Add the following lines to your [git attributes](http://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes)
 ```

data/dotgpg.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'dotgpg'
-  gem.version = '0.6.0'
+  gem.version = '0.6.1'
 
   gem.summary = 'gpg-encrypted backup for your dotenv files'
   gem.description = "Easy management of gpg-encrypted backup files"

data/lib/dotgpg/cli.rb

@@ -25,8 +25,8 @@ class Dotgpg
       FileUtils.mkdir_p(dir.dotgpg)
       unless File.exist? 'README.md'
         FileUtils.cp Pathname.new(__FILE__).dirname.join("template/README.md"), dir.path.join("README.md")
-      dir.add_key(key)
       end
+      dir.add_key(key)
     end
 
     desc "key", "export your GPG public key in a format that `dotgpg add` will understand"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotgpg
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Conrad Irwin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/gem-public_cert.pem
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -130,9 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: gpg-encrypted backup for your dotenv files
 test_files: []
-has_rdoc: