chef-encrypted-attributes 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d1bc69146514a06cc1e531b167dcc1181d2076
-  data.tar.gz: f0bd3f332555ff57c8fc1340d855df6ef8c98615
+  metadata.gz: 810a37dff2980969d642d2759f2ee1c09fdb1ebf
+  data.tar.gz: 3e199cd293403bdeccb89a1e6ce0ca93913f5bf2
 SHA512:
-  metadata.gz: 3e62b8c12e4dcb98b2fee808e01a8ca27e390cd434e3c4bcb9c53720ed0965ec2ecb6fcb4e9f476c03e645046d1a209912e6941663daa459eaff7534e0271124
-  data.tar.gz: aa3e2077dd7c68289ff0e7c79ffbfc928c5ae3e3dcd94bba77471ec478e7f6ec0bfe29de80f6cf4b5aeeb320ed88ddd8869f95cf2fc701d4830c64d41fb9e6ef
+  metadata.gz: 62020afcc9d396f9800c8364f5e3f111dc19ac6e7fa8639c2f0737dc071e257a4355a7ceef0d5c35bbeb7807fd857573982ab76d52db5ad01a1c79265db490cd
+  data.tar.gz: 1102b54b595fe434c360adea4367eea8ce44061c52cbea4262b87c1b6dd5e1783e859b07701ee68643a8f686fcbeb9d2a7aa1a4482fa85636c17cd125ba422d1

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 This file is used to list changes made in each version of `chef-encrypted-attributes`.
 
