berkshelf 3.0.0.beta7 → 3.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 093e4db16726fd19aa0f3851481f7f4223e8ddc5
-  data.tar.gz: 66efef230a148c0ac4a68db77a16722cce697b4c
+  metadata.gz: 34864a59cc163f2f46a8f0ff67ea71d60d013066
+  data.tar.gz: f9a55cfc84edeaf87736756035490331c6d22b1b
 SHA512:
-  metadata.gz: 7604553987f1fd224a37128cf05d189873f96bcc4d96f1c4cee0e2ee9a45beeb5eefe8095012adfb1696c429e559fd16a58946ed8232f5310a9da428f414f447
-  data.tar.gz: 62e0a0d8b2df6393da22d846e857389b1b4e003dcb1f1d60c84d1011e878bd8732277e1ba715f09f694c64e2380d95975f25265daf1edbe05ea0d26d8af70f2e
+  metadata.gz: 905e8267b648a21fb101f48a948660a8297763257c785177553720df1e02af1611d549d5cf0b3a73c66386baeb6101c0dd7e585296283762ddf2c1747b37c58e
+  data.tar.gz: 7af8c5176a2dc388730f0ce8b6c99d53fced510224fcd370b21aea9e58715cd8bd09bc0539ee87769aba095eaaf8d455bb5b77d620393442a42e1bc58b4f35ab

data/.gitignore

@@ -25,3 +25,4 @@ rerun.txt
 .rspec
 .kitchen
 vendor/ruby
+.ruby-version

data/.travis.yml

@@ -8,7 +8,10 @@ notifications:
       - "irc.freenode.org#berkshelf"
     skip_join: true
     use_notice: true
-bundler_args: --without guard
+branches:
+  only:
+    - master
+bundler_args: --without guard --jobs 7
 before_install:
   - sudo apt-get install -qq libarchive12 libarchive-dev
 before_script:

data/CONTRIBUTING.md

@@ -17,7 +17,7 @@ If you'd like to submit a patch:
 
 ### Install prerequisites
 
