RubyGems - berkshelf - Versions diffs - 2.0.0.beta → 2.0.0 - Mend

berkshelf 2.0.0.beta → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (92) hide show

data/CHANGELOG.md +19 -1
data/CONTRIBUTING.md +1 -3
data/Gemfile +0 -20
data/Guardfile +3 -3
data/LICENSE +6 -5
data/README.md +1 -0
data/Thorfile +48 -67
data/berkshelf.gemspec +48 -37
data/features/apply_command.feature +17 -11
data/features/config.feature +11 -11
data/features/configure_command.feature +8 -8
data/features/contingent_command.feature +37 -8
data/features/cookbook_command.feature +17 -14
data/features/groups_install.feature +24 -20
data/features/install_command.feature +24 -33
data/features/licenses.feature +112 -0
data/features/list_command.feature +17 -5
data/features/lockfile.feature +307 -188
data/features/outdated_command.feature +1 -4
data/features/package_command.feature +41 -19
data/features/shelf/list.feature +39 -0
data/features/shelf/show.feature +152 -0
data/features/shelf/uninstall.feature +103 -0
data/features/show_command.feature +49 -17
data/features/step_definitions/filesystem_steps.rb +12 -3
data/features/step_definitions/utility_steps.rb +0 -1
data/features/support/env.rb +11 -4
data/features/update_command.feature +22 -10
data/features/upload_command.feature +174 -127
data/features/vendor_install.feature +6 -6
data/generator_files/Berksfile.erb +1 -1
data/generator_files/metadata.rb.erb +7 -7
data/lib/berkshelf.rb +39 -27
data/lib/berkshelf/base_generator.rb +2 -3
data/lib/berkshelf/berksfile.rb +69 -17
data/lib/berkshelf/cached_cookbook.rb +17 -1
data/lib/berkshelf/chef.rb +2 -4
data/lib/berkshelf/chef/config.rb +51 -75
data/lib/berkshelf/chef/cookbook.rb +1 -2
data/lib/berkshelf/chef/cookbook/chefignore.rb +1 -1
data/lib/berkshelf/cli.rb +144 -194
data/lib/berkshelf/command.rb +11 -12
data/lib/berkshelf/commands/shelf.rb +130 -0
data/lib/berkshelf/commands/test_command.rb +11 -0
data/lib/berkshelf/community_rest.rb +1 -2
data/lib/berkshelf/config.rb +14 -10
data/lib/berkshelf/cookbook_generator.rb +30 -24
data/lib/berkshelf/cookbook_source.rb +1 -1
data/lib/berkshelf/cookbook_store.rb +0 -1
data/lib/berkshelf/core_ext.rb +1 -1
data/lib/berkshelf/core_ext/file.rb +1 -1
data/lib/berkshelf/downloader.rb +3 -1
data/lib/berkshelf/errors.rb +128 -53
data/lib/berkshelf/formatters.rb +2 -6
data/lib/berkshelf/formatters/human_readable.rb +8 -2
data/lib/berkshelf/formatters/json.rb +7 -1
data/lib/berkshelf/formatters/null.rb +0 -1
data/lib/berkshelf/git.rb +16 -16
data/lib/berkshelf/init_generator.rb +28 -26
data/lib/berkshelf/location.rb +12 -11
data/lib/berkshelf/locations/chef_api_location.rb +2 -2
data/lib/berkshelf/locations/git_location.rb +0 -1
data/lib/berkshelf/locations/github_location.rb +0 -1
data/lib/berkshelf/locations/path_location.rb +1 -2
data/lib/berkshelf/locations/site_location.rb +3 -2
data/lib/berkshelf/lockfile.rb +29 -10
data/lib/berkshelf/mixin/config.rb +155 -0
data/lib/berkshelf/mixin/logging.rb +0 -1
data/lib/berkshelf/mixin/shellout.rb +71 -0
data/lib/berkshelf/resolver.rb +7 -4
data/lib/berkshelf/test.rb +1 -3
data/lib/berkshelf/ui.rb +8 -4
data/lib/berkshelf/version.rb +1 -1
data/lib/thor/monkies/shell.rb +0 -1
data/spec/config/berkshelf.pem +27 -0
data/spec/config/knife.rb +12 -0
data/spec/config/validator.pem +27 -0
data/spec/spec_helper.rb +4 -8
data/spec/support/chef_api.rb +14 -9
data/spec/support/chef_server.rb +3 -4
data/spec/unit/berkshelf/berksfile_spec.rb +1 -1
data/spec/unit/berkshelf/cookbook_generator_spec.rb +12 -6
data/spec/unit/berkshelf/cookbook_source_spec.rb +13 -1
data/spec/unit/berkshelf/init_generator_spec.rb +5 -0
data/spec/unit/chef/config_spec.rb +9 -10
metadata +216 -93
data/features/info_command.feature +0 -39
data/features/open_command.feature +0 -36
data/lib/berkshelf/cli_commands/test_command.rb +0 -11
data/lib/berkshelf/mixin.rb +0 -10
data/lib/berkshelf/mixin/path_helpers.rb +0 -30
data/spec/support/knife.rb +0 -18

data/features/outdated_command.feature CHANGED

@@ -1,4 +1,4 @@
-Feature: outdated command
+Feature: Displaying outdated cookbooks
   As a user
   I want to know what cookbooks are outdated before I run update
   So that I can decide whether to update everything at once
@@ -7,7 +7,6 @@ Feature: outdated command
     Given I write to "Berksfile" with:
       """
       site :opscode
       cookbook 'berkshelf-cookbook-fixture'
       """
     When I successfully run `berks outdated`
@@ -24,7 +23,6 @@ Feature: outdated command
     Given I write to "Berksfile" with:
       """
       site :opscode
       cookbook 'berkshelf-cookbook-fixture', '>= 0.1'
       """
     When I run `berks outdated`
@@ -41,7 +39,6 @@ Feature: outdated command
     Given I write to "Berksfile" with:
       """
       site :opscode
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     When I run `berks outdated`

data/features/package_command.feature CHANGED

@@ -1,39 +1,61 @@
-Feature: package command
+Feature: Packaging a cookbook as a tarball for distribution
   As a user
   I want to be able to package a cookbook
   So that I can use it outside of Berkshelf
-  Scenario: Running the package command
-    Given I write to "Berksfile" with:
+  Scenario: When no options are passed
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I write to "Berksfile" with:
       """
       site :opscode
-      cookbook 'berkshelf-cookbook-fixture', '~> 1.0.0'
+      cookbook 'fake', '~> 1.0.0'
+      """
+    When I successfully run `berks package fake`
+    Then a file named "fake.tar.gz" should exist
+    And the output should contain:
+      """
+      Cookbook(s) packaged to
       """
-    And I successfully run `berks install`
-    When I successfully run `berks package berkshelf-cookbook-fixture`
-    Then a file named "berkshelf-cookbook-fixture.tar.gz" should exist
-    And the output should contain "Cookbook 'berkshelf-cookbook-fixture' saved to "
     And the exit status should be 0
-  Scenario: Running the package command with the --output option
-    Given I write to "Berksfile" with:
+  Scenario: With the --output option
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I write to "Berksfile" with:
       """
       site :opscode
-      cookbook 'berkshelf-cookbook-fixture', '~> 1.0.0'
+      cookbook 'fake', '~> 1.0.0'
       """
-    And I successfully run `berks install`
-    When I successfully run `berks package berkshelf-cookbook-fixture --output foo/bar`
-    Then a file named "foo/bar/berkshelf-cookbook-fixture.tar.gz" should exist
+    When I successfully run `berks package fake --output foo/bar`
+    Then a file named "foo/bar/fake.tar.gz" should exist
     And the exit status should be 0
-  Scenario: Running the package command with an installed cookbook name
-    Given I write to "Berksfile" with:
+  Scenario: With an installed cookbook name
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I write to "Berksfile" with:
       """
       site :opscode
-      cookbook 'berkshelf-cookbook-fixture', '~> 1.0.0'
+      cookbook 'fake', '~> 1.0.0'
       """
-    And I successfully run `berks install`
     When I run `berks package non-existent`
     Then a file named "non-existent.tar.gz" should not exist
-    And the output should contain "Cookbook 'non-existent' is not in your Berksfile"
+    And the output should contain:
+      """
+      Cookbook 'non-existent' is not in your Berksfile
+      """
     And the CLI should exit with the status code for error "CookbookNotFound"
+  Scenario: With an invalid cookbook
+    Given a cookbook named "cookbook with spaces"
+    And I write to "Berksfile" with:
+      """
+      cookbook 'cookbook with spaces', path: './cookbook with spaces'
+      """
+    When I run `berks package`
+    Then the output should contain:
+      """
+      The cookbook 'cookbook with spaces' has invalid filenames:
+      """
+    And the CLI should exit with the status code for error "InvalidCookbookFiles"

data/features/shelf/list.feature ADDED

@@ -0,0 +1,39 @@
+Feature: Listing all cookbooks in the Berkshelf shelf
+  As a user with a cookbook store
+  I want to show all the cookbooks I have installed
+  So that I can be well informed
+  Scenario: With no cookbooks in the store
+    When I successfully run `berks shelf list`
+    Then the output should contain:
+      """
+      There are no cookbooks in the Berkshelf shelf
+      """
+    And the exit status should be 0
+  Scenario: With two cookbooks in the store
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.3.4 |
+    When I successfully run `berks shelf list`
+    Then the output should contain:
+      """
+      Cookbooks in the Berkshelf shelf:
+        * ekaf (2.3.4)
+        * fake (1.0.0)
+      """
+    And the exit status should be 0
+  Scenario: With multiple cookbook versions installed
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | fake | 1.1.0 |
+      | fake | 1.2.0 |
+      | fake | 2.0.0 |
+    When I successfully run `berks shelf list`
+    Then the output should contain:
+      """
+      Cookbooks in the Berkshelf shelf:
+        * fake (1.0.0, 1.1.0, 1.2.0, 2.0.0)
+      """
+    And the exit status should be 0

data/features/shelf/show.feature ADDED

@@ -0,0 +1,152 @@
+Feature: Displaying information about a cookbook in the Berkshelf shelf
+  As a user with a cookbook store
+  I want to show information about a specific cookbook in my cookbook store
+  So that I can be well informed
+  Scenario: With a cookbook that is not in the store
+    When I run `berks shelf show fake`
+    Then the output should contain:
+      """
+      Cookbook 'fake' is not in the Berkshelf shelf
+      """
+    And the CLI should exit with the status code for error "CookbookNotFound"
+  Scenario: With cookbooks in the store
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.3.4 |
+    When I successfully run `berks shelf show fake`
+    Then the output should contain:
+      """
+      Displaying all versions of 'fake' in the Berkshelf shelf:
+              Name: fake
+           Version: 1.0.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+      """
+    And the output should not contain:
+      """
+      Name: ekaf
+      """
+    And the exit status should be 0
+  Scenario: With cookbooks in the store and the --version option
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.3.4 |
+    When I successfully run `berks shelf show fake --version 1.0.0`
+    Then the output should contain:
+      """
+      Displaying 'fake' (1.0.0) in the Berkshelf shelf:
+              Name: fake
+           Version: 1.0.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+      """
+    And the output should not contain:
+      """
+      Name: ekaf
+      """
+    And the exit status should be 0
+  Scenario: With cookbooks in the store and the --version option doesn't exist
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.3.4 |
+    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
+      """
+    And the CLI should exit with the status code for error "CookbookNotFound"
+  Scenario: With multiple cookbook versions installed
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | fake | 1.1.0 |
+      | fake | 1.2.0 |
+      | fake | 2.0.0 |
+    When I successfully run `berks shelf show fake`
+    Then the output should contain:
+      """
+      Displaying all versions of 'fake' in the Berkshelf shelf:
+              Name: fake
+           Version: 1.0.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+              Name: fake
+           Version: 1.1.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+              Name: fake
+           Version: 1.2.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+              Name: fake
+           Version: 2.0.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+      """
+    And the exit status should be 0
+  Scenario: With multiple cookbook versions installed and the --version flag
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | fake | 1.1.0 |
+      | fake | 1.2.0 |
+      | fake | 2.0.0 |
+    When I successfully run `berks shelf show fake --version 1.0.0`
+    Then the output should contain:
+      """
+      Displaying 'fake' (1.0.0) in the Berkshelf shelf:
+              Name: fake
+           Version: 1.0.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+      """
+    And the output should not contain:
+      """
+              Name: fake
+           Version: 1.1.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+      """
+    And the output should not contain:
+      """
+              Name: fake
+           Version: 1.2.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+      """
+    And the output should not contain:
+      """
+              Name: fake
+           Version: 2.0.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+      """
+    And the exit status should be 0

data/features/shelf/uninstall.feature ADDED