+## 0.5.0 (2015-04-03)
+
+* `#load_from_node` raises an exception if no ecnrypted attribute is found.
+* GemSpec:
+  * Fix Ruby < 2 support ([issue #2](https://github.com/onddo/chef-encrypted-attributes/pull/2), thanks [@chhsiung](https://github.com/chhsiung) for the help).
+  * Depend on `ffi-yajl` `< 3` as in Chef.
+
+* Tests:
+  * Use the new build environment on Travis ([issue #1](https://github.com/onddo/chef-encrypted-attributes/pull/1), thanks [Josh Kalderimis](https://github.com/joshk))
+  * GemSpec: Update RuboCop to version `0.29.1` (new offenses fixed).
+
+* Documentation:
+  * README: Fix testing link.
+
 ## 0.4.0 (2014-12-10)
 
 * Add Chef `12` support.

data/LICENSE

@@ -175,7 +175,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
 END OF TERMS AND CONDITIONS
 
-Copyright 2014 Onddo Labs, SL. (www.onddo.com)
+Copyright 2014-2015 Onddo Labs, SL. (www.onddo.com)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -2,9 +2,9 @@
 [![Gem Version](http://img.shields.io/gem/v/chef-encrypted-attributes.svg?style=flat)](http://badge.fury.io/rb/chef-encrypted-attributes)
 [![Dependency Status](http://img.shields.io/gemnasium/onddo/chef-encrypted-attributes.svg?style=flat)](https://gemnasium.com/onddo/chef-encrypted-attributes)
 [![Code Climate](http://img.shields.io/codeclimate/github/onddo/chef-encrypted-attributes.svg?style=flat)](https://codeclimate.com/github/onddo/chef-encrypted-attributes)
-[![Build Status](http://img.shields.io/travis/onddo/chef-encrypted-attributes/0.4.0.svg?style=flat)](https://travis-ci.org/onddo/chef-encrypted-attributes)
-[![Coverage Status](http://img.shields.io/coveralls/onddo/chef-encrypted-attributes/0.4.0.svg?style=flat)](https://coveralls.io/r/onddo/chef-encrypted-attributes?branch=0.4.0)
-[![Inline docs](http://inch-ci.org/github/onddo/chef-encrypted-attributes.svg?branch=0.4.0&style=flat)](http://inch-ci.org/github/onddo/chef-encrypted-attributes)
+[![Build Status](http://img.shields.io/travis/onddo/chef-encrypted-attributes.svg?style=flat)](https://travis-ci.org/onddo/chef-encrypted-attributes)
+[![Coverage Status](http://img.shields.io/coveralls/onddo/chef-encrypted-attributes.svg?style=flat)](https://coveralls.io/r/onddo/chef-encrypted-attributes?branch=master)
+[![Inline docs](http://inch-ci.org/github/onddo/chef-encrypted-attributes.svg?branch=master&style=flat)](http://inch-ci.org/github/onddo/chef-encrypted-attributes)
 
 [Chef](https://www.chef.io/) plugin to add Node encrypted attributes support using client keys.
 
@@ -193,11 +193,11 @@ See the [official gem documentation](http://www.rubydoc.info/gems/chef-encrypted
 
 The `chef-encrypted-attributes` gem is cryptographically signed by Onddo Labs's certificate, which identifies as *team@onddo.com*. You can obtain the official signature here:
 
-    https://raw.github.com/onddo/chef-encrypted-attributes/0.4.0/certs/team_onddo.crt
+    https://raw.github.com/onddo/chef-encrypted-attributes/master/certs/team_onddo.crt
 
 To be sure the gem you install has not been tampered with:
 
-    $ gem cert --add <(curl -Ls https://raw.github.com/onddo/chef-encrypted-attributes/0.4.0/certs/team_onddo.crt)
+    $ gem cert --add <(curl -Ls https://raw.github.com/onddo/chef-encrypted-attributes/master/certs/team_onddo.crt)
     $ gem install chef-encrypted-attributes -P MediumSecurity
 
 The *MediumSecurity* trust profile will verify signed gems, but allow the installation of unsigned dependencies. This is necessary because not all of `chef-encrypted-attributes`'s dependencies are signed, so we cannot use *HighSecurity*.
@@ -216,7 +216,7 @@ Still, this gem should be considered experimental until audited by professional
 
 If you have discovered a bug in `chef-encrypted-attributes` of a sensitive nature, i.e.  one which can compromise the security of `chef-encrypted-attributes` users, you can report it securely by sending a GPG encrypted message. Please use the following key:
 
-    https://raw.github.com/onddo/chef-encrypted-attributes/0.4.0/zuazo.gpg
+    https://raw.github.com/onddo/chef-encrypted-attributes/master/zuazo.gpg
 
 The key fingerprint is (or should be):
 
@@ -224,7 +224,7 @@ The key fingerprint is (or should be):
 
 ## Testing
 
-See [TESTING.md]((https://github.com/onddo/chef-encrypted-attributes/blob/master/TESTING.md).
+See [TESTING.md](https://github.com/onddo/chef-encrypted-attributes/blob/master/TESTING.md).
 
 ## Contributing
 
@@ -241,7 +241,9 @@ See [TODO.md](https://github.com/onddo/chef-encrypted-attributes/blob/master/TOD
 |                      |                                          |
 |:---------------------|:-----------------------------------------|
 | **Author:**          | [Xabier de Zuazo](https://github.com/zuazo) (<xabier@onddo.com>)
-| **Copyright:**       | Copyright (c) 2014 Onddo Labs, SL. (www.onddo.com)
+| **Contributor:**     | [Josh Kalderimis](https://github.com/joshk)
+| **Contributor:**     | [@chhsiung](https://github.com/chhsiung)
+| **Copyright:**       | Copyright (c) 2014-2015 Onddo Labs, SL. (www.onddo.com)
 | **License:**         | Apache License, Version 2.0
 
     Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/encrypted_attribute/cache_lru.rb

@@ -75,12 +75,9 @@ class Chef
       # @param key [String, Symbol] cache key to read.
       # @return [Mixed] cache key value.
       def [](key)
-        if key?(key)
-          val = super(key)
-          self[key] = val
-        else
-          nil
-        end
+        return nil unless key?(key)
+        val = super(key)
+        self[key] = val
       end
 
       # Sets a cache key.

data/lib/chef/encrypted_attribute/config.rb

@@ -254,8 +254,6 @@ class Chef
             rescue OpenSSL::PKey::RSAError, TypeError
               nil
             end
-          else
-            nil
           end
         return false if rsa_k.nil?
         rsa_k.public?

data/lib/chef/encrypted_attribute/encrypted_mash.rb

@@ -160,6 +160,10 @@ class Chef
       # @raise [UnsupportedEncryptedAttributeFormat] if encrypted attribute
       #   format is not supported or unknown.
       def self.json_create(enc_hs)
+        unless enc_hs.is_a?(Hash)
+          fail UnacceptableEncryptedAttributeFormat,
+               'Encrypted attribute not found or corrupted.'
+        end
         klass = string_to_klass(enc_hs[JSON_CLASS])
         if klass.nil?
           fail UnsupportedEncryptedAttributeFormat,

data/lib/chef/encrypted_attribute/remote_node.rb

@@ -66,7 +66,7 @@ class Chef
       #
       # @param attr_ary [Array<String>] node attribute path as Array.
       # @param partial_search [Boolean] whether to use partial search.
-      # @return [Mixed] node attribute value.
+      # @return [Mixed] node attribute value, `nil` if not found.
       # @raise [ArgumentError] if the attribute path format is wrong.
       # @raise [SearchFailure] if there is a Chef search error.
       # @raise [SearchFatalError] if the Chef search response is wrong.
@@ -134,11 +134,10 @@ class Chef
       # @param res [Array<Hash>] {SearchHelper#search} result.
       # @return [Mixed] final search result value.
       def parse_search_result(res)
-        if res.is_a?(Array) && res[0].is_a?(Hash) && res[0].key?('value')
-          res[0]['value']
-        else
-          nil
+        unless res.is_a?(Array) && res[0].is_a?(Hash) && res[0].key?('value')
+          return nil
         end
+        res[0]['value']
       end
 
       # Generates the cache key.

data/lib/chef/encrypted_attribute/version.rb

@@ -20,6 +20,6 @@
 class Chef
   class EncryptedAttribute
     # `chef-encrypted-attributes` gem version.
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/chef/knife/core/encrypted_attribute_editor_options.rb

@@ -30,7 +30,6 @@ class Chef
         # @param includer [Class] includer class.
         def self.included(includer)
           includer.class_eval do
-
             # Helper method to set the encrypted attributes configuration.
             def self.encrypted_attributes_option_set(key, value)
               Chef::Config[:knife][:encrypted_attributes][key] = value

data/lib/chef/knife/encrypted_attribute_update.rb

@@ -66,9 +66,8 @@ class Chef
         parse_args
 
         # update encrypted attribute
-        enc_attr = Chef::EncryptedAttribute.new(
-                     Chef::Config[:knife][:encrypted_attributes]
-                   )
+        knife_config = Chef::Config[:knife][:encrypted_attributes]
+        enc_attr = Chef::EncryptedAttribute.new(knife_config)
         if enc_attr.update_on_node(@node_name, @attr_ary)
           ui.info('Encrypted attribute updated.')
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-encrypted-attributes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Onddo Labs, SL.
@@ -30,22 +30,28 @@ cert_chain:
   cYe8PqNEkky7ugvF4zU3sB6TW+96XasuwDv1uJmyr35LF15U6Cs83+osMbAKJTmG
   /vqKzw==
   -----END CERTIFICATE-----
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +190,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.29.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.29.1
 description: Chef plugin to add Node encrypted attributes support using client keys
 email: team@onddo.com
 executables: []