berkshelf 3.0.0.beta2 → 3.0.0.beta3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.beta3
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -70,20 +70,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -146,28 +132,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -196,20 +182,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
@@ -294,20 +266,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0.alpha7
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -348,7 +306,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .cane
 - .gitignore
 - .ruby-version
 - .travis.yml
@@ -363,26 +320,31 @@ files:
 - berkshelf-complete.sh
 - berkshelf.gemspec
 - bin/berks
-- features/apply_command.feature
 - features/berksfile.feature
+- features/commands/apply.feature
+- features/commands/configure.feature
+- features/commands/contingent.feature
+- features/commands/cookbook.feature
+- features/commands/init.feature
+- features/commands/install.feature
+- features/commands/list.feature
+- features/commands/outdated.feature
+- features/commands/package.feature
+- features/commands/shelf/list.feature
+- features/commands/shelf/show.feature
+- features/commands/shelf/uninstall.feature
+- features/commands/show.feature
+- features/commands/update.feature
+- features/commands/upload.feature
+- features/commands/vendor.feature
+- features/community_site.feature
 - features/config.feature
-- features/configure_command.feature
-- features/contingent_command.feature
-- features/cookbook_command.feature
-- features/groups_install.feature
 - features/help.feature
-- features/init_command.feature
-- features/install_command.feature
 - features/json_formatter.feature
 - features/licenses.feature
-- features/list_command.feature
 - features/lockfile.feature
-- features/outdated_command.feature
-- features/package_command.feature
-- features/shelf/list.feature
-- features/shelf/show.feature
-- features/shelf/uninstall.feature
-- features/show_command.feature
+- features/resolver.feature
+- features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef/config_steps.rb
 - features/step_definitions/chef_server_steps.rb
 - features/step_definitions/cli_steps.rb
@@ -395,9 +357,6 @@ files:
 - features/step_definitions/utility_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
-- features/update_command.feature
-- features/upload_command.feature
-- features/vendor_command.feature
 - generator_files/Berksfile.erb
 - generator_files/Gemfile.erb
 - generator_files/README.md.erb
@@ -420,9 +379,6 @@ files:
 - lib/berkshelf/base_generator.rb
 - lib/berkshelf/berksfile.rb
 - lib/berkshelf/cached_cookbook.rb
-- lib/berkshelf/chef.rb
-- lib/berkshelf/chef/cookbook.rb
-- lib/berkshelf/chef/cookbook/chefignore.rb
 - lib/berkshelf/cli.rb
 - lib/berkshelf/commands/shelf.rb
 - lib/berkshelf/commands/test_command.rb
@@ -470,20 +426,6 @@ files:
 - spec/config/knife.rb
 - spec/config/validator.pem
 - spec/fixtures/Berksfile
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_download/unpacks_the_archive.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CookbookNotFound_error_on_a_404_response_for_a_non-existent_cookbook.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CookbookNotFound_error_on_a_404_response_for_a_non-existent_version.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/returns_the_cookbook_and_version_information.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_latest_version/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_latest_version/raises_a_CookbookNotFound_error_on_a_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_latest_version/returns_the_version_number_of_the_latest_version_of_the_cookbook.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_satisfy/returns_the_version_number_of_the_best_solution.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_versions/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_versions/raises_a_CookbookNotFound_error_on_a_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_versions/returns_an_array_containing_an_item_for_each_version.json
-- spec/fixtures/cassettes/Berkshelf_Resolver/_initialize/adds_the_dependencies_of_the_dependency_as_dependencies.yml
-- spec/fixtures/cassettes/Berkshelf_Resolver/_initialize/adds_the_dependencies_of_the_source_as_sources.yml
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
@@ -508,7 +450,6 @@ files:
 - spec/unit/berkshelf/api_client_spec.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
-- spec/unit/berkshelf/chef/cookbook/chefignore_spec.rb
 - spec/unit/berkshelf/community_rest_spec.rb
 - spec/unit/berkshelf/config_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb
@@ -562,26 +503,31 @@ signing_key:
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
-- features/apply_command.feature
 - features/berksfile.feature
+- features/commands/apply.feature
+- features/commands/configure.feature
+- features/commands/contingent.feature
+- features/commands/cookbook.feature
+- features/commands/init.feature
+- features/commands/install.feature
+- features/commands/list.feature
+- features/commands/outdated.feature
+- features/commands/package.feature
+- features/commands/shelf/list.feature
+- features/commands/shelf/show.feature
+- features/commands/shelf/uninstall.feature
+- features/commands/show.feature
+- features/commands/update.feature
+- features/commands/upload.feature
+- features/commands/vendor.feature
+- features/community_site.feature
 - features/config.feature
-- features/configure_command.feature
-- features/contingent_command.feature
-- features/cookbook_command.feature
-- features/groups_install.feature
 - features/help.feature
-- features/init_command.feature
-- features/install_command.feature
 - features/json_formatter.feature
 - features/licenses.feature
-- features/list_command.feature
 - features/lockfile.feature
-- features/outdated_command.feature
-- features/package_command.feature
-- features/shelf/list.feature
-- features/shelf/show.feature
-- features/shelf/uninstall.feature
-- features/show_command.feature
+- features/resolver.feature
+- features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef/config_steps.rb
 - features/step_definitions/chef_server_steps.rb
 - features/step_definitions/cli_steps.rb
@@ -594,27 +540,10 @@ test_files:
 - features/step_definitions/utility_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
-- features/update_command.feature
-- features/upload_command.feature
-- features/vendor_command.feature
 - spec/config/berkshelf.pem
 - spec/config/knife.rb
 - spec/config/validator.pem
 - spec/fixtures/Berksfile
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_download/unpacks_the_archive.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CookbookNotFound_error_on_a_404_response_for_a_non-existent_cookbook.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CookbookNotFound_error_on_a_404_response_for_a_non-existent_version.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/returns_the_cookbook_and_version_information.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_latest_version/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_latest_version/raises_a_CookbookNotFound_error_on_a_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_latest_version/returns_the_version_number_of_the_latest_version_of_the_cookbook.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_satisfy/returns_the_version_number_of_the_best_solution.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_versions/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_versions/raises_a_CookbookNotFound_error_on_a_404_response.json
-- spec/fixtures/cassettes/Berkshelf_CommunityREST/_versions/returns_an_array_containing_an_item_for_each_version.json
-- spec/fixtures/cassettes/Berkshelf_Resolver/_initialize/adds_the_dependencies_of_the_dependency_as_dependencies.yml
-- spec/fixtures/cassettes/Berkshelf_Resolver/_initialize/adds_the_dependencies_of_the_source_as_sources.yml
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
@@ -639,7 +568,6 @@ test_files:
 - spec/unit/berkshelf/api_client_spec.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
-- spec/unit/berkshelf/chef/cookbook/chefignore_spec.rb
 - spec/unit/berkshelf/community_rest_spec.rb
 - spec/unit/berkshelf/config_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb

data/.cane

@@ -1,4 +0,0 @@
---doc-exclude lib/berkshelf/errors.rb
---max-violations 100
---style-measure 120
---parallel

data/features/apply_command.feature

