chef-sugar 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762ec92b492ff5b729fc32c65c2c09033b4bf4bf
-  data.tar.gz: 1106d542f20dfe7435c3b7e4a0c77290e65e9849
+  metadata.gz: f5674537c266d05abd9f17e9b069f904945e12b7
+  data.tar.gz: b6f26132d9c4e1ee9fd99e7c5437e45bb884c4ea
 SHA512:
-  metadata.gz: 7fe01291031397c8335511196243ff8dffe104b092d2f044af898921bbaae6edf3643157240044c5ec5f2972bcb9a6c2b7917712719c52780c1cb6b6b89e5ee8
-  data.tar.gz: ee419d9a1756340bfecffa235b6828d8591ddd6fe3924944616123e941497c9d2ac7e94c76b4083cddb97fa15fbd1aaecc877130491c62fa213d9f6179bf709c
+  metadata.gz: 6e45cf63cba7efb2305fa499475f2e176135354cc157b39efb11ccf332bc8bb5df863e15785cad7c9ca8ca189778bcf9e8d95fcc1692201d08da417797c60ced
+  data.tar.gz: 5e8ba58f52af37590e283e49a1fdab8cde85a404b25e4fd1c481d46518b9532e9367225a47138c7ee70ec5e658939fa17182f948482d1ef072dee0bb1ddcc3d0

data/.travis.yml

@@ -1,5 +1,6 @@
 rvm:
   - 1.9.3
   - 2.0.0
-script:
-  - bundle exec rspec --color --format progress
+  - 2.1
+
+script: bundle exec rspec --color --format progress

data/CHANGELOG.md

@@ -2,12 +2,16 @@ Chef Sugar Changelog
 =========================
 This file is used to list changes made in each version of the chef-sugar cookbook and gem.
 
+v1.2.2 (2014-03-13)
+-------------------
+- Fix a critical bug with `encrypted_data_bag_item` using the wrong key
+
 v1.2.0 (2014-03-09)
 -------------------
 - Add `namespace` functionality for specifying attributes in a DSL
 - Add constraints helpers for comparing version strings
 - Add `require_chef_gem` to safely require and degrade if a gem is not installed
-- Add `deep_fetch` and `deep_fetch` to fetch deeply nested keys
+- Add `deep_fetch` and `deep_fetch!` to fetch deeply nested keys
 - Accept an optional secret key in `encrypted_data_bag_item` helper and raise a helpful error if one is not set (NOTE: this changes the airity of the method, but it's backward-compatible because Ruby is magic)
 - Add Stove for releasing
 - Updated copyrights for 2014

data/lib/chef/sugar/data_bag.rb

@@ -42,20 +42,19 @@ EOH
       # @param [String] id
       #   the id of the encrypted data bag
       # @param [String] secret
-      #   the encrypted data bag secret (default's to the +Chef::Config+ value)
+      #   the encrypted data bag secret raw value
       #
       # @return [Hash]
       #
       def encrypted_data_bag_item(bag, id, secret = nil)
         Chef::Log.debug "Loading encrypted data bag item #{bag}/#{id}"
 
-        secret ||= Chef::Config[:encrypted_data_bag_secret]
-
-        if secret
-          Chef::EncryptedDataBagItem.load(bag, id, secret)
-        else
+        if secret.nil? && Chef::Config[:encrypted_data_bag_secret].nil?
           raise EncryptedDataBagSecretNotGiven.new
         end
+
+        secret ||= File.read(Chef::Config[:encrypted_data_bag_secret])
+        Chef::EncryptedDataBagItem.load(bag, id, secret)
       end
 
       #
@@ -95,12 +94,12 @@ EOH
     end
 
     module DSL
-      # @see Chef::Sugar::DataBag#encrypted_data_bag_item?
+      # @see Chef::Sugar::DataBag#encrypted_data_bag_item
       def encrypted_data_bag_item(bag, id, secret = nil)
         Chef::Sugar::DataBag.encrypted_data_bag_item(bag, id, secret)
       end
 
-      # @see Chef::Sugar::DataBag#encrypted_data_bag_item_for_environment?
+      # @see Chef::Sugar::DataBag#encrypted_data_bag_item_for_environment
       def encrypted_data_bag_item_for_environment(bag, id, secret = nil)
         Chef::Sugar::DataBag.encrypted_data_bag_item_for_environment(node, bag, id, secret)
       end

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '1.2.0'
+    VERSION = '1.2.2'
   end
 end

data/metadata.rb

@@ -4,5 +4,14 @@ maintainer_email 'sethvargo@gmail.com'
 license          'Apache 2.0'
 description      'Installs chef-sugar. Please see the chef-sugar ' \
                  'Ruby gem for more information.'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.2.0'
+long_description <<-EOH
+Chef Sugar is a Gem & Chef Recipe that includes series of helpful syntactic
+sugars on top of the Chef core and other resources to make a cleaner, more lean
+recipe DSL, enforce DRY principles, and make writing Chef recipes an awesome and
+fun experience!
+
+For the most up-to-date information and documentation, please visit the [Chef
+Sugar project page on GitHub](https://github.com/sethvargo/chef-sugar).
+EOH
+
+version          '1.2.2'

data/spec/unit/chef/sugar/data_bag_spec.rb

@@ -13,7 +13,8 @@ describe Chef::Sugar::DataBag do
 
     context 'when Chef::Config is set' do
       it 'loads the secret key from the Chef::Config' do
-        Chef::Config.stub(:[]).with(:encrypted_data_bag_secret).and_return('B@c0n')
+        Chef::Config.stub(:[]).with(:encrypted_data_bag_secret).and_return('/data/path')
+        File.stub(:read).with('/data/path').and_return('B@c0n')
 
         expect(Chef::EncryptedDataBagItem).to receive(:load)
           .with('accounts', 'github', 'B@c0n')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler