berkshelf 3.0.0.beta2 → 3.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9eeec61abc7afc5a3a61ba58852f1ee753969f3
-  data.tar.gz: bf73a4918c2c1c00873e586f5e2e2a38fc7f30a8
+  metadata.gz: 1f30b6f5921539453a2eb582dcf8b483bf6f33e1
+  data.tar.gz: d47613f9a3940b7b8e0fa157f7e8e5643f468288
 SHA512:
-  metadata.gz: ff93338dfc827ddac156835b12deff45ac00d18515185cd2abad4f8283295987d28c31fc371d96ad045a0cc2392d22e3957e037fc00469c769e9b4b913c00480
-  data.tar.gz: 5d6fab4ced0612343c398a9b39893636e78bbee24f525160016c322c0e42e279cb86764004f98b59d57fe49c0f37432ad5de50ba8460b8fe55664f0dd0785f17
+  metadata.gz: 32ec7a95765d2b8d81792e71f6834736e12dd738ef0a5a4764c1fa5ae7dee346d581105349303efca4d4265e6df6f369832d5906d32453a7c24ba67f96bc90cf
+  data.tar.gz: 8b64c19ac6c62a77bbed0fea4aacca7fab0fc6f20442ba34c2b726917e48d5cad4bad7a9f1689568fbc83a009670e8a7e5113140eb3b1d155cf2c0c00e7d020b

data/.gitignore

@@ -18,7 +18,6 @@ tmp
 .DS_Store
 /spec/knife.rb
 /spec/*.pem
-/spec/fixtures/vcr_cassettes
 /features/config.yml
 *.sw[op]
 \.\#*

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 * New "universe" resolver which communicates with an API server to resolve constraint graphs faster and more reliably
 
+# 2.0.10
+
+* Huge performance increase when resolving a Berksfile when the Berkshelf contains a lot of cookbooks
+
+# 2.0.9
+
+* Update required version of Ridley
+
 # 2.0.7
 
 * Fix crash when parsing a lockfile that contains path locations which no longer exist

data/Gemfile

@@ -5,7 +5,6 @@ gemspec
 group :guard do
   gem 'coolline',      '~> 0.4.2'
   gem 'guard',         '~> 1.8'
-  gem 'guard-cane'
   gem 'guard-cucumber'
   gem 'guard-rspec'
   gem 'guard-spork'

data/Guardfile

@@ -23,7 +23,3 @@ guard 'cucumber', cli: '--drb --format pretty --tags ~@no_run --tags ~@wip', all
 
   watch(%r{^lib/berkshelf/cli.rb})                      { 'features' }
 end
-
-guard 'cane', run_all_on_start: false do
-  watch(/.*\.rb/)
-end

data/README.md

@@ -39,7 +39,7 @@ There is a [berkshelf bash completion script](https://raw.github.com/RiotGames/b
 
 Download the latest script
 
-    cd `brew --prefix`/etc/bash_completion && wget https://raw.github.com/RiotGames/berkshelf/master/berkshelf-complete.sh
+    cd `brew --prefix`/etc/bash_completion.d && wget https://raw.github.com/RiotGames/berkshelf/master/berkshelf-complete.sh
 
 And make sure you have this in your bash/zsh profile:
 

data/Thorfile

@@ -30,7 +30,7 @@ class Spec < Thor
 
   desc 'all', 'Run all specs and features'
   def all
-    exit(units_command && acceptance_command && quality_command)
+    exit(units_command && acceptance_command)
   end
 
   desc 'ci', 'Run tests on Travis'
@@ -49,22 +49,13 @@ class Spec < Thor
     exit(acceptance_command)
   end
 
-  desc 'quality', 'Run code quality tests'
-  def quality
-    exit(quality_command)
-  end
-
   no_tasks do
     def units_command
       run('rspec --color --format progress spec/unit')
     end
 
     def acceptance_command
-      run('cucumber --color --format progress --tags ~@no_run')
-    end
-
-    def quality_command
-      run('cane --gte coverage/.last_run.json,90')
+      run('cucumber --color --format progress --tags ~@no_run --strict')
     end
   end
 end

data/berkshelf.gemspec

@@ -34,24 +34,21 @@ Gem::Specification.new do |s|
   s.add_dependency 'buff-config',       '~> 0.2'
   s.add_dependency 'buff-extensions',   '~> 0.4'
   s.add_dependency 'buff-shell_out',    '~> 0.1'
-  s.add_dependency 'celluloid',         '>= 0.14.0'
   s.add_dependency 'faraday',           '>= 0.8.5'
   s.add_dependency 'hashie',            '>= 2.0.2'
   s.add_dependency 'minitar',           '~> 0.5.4'
   s.add_dependency 'retryable',         '~> 1.3.3'
-  s.add_dependency 'ridley',            '~> 1.4.0'
-  s.add_dependency 'solve',             '>= 0.5.0'
+  s.add_dependency 'ridley',            '~> 1.6'
+  s.add_dependency 'solve',             '>= 0.8.0'
   s.add_dependency 'thor',              '~> 0.18.0'
 
   s.add_development_dependency 'aruba',         '~> 0.5'
-  s.add_development_dependency 'cane',          '~> 2.5'
   s.add_development_dependency 'chef-zero',     '~> 1.5.0'
   s.add_development_dependency 'fuubar',        '~> 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 'test-kitchen',  '>= 1.0.0.alpha7'
-  s.add_development_dependency 'vcr',           '~> 2.4'
   s.add_development_dependency 'webmock',       '~> 1.11'
   s.add_development_dependency 'yard',          '~> 0.8'
 end

data/features/berksfile.feature

@@ -1,13 +1,7 @@
 Feature: Evaluating a Berksfile
-  As a user with a Berksfile
-  I want to evaluate things and see nice errors
-  So I can identify my syntax errors and faults
-
   Scenario: Containing pure Ruby
     Given I write to "Berksfile" with:
       """
-      source "http://localhost:26210"
-
       if ENV['BACON']
         puts "If you don't got bacon..."
       else
@@ -21,11 +15,10 @@ Feature: Evaluating a Berksfile
       If you don't got bacon...
       """
 
+
   Scenario: Containing methods I shouldn't be able to call
     Given I write to "Berksfile" with:
       """
-      source "http://localhost:26210"
-
       add_location(:foo)
       """
     When I run `berks install`
@@ -37,11 +30,10 @@ Feature: Evaluating a Berksfile
       """
     And the exit status should be "BerksfileReadError"
 
+
   Scenario: Containing Ruby syntax errors
     Given I write to "Berksfile" with:
       """
-      source "http://localhost:26210"
-
       ptus "This is a ruby syntax error"
       """
     When I run `berks install`

data/features/commands/apply.feature

@@ -0,0 +1,31 @@
+Feature: berks apply
+  Scenario: Locking a cookbook version with dependencies
+    Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
+      | dependency | 2.0.0 |
+    And the cookbook store has the cookbooks:
+      | dependency | 2.0.0 |
+    And the Chef Server has an environment named "my_env"
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    When I successfully run `berks apply my_env`
+    Then the version locks in the "my_env" environment should be:
+      | fake       | 1.0.0 |
+      | dependency | 2.0.0 |
+
+
+  Scenario: Locking cookbook versions to a non-existent Chef Environment
+    Given the Chef Server does not have an environment named "my_env"
+    And the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    When I run `berks apply my_env`
+    Then the output should contain:
+      """
+      The environment 'my_env' does not exist
+      """
+    And the exit status should be "EnvironmentNotFound"

data/features/{configure_command.feature → commands/configure.feature}

@@ -1,11 +1,7 @@
 @spawn
-Feature: Configuring Berkshelf via the command line
-  As CLI user of Berkshelf
-  I want a command to generate a Berkshelf configuration file based on my input
-  So I can quickly get up and running with the least amount of resistance
-
+Feature: berks configure
   Background:
-    Given I do not have a Berkshelf config
+    * I do not have a Berkshelf config
 
   Scenario: Using custom values
     When I run `berks configure` interactively
@@ -28,7 +24,7 @@ Feature: Configuring Berkshelf via the command line
       | chef.validation_key_path    | /Users/reset/.chef/reset.pem                      |
       | vagrant.vm.box              | Berkshelf-minimal                                 |
       | vagrant.vm.box_url          | https://dl.dropbox.com/Berkshelf.box              |
-    And the exit status should be 0
+
 
   Scenario: Accepting the default values
     Given I do not have a Chef config
@@ -49,9 +45,11 @@ Feature: Configuring Berkshelf via the command line
       | chef.validation_client_name | chef-validator                      |
       | chef.client_key             | /etc/chef/client.pem                |
       | chef.validation_key_path    | /etc/chef/validation.pem            |
-      | vagrant.vm.box              | Berkshelf-CentOS-6.3-x86_64-minimal |
-      | vagrant.vm.box_url          | https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box |
-    And the exit status should be 0
+      | vagrant.vm.box              | opscode_ubuntu-12.04_provisionerless |
+      | vagrant.vm.box_url          | https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box |
+      | vagrant.omnibus.enabled     | BOOLEAN[true] |
+      | vagrant.omnibus.version     | latest |
+
 
   Scenario: Creating a Berkshelf configuration file when one already exists
     Given I already have a Berkshelf config file
@@ -62,6 +60,7 @@ Feature: Configuring Berkshelf via the command line
       """
     And the exit status should be "ConfigExists"
 
+
   Scenario Outline: Using the --path option
     When I run `berks configure --path <path>` interactively
     And I type "https://api.opscode.com/organizations/vialstudios"
@@ -83,7 +82,6 @@ Feature: Configuring Berkshelf via the command line
       | chef.validation_key_path    | /Users/reset/.chef/reset.pem                      |
       | vagrant.vm.box              | Berkshelf-minimal                                 |
       | vagrant.vm.box_url          | https://dl.dropbox.com/Berkshelf.box              |
-    And the exit status should be 0
 
     Examples:
       | path                   |

data/features/{contingent_command.feature → commands/contingent.feature}

@@ -1,12 +1,9 @@
-Feature: Running the contingent command
-  As a user with a Berksfile
-  I want a way to the cookbooks that depend on another
-  So that I can better understand my infrastructure
-
+Feature: berks contingent
   Background:
-    Given the Berkshelf API server's cache is empty
-    And the Chef Server is empty
-    And the cookbook store is empty
+    * the Berkshelf API server's cache is empty
+    * the Chef Server is empty
+    * the cookbook store is empty
+
 
   Scenario: When there are dependent cookbooks
     Given the cookbook store has the cookbooks:
@@ -15,10 +12,8 @@ Feature: Running the contingent command
       | dep | ~> 1.0.0 |
     And the cookbook store contains a cookbook "ekaf" "1.0.0" with dependencies:
       | dep | ~> 1.0.0 |
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake', '1.0.0'
       cookbook 'ekaf', '1.0.0'
       """
@@ -29,15 +24,13 @@ Feature: Running the contingent command
         * ekaf (1.0.0)
         * fake (1.0.0)
       """
-    And the exit status should be 0
+
 
   Scenario: When there are no dependent cookbooks
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake', '1.0.0'
       """
     And I successfully run `berks contingent dep`
@@ -45,13 +38,10 @@ Feature: Running the contingent command
       """
       There are no cookbooks contingent upon 'dep' defined in this Berksfile
       """
-    And the exit status should be 0
+
 
   Scenario: When the cookbook is not in the Berksfile
-    Given I write to "Berksfile" with:
-      """
-      source "http://localhost:26210"
-      """
+    Given I have a Berksfile pointing at the local Berkshelf API
     And I successfully run `berks contingent dep`
     Then the output should contain:
       """

data/features/{cookbook_command.feature → commands/cookbook.feature}

@@ -1,18 +1,12 @@
-Feature: Creating a new cookbook
-  As a Cookbook author
-  I want a way to quickly generate a Cookbook skeleton that contains supporting Berkshelf files
-  So I can quickly and automatically generate a Cookbook containing Berkshelf supporting files or other common supporting files
-
+Feature: berks cookbook
   Scenario: With the default options
     When I successfully run `berks cookbook sparkle_motion`
     Then I should have a new cookbook skeleton "sparkle_motion"
-    And the exit status should be 0
+
 
   Scenario Outline: With various options
     When I successfully run `berks cookbook sparkle_motion --<option>`
     Then I should have a new cookbook skeleton "sparkle_motion" with <feature> support
-    And the exit status should be 0
-
   Examples:
     | option            | feature         |
     | foodcritic        | Foodcritic      |
@@ -25,21 +19,20 @@ Feature: Creating a new cookbook
     | skip-vagrant      | no Vagrant      |
     | skip-test-kitchen | no Test Kitchen |
 
+
   Scenario Outline: When a required supporting gem is not installed
     Given the gem "<gem>" is not installed
     When I successfully run `berks cookbook sparkle_motion --<option>`
     Then I should have a new cookbook skeleton "sparkle_motion" with <feature> support
     And the output should contain a warning to suggest supporting the option "<option>" by installing "<gem>"
-    And the exit status should be 0
-
   Examples:
     | option     | feature    | gem             |
     | foodcritic | Foodcritic | foodcritic      |
     | scmversion | SCMVersion | thor-scmversion |
 
+
   Scenario: When bundler is not installed
     Given the gem "bundler" is not installed
     When I successfully run `berks cookbook sparkle_motion`
     Then I should have a new cookbook skeleton "sparkle_motion"
     And the output should contain a warning to suggest supporting the default for "bundler" by installing "bundler"
-    And the exit status should be 0

data/features/{init_command.feature → commands/init.feature}

@@ -1,8 +1,4 @@
-Feature: initialize command
-  As a Cookbook author
-  I want a way to quickly prepare a Cookbook on my local disk with Berkshelf files
-  So that I can resolve my Cookbook's dependencies with Berkshelf
-
+Feature: berks init
   Scenario: initializing a path containing a cookbook
     Given a cookbook named "sparkle_motion"
     When I successfully run `berks init sparkle_motion`
@@ -14,25 +10,20 @@ Feature: initialize command
       metadata
       """
     And the output should contain "Successfully initialized"
-    And the exit status should be 0
+
 
   Scenario: initializing a path that does not contain a cookbook
     Given a directory named "not_a_cookbook"
-    When I successfully run `berks init not_a_cookbook`
-    Then the directory "not_a_cookbook" should have the following files:
-      | Berksfile |
-    And the directory "not_a_cookbook" should not have the following files:
-      | chefignore |
-    And the file "Berksfile" in the directory "not_a_cookbook" should not contain:
-      """
-      metadata
-      """
-    And the output should contain "Successfully initialized"
-    And the exit status should be 0
+    When I run `berks init not_a_cookbook`
+    And the exit status should be "NotACookbook"
+
 
   Scenario: initializing with no value given for target
+    Given I write to "metadata.rb" with:
+      """
+      name 'sparkle_motion'
+      """
     When I successfully run `berks init`
     Then the output should contain "Successfully initialized"
     And a file named "Berksfile" should exist
-    And a file named "chefignore" should not exist
-    And the exit status should be 0
+    And a file named "chefignore" should exist

data/features/{install_command.feature → commands/install.feature}

@@ -1,18 +1,13 @@
-Feature: install cookbooks from a Berksfile
-  As a user with a Berksfile
-  I want a command to install the cookbooks defined in my Berksfile and their recursive dependencies
-  So I don't have to download those cookbooks and their all of their dependencies manually
-
+Feature: berks install
   Background:
-    Given the Berkshelf API server's cache is empty
-    And the Chef Server is empty
-    And the cookbook store is empty
+    * the Berkshelf API server's cache is empty
+    * the Chef Server is empty
+    * the cookbook store is empty
+
 
   Scenario: installing the version that best satisfies our demand
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'berkshelf'
       """
     And the Chef Server has cookbooks:
@@ -27,11 +22,10 @@ Feature: install cookbooks from a Berksfile
     And the cookbook store should have the cookbooks:
       | berkshelf | 2.0.0 |
 
+
   Scenario: installing an explicit version demand
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'berkshelf', '1.0.0'
       """
     And the Chef Server has cookbooks:
@@ -46,11 +40,10 @@ Feature: install cookbooks from a Berksfile
     And the cookbook store should have the cookbooks:
       | berkshelf | 1.0.0 |
 
+
   Scenario: installing demands from all groups
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       group :one do
         cookbook 'ruby'
       end
@@ -73,11 +66,10 @@ Feature: install cookbooks from a Berksfile
       | ruby   | 1.0.0 |
       | elixir | 1.0.0 |
 
+
   Scenario: installing a demand that has already been installed
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'berkshelf-cookbook-fixture', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'deps'
       """
     And the cookbook store contains a cookbook "berkshelf" "1.0.0" with dependencies:
@@ -91,11 +83,66 @@ Feature: install cookbooks from a Berksfile
       Using hostsfile (1.0.1)
       """
 
-  Scenario: installing a demand from a path location
-    Given I write to "Berksfile" with:
+
+  Scenario: installing a single groups of demands with the --only flag
+    Given the cookbook store has the cookbooks:
+      | takeme | 1.0.0 |
+      | notme  | 1.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'takeme', group: :take_me
+      cookbook 'notme', group: :not_me
       """
-      source "http://localhost:26210"
+    When I successfully run `berks install --only take_me`
+    Then the output should contain "Using takeme (1.0.0)"
+    Then the output should not contain "Using notme (1.0.0)"
+
+
+  Scenario: installing multiple groups of demands with the --only flag
+    Given the cookbook store has the cookbooks:
+      | takeme | 1.0.0 |
+      | notme | 1.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'takeme', group: :take_me
+      cookbook 'notme', group: :not_me
+      """
+    When I successfully run `berks upload --only take_me not_me`
+    Then the output should contain "Using takeme (1.0.0)"
+    Then the output should contain "Using notme (1.0.0)"
+
+
+  Scenario: skipping a single group to install with the --except flag
+    Given the cookbook store has the cookbooks:
+      | takeme | 1.0.0 |
+      | notme | 1.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'takeme', group: :take_me
+      cookbook 'notme', group: :not_me
+      """
+    When I successfully run `berks upload --except not_me`
+    Then the output should contain "Using takeme (1.0.0)"
+    Then the output should not contain "Using notme (1.0.0)"
+
+
+  Scenario: skipping multiple groups to install with the --except flag
+    Given the cookbook store has the cookbooks:
+      | takeme | 1.0.0 |
+      | notme | 1.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'takeme', group: :take_me
+      cookbook 'notme', group: :not_me
+      """
+    When I successfully run `berks upload --except take_me not_me`
+    Then the output should not contain "Using takeme (1.0.0)"
+    Then the output should not contain "Using notme (1.0.0)"
+
 
+  Scenario: installing a demand from a path location
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
       cookbook 'example_cookbook', path: '../../fixtures/cookbooks/example_cookbook-0.5.0'
       """
     And the Berkshelf API server's cache is up to date
@@ -105,24 +152,22 @@ Feature: install cookbooks from a Berksfile
       Using example_cookbook (0.5.0) path: '
       """
 
+
   Scenario: installing a Berksfile from a remote directory that contains a path location
-    Given I write to "tmp_berks/Berksfile" with:
+    Given I have a Berksfile at "subdirectory" pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'example_cookbook', path: '../../../fixtures/cookbooks/example_cookbook-0.5.0'
       """
-    When I successfully run `berks install -b ./tmp_berks/Berksfile`
+    When I successfully run `berks install -b subdirectory/Berksfile`
     Then the output should contain:
       """
       Using example_cookbook (0.5.0) path: '
       """
 
+
   Scenario: installing a demand from a Git location
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git"
       """
     When I successfully run `berks install`
@@ -135,11 +180,10 @@ Feature: install cookbooks from a Berksfile
       Using berkshelf-cookbook-fixture (1.0.0) git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'master'
       """
 
+
   Scenario: installing a demand from a Git location that has already been installed
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git"
       """
     And the cookbook store has the git cookbooks:
@@ -150,11 +194,10 @@ Feature: install cookbooks from a Berksfile
       Using berkshelf-cookbook-fixture (1.0.0) git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'master'
       """
 
+
   Scenario: installing a Berksfile that contains a Git location with a rel
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'rel', rel: 'cookbooks/berkshelf-cookbook-fixture'
       """
     When I successfully run `berks install`
@@ -167,11 +210,10 @@ Feature: install cookbooks from a Berksfile
       Using berkshelf-cookbook-fixture (1.0.0) github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'rel' over protocol: 'git'
       """
 
+
   Scenario: installing a Berksfile that contains a Git location with a tag
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git", tag: "v0.2.0"
       """
     When I successfully run `berks install`
@@ -184,11 +226,10 @@ Feature: install cookbooks from a Berksfile
       Using berkshelf-cookbook-fixture (0.2.0) git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v0.2.0' at ref: '70a527e17d91f01f031204562460ad1c17f972ee'
       """
 
+
   Scenario: installing a Berksfile that contains a GitHub location
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0"
       """
     When I successfully run `berks install`
@@ -201,11 +242,10 @@ Feature: install cookbooks from a Berksfile
       Using berkshelf-cookbook-fixture (0.2.0) github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'v0.2.0' over protocol: 'git'
       """
 
+
   Scenario Outline: installing a Berksfile that contains a Github location and specific protocol
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v1.0.0", protocol: "<protocol>"
       """
     When I successfully run `berks install`
@@ -220,14 +260,13 @@ Feature: install cookbooks from a Berksfile
 
     Examples:
       | protocol |
-      | git |
-      | https |
+      | git      |
+      | https    |
+
 
   Scenario: installing a Berksfile that contains a Github location and an unsupported protocol
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0", protocol: "somethingabsurd"
       """
     When I run `berks install`
@@ -237,27 +276,25 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be "InvalidGitURI"
 
+
   Scenario: running install when current project is a cookbook and the 'metadata' is specified
     Given a cookbook named "sparkle_motion"
-    And the cookbook "sparkle_motion" has the file "Berksfile" with:
+    And I cd to "sparkle_motion"
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       metadata
       """
-    When I cd to "sparkle_motion"
-    And I successfully run `berks install`
+    When I successfully run `berks install`
     Then the output should contain:
       """
       Using sparkle_motion (0.0.0)
       """
 
+
   Scenario: running install when current project is a cookbook and the 'metadata' is specified with a path
     Given a cookbook named "fake"
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       metadata path: './fake'
       """
     When I successfully run `berks install`
@@ -266,16 +303,15 @@ Feature: install cookbooks from a Berksfile
       Using fake (0.0.0)
       """
 
+
   Scenario: running install when a Berksfile.lock is present
     Given the Chef Server has cookbooks:
       | bacon | 0.1.0 |
       | bacon | 0.2.0 |
       | bacon | 1.0.0 |
     And the Berkshelf API server's cache is up to date
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'bacon', '~> 0.1'
       """
     And I write to "Berksfile.lock" with:
@@ -294,6 +330,7 @@ Feature: install cookbooks from a Berksfile
       Installing bacon (0.2.0)
       """
 
+
   Scenario: running install with no Berksfile or Berksfile.lock
     When I run `berks install`
     Then the output should contain:
@@ -302,11 +339,10 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be "BerksfileNotFound"
 
+
   Scenario: running install when the Cookbook is not found on the remote site
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'doesntexist'
       cookbook 'other-failure'
       """
@@ -317,11 +353,10 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be "NoSolutionError"
 
+
   Scenario: installing a Berksfile that has a Git location source with an invalid Git URI
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'nginx', git: '/something/on/disk'
       """
     When I run `berks install`
@@ -331,11 +366,10 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be "InvalidGitURI"
 
+
   Scenario: installing when there are sources with duplicate names defined in the same group
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'berkshelf-cookbook-fixture'
       cookbook 'berkshelf-cookbook-fixture'
       """
@@ -346,11 +380,10 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be "DuplicateDependencyDefined"
 
+
   Scenario: when a Git demand points to a branch that does not satisfy the version constraint
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       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`
@@ -361,11 +394,10 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be "CookbookValidationFailure"
 
+
   Scenario: when a Git demand is defined and a cookbook of the same name and version is already in the cookbook store
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git", tag: "v1.0.0"
       """
     And the cookbook store has the cookbooks:
@@ -378,11 +410,10 @@ Feature: install cookbooks from a Berksfile
       Using berkshelf-cookbook-fixture (1.0.0) git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v1.0.0' at ref: 'b4f968c9001ad8de30f564a2107fab9cfa91f771'
       """
 
+
   Scenario: with a cookbook definition containing an invalid option
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook "berkshelf-cookbook-fixture", whatisthis: "I don't even know", anotherwat: "isthat"
       """
     When I run `berks install`
@@ -392,11 +423,10 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be "InternalError"
 
+
   Scenario: with a git error during download
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       cookbook "doesntexist", git: "git://github.com/asdjhfkljashflkjashfakljsf"
       """
@@ -407,3 +437,52 @@ Feature: install cookbooks from a Berksfile
       An error occurred during Git execution:
       """
       And the exit status should be "GitError"
+
+
+  Scenario: transitive dependencies in metadata
+    Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
+      | bacon | >= 0.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    And I write to "metadata.rb" with:
+      """
+      depends 'fake', '1.0.0'
+      depends 'bacon', '0.2.0'
+      """
+    And the Chef Server has cookbooks:
+      | bacon | 0.1.0 |
+      | bacon | 0.2.0 |
+      | bacon | 1.0.0 |
+    And the Berkshelf API server's cache is up to date
+    When I successfully run `berks install`
+    Then the cookbook store should have the cookbooks:
+      | bacon | 0.2.0 |
+    Then the output should contain:
+      """
+      Installing bacon (0.2.0)
+      """
+
+
+  Scenario: transitive dependencies in metadata when cookbooks are downloaded
+    Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
+      | bacon | >= 0.0.0 |
+    And the cookbook store has the cookbooks:
+      | bacon | 1.0.0 |
+      | bacon | 0.3.0 |
+      | bacon | 0.2.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    And I write to "metadata.rb" with:
+      """
+      depends 'fake', '1.0.0'
+      depends 'bacon', '0.2.0'
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Using bacon (0.2.0)
+      """