cheffish 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28db1ebb5c3ef956150fcdc87b75c67903fe729a
-  data.tar.gz: 3b06780cf90fc6b5b2af4a5b4a49ddad9535b59d
+  metadata.gz: 0667c4e296b1e3be43fefe384509dbc22e10202b
+  data.tar.gz: 35be2921f6449bc5f84ff3b3a16e11e3b228e465
 SHA512:
-  metadata.gz: a1c94c6da71dce1bbe8ba0e21043027e8a89c227591e728c87dcc1a32ea48a9bc72d674b6b1b2d511e48b64f1b8877be1f01446512276df705d27abdf5ebfcdd
-  data.tar.gz: eff6bbc45687d8dfaf2790fe79da4fd3d6d5f9d8540b7706dad8f498c5f96e8051e3ad6562cf13fa2af411310efed998f62e9fa482e97fd66964e79413ca1e70
+  metadata.gz: 3c4f73cd2e4b8619091566b49638bc5db5e8b8e5d4bb85bf6b0230d9ec9dab7d4f5ea9b24284a01c97a46eb0b48fea91c95bd9dee4e86816b08989ad1c7fe135
+  data.tar.gz: 8b149e416f184c91e452448fde3f0ebd195d8a4c3ae7c11328238915e1c11f41d197a6a59b57b6c3673607aa18d9894442a5ede6c8743bfc7de4c92ead990133

data/lib/cheffish.rb

@@ -83,12 +83,13 @@ module Cheffish
 
   def self.get_private_key_with_path(name, config = profiled_config)
     if config[:private_keys] && config[:private_keys][name]
-      if config[:private_keys][name].is_a?(String)
-        Chef::Log.info("Got key #{name} from Chef::Config.private_keys.#{name}, which points at #{config[:private_keys[name]]}.  Reading key from there ...")
-        return [ IO.read(config[:private_keys][name]), config[:private_keys][name] ]
+      named_key = config[:private_keys][name]
+      if named_key.is_a?(String)
+        Chef::Log.info("Got key #{name} from Chef::Config.private_keys.#{name}, which points at #{named_key}.  Reading key from there ...")
+        return [ IO.read(named_key), named_key]
       else
         Chef::Log.info("Got key #{name} raw from Chef::Config.private_keys.#{name}.")
-        return [ config[:private_keys][name].to_pem, nil ]
+        return [ named_key.to_pem, nil ]
       end
     elsif config[:private_key_paths]
       config[:private_key_paths].each do |private_key_path|

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/unit/get_private_key_spec.rb

@@ -23,6 +23,7 @@ describe Cheffish do
     File.open(key_file, "w+") do |f|
       f.write private_key_contents
     end
+    key_file
   end
 
   def setup_pem_key
@@ -30,6 +31,7 @@ describe Cheffish do
     File.open(key_file, "w+") do |f|
       f.write private_key_pem_contents
     end
+    key_file
   end
 
   def setup_garbage_key
@@ -37,6 +39,7 @@ describe Cheffish do
     File.open(key_file, "w+") do |f|
       f.write private_key_garbage_contents
     end
+    key_file
   end
 
   shared_examples_for "returning the contents of the key file if it finds one" do
@@ -62,7 +65,7 @@ describe Cheffish do
     end
   end
 
-  context "#get_private_key" do
+  describe "#get_private_key" do
     context "when private_key_paths has a directory which is empty" do
       let(:config) {
         { :private_key_paths => [ directory_that_exists ] }
@@ -90,5 +93,39 @@ describe Cheffish do
 
       it_behaves_like "returning the contents of the key file if it finds one"
     end
+
+    context "when private_keys is empty" do
+      let(:config) {
+        { :private_keys => {} }
+      }
+
+      it "returns nil" do
+        expect(Cheffish.get_private_key("ned_stark", config)).to be_nil
+      end
+    end
+
+    context "when private_keys contains the path to a key" do
+      let(:name) { "ned_stark" }
+      let(:config) {
+        { :private_keys => {name => setup_key} }
+      }
+
+      it "returns the contents of the key file" do
+        setup_key
+        expect(Cheffish.get_private_key(name, config)).to eq(private_key_contents)
+      end
+    end
+
+    context "when private_keys contains the path to a key" do
+      let(:name) { "ned_stark" }
+      let(:key) {double("key", :to_pem => private_key_contents)}
+      let(:config) {
+        { :private_keys => {name => key} }
+      }
+
+      it "returns the contents of the key file" do
+        expect(Cheffish.get_private_key(name, config)).to eq(private_key_contents)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero