berkshelf 1.4.6 → 2.0.0.beta

data/.gitignore

@@ -24,3 +24,4 @@ tmp
 \.\#*
 rerun.txt
 .rspec
+.kitchen

data/CHANGELOG.md

@@ -1,7 +1,3 @@
-# 1.4.6
-
-- Backport bug fixes from 2.0.2
-
 # 1.4.4
 
 - Bump Ridley dependency to 0.12, bringing in many bugfixes.
@@ -33,7 +29,7 @@
 
 # 1.3.1
 - Support for Vagrant 1.1.x
-- Move Berkshelf Vagrant plugin into it's [own repository](https://github.com/RiotGames/vagrant-berkshelf)
+- Move Berkshelf Vagrant plugin into it's [own repository](https://github.com/RiotGames/berkshelf-vagrant)
 - Added -d flag to output debug information in berks command
 - Various bug fixes in uploading cookbooks
 

data/CONTRIBUTING.md

@@ -34,7 +34,9 @@ Bundler will install all gems and their dependencies required for testing and de
 
 ### Running unit (RSpec) and acceptance (Cucumber) tests
 
-We use Chef Zero - an in-memory Chef Server for running tests. It is automatically managed by the Specs and Cukes. Simply run:
+Simply copy the `spec/knife.rb.sample` to `spec/knife.rb`, and point it at a
+chef server. Berkshelf tests may upload and destroy cookbooks on your chef
+server, so be sure to configure a server safe for this task.
 
     $ bundle exec guard start
 

data/Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
+
 gemspec
 
 group :development do
-  gem 'chef-zero', '~> 1.1'
+  gem 'chef-zero', '>= 0.9.9'
   gem 'coolline'
   gem 'guard', '>= 1.5.0'
   gem 'guard-cane'
@@ -33,3 +34,12 @@ group :development do
     gem 'win32console', require: false
   end
 end
+
+group :test do
+  gem 'fuubar'
+  gem 'json_spec'
+  gem 'rake', '>= 0.9.2.2'
+  gem 'rspec'
+  gem 'thor'
+  gem 'webmock'
+end

data/README.md

@@ -41,6 +41,22 @@ Plugins
 -------
 Please see [Plugins page](https://github.com/RiotGames/berkshelf/blob/master/PLUGINS.md) for more information.
 
+Configuration
+-------------
+Berkshelf will search in specific locations for a configuration file. In order:
+
+```text
+$PWD/.berkshelf/config.json
+$PWD/berkshelf/config.json
+$PWD/berkshelf-config.json
+$PWD/config.json
+~/.berkshelf/config.json
+```
+
+You are encouraged to keep project-specific configuration in the `$PWD/.berkshelf` directory. You can generate a project-configuration file by running:
+
+    $ berks configure --path ./.berkshelf/config.json
+
 SSL Errors
 ----------
 

data/Thorfile

@@ -46,7 +46,9 @@ class Default < Thor
     desc "ci", "Run all possible tests on Travis-CI"
     def ci
       ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
-      all
+      unless run_unit("--tag ~chef_server") && run_acceptance("--tags ~@chef_server") && run_quality
+        exit 1
+      end
     end
 
     desc "unit", "Run unit tests"

data/berkshelf.gemspec

@@ -3,65 +3,53 @@ require File.expand_path('../lib/berkshelf/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.authors               = [
-    'Jamie Winsor',
-    'Josiah Kiehl',
-    'Michael Ivey',
-    'Justin Campbell'
+    "Jamie Winsor",
+    "Josiah Kiehl",
+    "Michael Ivey",
+    "Justin Campbell"
   ]
   s.email                 = [
-    'reset@riotgames.com',
-    'jkiehl@riotgames.com',
-    'michael.ivey@riotgames.com',
-    'justin.campbell@riotgames.com'
+    "reset@riotgames.com",
+    "jkiehl@riotgames.com",
+    "michael.ivey@riotgames.com",
+    "justin.campbell@riotgames.com"
   ]
 
   s.description               = %q{Manages a Cookbook's, or an Application's, Cookbook dependencies}
   s.summary                   = s.description
-  s.homepage                  = 'http://berkshelf.com'
-  s.license                   = 'Apache 2.0'
+  s.homepage                  = "http://berkshelf.com"
+  s.license                   = "Apache 2.0"
   s.files                     = `git ls-files`.split($\)
   s.executables               = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files                = s.files.grep(%r{^(test|spec|features)/})
-  s.name                      = 'berkshelf'
-  s.require_paths             = ['lib']
+  s.name                      = "berkshelf"
+  s.require_paths             = ["lib"]
   s.version                   = Berkshelf::VERSION
-  s.required_ruby_version     = '>= 1.9.1'
-  s.required_rubygems_version = '>= 1.8.0'
+  s.required_ruby_version     = ">= 1.9.1"
+  s.required_rubygems_version = ">= 1.8.0"
 
   s.add_dependency 'celluloid', '>= 0.14.0'
-  s.add_dependency 'yajl-ruby'
+  s.add_dependency 'test-kitchen', '>= 1.0.0.alpha6'
   s.add_dependency 'activesupport', '>= 3.2.0'
   s.add_dependency 'mixlib-shellout', '~> 1.1'
   s.add_dependency 'mixlib-config', '~> 1.1'
   s.add_dependency 'faraday', '>= 0.8.5'
-  s.add_dependency 'ridley', '~> 0.12.4'
+  s.add_dependency 'ridley', '~> 0.12.1'
   s.add_dependency 'chozo', '>= 0.6.1'
   s.add_dependency 'hashie', '>= 2.0.2'
   s.add_dependency 'minitar'
-  s.add_dependency 'json', '>= 1.5.0'
-  s.add_dependency 'multi_json', '~> 1.5'
-  s.add_dependency 'solve', '>= 0.4.2'
+  s.add_dependency 'solve', '>= 0.4.4'
   s.add_dependency 'thor', '~> 0.18.0'
   s.add_dependency 'retryable'
   s.add_dependency 'addressable'
 
-  s.add_development_dependency 'aruba',         '~> 0.5'
-  s.add_development_dependency 'cane',          '~> 2.5'
-  s.add_development_dependency 'chef-zero',     '~> 1.0'
-  s.add_development_dependency 'fuubar',        '~> 1.1'
-  s.add_development_dependency 'json_spec',     '~> 1.1'
-  s.add_development_dependency 'rake',          '~> 0.9'
-  s.add_development_dependency 'rspec',         '~> 2.13'
-  s.add_development_dependency 'spork',         '~> 0.9'
-  s.add_development_dependency 'vcr',           '~> 2.4'
-  s.add_development_dependency 'webmock',       '~> 1.11'
-  s.add_development_dependency 'yard',          '~> 0.8'
-
-  # Guard extensions for development
-  s.add_development_dependency 'guard',         '~> 1.8'
-  s.add_development_dependency 'guard-cane'
-  s.add_development_dependency 'guard-cucumber'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-spork'
-  s.add_development_dependency 'guard-yard'
+  s.add_development_dependency 'aruba'
+  s.add_development_dependency 'cane'
+  s.add_development_dependency 'rake', '>= 0.9.2.2'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'spork'
+  s.add_development_dependency 'thor'
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'vcr', '~> 2.4.0'
 end

data/features/apply_command.feature

@@ -0,0 +1,32 @@
+Feature: lock cookbook versions on the server
+  As a berks user
+  I want to push my berks resolved cookbook versions to my environment
+  So that I can avoid manual configuration of my environments
+
+  @chef_server
+  Scenario: locking cookbook versions
+    Given I have an environment named "berkshelf_lock_test"
+    And I write to "Berksfile" with:
+      """
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'deps'
+      """
+    When I successfully run the apply command on "berkshelf_lock_test"
+    Then the version locks in "berkshelf_lock_test" should be:
+    | cookbook                     | version_lock |
+    | berkshelf-cookbook-fixture   |        1.0.0 |
+    | hostsfile                    |        1.0.1 |
+    And the exit status should be 0
+
+  @chef_server
+  Scenario: locking cookbook versions to an environment that does not exist
+    Given I do not have an environment named "berkshelf_lock_test"
+    And I write to "Berksfile" with:
+      """
+      cookbook 'berkshelf-cookbook-fixture'
+      """
+    When I run the apply command on "berkshelf_lock_test"
+    Then the output should contain:
+      """
+      The environment "berkshelf_lock_test" does not exist.
+      """
+    And the CLI should exit with the status code for error "EnvironmentNotFound"

data/features/configure_command.feature

@@ -59,3 +59,34 @@ Feature: configure command
       A configuration file already exists. Re-run with the --force flag if you wish to overwrite it.
       """
     And the CLI should exit with the status code for error "ConfigExists"
+
+  Scenario Outline: Generating a local Berkshelf config
+    Given I do not have a Berkshelf config file at "<path>"
+    When I run the "configure --path <path>" command interactively
+    And I type "https://api.opscode.com/organizations/vialstudios"
+    And I type "node_name"
+    And I type "client_key"
+    And I type "reset"
+    And I type "/Users/reset/.chef/reset.pem"
+    And I type "Berkshelf-minimal"
+    And I type "https://dl.dropbox.com/Berkshelf.box"
+    Then the output should contain:
+      """
+      Config written to:
+      """
+    And the exit status should be 0
+    And a Berkshelf config file should exist at "<path>" and contain:
+      | chef.chef_server_url        | https://api.opscode.com/organizations/vialstudios |
+      | chef.validation_client_name | reset                                             |
+      | chef.node_name              | node_name                                         |
+      | chef.client_key             | client_key                                        |
+      | chef.validation_key_path    | /Users/reset/.chef/reset.pem                      |
+      | vagrant.vm.box              | Berkshelf-minimal                                 |
+      | vagrant.vm.box_url          | https://dl.dropbox.com/Berkshelf.box              |
+
+    Examples:
+      |       path      |
+      | .berkshelf/config.json |
+      | berkshelf/config.json  |
+      | berkshelf-config.json  |
+      | config.json            |

data/features/contingent_command.feature

@@ -3,16 +3,16 @@ Feature: contingent command
   I want a way to the cookbooks that depend on another
   So that I can better understand my infrastructure
 
+  @slow_process
   Scenario: Running the contingent command against a cookbook
     Given I write to "Berksfile" with:
       """
-      cookbook "database", "1.3.12"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'deps'
       """
-    And I successfully run `berks install`
-    When I run `berks contingent mysql`
+    And I successfully run `berks contingent hostsfile`
     Then the output should contain:
       """
-      Cookbooks contingent upon mysql:
-        * database (1.3.12)
+      Cookbooks contingent upon hostsfile:
+        * berkshelf-cookbook-fixture (1.0.0)
       """
     And the exit status should be 0

data/features/default_locations.feature

@@ -24,11 +24,11 @@ Feature: Berksfile default locations
       | berkshelf-cookbook-fixture | 1.0.0 |
     And the exit status should be 0
 
-  @chef_server @focus
+  @chef_server
   Scenario: with a default chef_api(1) and site(2) location with a cookbook source that is not satisfied by the chef_api(1) location
     Given I write to "Berksfile" with:
       """
-      # chef_api :config
+      chef_api :config
       site :opscode
 
       cookbook 'berkshelf-cookbook-fixture', '1.0.0'

data/features/groups_install.feature

@@ -7,59 +7,58 @@ Feature: installing groups
     Given I write to "Berksfile" with:
       """
       group :notme do
-        cookbook "nginx", "= 0.101.2"
+        cookbook 'nginx', '= 0.101.2'
       end
 
-      cookbook "artifact", "= 0.10.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
 
       group :takeme do
-        cookbook "ntp", "= 1.1.8"
+        cookbook 'hostsfile', '1.0.1'
       end
       """
-    When I run the install command with flags:
-      | --except notme |
+    When I successfully run `berks install --except notme`
     Then the cookbook store should have the cookbooks:
-      | artifact | 0.10.0 |
-      | ntp      | 1.1.8 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
+      | hostsfile | 1.0.1 |
     And the cookbook store should not have the cookbooks:
       | nginx | 0.101.2 |
+    And the exit status should be 0
 
   Scenario: only groups
     Given I write to "Berksfile" with:
       """
       group :notme do
-        cookbook "nginx", "= 0.101.2"
+        cookbook 'nginx', '= 0.101.2'
       end
 
-      cookbook "artifact", "= 0.10.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
 
       group :takeme do
-        cookbook "ntp", "= 1.1.8"
+        cookbook 'hostsfile', '1.0.1'
       end
       """
-    When I run the install command with flags:
-      | --only takeme |
+    When I successfully run `berks install --only takeme`
     Then the cookbook store should have the cookbooks:
-      | ntp | 1.1.8 |
+      | hostsfile | 1.0.1 |
     And the cookbook store should not have the cookbooks:
-      | nginx    | 0.101.2 |
-      | artifact | 0.10.0 |
+      | nginx     | 0.101.2 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
+    And the exit status should be 0
 
   Scenario: attempting to provide an only and except option
     Given I write to "Berksfile" with:
       """
       group :notme do
-        cookbook "nginx", "= 0.101.2"
+        cookbook 'nginx', '= 0.101.2'
       end
 
-      cookbook "artifact", "= 0.10.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
 
       group :takeme do
-        cookbook "ntp", "= 1.1.8"
+        cookbook 'hostsfile', '1.0.1'
       end
       """
-    When I run the install command with flags:
-      | --only takeme --except notme |
+    When I run `berks install --only takeme --except notme`
     Then the output should contain:
       """
       Cannot specify both :except and :only

data/features/info_command.feature

@@ -5,12 +5,12 @@ Feature: info command
 
   Scenario: Running the info command with an installed cookbook name
     Given the cookbook store has the cookbooks:
-      | mysql   | 2.1.2  |
-      | mysql   | 1.2.4  |
-      | mysql   | 0.10.0 |
-    When I successfully run `berks info mysql`
-    Then the output should contain "Name: mysql"
-    Then the output should contain "Version: 2.1.2"
+      | berkshelf-cookbook-fixture   | 1.0.0  |
+      | berkshelf-cookbook-fixture   | 0.2.0  |
+      | berkshelf-cookbook-fixture   | 0.1.0  |
+    When I successfully run `berks info berkshelf-cookbook-fixture`
+    Then the output should contain "Name: berkshelf-cookbook-fixture"
+    Then the output should contain "Version: 1.0.0"
     Then the output should contain "Description: A fabulous new cookbook"
     Then the output should contain "Author: YOUR_COMPANY_NAME"
     Then the output should contain "Email: YOUR_EMAIL"
@@ -19,12 +19,12 @@ Feature: info command
 
   Scenario: Running the info command with an installed cookbook name and a version
     Given the cookbook store has the cookbooks:
-      | mysql   | 2.1.2  |
-      | mysql   | 1.2.4  |
-      | mysql   | 0.10.0 |
-    When I successfully run `berks info mysql --version 1.2.4`
-    Then the output should contain "Name: mysql"
-    Then the output should contain "Version: 1.2.4"
+      | berkshelf-cookbook-fixture   | 1.0.0  |
+      | berkshelf-cookbook-fixture   | 0.2.0  |
+      | berkshelf-cookbook-fixture   | 0.1.0  |
+    When I successfully run `berks info berkshelf-cookbook-fixture --version 0.2.0`
+    Then the output should contain "Name: berkshelf-cookbook-fixture"
+    Then the output should contain "Version: 0.2.0"
     Then the output should contain "Description: A fabulous new cookbook"
     Then the output should contain "Author: YOUR_COMPANY_NAME"
     Then the output should contain "Email: YOUR_EMAIL"
@@ -33,7 +33,7 @@ Feature: info command
 
   Scenario: Running the info command with a not installed cookbook name
     Given the cookbook store has the cookbooks:
-      | mysql   | 2.1.2  |
+      | berkshelf-cookbook-fixture   | 1.0.0  |
     When I run `berks info build-essential`
     Then the output should contain "Cookbook 'build-essential' was not installed by your Berksfile"
     And the CLI should exit with the status code for error "CookbookNotFound"

data/features/install_command.feature

@@ -3,73 +3,88 @@ Feature: install cookbooks from a Berksfile
   I want to be able to run knife berkshelf install to install my cookbooks
   So that I don't have to download my cookbooks and their dependencies manually
 
+  Scenario: installing with the old lockfile format
+    Given I write to "Berksfile" with:
+      """
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+      """
+    Given I write to "Berksfile.lock" with:
+      """
+      cookbook 'berkshelf-cookbook-fixture', :locked_version => '1.0.0'
+      """
+    When I successfully run `berks install`
+    Then the output should contain "You are using the old lockfile format. Attempting to convert..."
+    Then the file "Berksfile.lock" should contain JSON:
+      """
+      {
+        "sha":"bfb1de046fdc2a0c38cd5bbaddddce8bc1cd3c24",
+        "sources":{
+          "berkshelf-cookbook-fixture":{
+            "locked_version":"1.0.0",
+            "constraint":"= 1.0.0"
+          }
+        }
+      }
+      """
+
   Scenario: installing a Berksfile that contains a source with a default location
     Given I write to "Berksfile" with:
       """
-      cookbook "mysql", "1.2.4"
-      cookbook "openssl", "1.0.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     When I successfully run `berks install`
     Then the cookbook store should have the cookbooks:
-      | mysql   | 1.2.4 |
-      | openssl | 1.0.0 |
+      | berkshelf-cookbook-fixture   | 1.0.0 |
     And the output should contain:
       """
-      Installing mysql (1.2.4) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      Installing openssl (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
     And the exit status should be 0
 
   Scenario: installing a Berksfile that contains the cookbook explicitly desired by a source
     Given the cookbook store has the cookbooks:
-      | mysql   | 1.2.4 |
+      | berkshelf-cookbook-fixture   | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      cookbook "mysql", "= 1.2.4"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     When I successfully run `berks install`
     Then the output should contain:
       """
-      Using mysql (1.2.4)
+      Using berkshelf-cookbook-fixture (1.0.0)
       """
     And the exit status should be 0
 
   Scenario: installing a Berksfile that has multiple cookbooks in different groups
     Given the cookbook store has the cookbooks:
-      | build-essential   | 1.1.2 |
+      | berkshelf-cookbook-fixture   | 1.0.0 |
     And I write to "Berksfile" with:
       """
       group :a do
-        cookbook "build-essential", "1.1.2"
+        cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       end
 
       group :b do
-        cookbook "build-essential", "1.1.2"
+        cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       end
       """
     When I successfully run `berks install`
-    Then the output should contain "Using build-essential (1.1.2)"
+    Then the output should contain "Using berkshelf-cookbook-fixture (1.0.0)"
     And the exit status should be 0
 
   Scenario: installing a Berksfile that contains a source with dependencies, all of which already have been installed
-    Given the cookbook store contains a cookbook "mysql" "1.2.4" with dependencies:
-      | openssl      | = 1.0.0 |
-      | windows      | = 1.3.0 |
-      | chef_handler | = 1.0.6 |
+    Given the cookbook store contains a cookbook "berkshelf-cookbook-fixture" "1.0.0" with dependencies:
+      | hostsfile    | = 1.0.1 |
     And the cookbook store has the cookbooks:
-      | openssl      | 1.0.0 |
-      | windows      | 1.3.0 |
+      | hostsfile    | 1.0.1 |
     And I write to "Berksfile" with:
       """
-      cookbook "mysql", "~> 1.2.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'deps'
       """
     When I successfully run `berks install`
     Then the output should contain:
       """
-      Using mysql (1.2.4)
-      Using openssl (1.0.0)
-      Using windows (1.3.0)
-      Installing chef_handler (1.0.6) from site:
+      Using hostsfile (1.0.1)
       """
     And the exit status should be 0
 
@@ -86,84 +101,83 @@ Feature: install cookbooks from a Berksfile
   Scenario: installing a Berksfile that contains a Git location
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", git: "git://github.com/RiotGames/artifact-cookbook.git"
+      cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git"
       """
     When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
-      | artifact | 1.7.0 | master |
+      | berkshelf-cookbook-fixture | 1.0.0 | a97b9447cbd41a5fe58eee2026e48ccb503bd3bc |
     And the output should contain:
       """
-      Installing artifact (1.7.0) from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: 'master'
+      Installing berkshelf-cookbook-fixture (1.0.0) from git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'master'
       """
     And the exit status should be 0
 
-  Scenario: installing a Berksfile that contains a Git location with a ref
+  Scenario: installing a Berksfile that contains a Git location with a tag
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.9.8"
+      cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git", tag: "v0.2.0"
       """
     When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
-      | artifact | 0.9.8 | 0.9.8 |
+      | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
     And the output should contain:
       """
-      Installing artifact (0.9.8) from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.9.8'
+      Installing berkshelf-cookbook-fixture (0.2.0) from git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v0.2.0'
       """
     And the exit status should be 0
 
   Scenario: installing a Berksfile that contains a GitHub location
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8"
+      cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0"
       """
     When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
-      | artifact | 0.9.8 | 0.9.8 |
+      | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
     And the output should contain:
       """
-      Installing artifact (0.9.8) from github: 'RiotGames/artifact-cookbook' with branch: '0.9.8'
+      Installing berkshelf-cookbook-fixture (0.2.0) from github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'v0.2.0'
       """
     And the exit status should be 0
 
   Scenario: installing a Berksfile that contains a Github location and the default protocol
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8"
+      cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0"
       """
     When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
-      | artifact | 0.9.8 | 0.9.8 |
+      | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
     And the output should contain:
       """
-      Installing artifact (0.9.8) from github: 'RiotGames/artifact-cookbook' with branch: '0.9.8' over protocol: 'git'
+      Installing berkshelf-cookbook-fixture (0.2.0) from github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'v0.2.0' over protocol: 'git'
       """
     And the exit status should be 0
 
   Scenario Outline: installing a Berksfile that contains a Github location and specific protocol
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8", protocol: "<protocol>"
+      cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v1.0.0", protocol: "<protocol>"
       """
     When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
-      | artifact | 0.9.8 | 0.9.8 |
+      | berkshelf-cookbook-fixture | 1.0.0 | b4f968c9001ad8de30f564a2107fab9cfa91f771 |
     And the output should contain:
       """
-      Installing artifact (0.9.8) from github: 'RiotGames/artifact-cookbook' with branch: '0.9.8' over protocol: '<protocol>'
+      Installing berkshelf-cookbook-fixture (1.0.0) from github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'v1.0.0' over protocol: '<protocol>'
       """
     And the exit status should be 0
 
     Examples:
       | protocol |
-      # GitHub over ssh requires push authorization. Nonpushers will
-      # get a test failure here.
-      # | ssh   |
+      # | ssh   | # GitHub over ssh requires push authorization. Nonpushers will get a test failure here.
+      | git |
       | https |
 
   Scenario: installing a Berksfile that contains a Github location and an unsupported protocol
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8", protocol: "somethingabsurd"
+      cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0", protocol: "somethingabsurd"
       """
     When I run `berks install`
     Then the output should contain:
@@ -175,17 +189,14 @@ Feature: install cookbooks from a Berksfile
   Scenario: installing a Berksfile that contains an explicit site location
     Given I write to "Berksfile" with:
       """
-      cookbook "mysql", "1.2.4", site: "http://cookbooks.opscode.com/api/v1/cookbooks"
-      cookbook "openssl", "1.0.0", site: "http://cookbooks.opscode.com/api/v1/cookbooks"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0', site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
     When I successfully run `berks install`
     Then the cookbook store should have the cookbooks:
-      | mysql   | 1.2.4 |
-      | openssl | 1.0.0 |
+      | berkshelf-cookbook-fixture   | 1.0.0 |
     And the output should contain:
       """
-      Installing mysql (1.2.4) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      Installing openssl (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
     And the exit status should be 0
 
@@ -216,7 +227,7 @@ Feature: install cookbooks from a Berksfile
   Scenario: running install when the Cookbook is not found on the remote site
     Given I write to "Berksfile" with:
       """
-      cookbook "doesntexist"
+      cookbook 'doesntexist'
       """
     And I run `berks install`
     Then the output should contain:
@@ -228,7 +239,7 @@ Feature: install cookbooks from a Berksfile
   Scenario: installing a Berksfile that has a Git location source with an invalid Git URI
     Given I write to "Berksfile" with:
       """
-      cookbook "nginx", git: "/something/on/disk"
+      cookbook 'nginx', git: '/something/on/disk'
       """
     When I run `berks install`
     Then the output should contain:
@@ -240,46 +251,52 @@ Feature: install cookbooks from a Berksfile
   Scenario: installing when there are sources with duplicate names defined in the same group
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact"
-      cookbook "artifact"
+      cookbook 'berkshelf-cookbook-fixture'
+      cookbook 'berkshelf-cookbook-fixture'
       """
     When I run `berks install`
     Then the output should contain:
       """
-      Berksfile contains multiple sources named 'artifact'. Use only one, or put them in different groups.
+      Berksfile contains multiple sources named 'berkshelf-cookbook-fixture'. Use only one, or put them in different groups.
       """
     And the CLI should exit with the status code for error "DuplicateSourceDefined"
 
   Scenario: installing when a git source defines a branch that does not satisfy the version constraint
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", "= 0.9.8", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.10.0"
+      cookbook "berkshelf-cookbook-fixture", "= 1.0.0", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git", tag: "v0.2.0"
       """
     When I run `berks install`
-    Then the output should contain:
+    Then the output should match multiline:
       """
-      Cookbook downloaded for 'artifact' from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.10.0' does not satisfy the version constraint (= 0.9.8)
+      The cookbook downloaded from git: 'git://github\.com/RiotGames/berkshelf-cookbook-fixture\.git' with branch: 'v0\.2\.0' at ref: '.+':
+        berkshelf-cookbook-fixture \(.+\)
+
+      does not satisfy the version constraint:
+        berkshelf-cookbook-fixture \(= 1.0.0\)
+
+      This occurs when the Chef Server has a cookbook with a missing/mis-matched version number in its `metadata.rb`\.
       """
     And the CLI should exit with the status code for error "CookbookValidationFailure"
 
   Scenario: when a git location source is defined and a cookbook of the same name is already cached in the cookbook store
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.10.0"
+      cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git", tag: "v1.0.0"
       """
     And the cookbook store has the cookbooks:
-      | artifact | 0.10.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     When I successfully run `berks install`
     Then the output should contain:
       """
-      Installing artifact (0.10.0) from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.10.0'
+      Installing berkshelf-cookbook-fixture (1.0.0) from git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v1.0.0' at ref:
       """
     And the exit status should be 0
 
   Scenario: with a cookbook definition containing an invalid option
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", whatisthis: "I don't even know", anotherwat: "isthat"
+      cookbook "berkshelf-cookbook-fixture", whatisthis: "I don't even know", anotherwat: "isthat"
       """
     When I run `berks install`
     Then the output should contain:
@@ -292,28 +309,14 @@ Feature: install cookbooks from a Berksfile
   Scenario: with a cookbook definition containing a chef_api source location
     Given I write to "Berksfile" with:
       """
-      cookbook "cuke-test", "= 1.0.0", chef_api: :config
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0', chef_api: :config
       """
     And the Chef server has cookbooks:
-      | cuke-test | 1.0.0 |
-    When I successfully run `berks install`
-    Then the output should contain:
-      """
-      Installing cuke-test (1.0.0) from chef_api:
-      """
-    And the cookbook store should have the cookbooks:
-      | cuke-test | 1.0.0 |
-    And the exit status should be 0
-
-  Scenario: when the :site is not defined
-    Given I write to "Berksfile" with:
-      """
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0', site: nil
-      """
+      | berkshelf-cookbook-fixture | 1.0.0 |
     When I successfully run `berks install`
     Then the output should contain:
       """
-      Installing berkshelf-cookbook-fixture (1.0.0) from site:
+      Installing berkshelf-cookbook-fixture (1.0.0) from chef_api:
       """
     And the cookbook store should have the cookbooks:
       | berkshelf-cookbook-fixture | 1.0.0 |
@@ -322,7 +325,7 @@ Feature: install cookbooks from a Berksfile
   Scenario: with a chef_api source location specifying :config when a Berkshelf config is not found at the given path
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", chef_api: :config
+      cookbook 'berkshelf-cookbook-fixture', chef_api: :config
       """
     When I run the install command with flags:
       | -c /tmp/notthere.lol |
@@ -335,13 +338,13 @@ Feature: install cookbooks from a Berksfile
   Scenario: with a git error during download
     Given I write to "Berksfile" with:
       """
-      cookbook "ohai", "1.1.4"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       cookbook "doesntexist", git: "git://github.com/asdjhfkljashflkjashfakljsf"
       """
     When I run `berks install`
     Then the output should contain:
       """
-      Installing ohai (1.1.4) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       Failed to download 'doesntexist' from git: 'git://github.com/asdjhfkljashflkjashfakljsf' with branch: 'master'
       An error occured during Git execution:
       """
@@ -351,7 +354,7 @@ Feature: install cookbooks from a Berksfile
     Given I write to "Berksfile" with:
       """
       site :somethingabsurd
-      cookbook "ohai"
+      cookbook 'berkshelf-cookbook-fixture'
       """
     When I run `berks install`
     Then the output should contain: