berkshelf 2.0.18 → 3.0.0.beta1

data/.ruby-version

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

data/.travis.yml

@@ -8,7 +8,10 @@ notifications:
       - "irc.freenode.org#berkshelf"
     skip_join: true
     use_notice: true
+bundler_args: --without guard
+before_install:
+  - sudo apt-get install -qq libarchive12 libarchive-dev
 before_script:
   - git config --global user.email "ci@berkshelf.com"
   - git config --global user.name "Berkshelf"
-script: 'bundle exec thor spec:ci'
+script: bundle exec thor spec:ci

data/CHANGELOG.md

@@ -1,30 +1,6 @@
-# 2.0.18
+# 3.0.0
 
-* Fix issue with connecting to an HTTPS enabled community site
-
-# 2.0.17
-
-* Fix constraint on Hashie
-
-# 2.0.16
-
-* Update constraint on Ridley
-
-# 2.0.14
-
-* Backport changes from master to allow detecting cookbooks by metadata.json
-
-# 2.0.13
-
-* Lock transitive dependency on Faraday
-
-# 2.0.10
-
-* Huge performance increase when resolving a Berksfile when the Berkshelf contains a lot of cookbooks
-
-# 2.0.9
-
-* Update required version of Ridley
+* New "universe" resolver which communicates with an API server to resolve constraint graphs faster and more reliably
 
 # 2.0.7
 

data/Gemfile

@@ -2,8 +2,14 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :development do
-  gem 'test-kitchen', '>= 1.0.0.alpha7'
+group :guard do
+  gem 'coolline',      '~> 0.4.2'
+  gem 'guard',         '~> 1.8'
+  gem 'guard-cane'
+  gem 'guard-cucumber'
+  gem 'guard-rspec'
+  gem 'guard-spork'
+  gem 'guard-yard'
 
   require 'rbconfig'
 
@@ -25,3 +31,7 @@ group :development do
     gem 'win32console', require: false
   end
 end
+
+group :test do
+  gem 'berkshelf-api', github: "RiotGames/berkshelf-api"
+end

data/README.md

@@ -23,6 +23,14 @@ Usage
 -----
 See [berkshelf.com](http://berkshelf.com) for up-to-date usage instructions.
 
+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.
+
 Bash Completion
 ---------------
 There is a [berkshelf bash completion script](https://raw.github.com/RiotGames/berkshelf/master/berkshelf-complete.sh). If you're using homebrew, you can install it like this:
@@ -60,7 +68,7 @@ You are encouraged to keep project-specific configuration in the `$PWD/.berkshel
 SSL Errors
 ----------
 
-If you have trouble getting Berkshelf to successfully talk to an SSL Chef server, you can try making sure you
+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:

data/berkshelf.gemspec

@@ -27,21 +27,21 @@ Gem::Specification.new do |s|
   s.name                      = 'berkshelf'
   s.require_paths             = ['lib']
   s.version                   = Berkshelf::VERSION
-  s.required_ruby_version     = '>= 1.9.1'
+  s.required_ruby_version     = '>= 1.9.2'
   s.required_rubygems_version = '>= 1.8.0'
 
-  s.add_dependency 'activesupport',     '~> 3.2.0'
   s.add_dependency 'addressable',       '~> 2.3.4'
+  s.add_dependency 'buff-config',       '~> 0.1'
+  s.add_dependency 'buff-extensions',   '~> 0.4'
   s.add_dependency 'buff-shell_out',    '~> 0.1'
-  s.add_dependency 'chozo',             '>= 0.6.1'
-  s.add_dependency 'hashie',            '~> 2.0'
+  s.add_dependency 'celluloid',         '>= 0.14.0'
+  s.add_dependency 'faraday',           '>= 0.8.5'
+  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.7.0'
-  s.add_dependency 'solve',             '~> 0.8.2'
+  s.add_dependency 'ridley',            '~> 1.3.0'
+  s.add_dependency 'solve',             '>= 0.5.0'
   s.add_dependency 'thor',              '~> 0.18.0'
-  s.add_dependency 'rbzip2',            '~> 0.2.0'
-  s.add_dependency 'faraday',           '~> 0.8.5' # lock tranisitive dependency of Ridley
 
   s.add_development_dependency 'aruba',         '~> 0.5'
   s.add_development_dependency 'cane',          '~> 2.5'
@@ -49,18 +49,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fuubar',        '~> 1.1'
   s.add_development_dependency 'rake',          '~> 0.9'
   s.add_development_dependency 'rspec',         '~> 2.13'
-  s.add_development_dependency 'simplecov',     '~> 0.7'
   s.add_development_dependency 'spork',         '~> 0.9'
+  s.add_development_dependency 'test-kitchen',  '>= 1.0.0.alpha7'
   s.add_development_dependency 'vcr',           '~> 2.4'
   s.add_development_dependency 'webmock',       '~> 1.11'
   s.add_development_dependency 'yard',          '~> 0.8'
-
-  # Guard extensions for development
-  s.add_development_dependency 'coolline',      '~> 0.4.2' # readline for guard on MRI
-  s.add_development_dependency 'guard',         '~> 1.8'
-  s.add_development_dependency 'guard-cane'
-  s.add_development_dependency 'guard-cucumber'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-spork'
-  s.add_development_dependency 'guard-yard'
 end

data/bin/berks

@@ -1,15 +1,5 @@
 #!/usr/bin/env ruby
-$:.push File.expand_path("../../lib", __FILE__)
-require 'berkshelf'
+$:.push File.expand_path('../../lib', __FILE__)
+require 'berkshelf/cli'
 
-begin
-  Berkshelf::Cli.start
-rescue Berkshelf::BerkshelfError => e
-  Berkshelf.ui.error e
-  Berkshelf.ui.error "\t" + e.backtrace.join("\n\t") if ENV['BERKSHELF_DEBUG']
-  exit e.status_code
-rescue Ridley::Errors::RidleyError => e
-  Berkshelf.ui.error "#{e.class} #{e}"
-  Berkshelf.ui.error "\t" + e.backtrace.join("\n\t") if ENV['BERKSHELF_DEBUG']
-  exit 47
-end
+Berkshelf::Cli::Runner.new(ARGV.dup).execute!

data/features/apply_command.feature

@@ -3,36 +3,38 @@ Feature: Applying cookbook versions to a Chef Environment
   I want to push my berks resolved cookbook versions to my environment
   So that I can avoid manual configuration of my environments
 
-  @chef_server
   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 I have an environment named "berkshelf_lock_test"
+    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 "berkshelf_lock_test" should be:
+    Then the version locks in the "berkshelf_lock_test" environment should be:
       | cookbook   | version_lock |
-      | fake       | = 1.0.0 |
-      | dependency | = 2.0.0 |
+      | fake       | 1.0.0 |
+      | dependency | 2.0.0 |
     And the exit status should be 0
 
-  @chef_server
   Scenario: Locking cookbook versions to a non-existent Chef Environment
-    Given I do not have an environment named "berkshelf_lock_test"
+    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 the apply command on "berkshelf_lock_test"
+    When I run `berks apply berkshelf_lock_test`
     Then the output should contain:
       """
       The environment 'berkshelf_lock_test' does not exist
       """
-    And the CLI should exit with the status code for error "EnvironmentNotFound"
+    And the exit status should be "EnvironmentNotFound"

data/features/berksfile.feature

@@ -6,6 +6,8 @@ Feature: Evaluating a Berksfile
   Scenario: Containing pure Ruby
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       if ENV['BACON']
         puts "If you don't got bacon..."
       else
@@ -18,19 +20,12 @@ Feature: Evaluating a Berksfile
       """
       If you don't got bacon...
       """
-    And the exit status should be 0
-
-  Scenario: Calling valid DSL methods:
-    Given I write to "Berksfile" with:
-      """
-      site :opscode
-      """
-    When I successfully run `berks install`
-    And the exit status should be 0
 
   Scenario: Containing methods I shouldn't be able to call
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       add_location(:foo)
       """
     When I run `berks install`
@@ -40,11 +35,13 @@ Feature: Evaluating a Berksfile
 
         undefined method `add_location' for
       """
-    And the CLI should exit with the status code for error "BerksfileReadError"
+    And the exit status should be "BerksfileReadError"
 
   Scenario: Containing Ruby syntax errors
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       ptus "This is a ruby syntax error"
       """
     When I run `berks install`
@@ -54,3 +51,4 @@ Feature: Evaluating a Berksfile
 
         undefined method `ptus' for
       """
+    And the exit status should be "BerksfileReadError"

data/features/config.feature

@@ -4,7 +4,6 @@ Feature: Reading a Berkshelf configuration file
   So that I don't have to spend time modifying the default generated output each time
 
   Scenario: Missing a Berkshelf configuration file
-    Given I do not have a Berkshelf config file
     When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
       | config.vm.box = "Berkshelf-CentOS-6.3-x86_64-minimal" |
@@ -71,7 +70,7 @@ Feature: Reading a Berkshelf configuration file
     When I run `berks cookbook sparkle_motion`
     Then the output should contain "Invalid configuration"
     And the output should contain "vagrant.vm.box Expected attribute: 'vagrant.vm.box' to be a type of: 'String'"
-    And the CLI should exit with the status code for error "InvalidConfiguration"
+    And the exit status should be "InvalidConfiguration"
 
   Scenario: Using a Berkshelf configuration file with Chef configuration information
     Given I have a Berkshelf config file containing:

data/features/configure_command.feature

@@ -1,10 +1,13 @@
+@spawn
 Feature: Configuring Berkshelf via the command line
   As CLI user of Berkshelf
   I want a command to generate a Berkshelf configuration file based on my input
   So I can quickly get up and running with the least amount of resistance
 
+  Background:
+    Given I do not have a Berkshelf config
+
   Scenario: Using custom values
-    Given I do not have a Berkshelf config file
     When I run `berks configure` interactively
     And I type "https://api.opscode.com/organizations/vialstudios"
     And I type "node_name"
@@ -17,7 +20,6 @@ Feature: Configuring Berkshelf via the command line
       """
       Config written to:
       """
-    And the exit status should be 0
     And a Berkshelf config file should exist and contain:
       | chef.chef_server_url        | https://api.opscode.com/organizations/vialstudios |
       | chef.validation_client_name | reset                                             |
@@ -26,10 +28,10 @@ Feature: Configuring Berkshelf via the command line
       | chef.validation_key_path    | /Users/reset/.chef/reset.pem                      |
       | vagrant.vm.box              | Berkshelf-minimal                                 |
       | vagrant.vm.box_url          | https://dl.dropbox.com/Berkshelf.box              |
+    And the exit status should be 0
 
   Scenario: Accepting the default values
-    Given I do not have a Berkshelf config file
-    And I have a default Chef config
+    Given I do not have a Chef config
     When I run `berks configure` interactively
     And I type ""
     And I type ""
@@ -42,7 +44,6 @@ Feature: Configuring Berkshelf via the command line
       """
       Config written to:
       """
-    And the exit status should be 0
     And a Berkshelf config file should exist and contain:
       | chef.chef_server_url        | http://localhost:4000               |
       | chef.validation_client_name | chef-validator                      |
@@ -50,19 +51,19 @@ Feature: Configuring Berkshelf via the command line
       | chef.validation_key_path    | /etc/chef/validation.pem            |
       | vagrant.vm.box              | Berkshelf-CentOS-6.3-x86_64-minimal |
       | vagrant.vm.box_url          | https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box |
+    And the exit status should be 0
 
   Scenario: Creating a Berkshelf configuration file when one already exists
-    Given I have a default Berkshelf config file
-    When I run `berks configure` interactively
+    Given I already have a Berkshelf config file
+    When I run `berks configure`
     Then the output should contain:
       """
       A configuration file already exists. Re-run with the --force flag if you wish to overwrite it.
       """
-    And the CLI should exit with the status code for error "ConfigExists"
+    And the exit status should be "ConfigExists"
 
   Scenario Outline: Using the --path option
-    Given I do not have a Berkshelf config file at "<path>"
-    When I run the "configure --path <path>" command interactively
+    When I run `berks configure --path <path>` interactively
     And I type "https://api.opscode.com/organizations/vialstudios"
     And I type "node_name"
     And I type "client_key"
@@ -74,7 +75,6 @@ Feature: Configuring Berkshelf via the command line
       """
       Config written to:
       """
-    And the exit status should be 0
     And a Berkshelf config file should exist at "<path>" and contain:
       | chef.chef_server_url        | https://api.opscode.com/organizations/vialstudios |
       | chef.validation_client_name | reset                                             |
@@ -83,10 +83,9 @@ Feature: Configuring Berkshelf via the command line
       | chef.validation_key_path    | /Users/reset/.chef/reset.pem                      |
       | vagrant.vm.box              | Berkshelf-minimal                                 |
       | vagrant.vm.box_url          | https://dl.dropbox.com/Berkshelf.box              |
+    And the exit status should be 0
 
     Examples:
-      |       path      |
+      | path                   |
       | .berkshelf/config.json |
       | berkshelf/config.json  |
-      | berkshelf-config.json  |
-      | config.json            |

data/features/contingent_command.feature

@@ -3,6 +3,11 @@ Feature: Running the contingent command
   I want a way to the cookbooks that depend on another
   So that I can better understand my infrastructure
 
+  Background:
+    Given the Berkshelf API server's cache is empty
+    And the Chef Server is empty
+    And the cookbook store is empty
+
   Scenario: When there are dependent cookbooks
     Given the cookbook store has the cookbooks:
       | dep | 1.0.0 |
@@ -12,6 +17,8 @@ Feature: Running the contingent command
       | dep | ~> 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       cookbook 'ekaf', '1.0.0'
       """
@@ -29,6 +36,8 @@ Feature: Running the contingent command
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       """
     And I successfully run `berks contingent dep`
@@ -39,7 +48,10 @@ Feature: Running the contingent command
     And the exit status should be 0
 
   Scenario: When the cookbook is not in the Berksfile
-    Given an empty file named "Berksfile"
+    Given I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+      """
     And I successfully run `berks contingent dep`
     Then the output should contain:
       """

data/features/cookbook_command.feature

@@ -9,8 +9,7 @@ Feature: Creating a new cookbook
     And the exit status should be 0
 
   Scenario Outline: With various options
-    When I run the cookbook command to create "sparkle_motion" with options:
-      | --<option> |
+    When I successfully run `berks cookbook sparkle_motion --<option>`
     Then I should have a new cookbook skeleton "sparkle_motion" with <feature> support
     And the exit status should be 0
 
@@ -28,8 +27,7 @@ Feature: Creating a new cookbook
 
   Scenario Outline: When a required supporting gem is not installed
     Given the gem "<gem>" is not installed
-    When I run the cookbook command to create "sparkle_motion" with options:
-      | --<option> |
+    When I successfully run `berks cookbook sparkle_motion --<option>`
     Then I should have a new cookbook skeleton "sparkle_motion" with <feature> support
     And the output should contain a warning to suggest supporting the option "<option>" by installing "<gem>"
     And the exit status should be 0

data/features/groups_install.feature

@@ -9,6 +9,8 @@ Feature: Installing specific groups
       | takeme   | 1.0.0 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       group :notme do
         cookbook 'notme', '1.0.0'
       end
@@ -34,6 +36,8 @@ Feature: Installing specific groups
       | takeme   | 1.0.0 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       group :notme do
         cookbook 'notme', '1.0.0'
       end
@@ -47,7 +51,7 @@ Feature: Installing specific groups
     And I write to "Berksfile.lock" with:
       """
       {
-        "sources": {
+        "dependencies": {
           "notme": { "locked_version": "1.0.0"},
           "takeme": { "locked_version": "1.0.0"},
           "default": { "locked_version": "1.0.0"}
@@ -68,6 +72,8 @@ Feature: Installing specific groups
       | takeme   | 1.0.0 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       group :notme do
         cookbook 'notme', '1.0.0'
       end
@@ -87,6 +93,8 @@ Feature: Installing specific groups
   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
@@ -102,4 +110,4 @@ Feature: Installing specific groups
       """
       Cannot specify both :except and :only
       """
-    And the CLI should exit with the status code for error "ArgumentError"
+    And the exit status should be "ArgumentError"