chef-vault 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b27ba9a529d3f084f1e83119a6b6bf91819ba3a
-  data.tar.gz: eacae88edbe78fc8e0a27c7f6e5680b1e75e974d
+  metadata.gz: 297b60d8521397a8eeeded373503b9edb33b3195
+  data.tar.gz: 41a79787ab86193433047cdd6d9df05653ba1bf8
 SHA512:
-  metadata.gz: 1d18b4a6f3cfedf225041ee9b6e8c05b2c476f9fa8f04903038cec23bf631ee9a135c6c7199c26ce49971ed415651b22ec552bacd2cc684aa4a749096db90c81
-  data.tar.gz: 0895619aff3da11cb0d024bb87d8cbe00ba1330b4aa80bd6537cf1d2600f6b814e63ea291338c69d08456633d572d0464ab6a0b278018a0d7f95a8d2cd74070f
+  metadata.gz: 807c5cf031f54b6bff3b505eaa0a832387369d49340fdd96fb0956d35fdc26d96be34695be6ac0a0a1be1d280219f1cf25d3fcfaa680234a37e6a4d6754c50ef
+  data.tar.gz: ea0973774c69df1a76e587d02e075209feee0ac01bfd590be9813889def4a147da057b907a8b66ca3dadbbdbc107f8fd83932ce638fd25ade5b45729098e6cfb

data/.travis.yml

@@ -9,3 +9,10 @@ env: TRAVIS_BUILD=true
 matrix:
   allow_failures:
     - rvm: "1.9.3-p551"
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/60e610197dad8edc59f9
+    on_success: always
+    on_failure: always
+    on_start: false

data/Changelog.md

@@ -25,6 +25,11 @@ This release will also remove the chef-vault 1.x commands (encrypt/decrypt)
 
 ## Released
 
