berkshelf 3.0.0.beta9 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a93a58092d85d92072229df17a0ac18f86be4c61
-  data.tar.gz: 2d5f1a561cc471759fff50cdd1e1838ac3ad6728
+  metadata.gz: 90ffa4862aad42150a8e4a7386f48a3495f0f7ef
+  data.tar.gz: 215b5e4128bc085893ee1740e8d02d73a6fdbd90
 SHA512:
-  metadata.gz: f2a9db9d98a43f866c73d75cb3a74418f96dd4feadfb4d20d57ef47e8f0dd0a50d787a5446e0c66050383918c4acd9781e948c6e5c84c1a5d5cfd79e1219301d
-  data.tar.gz: 78395f776b664f4184f6d9fd91ca564833db46d684571a93734c34516c4d894774ba1320774ad3054757177e9ddc861b7ceba96b244f281c25c8f689bd8b13a4
+  metadata.gz: 5725f1b7ca2b51b17cbfdad97727f06548ae6445b90646f2c85293fcec6f5f160eaf36c0a7ccef26efc6333902e6d3885190a6a1b4033d0c8e87fd7ae8eb4d14
+  data.tar.gz: 814b494a2a9f5c92df52effecc0208938ff6829a22d5c21ee1f6a00526826df3c978f87cf2b9ff2dab9905ae854d438be00b20263c67cd1b011a2b24b31286c0

data/.travis.yml

@@ -9,9 +9,13 @@ notifications:
       - "irc.freenode.org#berkshelf"
     skip_join: true
     use_notice: true
+  webhooks:
+    urls:
+      - "https://webhooks.gitter.im/e/cdd41ff6c4d1f062c2f1"
 branches:
   only:
     - master
+env: USE_SYSTEM_GECODE=1
 bundler_args: --without guard --jobs 7
 before_install:
   - sudo apt-get install -qq libarchive12 libarchive-dev libgecode-dev

data/README.md

@@ -1,5 +1,4 @@
-Berkshelf
-=========
+# Berkshelf
 [![Gem Version](https://img.shields.io/gem/v/berkshelf.svg)][gem]
 [![Build Status](https://img.shields.io/travis/berkshelf/berkshelf.svg)][travis]
 
@@ -8,11 +7,40 @@ Berkshelf
 
 Manage a Cookbook or an Application's Cookbook dependencies
 
-Installation
-------------
+## Installation
 
 **WARNING:** It is advised at this time that you [use Berkshelf 3](https://github.com/berkshelf/berkshelf/wiki/Howto:-Use-the-bleeding-edge). Berkshelf 2 is no longer being actively developed and has a number of significant issues related to dependency resolution that Berkshelf 3 fixes.
 
+### Manually install Gecode (temporary)
+
+The current release candidate of Vagrant Berkshelf requires you to have Gecode installed on your machine. In the future this process will be provided in an easy and automated fashion.
+
+#### OSX
+
+    $ cd $( brew --prefix )
+    $ git checkout 3c5ca25 Library/Formula/gecode.rb
+    $ brew install gecode
+
+#### Debian and Ubuntu
+
+    $ sudo apt-get install libgecode-dev
+
+##### Source
+
+    $ curl -O http://www.gecode.org/download/gecode-3.7.3.tar.gz
+    $ tar zxvf gecode-3.7.3.tar.gz
+    $ ./configure --disable-doc-dot \
+        --disable-doc-search \
+        --disable-doc-tagfile \
+        --disable-doc-chm \
+        --disable-doc-docset \
+        --disable-qt \
+        --disable-examples
+    $ make
+    $ (sudo) make install
+
+### Gem Installation
+
 Add Berkshelf to your repository's `Gemfile`:
 
 ```ruby
@@ -21,90 +49,83 @@ gem 'berkshelf'
 
 Or run it as a standalone:
 
-    gem install berkshelf
+    $ gem install berkshelf
+
+## Usage
 
-Usage
------
 See [berkshelf.com](http://berkshelf.com) for up-to-date usage instructions.
 
-Supported Platforms
--------------------
+## Supported Platforms
+
 Berkshelf is tested on Ruby 1.9.3, 2.0.0, and JRuby 1.6+.
 
 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.
 
-Shell Completion
-----------------
+## Shell Completion
+
 - [Bash](https://github.com/berkshelf/berkshelf-bash-plugin)
 - [ZSH](https://github.com/berkshelf/berkshelf-zsh-plugin)
 
-Plugins
--------
+## Plugins
+
 Please see [Plugins page](https://github.com/berkshelf/berkshelf/blob/master/PLUGINS.md) for more information.
 
-Configuration
--------------
+## 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
-```
+    $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. A default configuration file is generated for you, but you can update the values to suit your needs.
 
-Github Cookbooks
-----------------
+## 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
+      "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
-----------
+## SSL Errors
 
 If you have trouble getting Berkshelf to successfully talk to an SSL Chef Server, you can try making sure you
 have a certificate bundle available to your shell. `export SSL_CERT_FILE=...path/to/cert/file...`
 
 If you need to disable SSL, you can in `~/.berkshelf/config.json` like so:
 
-```
-{
-  "ssl": {
-    "verify": false
-  }
-}
-```
+    {
+      "ssl": {
+        "verify": false
+      }
+    }
+
+## Authors
 
-Authors
--------
 - Jamie Winsor (<jamie@vialstudios.com>)
 - Josiah Kiehl (<jkiehl@riotgames.com>)
 - Michael Ivey (<michael.ivey@riotgames.com>)

data/berkshelf.gemspec

@@ -39,8 +39,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'minitar',              '~> 0.5.4'
   s.add_dependency 'retryable',            '~> 1.3.3'
   s.add_dependency 'ridley',               '~> 3.0'
-  s.add_dependency 'solve',                '~> 1.0.0.rc1'
-  s.add_dependency 'thor',                 '~> 0.18.0'
+  s.add_dependency 'solve',                '~> 1.0.0.rc3'
+  s.add_dependency 'thor',                 '~> 0.18'
   s.add_dependency 'octokit',              '~> 2.6'
 
   s.add_development_dependency 'aruba',         '~> 0.5'
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   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 'test-kitchen',  '~> 1.2'
   s.add_development_dependency 'webmock',       '~> 1.11'
   s.add_development_dependency 'yard',          '~> 0.8'
 end

data/features/commands/update.feature

@@ -64,6 +64,35 @@ Feature: berks update
         fake (0.2.0)
       """
 
+  Scenario: With a transitive dependency specified
+    Given the cookbook store contains a cookbook "seth" "1.0.0" with dependencies:
+      | fake | ~> 0.1 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'seth', '1.0.0'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        seth (= 1.0.0)
+
+      GRAPH
+        fake (0.1.0)
+        seth (1.0.0)
+          fake (~> 0.1)
+      """
+    When I successfully run `berks update fake`
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        seth (= 1.0.0)
+
+      GRAPH
+        fake (0.2.0)
+        seth (1.0.0)
+          fake (~> 0.1)
+      """
+
   Scenario: With a git location
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -93,7 +122,18 @@ Feature: berks update
       """
 
   Scenario: With a cookbook that does not exist
-    Given I have a Berksfile pointing at the local Berkshelf API
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake
+
+      GRAPH
+        fake (0.2.0)
+      """
     When I run `berks update not_real`
     Then the output should contain:
       """

data/features/commands/upload.feature

@@ -71,10 +71,34 @@ Feature: berks upload
     When I successfully run `berks upload reset`
     Then the Chef Server should have the cookbooks:
       | reset | 3.4.5 |
-      | fake  | 1.0.0 |
     And the Chef Server should not have the cookbooks:
+      | fake  | 1.0.0 |
       | ekaf  | 2.0.0 |
 
+  Scenario: specifying a single cookbook that is a transitive dependency
+    Given the cookbook store contains a cookbook "reset" "3.4.5" with dependencies:
+      | fake | 1.0.0 |
+      | ekaf | 2.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'reset', '3.4.5'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        reset (= 3.4.5)
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+        reset (3.4.5)
+          ekaf (= 2.0.0)
+          fake (= 1.0.0)
+      """
+    When I successfully run `berks upload fake`
+    Then the Chef Server should have the cookbooks:
+      | fake  | 1.0.0 |
+
   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:
@@ -232,6 +256,41 @@ Feature: berks upload
       | fake | 1.0.0 |
       | ekaf | 2.0.0 |
 
+  Scenario: specifying cookbooks with transitive dependencies in a group
+    Given the cookbook store contains a cookbook "reset" "3.4.5" with dependencies:
+      | fake | 1.0.0 |
+    And the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
+      | ekaf | 2.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      group :rockstars do
+        cookbook 'reset', '3.4.5'
+      end
+
+      group :losers do
+        cookbook 'seth', '1.0.0'
+      end
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        reset (= 3.4.5)
+
+      GRAPH
+        ekaf (2.0.0)
+        fake (1.0.0)
+          ekaf (= 2.0.0)
+        reset (3.4.5)
+          fake (= 1.0.0)
+      """
+    When I successfully run `berks upload --only rockstars`
+    Then the Chef Server should have the cookbooks:
+      | reset | 3.4.5 |
+      | fake  | 1.0.0 |
+      | ekaf  | 2.0.0 |
+    And the Chef Server should not have the cookbooks:
+      | seth | 1.0.0 |
+
   Scenario: attempting to upload an invalid cookbook
     Given a cookbook named "cookbook with spaces"
     And I have a Berksfile pointing at the local Berkshelf API with:
@@ -281,7 +340,7 @@ Feature: berks upload
     When I successfully run `berks upload fake`
     Then the output should contain:
       """
-      Uploading fake (0.0.0)
+      Uploaded fake (0.0.0)
       """
 
   Scenario: When the cookbook already exist
@@ -304,12 +363,6 @@ Feature: berks upload
       """
       Skipping fake (1.0.0) (frozen)
       """
-    And the output should contain:
-      """
-      Skipped uploading some cookbooks because they already exist on the remote server and are frozen. Re-run with the `--force` flag to force overwrite these cookbooks:
-
-        * fake (1.0.0)
-      """
 
   Scenario: When the cookbook already exist and is a metadata location
     Given a cookbook named "fake"
@@ -334,9 +387,6 @@ Feature: berks upload
     Then the output should contain:
       """
       Skipping fake (0.0.0) (frozen)
-      Skipped uploading some cookbooks because they already exist on the remote server and are frozen. Re-run with the `--force` flag to force overwrite these cookbooks:
-
-        * fake (0.0.0)
       """
 
   Scenario: When the syntax check is skipped

data/features/lifecycle.feature

@@ -209,6 +209,99 @@ Feature: Lifecycle commands
     * the output should not contain "Using ekaf (1.0.0)"
     * the output should contain "Using fake (1.0.0)"
 
+  Scenario: Moving a transitive dependency to a direct dependency
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    * I write to "metadata.rb" with:
+      """
+      name 'transitive'
+      version '1.2.3'
+      depends 'fake', '1.0.0'
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        transitive
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (1.0.0)
+        transitive (1.2.3)
+          fake (= 1.0.0)
+      """
+    * the output should not contain "Using ekaf (1.0.0)"
+    * the output should contain "Using fake (1.0.0)"
+    * I write to "fake/metadata.rb" with:
+      """
+      name 'fake'
+      version '1.0.0'
+      """
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      cookbook 'fake', path: 'fake'
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake
+          path: ./fake
+        transitive
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (1.0.0)
+        transitive (1.2.3)
+          fake (= 1.0.0)
+      """
+
+  Scenario: Moving a transitive dependency to a direct dependency and then removing it
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    * I write to "metadata.rb" with:
+      """
+      name 'transitive'
+      version '1.2.3'
+      depends 'fake'
+      """
+    * I successfully run `berks install`
+    * I write to "fake/metadata.rb" with:
+      """
+      name 'fake'
+      version '1.0.0'
+      """
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      cookbook 'fake', path: 'fake'
+      """
+    * I successfully run `berks install`
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        transitive
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (1.0.0)
+        transitive (1.2.3)
+          fake (>= 0.0.0)
+      """
+
   Scenario: Bumping the version of a local cookbook
     * I have a Berksfile pointing at the local Berkshelf API with:
       """