ssssh 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d67cbed98ca5abfddc7ec818b486df7c1d8ad262
-  data.tar.gz: fb79d035bda7503889e376e2816f0422fbe15da7
+  metadata.gz: eef52cc397abec11348e1c17be44d31adf552a56
+  data.tar.gz: a1673a612e4cac2b428e55d04a5dcef21ea58335
 SHA512:
-  metadata.gz: 6f6ba99c2a19db54020cfd4bfab66c3f609cc897ba6f483b3e47116fccb486d6409e371c42262652188095e3c7b77fb215743de2d24ff38b64b247f91a78b0cf
-  data.tar.gz: ca9d385e84a56e12866f2e1437deb09eb84568449f09420a3209261f1321210dbf777958760b326c89edac1bb3f9360caec01ed7b0e0813279852fb207dfa552
+  metadata.gz: ccfab41aa8f45b245b2c87d1011736efcb87f628b18a23fa793c42df933dbf350c9c1c6d433d83f906bee6a45fa9c96fa57deaabcb0175c630a55a36e1b94dd8
+  data.tar.gz: e44a896cc694db6b11f768c827e30350d4bca6fb4b7a33931765b4f7ad1eece187e3a8e6e0321bd8f87243767c6dd74a59560e9ffda16047b94c85666ee1aac4

data/README.md

@@ -12,7 +12,9 @@ Later, you can decrypt them:
 
     ssssh decrypt < secrets.encrypted > secrets.txt
 
-This assumes that the necessary AWS_xxx environment variables are set, and that KEY-ID is the name or alias of an existing KMS key.
+KEY-ID must be the name or alias of an existing KMS key.
+
+Naturally, suitable AWS credentials must be provided (via environment variables, command-line options, or EC2 instance profile).
 
 ## Limitations
 

data/bin/ssssh

@@ -82,16 +82,22 @@ Clamp do
     }.reject { |k,v| v.nil? || v == "" }
   end
 
-  def kms
-    @kms ||= Aws::KMS::Client.new(aws_config)
+  def with_kms
+    yield Aws::KMS::Client.new(aws_config)
+  rescue Aws::KMS::Errors::ServiceError => e
+    signal_error(e.message, :status => 9)
   end
 
   def encrypt(plaintext, key_id)
-    kms.encrypt(:key_id => key_id, :plaintext => plaintext).ciphertext_blob
+    with_kms do |kms|
+      kms.encrypt(:key_id => key_id, :plaintext => plaintext).ciphertext_blob
+    end
   end
 
   def decrypt(ciphertext)
-    kms.decrypt(:ciphertext_blob => ciphertext).plaintext
+    with_kms do |kms|
+      kms.decrypt(:ciphertext_blob => ciphertext).plaintext
+    end
   end
 
 end

data/lib/ssssh/version.rb

@@ -1,3 +1,3 @@
 module Ssssh
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/ssssh.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "aws-sdk-core", "~> 2.0"
-  spec.add_runtime_dependency "clamp", ">= 0.6"
+  spec.add_runtime_dependency "clamp", ">= 0.6.4"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssssh
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement