berkshelf 3.0.0.beta3 → 3.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f30b6f5921539453a2eb582dcf8b483bf6f33e1
-  data.tar.gz: d47613f9a3940b7b8e0fa157f7e8e5643f468288
+  metadata.gz: 5f5088e43f8c5365f1e59d658fd1756124755b65
+  data.tar.gz: a69deb7ea7f326a6811000b60fe773ff8012766c
 SHA512:
-  metadata.gz: 32ec7a95765d2b8d81792e71f6834736e12dd738ef0a5a4764c1fa5ae7dee346d581105349303efca4d4265e6df6f369832d5906d32453a7c24ba67f96bc90cf
-  data.tar.gz: 8b64c19ac6c62a77bbed0fea4aacca7fab0fc6f20442ba34c2b726917e48d5cad4bad7a9f1689568fbc83a009670e8a7e5113140eb3b1d155cf2c0c00e7d020b
+  metadata.gz: 29b808bebf200fd436c4f49c4207396bcf9210d2c2f9fb53d935cf1d552385f45fb423f5d077c7b4f0d4d6e85c2f2a0bb007becbf0d9780dff1df875ba371961
+  data.tar.gz: 9bf52b249305d61aa2b6aef4a73a1ec06a661219635989bf9c29d4979ff13ed69e6ea9e4cbecc7d9427918c00dbeebd8873f1e8e7f31601db8dde38bfb4d5bc7

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.0.0-p353

data/.travis.yml

@@ -12,6 +12,7 @@ bundler_args: --without guard
 before_install:
   - sudo apt-get install -qq libarchive12 libarchive-dev
 before_script:
+  - echo "StrictHostKeyChecking no" > ~/.ssh/config
   - git config --global user.email "ci@berkshelf.com"
   - git config --global user.name "Berkshelf"
 script: bundle exec thor spec:ci

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # 3.0.0
 
-* New "universe" resolver which communicates with an API server to resolve constraint graphs faster and more reliably
+* Enhancements
+  * New "universe" resolver which communicates with an API server to resolve constraint graphs faster and more reliably
+
+* Bug Fixes
+  * Raw metadata will be compiled into metadata.json during vendor process
 
 # 2.0.10
 
@@ -10,6 +14,12 @@
 
 * Update required version of Ridley
 
+# 2.0.8
+
+* Account for API changes to solve
+* Rescue exceptions when parsing the lockfile
+* Fix deprecation errors
+
 # 2.0.7
 
 * Fix crash when parsing a lockfile that contains path locations which no longer exist
@@ -98,7 +108,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/berkshelf/vagrant-berkshelf)
 - Added -d flag to output debug information in berks command
 - Various bug fixes in uploading cookbooks
 

data/CONTRIBUTING.md

