cheffish 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a770a15bb48a8939bddbac6cbf95661afe11ea8c
-  data.tar.gz: 3233751aaa45372d416ac070eaa622e23879c989
+  metadata.gz: 9604eb3cba629ceef8d7e57aa5009d0cbbca6b7e
+  data.tar.gz: 7f8f7a795195719ad566edcb42df0486633236f0
 SHA512:
-  metadata.gz: ba67174d5be4f0c5a632002774a9c01815f19e1fa5112a71bc34ed2b7eeb83d5ae6df0f19707b3163c81cc50748b1c155a7fd42adf51588d8bcd110164cda62f
-  data.tar.gz: 3ef33eaf368193fe7f922dd3aaa82cd5d83c3bde5509135f8c080a53636060a98d797bdda7be487f99cd835f149678302a99ad6875e1c425080c3782c86d3cda
+  metadata.gz: acdaabb743e1003022f2282e041d0fdcccf7e8ed8c7ce7928b2dcf021ad51dfd9ad8fac9fca7d7a63ff910b9b933b9f0648c107b760716b61f06133869c92165
+  data.tar.gz: d9280f736b9ad162c83da2a435a7f75edc3c45b26f37f975b0120017f65fe6f886c1f6f145bdb5c513c530057ea6fa5b170db67684aa27a3d37cd07b4890b3e1

data/lib/chef/resource/chef_data_bag_item.rb

@@ -37,7 +37,13 @@ class Chef
       property :raw_data, Hash
 
       # If secret or secret_path are set, encrypt is assumed true.  encrypt exists mainly for with_secret and with_secret_path
-      property :encrypt, Boolean, default: lazy { secret || secret_path }
+      property :encrypt, Boolean, default: lazy {
+        if secret.nil? && secret_path.nil?
+          false
+        else
+          true
+        end
+      }
       property :secret, String
       property :secret_path, String
       property :encryption_version, Integer
@@ -165,8 +171,8 @@ class Chef
 
             # There are no encryptable values, so pretend encryption is the same as desired
 
-            current_resource.encrypt new_resource.encrypt
-            current_resource.encryption_version new_resource.encryption_version
+            current_resource.encrypt(new_resource.encrypt) unless new_resource.encrypt.nil?
+            current_resource.encryption_version(new_resource.encryption_version) if new_resource.encryption_version
             if new_resource.secret || new_resource.secret_path
               current_resource.secret new_secret
             end

data/lib/chef/resource/private_key.rb

@@ -239,11 +239,11 @@ class Chef
               if key
                 @current_private_key = key
                 resource.format key_format[:format]
-                resource.type key_format[:type]
-                resource.size key_format[:size]
-                resource.exponent key_format[:exponent]
-                resource.pass_phrase key_format[:pass_phrase]
-                resource.cipher key_format[:cipher]
+                resource.type(key_format[:type]) if key_format[:type]
+                resource.size(key_format[:size]) if key_format[:size]
+                resource.exponent(key_format[:exponent]) if key_format[:exponent]
+                resource.pass_phrase(key_format[:pass_phrase]) if key_format[:pass_phrase]
+                resource.cipher(key_format[:cipher]) if key_format[:cipher]
               end
             rescue
               # If there's an error reading, we assume format and type are wrong and don't futz with them

data/lib/cheffish/key_formatter.rb

@@ -23,7 +23,7 @@ module Cheffish
         end
       end
 
-      key_format[:type] = type_of(key)
+      key_format[:type] = type_of(key) if type_of(key)
       key_format[:size] = size_of(key) if size_of(key)
       key_format[:pass_phrase] = pass_phrase if pass_phrase
       # TODO cipher, exponent
@@ -94,19 +94,21 @@ module Cheffish
 
     def self.type_of(key)
       case key.class
-      when OpenSSL::PKey::RSA
-        :rsa
-      when OpenSSL::PKey::DSA
-        :dsa
+        when OpenSSL::PKey::RSA
+          :rsa
+        when OpenSSL::PKey::DSA
+          :dsa
+        else
+          nil
       end
     end
 
     def self.size_of(key)
       case key.class
-      when OpenSSL::PKey::RSA
-        key.n.num_bytes * 8
-      else
-        nil
+        when OpenSSL::PKey::RSA
+          key.n.num_bytes * 8
+        else
+          nil
       end
     end
   end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library to manipulate Chef in Chef.