@@ -1,40 +0,0 @@
-Feature: Applying cookbook versions to a Chef Environment
-  As a berks user
-  I want to push my berks resolved cookbook versions to my environment
-  So that I can avoid manual configuration of my environments
-
-  Scenario: Locking a cookbook version with dependencies
-    Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
-      | dependency | 2.0.0 |
-    And the cookbook store has the cookbooks:
-      | dependency | 2.0.0 |
-    And The Chef Server has an environment named "berkshelf_lock_test"
-    And I write to "Berksfile" with:
-      """
-      source "http://localhost:26210"
-
-      cookbook 'fake', '1.0.0'
-      """
-    When I successfully run `berks apply berkshelf_lock_test`
-    Then the version locks in the "berkshelf_lock_test" environment should be:
-      | cookbook   | version_lock |
-      | fake       | 1.0.0 |
-      | dependency | 2.0.0 |
-    And the exit status should be 0
-
-  Scenario: Locking cookbook versions to a non-existent Chef Environment
-    Given The Chef Server does not have an environment named "berkshelf_lock_test"
-    And 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'
-      """
-    When I run `berks apply berkshelf_lock_test`
-    Then the output should contain:
-      """
-      The environment 'berkshelf_lock_test' does not exist
-      """
-    And the exit status should be "EnvironmentNotFound"

data/features/groups_install.feature

@@ -1,113 +0,0 @@
-Feature: Installing specific groups
-  As a user
-  I want to be able specify groups of cookbooks to include or exclude
-  So I don't install cookbooks that are part of a group that I do not want to install
-
-  Scenario: Using the --except option
-    Given the cookbook store has the cookbooks:
-      | default  | 1.0.0 |
-      | takeme   | 1.0.0 |
-    Given I write to "Berksfile" with:
-      """
-      source "http://localhost:26210"
-
-      group :notme do
-        cookbook 'notme', '1.0.0'
-      end
-
-      cookbook 'default', '1.0.0'
-
-      group :takeme do
-        cookbook 'takeme', '1.0.0'
-      end
-      """
-    When I successfully run `berks install --except notme`
-    Then the output should contain:
-      """
-      Using default (1.0.0)
-      Using takeme (1.0.0)
-      """
-    And the output should not contain "Using notme (1.0.0)"
-    And the exit status should be 0
-
-  Scenario: Using the --except option with a lockfile
-    Given the cookbook store has the cookbooks:
-      | default  | 1.0.0 |
-      | takeme   | 1.0.0 |
-    Given I write to "Berksfile" with:
-      """
-      source "http://localhost:26210"
-
-      group :notme do
-        cookbook 'notme', '1.0.0'
-      end
-
-      cookbook 'default', '1.0.0'
-
-      group :takeme do
-        cookbook 'takeme', '1.0.0'
-      end
-      """
-    And I write to "Berksfile.lock" with:
-      """
-      {
-        "dependencies": {
-          "notme": { "locked_version": "1.0.0"},
-          "takeme": { "locked_version": "1.0.0"},
-          "default": { "locked_version": "1.0.0"}
-        }
-      }
-      """
-    When I successfully run `berks install --except notme`
-    Then the output should contain:
-      """
-      Using default (1.0.0)
-      Using takeme (1.0.0)
-      """
-    And the output should not contain "Using notme (1.0.0)"
-    And the exit status should be 0
-
-  Scenario: Using the --only option
-    Given the cookbook store has the cookbooks:
-      | takeme   | 1.0.0 |
-    Given I write to "Berksfile" with:
-      """
-      source "http://localhost:26210"
-
-      group :notme do
-        cookbook 'notme', '1.0.0'
-      end
-
-      cookbook 'default', '1.0.0'
-
-      group :takeme do
-        cookbook 'takeme', '1.0.0'
-      end
-      """
-    When I successfully run `berks install --only takeme`
-    Then the output should contain "Using takeme (1.0.0)"
-    Then the output should not contain "Using notme (1.0.0)"
-    Then the output should not contain "Using default (1.0.0)"
-    And the exit status should be 0
-
-  Scenario: Attempting to provide an only and except option
-    Given I write to "Berksfile" with:
-      """
-      source "http://localhost:26210"
-
-      group :notme do
-        cookbook 'nginx', '= 0.101.2'
-      end
-
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
-
-      group :takeme do
-        cookbook 'hostsfile', '1.0.1'
-      end
-      """
-    When I run `berks install --only takeme --except notme`
-    Then the output should contain:
-      """
-      Cannot specify both :except and :only
-      """
-    And the exit status should be "ArgumentError"