@@ -1,53 +1,53 @@
-# Contributing
-
-## Developing
-
-If you'd like to submit a patch:
-
-1. Fork the project.
-2. Make your feature addition or bug fix.
-3. Add [tests](#testing) for it. This is important so that it isn't broken in a
-   future version unintentionally.
-4. Commit. **Do not touch any unrelated code, such as the gemspec or version.**
-   If you must change unrelated code, do it in a commit by itself, so that it
-   can be ignored.
-5. Send a pull request.
-
-## Testing
-
-### Install prerequisites
-
-Install git and mercurial on your test system. (http://mercurial.selenic.com/wiki/Download)
-
-Install the latest version of [Bundler](http://gembundler.com)
-
-    $ gem install bundler
-
-Clone the project
-
-    $ git clone git://github.com/RiotGames/berkshelf.git
-
-and run:
-
-    $ cd berkshelf
-    $ bundle install
-
-Bundler will install all gems and their dependencies required for testing and developing.
-
-### 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:
-
-    $ bundle exec guard start
-
-See [here](https://github.com/tdegrunt/vagrant-chef-server-bootstrap) for a
-quick way to get a testing chef server up.
-
-### Debugging Issues
-By default, Berkshelf will only give you the top-level output from a failed command. If you're working deep inside the core, an error like:
-
-    Berkshelf Error: wrong number of arguments (2 for 1)
-
-isn't exactly helpful...
-
-Specify the `BERKSHELF_DEBUG` flag when running your command to see a full stack trace and other helpful debugging information.
+# Contributing
+
+## Developing
+
+If you'd like to submit a patch:
+
+1. Fork the project.
+2. Make your feature addition or bug fix.
+3. Add [tests](#testing) for it. This is important so that it isn't broken in a
+   future version unintentionally.
+4. Commit. **Do not touch any unrelated code, such as the gemspec or version.**
+   If you must change unrelated code, do it in a commit by itself, so that it
+   can be ignored.
+5. Send a pull request.
+
+## Testing
+
+### Install prerequisites
+
+Install git and mercurial on your test system. (http://mercurial.selenic.com/wiki/Download)
+
+Install the latest version of [Bundler](http://gembundler.com)
+
+    $ gem install bundler
+
+Clone the project
+
+    $ git clone git://github.com/berkshelf/berkshelf.git
+
+and run:
+
+    $ cd berkshelf
+    $ bundle install
+
+Bundler will install all gems and their dependencies required for testing and developing.
+
+### 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:
+
+    $ bundle exec guard start
+
+See [here](https://github.com/tdegrunt/vagrant-chef-server-bootstrap) for a
+quick way to get a testing chef server up.
+
+### Debugging Issues
+By default, Berkshelf will only give you the top-level output from a failed command. If you're working deep inside the core, an error like:
+
+    Berkshelf Error: wrong number of arguments (2 for 1)
+
+isn't exactly helpful...
+
+Specify the `BERKSHELF_DEBUG` flag when running your command to see a full stack trace and other helpful debugging information.

data/Gemfile

@@ -32,5 +32,5 @@ group :guard do
 end
 
 group :test do
-  gem 'berkshelf-api', github: "RiotGames/berkshelf-api"
+  gem 'berkshelf-api', github: "berkshelf/berkshelf-api"
 end

data/Guardfile

@@ -4,19 +4,25 @@ guard 'spork' do
   watch(%r{^features/support/}) { :cucumber }
 end
 
-guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
-  watch(%r{app/.+\.rb})
-  watch(%r{lib/.+\.rb})
-  watch(%r{ext/.+\.c})
+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
 
-guard 'rspec', cli: '--color --drb --format Fuubar', all_on_start: false, all_after_pass: false do
+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
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')       { 'spec' }
 end
 
-guard 'cucumber', cli: '--drb --format pretty --tags ~@no_run --tags ~@wip', all_on_start: false, all_after_pass: false do
+cucumber_cli = '--drb --format pretty --tags ~@no_run --tags ~@wip'
+cucumber_cli += ' --tags ~@spawn --tags ~@api_server' if RUBY_PLATFORM =~ /mswin|mingw|windows/
+guard 'cucumber', cli: cucumber_cli, all_on_start: false, all_after_pass: false do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})                      { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/PLUGINS.md

@@ -8,7 +8,7 @@ This is a list of community-contributed plugins for Berkshelf. A few notes:
 Plugins
 -------
 - [berkshelf-shims](https://github.com/JeffBellegarde/berkshelf-shims) - Provide shims functionality for Berkshelf.
-- [vagrant-berkshelf](https://github.com/RiotGames/vagrant-berkshelf) - A Vagrant plugin to add Berkshelf integration to the Chef provisioners.
+- [vagrant-berkshelf](https://github.com/berkshelf/vagrant-berkshelf) - A Vagrant plugin to add Berkshelf integration to the Chef provisioners.
 
 I want to add my plugin!
 ------------------------
@@ -21,4 +21,4 @@ I want to add my plugin!
 
   For example:
 
-  [berkshelf-myface](https://github.com/RiotGames/berkshelf-myface) - A plugin to add myface support to Berkshelf.
+  [berkshelf-myface](https://github.com/berkshelf/berkshelf-myface) - A plugin to add myface support to Berkshelf.

data/README.md

@@ -1,9 +1,7 @@
 Berkshelf
 =========
 [![Gem Version](https://badge.fury.io/rb/berkshelf.png)](http://badge.fury.io/rb/berkshelf)
-[![Build Status](https://travis-ci.org/RiotGames/berkshelf.png?branch=master)](https://travis-ci.org/RiotGames/berkshelf)
-[![Dependency Status](https://gemnasium.com/RiotGames/berkshelf.png)](https://gemnasium.com/RiotGames/berkshelf)
-[![Code Climate](https://codeclimate.com/github/RiotGames/berkshelf.png)](https://codeclimate.com/github/RiotGames/berkshelf)
+[![Build Status](https://travis-ci.org/berkshelf/berkshelf.png?branch=master)](https://travis-ci.org/berkshelf/berkshelf)
 
 Manage a Cookbook or an Application's Cookbook dependencies
 
@@ -33,13 +31,13 @@ Ruby 1.9.1 and 1.9.2 are not officially supported. If you encounter problems, pl
 
 Bash Completion
 ---------------
-There is a [berkshelf bash completion script](https://raw.github.com/RiotGames/berkshelf/master/berkshelf-complete.sh). If you're using homebrew, you can install it like this:
+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 && wget https://raw.github.com/RiotGames/berkshelf/master/berkshelf-complete.sh
+    cd `brew --prefix`/etc/bash_completion.d && wget https://raw.github.com/berkshelf/berkshelf/master/berkshelf-complete.sh
 
 And make sure you have this in your bash/zsh profile:
 
@@ -47,7 +45,7 @@ And make sure you have this in your bash/zsh profile:
 
 Plugins
 -------
-Please see [Plugins page](https://github.com/RiotGames/berkshelf/blob/master/PLUGINS.md) for more information.
+Please see [Plugins page](https://github.com/berkshelf/berkshelf/blob/master/PLUGINS.md) for more information.
 
 Configuration
 -------------
@@ -61,9 +59,7 @@ $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
+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.
 
 SSL Errors
 ----------
@@ -89,6 +85,6 @@ Authors
 - Justin Campbell (<justin@justincampbell.me>)
 - Seth Vargo (<sethvargo@gmail.com>)
 
-Thank you to all of our [Contributors](https://github.com/RiotGames/berkshelf/graphs/contributors), testers, and users.
+Thank you to all of our [Contributors](https://github.com/berkshelf/berkshelf/graphs/contributors), testers, and users.
 
-If you'd like to contribute, please see our [contribution guidelines](https://github.com/RiotGames/berkshelf/blob/master/CONTRIBUTING.md) first.
+If you'd like to contribute, please see our [contribution guidelines](https://github.com/berkshelf/berkshelf/blob/master/CONTRIBUTING.md) first.

data/berkshelf.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   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.6'
+  s.add_dependency 'ridley',            '~> 2.3'
   s.add_dependency 'solve',             '>= 0.8.0'
   s.add_dependency 'thor',              '~> 0.18.0'
 

data/features/commands/apply.feature

@@ -1,3 +1,4 @@
+@api_server
 Feature: berks apply
   Scenario: Locking a cookbook version with dependencies
     Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
@@ -9,10 +10,11 @@ Feature: berks apply
       """
       cookbook 'fake', '1.0.0'
       """
-    When I successfully run `berks apply my_env`
+    When I successfully run `berks install`
+    And 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 |
+      | fake       | = 1.0.0 |
+      | dependency | = 2.0.0 |
 
 
   Scenario: Locking cookbook versions to a non-existent Chef Environment
@@ -23,9 +25,18 @@ Feature: berks apply
       """
       cookbook 'fake', '1.0.0'
       """
-    When I run `berks apply my_env`
+    When I successfully run `berks install`
+    And 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"
+
+  Scenario: Locking an environment when no lockfile is present
+    When I run `berks apply my_env`
+    Then the output should contain:
+      """
+      No lockfile found at Berksfile.lock
+      """
+    And the exit status should be "LockfileNotFound"

data/features/commands/cookbook.feature

@@ -13,7 +13,7 @@ Feature: berks cookbook
     | chef-minitest     | Chef-Minitest   |
     | scmversion        | SCMVersion      |
     | no-bundler        | no Bundler      |
-    # Disable testing of skip git until Test Kitchen supports the skip_git flag in it's generator
+    # Disable testing of skip git until Test Kitchen supports the skip_git flag in its generator
     # https://github.com/opscode/test-kitchen/issues/141
     # | skip-git          | no Git          |
     | skip-vagrant      | no Vagrant      |

data/features/commands/install.feature

@@ -59,8 +59,8 @@ Feature: berks install
     When I successfully run `berks install`
     Then the output should contain:
       """
-      Installing ruby (1.0.0)
-      Installing elixir (1.0.0)
+      Installing ruby (1.0.0) from http://localhost:26310/ (via 0.0.0.0)
+      Installing elixir (1.0.0) from http://localhost:26310/ (via 0.0.0.0)
       """
     And the cookbook store should have the cookbooks:
       | ruby   | 1.0.0 |
@@ -205,9 +205,9 @@ Feature: berks install
       | berkshelf-cookbook-fixture | 1.0.0 | 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a |
     And the output should contain:
       """
-      Fetching 'berkshelf-cookbook-fixture' from github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'rel' over protocol: 'git'
+      Fetching 'berkshelf-cookbook-fixture' from github: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'rel'
       building universe...
-      Using berkshelf-cookbook-fixture (1.0.0) github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'rel' over protocol: 'git'
+      Using berkshelf-cookbook-fixture (1.0.0) github: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'rel' at ref: '93f5768b7d14df45e10d16c8bf6fe98ba3ff809a'
       """
 
 
@@ -227,6 +227,37 @@ Feature: berks install
       """
 
 
+  Scenario: installing a Berksfile that contains a Git location with a ref
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git", ref: "70a527e17d91f01f031204562460ad1c17f972ee"
+      """
+    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 git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with ref: '70a527e17d91f01f031204562460ad1c17f972ee'
+      building universe...
+      Using berkshelf-cookbook-fixture (0.2.0) git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with ref: '70a527e17d91f01f031204562460ad1c17f972ee'
+      """
+
+
+  Scenario: installing a Berksfile that contains a Git location with an abbreviated ref
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git", ref: "70a527"
+      """
+    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 git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with ref: '70a527'
+      building universe...
+      Using berkshelf-cookbook-fixture (0.2.0) git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with ref: '70a527' at ref: '70a527e17d91f01f031204562460ad1c17f972ee'
+      """
+
   Scenario: installing a Berksfile that contains a GitHub location
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -237,31 +268,70 @@ Feature: berks install
       | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
     And the output should contain:
       """
-      Fetching 'berkshelf-cookbook-fixture' from github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'v0.2.0' over protocol: 'git'
+      Fetching 'berkshelf-cookbook-fixture' from github: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v0.2.0'
       building universe...
-      Using berkshelf-cookbook-fixture (0.2.0) github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'v0.2.0' over protocol: 'git'
+      Using berkshelf-cookbook-fixture (0.2.0) github: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v0.2.0' at ref: '70a527e17d91f01f031204562460ad1c17f972ee'
       """
 
 
-  Scenario Outline: installing a Berksfile that contains a Github location and specific protocol
+  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", tag: "v1.0.0", protocol: "<protocol>"
+      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
+    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"
+      """
+    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 github: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v0.2.0'
+      building universe...
+      Using berkshelf-cookbook-fixture (0.2.0) github: '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 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 | 1.0.0 | b4f968c9001ad8de30f564a2107fab9cfa91f771 |
+      | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
     And the output should contain:
       """
-      Fetching 'berkshelf-cookbook-fixture' from github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'v1.0.0' over protocol: '<protocol>'
+      Fetching 'berkshelf-cookbook-fixture' from github: 'https://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v0.2.0'
       building universe...
-      Using berkshelf-cookbook-fixture (1.0.0) github: 'RiotGames/berkshelf-cookbook-fixture' with branch: 'v1.0.0' over protocol: '<protocol>'
+      Using berkshelf-cookbook-fixture (0.2.0) github: 'https://github.com/RiotGames/berkshelf-cookbook-fixture.git' with branch: 'v0.2.0' at ref: '70a527e17d91f01f031204562460ad1c17f972ee'
       """
 
-    Examples:
-      | protocol |
-      | git      |
-      | https    |
+
+  # 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