+## v2.6.1
+
+* Remove dependency on [rspec-its](https://github.com/rspec/rspec-its)
+* (via Chef/Dan DeLeo): reduce the number of parts of chef that chef-vault `require`s to easy integration of chef-vault into ChefDK
+
 ## v2.6.0 / 2015-05-13
 
 * ChefVault::Item#clients can now accept a Chef::ApiClient object instead of a search string.  Requested by @lamont-granquist to make implementing chef-vault into `knife bootstrap` easier

data/README.md

@@ -8,6 +8,8 @@
 
 [![Code Climate](https://codeclimate.com/github/Nordstrom/chef-vault/badges/gpa.svg)](https://codeclimate.com/github/Nordstrom/chef-vault)
 
+[![Join the chat at https://gitter.im/Nordstrom/chef-vault](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Nordstrom/chef-vault)
+
 ## DESCRIPTION:
 
 Gem that allows you to encrypt a Chef Data Bag Item using the public keys of
@@ -227,6 +229,9 @@ small pull requests are preferred to large omnibus patches, as the
 robustness pass is a multi-person effort and we don't want to create merge
 conflicts unnecessarily.
 
+We also have a [Gitter room](https://gitter.im/Nordstrom/chef-vault)
+where you can discuss chef-vault and the robustness improvements.
+
 ## Authors
 
 Author:: Kevin Moser - @moserke<br>

data/chef-vault.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.name             = 'chef-vault'
   s.version          = ChefVault::VERSION
   s.has_rdoc         = true
-  s.authors          = ['Kevin Moser']
-  s.email            = ['kevin.moser@nordstrom.com']
+  s.authors          = ['Kevin Moser', 'James FitzGibbon']
+  s.email            = ['techcheftm@nordstrom.com']
   s.summary          = 'Data encryption support for Chef using data bags'
   s.description      = s.summary
   s.homepage         = 'https://github.com/Nordstrom/chef-vault'
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rspec', '~> 3.2'
-  s.add_development_dependency 'rspec-its', '~> 1.1'
   s.add_development_dependency 'aruba', '~> 0.6'
   s.add_development_dependency 'simplecov', '~> 0.9'
   s.add_development_dependency 'simplecov-console', '~> 0.2'

data/lib/chef-vault.rb

@@ -16,7 +16,12 @@
 # limitations under the License.
 #
 
-require 'chef'
+require 'chef/search/query'
+require 'chef/version'
+require 'chef/config'
+require 'chef/api_client'
+require 'chef/data_bag_item'
+require 'chef/encrypted_data_bag_item'
 require 'chef/user'
 require 'chef-vault/version'
 require 'chef-vault/exceptions'

data/lib/chef-vault/item_keys.rb

@@ -17,7 +17,7 @@
 class ChefVault
   class ItemKeys < Chef::DataBagItem
     def initialize(vault, name)
-      super() # parenthesis required to strip off parameters
+      super() # parentheses required to strip off parameters
       @data_bag = vault
       @raw_data["id"] = name
       @raw_data["admins"] = []

data/lib/chef-vault/version.rb

@@ -14,6 +14,6 @@
 # limitations under the License.
 
 class ChefVault
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/spec/chef-vault/certificate_spec.rb

@@ -23,7 +23,9 @@ RSpec.describe ChefVault::Certificate do
   end
 
   describe '#[]' do
-    specify { expect(cert['id']).to eq 'bar' }
+    it "given an 'id' parameter, returns its value" do
+      expect(cert['id']).to eq 'bar'
+    end
   end
 
   describe 'decrypt_contents' do

data/spec/chef-vault/item_keys_spec.rb

@@ -1,15 +1,21 @@
 RSpec.describe ChefVault::ItemKeys do
   describe '#new' do
-    subject(:keys) { ChefVault::ItemKeys.new("foo", "bar") }
+    let(:keys) { ChefVault::ItemKeys.new("foo", "bar") }
 
-    it { should be_an_instance_of ChefVault::ItemKeys }
+    it "'foo' is assigned to @data_bag" do
+      expect(keys.data_bag).to eq 'foo'
+    end
 
-    its(:data_bag) { should eq "foo" }
+    it "sets the keys id to 'bar'" do
+      expect(keys["id"]).to eq 'bar'
+    end
 
-    specify { expect(keys["id"]).to eq 'bar' }
+    it 'initializes the keys[admin] to an empty array' do
+      expect(keys['admins']).to eq []
+    end
 
-    specify { expect(keys["admins"]).to eq [] }
-
-    specify { expect(keys["clients"]).to eq [] }
+    it 'initializes the keys[clients] to an empty array' do
+      expect(keys['admins']).to eq []
+    end
   end
 end

data/spec/chef-vault/item_spec.rb

@@ -129,17 +129,25 @@ RSpec.describe ChefVault::Item do
   end
 
   describe '::new' do
-    it { should be_an_instance_of ChefVault::Item }
-
-    its(:keys) { should be_an_instance_of ChefVault::ItemKeys }
+    it 'item[keys] is an instance of ChefVault::ItemKeys' do
+      expect(item.keys).to be_an_instance_of(ChefVault::ItemKeys)
+    end
 
-    its(:data_bag) { should eq "foo" }
+    it "the item's 'vault' parameter is assigned to data_bag" do
+      expect(item.data_bag).to eq 'foo'
+    end
 
-    specify { expect(item['id']).to eq 'bar' }
+    it "the vault item name is assiged to the data bag ['id']" do
+      expect(item['id']).to eq 'bar'
+    end
 
-    specify { expect(item.keys['id']).to eq 'bar_keys' }
+    it "creates a corresponding 'keys' data bag with an '_keys' id" do
+      expect(item.keys['id']).to eq 'bar_keys'
+    end
 
-    specify { expect(item.keys.data_bag).to eq 'foo' }
+    it "sets the item keys data bag to 'foo'" do
+      expect(item.keys.data_bag).to eq 'foo'
+    end
 
     it 'defaults the node name' do
       item = ChefVault::Item.new('foo', 'bar')
@@ -205,10 +213,13 @@ RSpec.describe ChefVault::Item do
   describe '#save' do
     context 'when item["id"] is bar.bar' do
       let(:item) { ChefVault::Item.new("foo", "bar.bar") }
-      specify { expect { item.save }.to raise_error }
+      it "raises an error on save with an invalid item['id']" do
+        expect { item.save }.to raise_error
+
+      end
     end
 
-    it 'should validate that the id of the vault matches the id of the keys data bag' do
+    it 'validates that the id of the vault matches the id of the keys data bag' do
       item = ChefVault::Item.new('foo', 'bar')
       item['id'] = 'baz'
       item.keys['clients'] = %w(admin)

data/spec/chef-vault/user_spec.rb

@@ -23,7 +23,9 @@ RSpec.describe ChefVault::User do
   end
 
   describe '#[]' do
-    specify { expect(user['id']).to eq 'bar' }
+    it "returns the value of the 'id' parameter" do
+      expect(user['id']).to eq 'bar'
+    end
   end
 
   describe 'decrypt_password' do

data/spec/chef-vault_spec.rb

@@ -1,29 +1,35 @@
 RSpec.describe ChefVault do
-  subject(:vault) { ChefVault.new('foo') }
+  let(:vault) { ChefVault.new('foo') }
 
   describe '#new' do
     context 'with only a vault parameter specified' do
-      it { should be_an_instance_of ChefVault }
 
-      its(:vault) { should eq "foo" }
-    end
-
-    context 'with a vault and config file parameter specified' do
-      before do
-        allow(IO).to receive(:read).with('knife.rb').and_return("node_name 'bar'")
+      it "assigns 'foo' to the vault accessor" do
+        expect(vault.vault).to eq 'foo'
       end
+    end
+  end
 
-      let(:vault) { ChefVault.new('foo', 'knife.rb') }
+  context 'with a vault and config file parameter specified' do
+    before do
+      allow(IO).to receive(:read).with('knife.rb').and_return("node_name 'myserver'")
+    end
 
-      it { should be_an_instance_of ChefVault }
+    let(:vault) { ChefVault.new('foo', 'knife.rb') }
 
-      its(:vault) { should eq "foo" }
+    it "assigns 'foo' to the vault accessor" do
+        expect(vault.vault).to eq 'foo'
+    end
 
-      specify { expect { Chef::Config[:node_name].should eq "bar" } }
+    it 'loads the Chef config values' do
+      expect(ChefVault).to receive(:load_config).with('knife.rb')
+      vault
     end
+  end
 
-    describe '#version' do
-      its(:version) { should eq ChefVault::VERSION }
+  describe '#version' do
+    it 'the version method equals VERSION' do
+      expect(vault.version).to eq(ChefVault::VERSION)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 require 'simplecov' if ENV['COVERAGE']
-
 require_relative '../lib/chef-vault'
 
-require 'rspec/its'
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chef-vault
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Kevin Moser
+- James FitzGibbon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,20 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +111,7 @@ dependencies:
         version: 0.10.10
 description: Data encryption support for Chef using data bags
 email:
-- kevin.moser@nordstrom.com
+- techcheftm@nordstrom.com
 executables:
 - chef-vault
 extensions: []