hiera-eyaml-gpg 0.4 → 0.5.rc1

data/Gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org/'
 
 gem 'hiera-eyaml', ">=1.3.8"
-gem 'gpgme', ">=2.0.0"
 
 group :development do
   gem "aruba"
-end
+end

data/README.md

@@ -25,6 +25,17 @@ To get started, install the hiera-eyaml-gpg gem.
 
     $ gem install hiera-eyaml-gpg
 
+You will also need to install either the `gpgme` (recommended) or `ruby_gpg` gem:
+
+    $ gem install gpgme
+
+OR
+
+    $ gem install ruby_gpg -v ">=0.3.1"
+
+Note: you will need to use `ruby_gpg` with the Puppet server as it uses JRuby which cannot
+make use of native extensions such as `gpgme`.
+
 If you haven't already installed it, this requires and will install the hiera-eyaml gem, which you
 should probably acquint yourself with at https://github.com/TomPoulton/hiera-eyaml.
 
@@ -38,7 +49,7 @@ How to use
 
 Once installed you can create encrypted hiera-eyaml blocks that are encrypted using GPG.
 
-    $ eyaml -n gpg -e -s "A secret string to encrypt" --gpg-recipients bob@example.com,hiera@example.com
+    $ eyaml encrypt -n gpg -s "A secret string to encrypt" --gpg-recipients bob@example.com,hiera@example.com
 
 If you do not have a web of trust (i.e. you normally use --always-trust for gpg signing) then you'll need 
 to use the `--gpg-always-trust` option on the command line.
@@ -46,7 +57,7 @@ to use the `--gpg-always-trust` option on the command line.
 It gets pretty dull to keep on remembering which recipients you should use, so you can put them in a file
 and specify that instead.
 
-    $ eyaml -n gpg -e -s "A secret string to encrypt" --gpg-recipients-file hiera-eyaml-gpg.recipients
+    $ eyaml encrypt -n gpg -s "A secret string to encrypt" --gpg-recipients-file hiera-eyaml-gpg.recipients
 
 In fact, when editing a file on disk and neither of the --gpg-recipient options are provided it will
 automatically look for a `hiera-eyaml-gpg.recipients` file in the same directory as the file being edited 

data/hiera-eyaml-gpg.gemspec

@@ -18,5 +18,4 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency('hiera-eyaml', '>=1.3.8')
-  gem.add_dependency('gpgme', '>=2.0.0')
 end

data/lib/hiera/backend/eyaml/encryptors/gpg/version.rb

@@ -3,9 +3,9 @@ class Hiera
     module Eyaml
       module Encryptors
         module Gpg
-          VERSION = "0.4"
+          VERSION = "0.5.rc1"
         end
       end
     end
   end
-end
+end

data/lib/hiera/backend/eyaml/encryptors/gpg.rb

@@ -1,4 +1,13 @@
-require 'gpgme'
+begin
+  require 'gpgme'
+rescue LoadError
+  begin
+    require 'ruby_gpg'
+  rescue LoadError
+    fail "hiera-eyaml-gpg requires either the 'gpgme' or 'ruby_gpg' gem"
+  end
+end
+
 require 'base64'
 require 'pathname'
 require 'hiera/backend/eyaml/encryptor'
@@ -93,8 +102,13 @@ class Hiera
           end
 
           def self.encrypt plaintext
-            ENV["GNUPGHOME"] = self.option :gnupghome
-            debug("GNUPGHOME is #{ENV['GNUPGHOME']}")
+            unless defined?(GPGME)
+              raise RecoverableError, "Encryption is only supported when using the 'gpgme' gem"
+            end
+
+            gnupghome = self.option :gnupghome
+            GPGME::Engine.home_dir = gnupghome
+            debug("GNUPGHOME is #{gnupghome}")
 
             ctx = GPGME::Ctx.new
 
@@ -132,8 +146,15 @@ class Hiera
           end
 
           def self.decrypt ciphertext
-            ENV["GNUPGHOME"] = self.option :gnupghome
-            debug("GNUPGHOME is #{ENV['GNUPGHOME']}")
+            gnupghome = self.option :gnupghome
+            debug("GNUPGHOME is #{gnupghome}")
+
+            unless defined?(GPGME)
+              RubyGpg.config.homedir = gnupghome if gnupghome
+              return RubyGpg.decrypt_string(ciphertext)
+            end
+
+            GPGME::Engine.home_dir = gnupghome
 
             ctx = if hiera?
               GPGME::Ctx.new
@@ -158,8 +179,8 @@ class Hiera
               txt.seek 0
               txt.read
             else
-              warn("No usable keys found in #{ENV['GNUPGHOME']}. Check :gpgpghome value in hiera.yaml is correct")
-              raise ArgumentError, "No usable keys found in #{ENV['GNUPGHOME']}. Check :gpgpghome value in hiera.yaml is correct"
+              warn("No usable keys found in #{gnupghome}. Check :gpg_gnupghome value in hiera.yaml is correct")
+              raise ArgumentError, "No usable keys found in #{gnupghome}. Check :gpg_gnupghome value in hiera.yaml is correct"
             end
           end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml-gpg
 version: !ruby/object:Gem::Version
-  version: '0.4'
-  prerelease: 
+  version: 0.5.rc1
+  prerelease: 4
 platform: ruby
 authors:
 - Simon Hildrew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera-eyaml
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.8
-- !ruby/object:Gem::Dependency
-  name: gpgme
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 description: GPG encryptor for use with hiera-eyaml
 email: 
 executables: []
@@ -75,13 +59,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Encryption plugin for hiera-eyaml backend for Hiera
 test_files: []
+has_rdoc: