berkshelf 1.4.6 → 2.0.0.beta

data/features/json_formatter.feature

@@ -6,28 +6,53 @@ Feature: --format json
   Scenario: JSON output installing a cookbook from the default location
     Given I write to "Berksfile" with:
       """
-      cookbook "mysql", "= 1.2.4"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+      """
+    When I successfully run `berks install --format json`
+    Then the output should contain JSON:
+      """
+      {
+        "cookbooks": [
+          {
+            "version": "1.0.0",
+            "location": "site: 'http://cookbooks.opscode.com/api/v1/cookbooks'",
+            "name": "berkshelf-cookbook-fixture"
+          }
+        ],
+        "errors": [
+
+        ],
+        "messages": [
+
+        ]
+      }
       """
-    When I run the install command with flags:
-      | --format json |
-    Then the output should be JSON
-    And the JSON at "cookbooks" should have 2 cookbooks
-    And the JSON at "cookbooks/0/version" should be "1.2.4"
-    And the JSON at "cookbooks/0/location" should be "site: 'http://cookbooks.opscode.com/api/v1/cookbooks'"
 
   Scenario: JSON output installing a cookbook we already have
     Given the cookbook store has the cookbooks:
-      | mysql   | 1.2.4 |
+      | berkshelf-cookbook-fixture   | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      cookbook "mysql", "= 1.2.4"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+      """
+    When I successfully run `berks install --format json`
+    Then the output should contain JSON:
+      """
+      {
+        "cookbooks": [
+          {
+            "name": "berkshelf-cookbook-fixture",
+            "version": "1.0.0"
+          }
+        ],
+        "errors": [
+
+        ],
+        "messages": [
+
+        ]
+      }
       """
-    When I run the install command with flags:
-      | --format json |
-    Then the output should be JSON
-    And the JSON at "cookbooks" should have 1 cookbook
-    And the JSON at "cookbooks/0/version" should be "1.2.4"
-    And the JSON should not have "cookbooks/0/location"
 
   @chef_server
   Scenario: JSON output when running the upload command
@@ -35,11 +60,23 @@ Feature: --format json
       | example_cookbook | example_cookbook-0.5.0 |
     And the Chef server does not have the cookbooks:
       | example_cookbook | 0.5.0 |
-    When I run the upload command with flags:
-      | --format json |
-    Then the output should be JSON
-    And the JSON at "cookbooks" should have 1 cookbook
-    And the JSON at "cookbooks/0/version" should be "0.5.0"
-    And the JSON should have "cookbooks/0/uploaded_to"
-    And the Chef server should have the cookbooks:
-      | example_cookbook | 0.5.0 |
+    When I successfully run `berks upload --format json`
+    Then the output should contain JSON:
+      """
+      {
+        "cookbooks": [
+          {
+            "name": "example_cookbook",
+            "version": "0.5.0",
+            "location": "path: '<%= File.expand_path(File.join(fixtures_path, 'cookbooks', 'example_cookbook-0.5.0')) %>'",
+            "uploaded_to": "http://localhost:4000/"
+          }
+        ],
+        "errors": [
+
+        ],
+        "messages": [
+
+        ]
+      }
+      """

data/features/list_command.feature

@@ -3,23 +3,17 @@ Feature: list command
   I want a way to show all my cookbooks and their versions without opening my Berksfile
   So that I can be more productive
 
-  @slow_process
   Scenario: Running the list command
     Given I write to "Berksfile" with:
       """
-      cookbook "build-essential", "1.2.0"
-      cookbook "chef-client", "1.2.0"
-      cookbook "mysql", "1.2.4"
-      cookbook "openssl", "1.0.0"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+      cookbook 'hostsfile', '1.0.1'
       """
-    And I successfully run `berks install`
-    When I run `berks list`
+    When I successfully run `berks list`
     Then the output should contain:
       """
       Cookbooks installed by your Berksfile:
-        * build-essential (1.2.0)
-        * chef-client (1.2.0)
-        * mysql (1.2.4)
-        * openssl (1.0.0)
+        * berkshelf-cookbook-fixture (1.0.0)
+        * hostsfile (1.0.1)
       """
     And the exit status should be 0

data/features/lockfile.feature

@@ -3,15 +3,295 @@ Feature: Berksfile.lock
   I want my versions to be locked even when I don't specify versions in my Berksfile
   So when I share my repository, all other developers get the same versions that I did when I installed.
 
-  @slow_process
   Scenario: Writing the Berksfile.lock
     Given I write to "Berksfile" with:
       """
