berkshelf 3.0.0.beta1 → 3.0.0.beta2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f9eeec61abc7afc5a3a61ba58852f1ee753969f3
+  data.tar.gz: bf73a4918c2c1c00873e586f5e2e2a38fc7f30a8
+SHA512:
+  metadata.gz: ff93338dfc827ddac156835b12deff45ac00d18515185cd2abad4f8283295987d28c31fc371d96ad045a0cc2392d22e3957e037fc00469c769e9b4b913c00480
+  data.tar.gz: 5d6fab4ced0612343c398a9b39893636e78bbee24f525160016c322c0e42e279cb86764004f98b59d57fe49c0f37432ad5de50ba8460b8fe55664f0dd0785f17

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p429
+2.0.0-p247

data/CONTRIBUTING.md

@@ -17,6 +17,8 @@ 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 the latest version of [Bundler](http://gembundler.com)
 
     $ gem install bundler

data/LICENSE

@@ -3,7 +3,7 @@ Copyright 2012-2013 Riot Games
     Jamie Winsor (<jamie@vialstudios.com>)
     Josiah Kiehl (<jkiehl@riotgames.com>)
     Michael Ivey (<michael.ivey@riotgames.com>)
-    Justin Campbell (<justin.campbell@riotgames.com>)
+    Justin Campbell (<justin@justincampbell.me>)
     Seth Vargo (<sethvargo@gmail.com>)
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/README.md

@@ -86,7 +86,7 @@ Authors
 - Jamie Winsor (<jamie@vialstudios.com>)
 - Josiah Kiehl (<jkiehl@riotgames.com>)
 - Michael Ivey (<michael.ivey@riotgames.com>)
-- Justin Campbell (<justin.campbell@riotgames.com>)
+- 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.

data/Thorfile

@@ -56,11 +56,11 @@ class Spec < Thor
 
   no_tasks do
     def units_command
-      run('rspec --color --format=documentation spec/unit')
+      run('rspec --color --format progress spec/unit')
     end
 
     def acceptance_command
-      run('cucumber --color --format pretty --tags ~@no_run')
+      run('cucumber --color --format progress --tags ~@no_run')
     end
 
     def quality_command

data/berkshelf.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
     'jamie@vialstudios.com',
     'jkiehl@riotgames.com',
     'michael.ivey@riotgames.com',
-    'justin.campbell@riotgames.com',
+    'justin@justincampbell.me',
     'sethvargo@gmail.com'
   ]
 
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.8.0'
 
   s.add_dependency 'addressable',       '~> 2.3.4'
-  s.add_dependency 'buff-config',       '~> 0.1'
+  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'
@@ -39,7 +39,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.3.0'
+  s.add_dependency 'ridley',            '~> 1.4.0'
   s.add_dependency 'solve',             '>= 0.5.0'
   s.add_dependency 'thor',              '~> 0.18.0'
 

data/features/install_command.feature

@@ -18,7 +18,7 @@ Feature: install cookbooks from a Berksfile
     And the Chef Server has cookbooks:
       | berkshelf | 1.0.0 |
       | berkshelf | 2.0.0 |
-    And the Berkshelf API server cache is up to date
+    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -37,7 +37,7 @@ Feature: install cookbooks from a Berksfile
     And the Chef Server has cookbooks:
       | berkshelf | 1.0.0 |
       | berkshelf | 2.0.0 |
-    And the Berkshelf API server cache is up to date
+    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -62,7 +62,7 @@ Feature: install cookbooks from a Berksfile
     And the Chef Server has cookbooks:
       | ruby   | 1.0.0 |
       | elixir | 1.0.0 |
-    And the Berkshelf API server cache is up to date
+    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -84,7 +84,7 @@ Feature: install cookbooks from a Berksfile
       | hostsfile    | = 1.0.1 |
     And the cookbook store has the cookbooks:
       | hostsfile    | 1.0.1 |
-    And the Berkshelf API server cache is up to date
+    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -96,9 +96,9 @@ Feature: install cookbooks from a Berksfile
       """
       source "http://localhost:26210"
 
-      cookbook 'example_cookbook', path: '../../spec/fixtures/cookbooks/example_cookbook-0.5.0'
+      cookbook 'example_cookbook', path: '../../fixtures/cookbooks/example_cookbook-0.5.0'
       """