@@ -0,0 +1,103 @@
+Feature: Removing a cookbook from the Berkshelf shelf
+  As a user with a cookbook store
+  I want to remove a cookbook because it's a bad version
+  So that I don't have to manually touch things in the ~/.berkshelf directory
+  Scenario: With no cookbooks in the store
+    When I run `berks shelf uninstall fake`
+    Then the output should contain:
+      """
+      Cookbook 'fake' is not in the Berkshelf shelf
+      """
+    And the CLI should exit with the status code for error "CookbookNotFound"
+  Scenario: With two cookbooks in the store
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.3.4 |
+    When I successfully run `berks shelf uninstall fake`
+    Then the output should contain:
+      """
+      Successfully uninstalled fake (1.0.0)
+      """
+    And the cookbook store should not have the cookbooks:
+      | fake | 1.0.0 |
+    And the cookbook store should have the cookbooks:
+      | ekaf | 2.3.4 |
+    And the exit status should be 0
+  Scenario: With multiple cookbook versions installed
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | fake | 1.1.0 |
+      | fake | 1.2.0 |
+      | fake | 2.0.0 |
+    When I successfully run `berks shelf uninstall fake`
+    Then the output should contain:
+      """
+      Successfully uninstalled fake (1.0.0)
+      Successfully uninstalled fake (1.1.0)
+      Successfully uninstalled fake (1.2.0)
+      Successfully uninstalled fake (2.0.0)
+      """
+    And the cookbook store should not have the cookbooks:
+      | fake | 1.0.0 |
+      | fake | 1.1.0 |
+      | fake | 1.2.0 |
+      | fake | 2.0.0 |
+    And the exit status should be 0
+  Scenario: When specifying a version
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | fake | 1.1.0 |
+      | fake | 1.2.0 |
+      | fake | 2.0.0 |
+    When I successfully run `berks shelf uninstall fake --version 1.0.0`
+    Then the output should contain:
+      """
+      Successfully uninstalled fake (1.0.0)
+      """
+    And the cookbook store should not have the cookbooks:
+      | fake | 1.0.0 |
+    And the cookbook store should have the cookbooks:
+      | fake | 1.1.0 |
+      | fake | 1.2.0 |
+      | fake | 2.0.0 |
+    And the exit status should be 0
+  Scenario: With contingencies
+    Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
+      | ekaf | 2.3.4 |
+    And the cookbook store has the cookbooks:
+      | ekaf | 2.3.4 |
+    When I run `berks shelf uninstall ekaf` interactively
+    And I type "yes"
+    Then the output should contain:
+      """
+      [fake (1.0.0)] depend on ekaf.
+      Are you sure you want to continue? (y/N)
+      """
+    And the output should contain:
+      """
+      Successfully uninstalled ekaf (2.3.4)
+      """
+    And the cookbook store should not have the cookbooks:
+      | ekaf | 2.3.4 |
+    And the exit status should be 0
+  Scenario: With contingencies and the --force flag
+    Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
+      | ekaf | 2.3.4 |
+    And the cookbook store has the cookbooks:
+      | ekaf | 2.3.4 |
+    When I run `berks shelf uninstall ekaf --force`
+    Then the output should contain:
+      """
+      Successfully uninstalled ekaf (2.3.4)
+      """
+    And the cookbook store should not have the cookbooks:
+      | ekaf | 2.3.4 |
+    And the exit status should be 0

data/features/show_command.feature CHANGED

@@ -1,26 +1,58 @@
-Feature: show command
-  As a user with a Berksfile
-  I want a way to show the path to a cookbooks on my local file system
-  So that I can view the source and debug
+Feature: Displaying information about a cookbook defined by a Berksfile
+  As a user
+  I want to be able to view the metadata information of a cached cookbook
+  So that I can troubleshoot bugs or satisfy my own curiosity
-  Scenario: Running the show command with an installed cookbook name
+  Scenario: With no options
     Given the cookbook store has the cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
+      | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+      cookbook 'fake', '1.0.0'
+      """
+    When I successfully run `berks show fake`
+    Then the output should contain:
+      """
+              Name: fake
+           Version: 1.0.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
       """
-    When I successfully run `berks show berkshelf-cookbook-fixture`
-    Then the output should contain "berkshelf/tmp/berkshelf/cookbooks/berkshelf-cookbook-fixture-1.0.0"
-    And the exit status should be 0
-  Scenario: Running the show command with a not installed cookbook name
-    Given I write to "Berksfile" with:
+  Scenario: When JSON is requested
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I write to "Berksfile" with:
+      """
+      cookbook 'fake', '1.0.0'
       """
-      site :opscode
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+    When I successfully run `berks show fake --format json`
+    Then the output should contain:
       """
-    When I run `berks show build-essential`
-    Then the output should contain "Cookbook 'build-essential' was not installed by your Berksfile"
+      {
+        "cookbooks": [
+          {
+            "name": "fake",
+            "version": "1.0.0",
+            "description": "A fabulous new cookbook",
+            "author": "YOUR_COMPANY_NAME",
+            "email": "YOUR_EMAIL",
+            "license": "none"
+          }
+        ],
+        "errors": [
+        ],
+        "messages": [
+        ]
+      }
+      """
+  Scenario: When the cookbook is not in the Berksfile
+    Given an empty file named "Berksfile"
+    When I run `berks show fake`
+    Then the output should contain "Cookbook 'fake' is not installed by your Berksfile"
     And the CLI should exit with the status code for error "CookbookNotFound"