-Install git and mercurial on your test system. (http://mercurial.selenic.com/wiki/Download)
+Install git on your test system.
 
 Install the latest version of [Bundler](http://gembundler.com)
 

data/Gemfile

@@ -8,7 +8,6 @@ group :guard do
   gem 'guard-cucumber'
   gem 'guard-rspec'
   gem 'guard-spork'
-  gem 'guard-yard'
 
   require 'rbconfig'
 

data/Guardfile

@@ -4,14 +4,6 @@ guard 'spork' do
   watch(%r{^features/support/}) { :cucumber }
 end
 
-unless RUBY_PLATFORM =~ /mswin|mingw|windows/
-  guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
-    watch(%r{app/.+\.rb})
-    watch(%r{lib/.+\.rb})
-    watch(%r{ext/.+\.c})
-  end
-end
-
 rspec_cli = '--color --drb --format Fuubar'
 rspec_cli += ' --tag ~@api_client --tag ~@not_supported_on_windows' if RUBY_PLATFORM =~ /mswin|mingw|windows/
 guard 'rspec', cli: rspec_cli, all_on_start: false, all_after_pass: false do

data/README.md

@@ -32,19 +32,10 @@ Ruby 1.9 mode is required on all interpreters.
 
 Ruby 1.9.1 and 1.9.2 are not officially supported. If you encounter problems, please upgrade to Ruby 2.0 or 1.9.3.
 
-Bash Completion
----------------
-There is a [berkshelf bash completion script](https://raw.github.com/berkshelf/berkshelf/master/berkshelf-complete.sh). If you're using homebrew, you can install it like this:
-
-    brew install bash-completion # if you haven't already
-
-Download the latest script
-
-    (cd `brew --prefix`/etc/bash_completion.d && curl https://raw.github.com/berkshelf/berkshelf/master/berkshelf-complete.sh > berkshelf-complete.sh)
-
-And make sure you have this in your bash/zsh profile:
-
-    [ -f `brew --prefix`/etc/bash_completion ] && source `brew --prefix`/etc/bash_completion
+Shell Completion
+----------------
+- [Bash](https://github.com/berkshelf/berkshelf-bash-plugin)
+- [ZSH](https://github.com/berkshelf/berkshelf-zsh-plugin)
 
 Plugins
 -------
@@ -64,6 +55,35 @@ $PWD/config.json
 
 You are encouraged to keep project-specific configuration in the `$PWD/.berkshelf` directory. A default configuration file is generated for you, but you can update the values to suit your needs.
 
+Github Cookbooks
+----------------
+With Berkshelf 3 you can query a Berkshelf-API server (a server which indexes cookbooks from various sources and
+hosts it over a REST API) in order to resolve the cookbook dependencies. When you choose to host your own Berkshelf-API
+server, you can configure it to also index cookbooks hosted in various Github and/or Github Enterprise organizations.
+
+When doing so you should also configure Berkshelf so it can download cookbooks from your indexed Github organizations:
+
+```
+{
+  "github":[
+    {
+      "access_token": ""
+    },
+    {
+      "access_token": "",
+      "api_endpoint": "https://github.enterprise.local/api/v3",
+      "web_endpoint": "https://github.enterprise.local",
+      "ssl_verify": true
+    }
+  ]
+}
+```
+
+The first subsection is used for any organization hosted on github.com. As this is the default, you do not have to set the
+endpoint info (these are known values for github.com). The second subsection is used when you also index cookbooks from
+organizations hosted on Github Enterprise. In this case you will need to specify the specific endpoint info so Berkshelf
+knows where to connect to. You can add as many subsections as you have endpoints.
+
 SSL Errors
 ----------
 

data/berkshelf.gemspec

@@ -31,14 +31,14 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.8.0'
 
   s.add_dependency 'addressable',          '~> 2.3.4'
-  s.add_dependency 'berkshelf-api-client', '~> 1.1'
+  s.add_dependency 'berkshelf-api-client', '~> 1.2.0.rc2'
   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 'faraday',              '~> 0.8.5'
+  s.add_dependency 'faraday',              '~> 0.9.0'
   s.add_dependency 'minitar',              '~> 0.5.4'
   s.add_dependency 'retryable',            '~> 1.3.3'
-  s.add_dependency 'ridley',               '~> 2.3'
+  s.add_dependency 'ridley',               '~> 3.0.0.rc1'
   s.add_dependency 'solve',                '>= 0.8.0'
   s.add_dependency 'thor',                 '~> 0.18.0'
   s.add_dependency 'octokit',              '~> 2.6'

data/features/commands/install.feature

@@ -66,12 +66,14 @@ Feature: berks install
   Scenario: installing a demand that has already been installed
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      cookbook 'berkshelf-cookbook-fixture', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'deps'
+      cookbook 'berkshelf-cookbook-fixture',
+        github: 'RiotGames/berkshelf-cookbook-fixture',
+        branch: 'deps'
       """
     And the cookbook store contains a cookbook "berkshelf" "1.0.0" with dependencies:
-      | hostsfile    | = 1.0.1 |
+      | hostsfile | = 1.0.1 |
     And the cookbook store has the cookbooks:
-      | hostsfile    | 1.0.1 |
+      | hostsfile | 1.0.1 |
     And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
@@ -170,7 +172,6 @@ Feature: berks install
 
   Scenario: installing a demand from a path location locks the graph to that version
     Given the Chef Server has cookbooks:
-      # | example_cookbook | 1.0.0 |                           |
       | other_cookbook   | 1.0.0 | example_cookbook ~> 1.0.0 |
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -226,7 +227,10 @@ Feature: berks install
   Scenario: installing a Berksfile that contains a Git location with a rel
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      cookbook "berkshelf-cookbook-fixture", github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'rel', rel: 'cookbooks/berkshelf-cookbook-fixture'
+      cookbook 'berkshelf-cookbook-fixture',
+        github: 'RiotGames/berkshelf-cookbook-fixture',
+        branch: 'rel',
+        rel:    'cookbooks/berkshelf-cookbook-fixture'
       """
     When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
@@ -298,22 +302,10 @@ Feature: berks install
       Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
       """
 
-  Scenario: installing a Berksfile that contains a GitHub location ending in .git
-    Given I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture.git", tag: "v0.2.0"
-      """
-    When I run `berks install`
-    Then the output should contain:
-      """
-      'RiotGames/berkshelf-cookbook-fixture.git' is not a valid GitHub identifier - should not end in '.git'
-      """
-    And the exit status should be "InvalidGitHubIdentifier"
-
-  Scenario: installing a Berksfile that contains a Github location and protocol git
+  Scenario: installing a Berksfile that contains a GitHub location
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0", protocol: "git"
+      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:
@@ -325,47 +317,6 @@ Feature: berks install
       Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
       """
 
-  Scenario: installing a Berksfile that contains a Github location and protocol https
-    Given I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0", protocol: "https"
-      """
-    When I successfully run `berks install`
-    Then the cookbook store should have the git cookbooks:
-      | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
-    And the output should contain:
-      """
-      Fetching 'berkshelf-cookbook-fixture' from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
-      Fetching cookbook index from http://0.0.0.0:26210...
-      Using berkshelf-cookbook-fixture (0.2.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
-      """
-
-  # GitHub doesn't permit anonymous SSH access, so we are going to get a
-  # failure message back. That's okay, if GitHub tells us our key was denied,
-  # we know the connection has made it that far.
-  Scenario: installing a Berksfile that contains a Github location and protocol ssh
-    Given I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0", protocol: "ssh"
-      """
-    When I run `berks install`
-    Then the output should contain:
-      """
-      Permission denied (publickey).
-      """
-
-  Scenario: installing a Berksfile that contains a Github location and an unsupported protocol
-    Given I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      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:
-      """
-      'somethingabsurd' is not supported for the 'github' location key - please use 'git' instead
-      """
-    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 I cd to "sparkle_motion"
@@ -438,18 +389,6 @@ Feature: berks install
       """
     And the exit status should be "NoSolutionError"
 
-  Scenario: installing a Berksfile that has a Git location source with an invalid Git URI
-    Given I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook 'nginx', git: '/something/on/disk'
-      """
-    When I run `berks install`
-    Then the output should contain:
-      """
-      '/something/on/disk' is not a valid Git URI
-      """
-    And the exit status should be "InvalidGitURI"
-
   Scenario: installing when there are sources with duplicate names defined in the same group
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -459,7 +398,7 @@ Feature: berks install
     When I run `berks install`
     Then the output should contain:
       """
-      Berksfile contains multiple entries named 'berkshelf-cookbook-fixture'. Use only one, or put them in different groups.
+      Your Berksfile contains multiple entries named 'berkshelf-cookbook-fixture'. Please remove duplicate dependencies, or put them in different groups.
       """
     And the exit status should be "DuplicateDependencyDefined"
 
@@ -491,18 +430,6 @@ Feature: berks install
       Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v1.0.0)
       """
 
-  Scenario: with a cookbook definition containing an invalid option
-    Given I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook "berkshelf-cookbook-fixture", whatisthis: "I don't even know", anotherwat: "isthat"
-      """
-    When I run `berks install`
-    Then the output should contain:
-      """
-      Invalid options for dependency: 'whatisthis', 'anotherwat'.
-      """
-    And the exit status should be "InternalError"
-
   Scenario: with a git error during download
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -512,10 +439,9 @@ Feature: berks install
     When I run `berks install`
     Then the output should contain:
       """
-      Fetching 'doesntexist' from git://github.com/asdjhfkljashflkjashfakljsf (at master)
-      An error occurred during Git execution:
+      Repository not found.
       """
-      And the exit status should be "GitError"
+      And the exit status should be "GitLocation::GitError"
 
   Scenario: transitive dependencies in metadata
     Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
@@ -526,6 +452,7 @@ Feature: berks install
       """
     And I write to "metadata.rb" with:
       """
+      name "myface"
       depends 'fake', '1.0.0'
       depends 'bacon', '0.2.0'
       """
@@ -555,6 +482,7 @@ Feature: berks install
       """
     And I write to "metadata.rb" with:
       """
+      name "myface"
       depends 'fake', '1.0.0'
       depends 'bacon', '0.2.0'
       """

data/features/commands/search.feature

@@ -0,0 +1,15 @@
+Feature: berks search
+  Scenario: Searching for a cookbook by name
+    * I successfully run `berks search berkshelf-cookbook-fixture`
+    * the output should contain:
+      """
+      berkshelf-cookbook-fixture (1.0.0)
+      """
+
+  Scenario: Searching for a cookbook by partial name
+    * I successfully run `berks search berkshelf-`
+    * the output should contain:
+      """
+      berkshelf-api (1.0.0)
+      berkshelf-cookbook-fixture (1.0.0)
+      """

data/features/commands/shelf/show.feature

@@ -3,7 +3,7 @@ Feature: berks shelf show
     When I run `berks shelf show fake`
     Then the output should contain:
       """
-      Cookbook 'fake' is not in the Berkshelf shelf
+      Cookbook 'fake' not found in the Berkshelf shelf!
       """
     And the exit status should be "CookbookNotFound"
 
@@ -54,7 +54,7 @@ Feature: berks shelf show
     When I run `berks shelf show fake --version 1.2.3`
     Then the output should contain:
       """
-      Cookbook 'fake' (1.2.3) is not in the Berkshelf shelf
+      Cookbook 'fake' (1.2.3) not found in the Berkshelf shelf!
       """
     And the exit status should be "CookbookNotFound"
 

data/features/commands/shelf/uninstall.feature

@@ -3,7 +3,7 @@ Feature: berks shelf uninstall
     When I run `berks shelf uninstall fake`
     Then the output should contain:
       """
-      Cookbook 'fake' is not in the Berkshelf shelf
+      Cookbook 'fake' not found in the Berkshelf shelf!
       """
     And the exit status should be "CookbookNotFound"
 

data/features/commands/show.feature

@@ -61,7 +61,7 @@ Feature: berks show
     When I run `berks show fake`
     Then the output should contain:
       """
-      Could not find cookbook 'fake'. Make sure it is in your Berksfile, then run `berks install` to download and install the missing dependencies.
+      Dependency 'fake' was not found. Please make sure it is in your Berksfile, and then run `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "DependencyNotFound"
 
@@ -73,7 +73,7 @@ Feature: berks show
     When I run `berks show fake`
     Then the output should contain:
       """
-      Could not find cookbook 'fake'. Make sure it is in your Berksfile, then run `berks install` to download and install the missing dependencies.
+      Dependency 'fake' was not found. Please make sure it is in your Berksfile, and then run `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "DependencyNotFound"
 
@@ -94,6 +94,6 @@ Feature: berks show
     When I run `berks show fake`
     Then the output should contain:
       """
-      Could not find cookbook 'fake (1.0.0)'. Run `berks install` to download and install the missing cookbook.
+      Cookbook 'fake' (1.0.0) not found in the cookbook store!
       """
     And the exit status should be "CookbookNotFound"

data/features/commands/update.feature

@@ -64,11 +64,39 @@ Feature: berks update
         fake (0.2.0)
       """
 
+  Scenario: With a git location
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        berkshelf-cookbook-fixture
+          git: git://github.com/RiotGames/berkshelf-cookbook-fixture
+          revision: 70a527e17d91f01f031204562460ad1c17f972ee
+
+      GRAPH
+        berkshelf-cookbook-fixture (0.2.0)
+      """
+    And I successfully run `berks install`
+    When I successfully run `berks update`
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        berkshelf-cookbook-fixture
+          git: git://github.com/RiotGames/berkshelf-cookbook-fixture
+          revision: a97b9447cbd41a5fe58eee2026e48ccb503bd3bc
+
+      GRAPH
+        berkshelf-cookbook-fixture (1.0.0)
+      """
+
   Scenario: With a cookbook that does not exist
     Given I have a Berksfile pointing at the local Berkshelf API
     When I run `berks update not_real`
     Then the output should contain:
       """
-      Could not find cookbook 'not_real'. Make sure it is in your Berksfile, then run `berks install` to download and install the missing dependencies.
+      Dependency 'not_real' was not found. Please make sure it is in your Berksfile, and then run `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "DependencyNotFound"

data/features/commands/upload.feature

@@ -1,6 +1,5 @@
 Feature: berks upload
   Background:
-    * the Berkshelf API server's cache is empty
     * the Chef Server is empty
     * the cookbook store has the cookbooks:
       | fake | 1.0.0 |
@@ -13,6 +12,16 @@ Feature: berks upload
       cookbook 'fake', '1.0.0'
       cookbook 'ekaf', '2.0.0'
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+        ekaf (= 2.0.0)
+
+      GRAPH
+        fake (1.0.0)
+        ekaf (2.0.0)
+      """
     When I successfully run `berks upload`
     Then the Chef Server should have the cookbooks:
       | fake | 1.0.0 |
@@ -24,6 +33,15 @@ Feature: berks upload
       """
       cookbook 'fake', path: './fake'
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake
+          path: ./fake
+
+      GRAPH
+        fake (0.0.0)
+      """
     When I successfully run `berks upload`
     Then the Chef Server should have the cookbooks:
       | fake | 0.0.0 |
@@ -33,10 +51,23 @@ Feature: berks upload
       | fake | = 1.0.0 |
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      cookbook 'fake', '1.0.0'
-      cookbook 'ekaf', '2.0.0'
+      cookbook 'fake',  '1.0.0'
+      cookbook 'ekaf',  '2.0.0'
       cookbook 'reset', '3.4.5'
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf (= 2.0.0)
+        fake (= 1.0.0)
+        reset (= 3.4.5)
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+        reset (3.4.5)
+          fake (= 1.0.0)
+      """
     When I successfully run `berks upload reset`
     Then the Chef Server should have the cookbooks:
       | reset | 3.4.5 |
@@ -46,10 +77,18 @@ Feature: berks upload
 
   Scenario: specifying a dependency not defined in the Berksfile
     Given I have a Berksfile pointing at the local Berkshelf API
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
     When I run `berks upload reset`
     Then the output should contain:
       """
-      Could not find cookbook 'reset'. Make sure it is in your Berksfile, then run `berks install` to download and install the missing dependencies.
+      Dependency 'reset' was not found. Please make sure it is in your Berksfile, and then run `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "DependencyNotFound"
 
@@ -60,6 +99,18 @@ Feature: berks upload
       cookbook 'ekaf', '2.0.0'
       cookbook 'oops', '3.0.0'
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf (= 2.0.0)
+        fake (= 1.0.0)
+        oops (= 3.0.0)
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+        oops (3.0.0)
+      """
     When I successfully run `berks upload fake ekaf`
     Then the Chef Server should have the cookbooks:
       | fake |
@@ -67,12 +118,50 @@ Feature: berks upload
     And the Chef Server should not have the cookbooks:
       | oops |
 
+  Scenario: uploading a filter does not change the lockfile
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', group: :take_me
+      cookbook 'ekaf', group: :not_me
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf
+        fake
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+      """
+    When I run `berks upload --only take_me`
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        ekaf
+        fake
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+      """
+
   Scenario: uploading a single groups of demands with the --only flag
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'fake', group: :take_me
       cookbook 'ekaf', group: :not_me
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf
+        fake
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+      """
     When I successfully run `berks upload --only take_me`
     Then the Chef Server should have the cookbooks:
       | fake | 1.0.0 |
@@ -85,6 +174,16 @@ Feature: berks upload
       cookbook 'fake', group: :take_me
       cookbook 'ekaf', group: :not_me
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf
+        fake
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+      """
     When I successfully run `berks upload --only take_me not_me`
     And the Chef Server should have the cookbooks:
       | fake | 1.0.0 |
@@ -96,6 +195,16 @@ Feature: berks upload
       cookbook 'fake', group: :take_me
       cookbook 'ekaf', group: :not_me
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf
+        fake
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+      """
     When I successfully run `berks upload --except not_me`
     And the Chef Server should have the cookbooks:
       | fake | 1.0.0 |
@@ -108,6 +217,16 @@ Feature: berks upload
       cookbook 'fake', group: :take_me
       cookbook 'ekaf', group: :not_me
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf
+        fake
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+      """
     When I successfully run `berks upload --except take_me not_me`
     And the Chef Server should not have the cookbooks:
       | fake | 1.0.0 |
@@ -119,6 +238,15 @@ Feature: berks upload
       """
       cookbook 'cookbook with spaces', path: './cookbook with spaces'
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        cookbook with spaces
+          path: ./cookbook with spaces
+
+      GRAPH
+        cookbook with spaces (0.0.0)
+      """
     When I run `berks upload`
     Then the output should contain:
       """
@@ -140,6 +268,16 @@ Feature: berks upload
       """
       metadata
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (0.0.0)
+      """
     When I successfully run `berks upload fake`
     Then the output should contain:
       """
@@ -153,6 +291,14 @@ Feature: berks upload
       """
       cookbook 'fake', '1.0.0'
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
     When I successfully run `berks upload`
     Then the output should contain:
       """
@@ -169,12 +315,21 @@ Feature: berks upload
     Given a cookbook named "fake"
     And the cookbook "fake" has the file "Berksfile" with:
       """
-      source 'https://api.berkshelf.com'
       metadata
       """
-    And the Chef Server has frozen cookbooks:
-      | fake  | 0.0.0 |
     And I cd to "fake"
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (0.0.0)
+      """
+    And the Chef Server has frozen cookbooks:
+      | fake | 0.0.0 |
     When I successfully run `berks upload`
     Then the output should contain:
       """
@@ -205,6 +360,16 @@ Feature: berks upload
       source 'https://api.berkshelf.com'
       metadata
       """
+    And the cookbook "fake" has the file "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (0.0.0)
+      """
     And I cd to "fake"
     When I successfully run `berks upload --skip-syntax-check`
     Then the Chef Server should have the cookbooks: