berkshelf 2.0.0.beta → 2.0.0

data/spec/support/chef_api.rb

@@ -24,7 +24,8 @@ module Berkshelf
         else
           ridley.cookbook.delete(name, version)
         end
-      rescue Ridley::Errors::HTTPNotFound
+      rescue Ridley::Errors::HTTPNotFound,
+             Ridley::Errors::ResourceNotFound
         true
       end
 
@@ -36,7 +37,8 @@ module Berkshelf
         else
           !versions.find { |ver| ver == version }.nil?
         end
-      rescue Ridley::Errors::HTTPNotFound
+      rescue Ridley::Errors::HTTPNotFound,
+             Ridley::Errors::ResourceNotFound
         false
       end
 
@@ -67,10 +69,13 @@ module Berkshelf
           FileUtils.touch(cookbook_path.join(file))
         end
 
-        metadata = <<-EOF
-name "#{name}"
-version "#{version}"
-EOF
+        metadata = [].tap do |a|
+          a << "name     '#{name}'"
+          a << "version  '#{version}'"
+          a << "license  '#{options[:license]}'" if options[:license]
+          a << "" # ensure newline
+        end.join("\n")
+
 
         if options[:dependencies]
           options[:dependencies].each do |name, constraint|
@@ -111,9 +116,9 @@ EOF
 
         def ridley
           @ridley ||= Ridley.new(
-            server_url: Berkshelf::Chef::Config[:chef_server_url],
-            client_name: Berkshelf::Chef::Config[:node_name],
-            client_key: Berkshelf::Chef::Config[:client_key],
+            server_url:   Berkshelf.chef_config[:chef_server_url],
+            client_name:  Berkshelf.chef_config[:node_name],
+            client_key:   Berkshelf.chef_config[:client_key],
             ssl: { verify: false }
           )
         end

data/spec/support/chef_server.rb

@@ -14,15 +14,14 @@ module Berkshelf::RSpec
       end
 
       def server
-        @server ||= ChefZero::Server.new(port: PORT, signals: false, log_requests: true)
+        @server ||= ChefZero::Server.new(port: PORT, generate_real_keys: false)
       end
 
       def server_url
-        "http://localhost:#{PORT}"
+        (@server && @server.url) || "http://localhost:#{PORT}"
       end
 
       def start
-        Thin::Logging.silent = true
         server.start_background
         server.on_response do |request, response|
           request_log << [ request, response ]
@@ -33,7 +32,7 @@ module Berkshelf::RSpec
       end
 
       def stop
-        @server.stop if @server
+        @server.stop if running?
       end
 
       def running?

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -542,7 +542,7 @@ describe Berkshelf::Berksfile do
       it 'applys the locked_versions of the Lockfile sources to the given Chef environment' do
         subject.apply('berkshelf')
 
-        environment = ::JSON.parse(chef_server.data['environments']['berkshelf'])
+        environment = ::JSON.parse(chef_server.data_store.get(['environments', 'berkshelf']))
         expect(environment['cookbook_versions']).to have(2).items
         expect(environment['cookbook_versions']['nginx']).to eq('1.2.3')
         expect(environment['cookbook_versions']['artifact']).to eq('1.4.0')

data/spec/unit/berkshelf/cookbook_generator_spec.rb

@@ -3,6 +3,11 @@ require 'spec_helper'
 describe Berkshelf::CookbookGenerator do
   let(:name) { 'sparkle_motion' }
   let(:target) { tmp_path.join(name) }
+  let(:kitchen_generator) { double('kitchen-generator', invoke_all: nil) }
+
+  before do
+    Kitchen::Generator::Init.stub(:new).with(any_args()).and_return(kitchen_generator)
+  end
 
   context 'with default options' do
     before do
@@ -39,11 +44,11 @@ describe Berkshelf::CookbookGenerator do
           contains 'Author:: YOUR_NAME (<YOUR_EMAIL>)'
         end
         file 'metadata.rb' do
-          contains 'name             "sparkle_motion"'
-          contains 'maintainer       "YOUR_NAME"'
-          contains 'maintainer_email "YOUR_EMAIL"'
-          contains 'license          "All rights reserved"'
-          contains 'description      "Installs/Configures sparkle_motion"'
+          contains "name             'sparkle_motion'"
+          contains "maintainer       'YOUR_NAME'"
+          contains "maintainer_email 'YOUR_EMAIL'"
+          contains "license          'All rights reserved'"
+          contains "description      'Installs/Configures sparkle_motion'"
         end
         file 'Berksfile' do
           contains 'site :opscode'
@@ -57,6 +62,7 @@ describe Berkshelf::CookbookGenerator do
 
   context "given a 'maintainer_email' option" do
     before do
+      Kitchen::Generator::Init.stub(:new).with(any_args()).and_return(kitchen_generator)
       capture(:stdout) {
         Berkshelf::CookbookGenerator.new([target, name], maintainer_email: 'jamie@vialstudios.com').invoke_all
       }
@@ -66,7 +72,7 @@ describe Berkshelf::CookbookGenerator do
       email = email
       expect(target).to have_structure {
         file 'metadata.rb' do
-          contains 'maintainer_email "jamie@vialstudios.com"'
+          contains "maintainer_email 'jamie@vialstudios.com'"
         end
       }
     end

data/spec/unit/berkshelf/cookbook_source_spec.rb

@@ -293,7 +293,7 @@ describe Berkshelf::CookbookSource do
     end
 
     it 'includes the git url and ref' do
-      location = double('git', uri: 'git://github.com/foo/bar.git', ref: 'abcd1234')
+      location = double('git', uri: 'git://github.com/foo/bar.git', ref: 'abcd1234', rel: nil)
       location.stub(:kind_of?).with(Berkshelf::SiteLocation).and_return(false)
       location.stub(:kind_of?).with(Berkshelf::GitLocation).and_return(true)
       subject.stub(:location).and_return(location)
@@ -304,6 +304,18 @@ describe Berkshelf::CookbookSource do
       expect(hash[:ref]).to eq('abcd1234')
     end
 
+    it 'includes the git url and rel' do
+      location = double('git', uri: 'git://github.com/foo/bar.git', ref: nil, rel: 'cookbooks/foo')
+      location.stub(:kind_of?).with(Berkshelf::SiteLocation).and_return(false)
+      location.stub(:kind_of?).with(Berkshelf::GitLocation).and_return(true)
+      subject.stub(:location).and_return(location)
+
+      expect(hash).to have_key(:git)
+      expect(hash[:git]).to eq('git://github.com/foo/bar.git')
+      expect(hash).to have_key(:rel)
+      expect(hash[:rel]).to eq('cookbooks/foo')
+    end
+
     it 'includes a relative path' do
       subject.instance_variable_set(:@options, { path: '~/Development/foo' })
 

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -3,6 +3,11 @@ require 'spec_helper'
 describe Berkshelf::InitGenerator, vcr: { record: :new_episodes, serialize_with: :json } do
   let(:target) { tmp_path.join("some_cookbook") }
   let(:resolver) { double('resolver') }
+  let(:kitchen_generator) { double('kitchen-generator', invoke_all: nil) }
+
+  before do
+    Kitchen::Generator::Init.stub(:new).with(any_args()).and_return(kitchen_generator)
+  end
 
   context 'with default options' do
     before do

data/spec/unit/chef/config_spec.rb

@@ -1,32 +1,31 @@
 require 'spec_helper'
 
 describe Berkshelf::Chef::Config do
-  describe '.path' do
+  describe '.location' do
     let(:path) { '/fake/path/for/.chef' }
     let(:config) { File.join(path, 'knife.rb') }
+    let(:location) { Berkshelf::Chef::Config.send(:location) }
 
     before do
       ENV.stub(:[]).and_return(nil)
 
       File.stub(:exists?).with(any_args()).and_return(false)
       File.stub(:exists?).with(config).and_return(true)
-
-      Berkshelf::Chef::Config.instance_variable_set(:@path, nil)
     end
 
     it 'uses $BERKSHELF_CHEF_CONFIG' do
       ENV.stub(:[]).with('BERKSHELF_CHEF_CONFIG').and_return(config)
-      expect(Berkshelf::Chef::Config.path).to eq(config)
+      expect(location).to eq(config)
     end
 
     it 'uses $KNIFE_HOME' do
       ENV.stub(:[]).with('KNIFE_HOME').and_return(path)
-      expect(Berkshelf::Chef::Config.path).to eq(config)
+      expect(location).to eq(config)
     end
 
     it 'uses ::working_dir' do
       Berkshelf::Chef::Config.stub(:working_dir).and_return(path)
-      expect(Berkshelf::Chef::Config.path).to eq(config)
+      expect(location).to eq(config)
     end
 
     context 'an ascending search' do
@@ -41,7 +40,7 @@ describe Berkshelf::Chef::Config do
         end
 
         it 'chooses the closest path' do
-          expect(Berkshelf::Chef::Config.path).to eq('/fake/.chef/path/with/multiple/.chef/knife.rb')
+          expect(location).to eq('/fake/.chef/path/with/multiple/.chef/knife.rb')
         end
       end
 
@@ -55,7 +54,7 @@ describe Berkshelf::Chef::Config do
         end
 
         it 'uses the current directory' do
-          expect(Berkshelf::Chef::Config.path).to eq('/fake/.chef/knife.rb')
+          expect(location).to eq('/fake/.chef/knife.rb')
         end
       end
 
@@ -69,14 +68,14 @@ describe Berkshelf::Chef::Config do
         end
 
         it 'uses the top-level directory' do
-          expect(Berkshelf::Chef::Config.path).to eq('/.chef/knife.rb')
+          expect(location).to eq('/.chef/knife.rb')
         end
       end
     end
 
     it 'uses $HOME' do
       ENV.stub(:[]).with('HOME').and_return(File.join(path, '..'))
-      expect(Berkshelf::Chef::Config.path).to eq(config)
+      expect(location).to eq(config)
     end
   end
 end

metadata

@@ -1,27 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
 - Josiah Kiehl
 - Michael Ivey
 - Justin Campbell
+- Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,31 +30,31 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: test-kitchen
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha6
+        version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha6
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,47 +62,47 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: chozo
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,15 +110,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: ridley
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,47 +126,47 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
-  name: chozo
+  name: retryable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: ridley
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: minitar
+  name: solve
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -173,15 +174,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: solve
+  name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 1.0.0.alpha7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -189,7 +190,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 1.0.0.alpha7
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -207,103 +208,215 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.18.0
 - !ruby/object:Gem::Dependency
-  name: retryable
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '0.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '2.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: spork
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: coolline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: guard-cane
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -319,7 +432,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spork
+  name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -335,7 +448,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -351,7 +464,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: guard-spork
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -367,27 +480,28 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: guard-yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - reset@riotgames.com
 - jkiehl@riotgames.com
 - michael.ivey@riotgames.com
 - justin.campbell@riotgames.com
+- sethvargo@gmail.com
 executables:
 - berks
 extensions: []
@@ -416,15 +530,17 @@ files:
 - features/default_locations.feature
 - features/groups_install.feature
 - features/help.feature
-- features/info_command.feature
 - features/init_command.feature
 - features/install_command.feature
 - features/json_formatter.feature
+- features/licenses.feature
 - features/list_command.feature
 - features/lockfile.feature
-- features/open_command.feature
 - features/outdated_command.feature
 - features/package_command.feature
+- features/shelf/list.feature
+- features/shelf/show.feature
+- features/shelf/uninstall.feature
 - features/show_command.feature
 - features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef_server_steps.rb
@@ -463,8 +579,9 @@ files:
 - lib/berkshelf/chef/cookbook.rb
 - lib/berkshelf/chef/cookbook/chefignore.rb
 - lib/berkshelf/cli.rb
-- lib/berkshelf/cli_commands/test_command.rb
 - lib/berkshelf/command.rb
+- lib/berkshelf/commands/shelf.rb
+- lib/berkshelf/commands/test_command.rb
 - lib/berkshelf/community_rest.rb
 - lib/berkshelf/config.rb
 - lib/berkshelf/cookbook_generator.rb
@@ -491,9 +608,9 @@ files:
 - lib/berkshelf/locations/site_location.rb
 - lib/berkshelf/lockfile.rb
 - lib/berkshelf/logger.rb
-- lib/berkshelf/mixin.rb
+- lib/berkshelf/mixin/config.rb
 - lib/berkshelf/mixin/logging.rb
-- lib/berkshelf/mixin/path_helpers.rb
+- lib/berkshelf/mixin/shellout.rb
 - lib/berkshelf/resolver.rb
 - lib/berkshelf/test.rb
 - lib/berkshelf/thor.rb
@@ -502,6 +619,9 @@ files:
 - lib/thor/monkies.rb
 - lib/thor/monkies/hash_with_indifferent_access.rb
 - lib/thor/monkies/shell.rb
+- spec/config/berkshelf.pem
+- spec/config/knife.rb
+- spec/config/validator.pem
 - spec/fixtures/Berksfile
 - spec/fixtures/cassettes/Berkshelf_CommunityREST/_download/unpacks_the_archive.json
 - spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
@@ -548,7 +668,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/chef_api.rb
 - spec/support/chef_server.rb
-- spec/support/knife.rb
 - spec/support/matchers/file_system_matchers.rb
 - spec/support/matchers/filepath_matchers.rb
 - spec/support/test_generators.rb
@@ -613,15 +732,17 @@ test_files:
 - features/default_locations.feature
 - features/groups_install.feature
 - features/help.feature
-- features/info_command.feature
 - features/init_command.feature
 - features/install_command.feature
 - features/json_formatter.feature
+- features/licenses.feature
 - features/list_command.feature
 - features/lockfile.feature
-- features/open_command.feature
 - features/outdated_command.feature
 - features/package_command.feature
+- features/shelf/list.feature
+- features/shelf/show.feature
+- features/shelf/uninstall.feature
 - features/show_command.feature
 - features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef_server_steps.rb
@@ -635,6 +756,9 @@ test_files:
 - features/update_command.feature
 - features/upload_command.feature
 - features/vendor_install.feature
+- spec/config/berkshelf.pem
+- spec/config/knife.rb
+- spec/config/validator.pem
 - spec/fixtures/Berksfile
 - spec/fixtures/cassettes/Berkshelf_CommunityREST/_download/unpacks_the_archive.json
 - spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
@@ -681,7 +805,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/chef_api.rb
 - spec/support/chef_server.rb
-- spec/support/knife.rb
 - spec/support/matchers/file_system_matchers.rb
 - spec/support/matchers/filepath_matchers.rb
 - spec/support/test_generators.rb