-    And the Berkshelf API server cache is up to date
+    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -110,7 +110,7 @@ Feature: install cookbooks from a Berksfile
       """
       source "http://localhost:26210"
 
-      cookbook 'example_cookbook', path: '../../../spec/fixtures/cookbooks/example_cookbook-0.5.0'
+      cookbook 'example_cookbook', path: '../../../fixtures/cookbooks/example_cookbook-0.5.0'
       """
     When I successfully run `berks install -b ./tmp_berks/Berksfile`
     Then the output should contain:
@@ -266,11 +266,39 @@ 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:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'bacon', '~> 0.1'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "dependencies": {
+          "bacon": {
+            "locked_version": "0.2.0"
+          }
+        }
+      }
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Installing bacon (0.2.0)
+      """
+
   Scenario: running install with no Berksfile or Berksfile.lock
     When I run `berks install`
     Then the output should contain:
       """
-      No Berksfile or Berksfile.lock found at:
+      No Berksfile or Berksfile.lock found at '
       """
     And the exit status should be "BerksfileNotFound"
 

data/features/json_formatter.feature

@@ -17,7 +17,7 @@ Feature: --format json
       """
     And the Chef Server has cookbooks:
       | berkshelf | 1.0.0 |
-    And the Berkshelf API server cache is up to date
+    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install --format json`
     Then the output should contain JSON:
       """
@@ -65,12 +65,53 @@ Feature: --format json
       }
       """
 
+  Scenario: JSON output when running the show command
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'fake', '1.0.0'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "dependencies": {
+          "fake": {
+            "locked_version": "1.0.0"
+          }
+        }
+      }
+      """
+    When I successfully run `berks show fake --format json`
+    Then the output should contain JSON:
+      """
+      {
+        "cookbooks": [
+          {
+            "name": "fake",
+            "version": "1.0.0",
+            "description": "A fabulous new cookbook",
+            "author": "YOUR_COMPANY_NAME",
+            "email": "YOUR_EMAIL",
+            "license": "none"
+          }
+        ],
+        "errors": [
+
+        ],
+        "messages": [
+        ]
+      }
+      """
+
   Scenario: JSON output when running the upload command
     Given I write to "Berksfile" with:
       """
       source "http://localhost:26210"
 
-      cookbook 'example_cookbook', path: '../../spec/fixtures/cookbooks/example_cookbook-0.5.0'
+      cookbook 'example_cookbook', path: '../../fixtures/cookbooks/example_cookbook-0.5.0'
       """
     When I successfully run `berks upload --format json`
     Then the output should contain JSON:
@@ -80,7 +121,7 @@ Feature: --format json
           {
             "name": "example_cookbook",
             "version": "0.5.0",
-            "location": "../../spec/fixtures/cookbooks/example_cookbook-0.5.0",
+            "location": "../../fixtures/cookbooks/example_cookbook-0.5.0",
             "uploaded_to": "http://localhost:26310/"
           }
         ],
@@ -92,3 +133,52 @@ Feature: --format json
         ]
       }
       """
+
+  Scenario: JSON output when running the outdated command
+    Given the cookbook store has the cookbooks:
+      | seth | 0.1.0 |
+    And the Chef Server has cookbooks:
+      | seth | 0.1.0 |
+      | seth | 0.2.9 |
+      | seth | 1.0.0 |
+    And the Berkshelf API server's cache is up to date
+    And I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'seth', '~> 0.1'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "dependencies": {
+          "seth": {
+            "locked_version": "0.1.0"
+          }
+        }
+      }
+      """
+    And I successfully run `berks outdated --format json`
+    Then the output should contain:
+      """
+      {
+        "cookbooks": [
+          {
+            "version": "0.2.9",
+            "sources": {
+              "http://localhost:26210": {
+                "name": "seth",
+                "version": "0.2.9"
+              }
+            },
+            "name": "seth"
+          }
+        ],
+        "errors": [
+
+        ],
+        "messages": [
+          "The following cookbooks have newer versions:"
+        ]
+      }
+      """

data/features/licenses.feature

@@ -102,7 +102,7 @@ Feature: Installing cookbooks with specific licenses
       """
       source "http://localhost:26210"
 
-      cookbook 'fake', path: '../../spec/tmp/berkshelf/cookbooks/fake-0.1.0'
+      cookbook 'fake', path: '../../tmp/berkshelf/cookbooks/fake-0.1.0'
       """
     And I have a Berkshelf config file containing:
       """

data/features/lockfile.feature

@@ -18,7 +18,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies":{
           "fake":{
-            "constraint":"= 1.0.0",
             "locked_version":"1.0.0"
           }
         }
@@ -45,7 +44,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies": {
           "fake": {
-            "constraint": "= 1.0.0",
             "locked_version": "1.0.0"
           }
         }
@@ -66,7 +64,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies": {
           "fake": {
-            "constraint": "= 1.0.0",
             "locked_version": "1.0.0"
           }
         }
@@ -78,7 +75,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies": {
           "fake": {
-            "constraint": "= 1.0.0",
             "locked_version": "1.0.0"
           }
         }
@@ -104,7 +100,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies":{
           "fake":{
-            "constraint":"= 0.0.0",
             "path":"./fake"
           }
         }
@@ -159,7 +154,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies": {
           "fake":{
-            "constraint": "= 1.0.0",
             "locked_version": "1.0.0"
           },
           "dep":{
@@ -183,7 +177,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "constraint":"~> 1.0.0",
             "locked_version":"1.0.0"
           }
         }
@@ -195,7 +188,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "constraint":"~> 1.0.0",
             "locked_version":"1.0.0"
           }
         }
@@ -217,7 +209,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "constraint":"~> 0.1",
             "locked_version":"0.1.0"
           }
         }
@@ -229,7 +220,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "constraint":"~> 0.1",
             "locked_version":"0.2.0"
           }
         }
@@ -250,7 +240,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "constraint":"= 1.0.0",
             "locked_version":"1.0.0"
           }
         }
@@ -262,7 +251,6 @@ Feature: Creating and reading the Berkshelf lockfile
       {
         "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "constraint":"= 1.0.0",
             "locked_version":"1.0.0"
           }
         }

data/features/outdated_command.feature

@@ -4,5 +4,129 @@ Feature: Displaying outdated cookbooks
   So that I can decide whether to update everything at once
 
   Scenario: the dependency is up to date
+    Given the Chef Server has cookbooks:
+      | bacon | 1.0.0 |
+      | bacon | 1.1.0 |
+    And the Berkshelf API server's cache is up to date
+    And the cookbook store has the cookbooks:
+      | bacon | 1.1.0 |
+    And I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'bacon', '~> 1.1.0'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "dependencies": {
+          "bacon": {
+            "locked_version": "1.1.0"
+          }
+        }
+      }
+      """
+    When I successfully run `berks outdated`
+    Then the output should contain:
+      """
+      All cookbooks up to date!
+      """
+
   Scenario: the dependency has a no version constraint and there are new items
+    Given the Chef Server has cookbooks:
+      | bacon | 1.0.0 |
+      | bacon | 1.1.0 |
+    And the Berkshelf API server's cache is up to date
+    And the cookbook store has the cookbooks:
+      | bacon | 1.0.0 |
+    And I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'bacon'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "dependencies": {
+          "bacon": {
+            "locked_version": "1.0.0"
+          }
+        }
+      }
+      """
+    When I successfully run `berks outdated`
+    Then the output should contain:
+      """
+      The following cookbooks have newer versions:
+        * bacon (1.1.0) [http://localhost:26210]
+      """
+
   Scenario: the dependency has a version constraint and there are new items that satisfy it
+    Given the Chef Server has cookbooks:
+      | bacon | 1.1.0 |
+      | bacon | 1.2.1 |
+      | bacon | 1.5.8 |
+    And the Berkshelf API server's cache is up to date
+    And the cookbook store has the cookbooks:
+      | bacon | 1.0.0 |
+    And I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'bacon', '~> 1.0'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "dependencies": {
+          "bacon": {
+            "locked_version": "1.0.0"
+          }
+        }
+      }
+      """
+    When I successfully run `berks outdated`
+    Then the output should contain:
+      """
+      The following cookbooks have newer versions:
+        * bacon (1.5.8) [http://localhost:26210]
+      """
+
+  Scenario: When there is no lockfile present
+    And I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'bacon', '1.0.0'
+      """
+    When I run `berks outdated`
+    Then the output should contain:
+      """
+      Could not find cookbook 'bacon (>= 0.0.0)'. Try running `berks install` to download and install the missing dependencies.
+      """
+    And the exit status should be "LockfileNotFound"
+
+  Scenario: When the cookbook is not installed
+    And I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'bacon', '1.0.0'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "dependencies": {
+          "bacon": {
+            "locked_version": "1.0.0"
+          }
+        }
+      }
+      """
+    When I run `berks outdated`
+    Then the output should contain:
+      """
+      Could not find cookbook 'bacon (= 1.0.0)'. Try running `berks install` to download and install the missing dependencies.
+      """
+    And the exit status should be "CookbookNotFound"