-      cookbook 'ntp', '1.1.8'
+      site :opscode
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
-    When I run the install command
-    Then a file named "Berksfile.lock" should exist in the current directory
-    And the file "Berksfile.lock" should contain in the current directory:
+    When I successfully run `berks install`
+    Then the file "Berksfile.lock" should contain JSON:
       """
-      cookbook 'ntp', :locked_version => '1.1.8'
+      {
+        "sha":"c6438d7590f4d695d8abae83ff22586ba6d3a52e",
+        "sources":{
+          "berkshelf-cookbook-fixture":{
+            "constraint":"= 1.0.0",
+            "locked_version":"1.0.0"
+          }
+        }
+      }
       """
+
+  Scenario: Installing a cookbook with dependencies
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', '1.0.0', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'deps'
+    """
+  When I successfully run `berks install`
+  Then the file "Berksfile.lock" should contain JSON:
+    """
+    {
+      "sha":"572a911ad3fda64121835ae842141b1d711f71fc",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "constraint":"= 1.0.0",
+          "locked_version":"1.0.0",
+          "git": "git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
+          "ref":"f080e8a74dcb1948780389f45cd2862091f8a0b6"
+        },
+        "hostsfile":{
+          "constraint":"= 1.0.1",
+          "locked_version":"1.0.1"
+        }
+      }
+    }
+    """
+
+  Scenario: Writing the Berksfile.lock with a pessimistic lock
+    Given I write to "Berksfile" with:
+      """
+      site :opscode
+      cookbook 'berkshelf-cookbook-fixture', '~> 1.0.0'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "sha":"e42f8e41a5e646bd86591c5b7ec25442736b87fd",
+        "sources":{
+          "berkshelf-cookbook-fixture":{
+            "constraint":"~> 1.0.0",
+            "locked_version":"1.0.0"
+          }
+        }
+      }
+      """
+    When I successfully run `berks install`
+    Then the file "Berksfile.lock" should contain JSON:
+      """
+      {
+        "sha":"e42f8e41a5e646bd86591c5b7ec25442736b87fd",
+        "sources":{
+          "berkshelf-cookbook-fixture":{
+            "constraint":"~> 1.0.0",
+            "locked_version":"1.0.0"
+          }
+        }
+      }
+      """
+
+  Scenario: Updating with a Berksfile.lock with pessimistic lock
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
+    """
+  And I write to "Berksfile.lock" with:
+    """
+    {
+      "sha":"3dced4fcd9c3f72b68e746190aaa1140bdc6cc3d",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "constraint":"~> 0.1",
+          "locked_version":"0.1.0"
+        }
+      }
+    }
+    """
+  When I successfully run `berks update berkshelf-cookbook-fixture`
+  Then the file "Berksfile.lock" should contain JSON:
+    """
+    {
+      "sha":"b2714a4f9bdf500cb20267067160a0b3c1d8404c",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "constraint":"~> 0.1",
+          "locked_version":"0.2.0"
+        }
+      }
+    }
+    """
+
+  Scenario: Updating with a Berksfile.lock with hard lock
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+    """
+  And I write to "Berksfile.lock" with:
+    """
+    {
+      "sha":"7d07c22eca03bf6da5aaf38ae81cb9a8a439c692",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "constraint":"= 1.0.0",
+          "locked_version":"1.0.0"
+        }
+      }
+    }
+    """
+  When I successfully run `berks update berkshelf-cookbook-fixture`
+  Then the file "Berksfile.lock" should contain JSON:
+    """
+    {
+      "sha":"c6438d7590f4d695d8abae83ff22586ba6d3a52e",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "constraint":"= 1.0.0",
+          "locked_version":"1.0.0"
+        }
+      }
+    }
+    """
+
+  Scenario: Updating a Berksfile.lock with a git location
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', ref: '919afa0c4'
+    """
+  When I successfully run `berks install`
+  Then the file "Berksfile.lock" should contain JSON:
+    """
+    {
+      "sha": "b8e06c891c824b3e3481df024eb241e1c02572a6",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
+          "ref":"919afa0c402089df23ebdf36637f12271b8a96b4",
+          "locked_version":"1.0.0"
+        }
+      }
+    }
+    """
+
+  Scenario: Updating a Berksfile.lock with a git location and a branch
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', branch: 'master'
+    """
+  When I successfully run `berks install`
+  Then the file "Berksfile.lock" should contain JSON:
+    """
+    {
+      "sha": "310f95bb86ba76b47eef28abc621d0e8de19bbb6",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
+          "ref":"a97b9447cbd41a5fe58eee2026e48ccb503bd3bc",
+          "locked_version":"1.0.0"
+        }
+      }
+    }
+    """
+
+  Scenario: Updating a Berksfile.lock with a git location and a branch
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', tag: 'v0.2.0'
+    """
+  When I successfully run `berks install`
+  Then the file "Berksfile.lock" should contain JSON:
+    """
+    {
+      "sha": "ade51e222f569cc299f34ec1100d321f3b230c36",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
+          "ref":"70a527e17d91f01f031204562460ad1c17f972ee",
+          "locked_version":"0.2.0"
+        }
+      }
+    }
+    """
+
+  Scenario: Updating a Berksfile.lock with a GitHub location
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', github: 'RiotGames/berkshelf-cookbook-fixture', ref: '919afa0c4'
+    """
+  When I successfully run `berks install`
+  Then the file "Berksfile.lock" should contain JSON:
+    """
+    {
+      "sha": "3ac97aa503bcebb2b393410aebc176c3c5bed2d4",
+      "sources":{
+        "berkshelf-cookbook-fixture":{
+          "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
+          "ref":"919afa0c402089df23ebdf36637f12271b8a96b4",
+          "locked_version":"1.0.0"
+        }
+      }
+    }
+    """
+
+  Scenario: Updating a Berksfile.lock with a path location
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'fake', path: './fake'
+    """
+  And a cookbook named "fake"
+  When I successfully run `berks install`
+  Then the file "Berksfile.lock" should contain JSON:
+    """
+    {
+      "sha": "42a13f91f1ba19ce8c6776fe267e74510dee27ce",
+      "sources":{
+        "fake":{
+          "path":"./fake",
+          "locked_version":"0.0.0"
+        }
+      }
+    }
+    """
+
+  Scenario: Updating a Berksfile.lock with a different site location
+  Given pending we have a reliable non-opscode site to test
+  # Given I write to "Berksfile" with:
+  #   """
+  #   cookbook 'fake', site: 'example.com'
+  #   """
+  # When I successfully run `berks install`
+  # Then the file "Berksfile.lock" should contain JSON:
+  #   """
+  #   {
+  #     "sha": "3232c5ae6f54aee3efc5fdcfce69249a2526822b",
+  #     "sources":{
+  #       "sudo":{
+  #         "site":"opscode",
+  #         "locked_version":"2.0.4"
+  #       }
+  #     }
+  #   }
+  #   """
+
+  Scenario: Installing when the locked version is no longer satisfied
+  Given I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+    """
+  And I successfully run `berks install`
+  And I write to "Berksfile" with:
+    """
+    site :opscode
+    cookbook 'berkshelf-cookbook-fixture', '~> 1.3.0'
+    """
+  When I run `berks install`
+  Then the output should contain:
+    """
+    Berkshelf could not find compatible versions for cookbook 'berkshelf-cookbook-fixture':
+      In Berksfile:
+        berkshelf-cookbook-fixture (1.0.0)
+
+      In Berksfile.lock:
+        berkshelf-cookbook-fixture (~> 1.3.0)
+
+    Try running `berks update berkshelf-cookbook-fixture, which will try to find  'berkshelf-cookbook-fixture' matching '~> 1.3.0'.
+    """
+  And the CLI should exit with the status code for error "OutdatedCookbookSource"

data/features/open_command.feature

@@ -4,21 +4,24 @@ Feature: open command
   So that I can troubleshoot bugs in my dependencies
 
   Scenario: Running berks open with no $EDITOR
-    Given the environment variable EDITOR is nil
+    Given the BERKSHELF_EDITOR and VISUAL environment variables are not set
+    And the environment variable EDITOR is nil
     And the cookbook store has the cookbooks:
       | mysql | 1.2.4 |
     When I run `berks open mysql`
     Then the output should contain "To open a cookbook, set $EDITOR or $BERKSHELF_EDITOR"
 
   Scenario: Running berks open with an $EDITOR
-    Given the environment variable EDITOR is "ls"
+    Given the BERKSHELF_EDITOR and VISUAL environment variables are not set
+    And the environment variable EDITOR is "ls"
     And the cookbook store has the cookbooks:
       | mysql | 1.2.4 |
     When I run `berks open mysql`
     Then the output should contain "metadata.rb"
 
   Scenario: Running berks open with a missing EDITOR
-    Given the environment variable EDITOR is "wat"
+    Given the BERKSHELF_EDITOR and VISUAL environment variables are not set
+    And the environment variable EDITOR is "wat"
     And the cookbook store has the cookbooks:
       | mysql | 1.2.4 |
     When I run `berks open mysql`
@@ -26,7 +29,8 @@ Feature: open command
     And the CLI should exit with the status code for error "CommandUnsuccessful"
 
   Scenario: Running berks open when the cookbook does not exist
-    Given the environment variable EDITOR is "ls"
+    Given the BERKSHELF_EDITOR and VISUAL environment variables are not set
+    And the environment variable EDITOR is "ls"
     When I run `berks open mysql`
     Then the output should contain "Cookbook 'mysql' not found in any of the sources!"
     And the CLI should exit with the status code for error "CookbookNotFound"