berkshelf 3.0.0.beta8 → 3.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34864a59cc163f2f46a8f0ff67ea71d60d013066
-  data.tar.gz: f9a55cfc84edeaf87736756035490331c6d22b1b
+  metadata.gz: a93a58092d85d92072229df17a0ac18f86be4c61
+  data.tar.gz: 2d5f1a561cc471759fff50cdd1e1838ac3ad6728
 SHA512:
-  metadata.gz: 905e8267b648a21fb101f48a948660a8297763257c785177553720df1e02af1611d549d5cf0b3a73c66386baeb6101c0dd7e585296283762ddf2c1747b37c58e
-  data.tar.gz: 7af8c5176a2dc388730f0ce8b6c99d53fced510224fcd370b21aea9e58715cd8bd09bc0539ee87769aba095eaaf8d455bb5b77d620393442a42e1bc58b4f35ab
+  metadata.gz: f2a9db9d98a43f866c73d75cb3a74418f96dd4feadfb4d20d57ef47e8f0dd0a50d787a5446e0c66050383918c4acd9781e948c6e5c84c1a5d5cfd79e1219301d
+  data.tar.gz: 78395f776b664f4184f6d9fd91ca564833db46d684571a93734c34516c4d894774ba1320774ad3054757177e9ddc861b7ceba96b244f281c25c8f689bd8b13a4

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 notifications:
   irc:
     channels:
@@ -13,7 +14,7 @@ branches:
     - master
 bundler_args: --without guard --jobs 7
 before_install:
-  - sudo apt-get install -qq libarchive12 libarchive-dev
+  - sudo apt-get install -qq libarchive12 libarchive-dev libgecode-dev
 before_script:
   - echo "StrictHostKeyChecking no" > ~/.ssh/config
   - git config --global user.email "ci@berkshelf.com"

data/README.md

@@ -1,7 +1,10 @@
 Berkshelf
 =========
-[![Gem Version](https://badge.fury.io/rb/berkshelf.png)](http://badge.fury.io/rb/berkshelf)
-[![Build Status](https://travis-ci.org/berkshelf/berkshelf.png?branch=master)](https://travis-ci.org/berkshelf/berkshelf)
+[![Gem Version](https://img.shields.io/gem/v/berkshelf.svg)][gem]
+[![Build Status](https://img.shields.io/travis/berkshelf/berkshelf.svg)][travis]
+
+[gem]: https://rubygems.org/gems/berkshelf
+[travis]: https://travis-ci.org/berkshelf/berkshelf
 
 Manage a Cookbook or an Application's Cookbook dependencies
 

data/berkshelf.gemspec

@@ -38,8 +38,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday',              '~> 0.9.0'
   s.add_dependency 'minitar',              '~> 0.5.4'
   s.add_dependency 'retryable',            '~> 1.3.3'
-  s.add_dependency 'ridley',               '~> 3.0.0.rc1'
-  s.add_dependency 'solve',                '>= 0.8.0'
+  s.add_dependency 'ridley',               '~> 3.0'
+  s.add_dependency 'solve',                '~> 1.0.0.rc1'
   s.add_dependency 'thor',                 '~> 0.18.0'
   s.add_dependency 'octokit',              '~> 2.6'
 

data/features/config.feature

@@ -20,10 +20,6 @@ Feature: Reading a Berkshelf configuration file
           "box_url": "http://files.vagrantup.com/lucid64.box",
           "forward_port": {
             "12345": "54321"
-          },
-          "network": {
-            "bridged": true,
-            "hostonly": "12.34.56.78"
           }
         }
       }
@@ -35,8 +31,7 @@ Feature: Reading a Berkshelf configuration file
       | config.vm.box = "my_box" |
       | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
       | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-      | config.vm.network :private_network, ip: "12.34.56.78" |
-      | config.vm.network :public_network |
+      | config.vm.network :private_network, type: "dhcp" |
     And the exit status should be 0
 
   Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version
@@ -53,10 +48,6 @@ Feature: Reading a Berkshelf configuration file
           "box_url": "http://files.vagrantup.com/lucid64.box",
           "forward_port": {
             "12345": "54321"
-          },
-          "network": {
-            "bridged": true,
-            "hostonly": "12.34.56.78"
           }
         }
       }
@@ -68,8 +59,7 @@ Feature: Reading a Berkshelf configuration file
       | config.vm.box = "my_box" |
       | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
       | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-      | config.vm.network :private_network, ip: "12.34.56.78" |
-      | config.vm.network :public_network |
+      | config.vm.network :private_network, type: "dhcp" |
     And the exit status should be 0
 
   Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version to latest
@@ -86,10 +76,6 @@ Feature: Reading a Berkshelf configuration file
           "box_url": "http://files.vagrantup.com/lucid64.box",
           "forward_port": {
             "12345": "54321"
-          },
-          "network": {
-            "bridged": true,
-            "hostonly": "12.34.56.78"
           }
         }
       }
@@ -101,8 +87,7 @@ Feature: Reading a Berkshelf configuration file
       | config.vm.box = "my_box" |
       | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
       | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-      | config.vm.network :private_network, ip: "12.34.56.78" |
-      | config.vm.network :public_network |
+      | config.vm.network :private_network, type: "dhcp" |
 
   Scenario: Using a partial Berkshelf configuration file
     Given I have a Berkshelf config file containing:

data/generator_files/Gemfile.erb

@@ -2,13 +2,17 @@ source 'https://rubygems.org'
 
 gem 'berkshelf'
 
-# Uncomment these lines (and the ones in the generated Vagrantfile) if you want
-# to live on the Edge:
+# Uncomment these lines if you want to live on the Edge:
 #
-# gem "berkshelf", github: "berkshelf/berkshelf"
-# gem "vagrant", github: "mitchellh/vagrant", tag: "v1.3.5"
-# gem "vagrant-berkshelf", github: "berkshelf/vagrant-berkshelf"
-# gem "vagrant-omnibus", github: "schisamo/vagrant-omnibus", tag: "v1.1.2"
+# group :development do
+#   gem "berkshelf", github: "berkshelf/berkshelf"
+#   gem "vagrant", github: "mitchellh/vagrant", tag: "v1.5.2"
+# end
+#
+# group :plugins do
+#   gem "vagrant-berkshelf", github: "berkshelf/vagrant-berkshelf"
+#   gem "vagrant-omnibus", github: "schisamo/vagrant-omnibus"
+# end
 
 <% if options[:foodcritic] -%>
 gem 'thor-foodcritic'

data/generator_files/Vagrantfile.erb

@@ -1,13 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Uncomment these lines (and the ones in the generated Gemfile) if you want
-# to live on the Edge:
-#
-# Vagrant.require_plugin "vagrant-berkshelf"
-# Vagrant.require_plugin "vagrant-omnibus"
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
 
-Vagrant.configure("2") do |config|
+Vagrant.require_version ">= 1.5.0"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
@@ -36,20 +35,7 @@ Vagrant.configure("2") do |config|
   # via the IP. Host-only networks can talk to the host machine as well as
   # any other machines on the same network, but cannot be accessed (through this
   # network interface) by any external networks.
-<% if berkshelf_config.vagrant.vm.network.hostonly.present? -%>
-  config.vm.network :private_network, ip: "<%= berkshelf_config.vagrant.vm.network.hostonly %>"
-<% else %>
-  config.vm.network :private_network, ip: "192.168.33.10"
-<% end -%>
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-<% if berkshelf_config.vagrant.vm.network.bridged -%>
-  config.vm.network :public_network
-<% else %>
-  # config.vm.network :public_network
-<% end -%>
+  config.vm.network :private_network, type: "dhcp"
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,

data/lib/berkshelf.rb

@@ -4,6 +4,7 @@ require 'forwardable'
 require 'json'
 require 'pathname'
 require 'ridley'
+require 'semverse'
 require 'solve'
 require 'thor'
 require 'tmpdir'

data/lib/berkshelf/berksfile.rb

@@ -233,7 +233,7 @@ module Berkshelf
     #
     # @param [String] name
     #   the name of the dependency to add
-    # @param [String, Solve::Constraint] constraint
+    # @param [String, Semverse::Constraint] constraint
     #   the constraint to lock the dependency to
     #
     # @option options [Symbol, Array] :group

data/lib/berkshelf/community_rest.rb

@@ -146,12 +146,12 @@ module Berkshelf
     end
 
     # @param [String] name
-    # @param [String, Solve::Constraint] constraint
+    # @param [String, Semverse::Constraint] constraint
     #
     # @return [String]
     def satisfy(name, constraint)
-      Solve::Solver.satisfy_best(constraint, versions(name)).to_s
-    rescue Solve::Errors::NoSolutionError
+      Semverse::Constraint.satisfy_best(constraint, versions(name)).to_s
+    rescue Semverse::NoSolutionError
       nil
     end
 

data/lib/berkshelf/config.rb

@@ -104,12 +104,6 @@ module Berkshelf
     attribute 'vagrant.vm.forward_port',
       type: Hash,
       default: Hash.new
-    attribute 'vagrant.vm.network.bridged',
-      type: Boolean,
-      default: false
-    attribute 'vagrant.vm.network.hostonly',
-      type: String,
-      default: '33.33.33.10'
     attribute 'vagrant.vm.provision',
       type: String,
       default: 'chef_solo'

data/lib/berkshelf/cookbook_store.rb

@@ -96,8 +96,8 @@ module Berkshelf
     def cookbooks(filter = nil)
       cookbooks = storage_path.children.collect do |path|
         begin
-          Solve::Version.split(File.basename(path).slice(CachedCookbook::DIRNAME_REGEXP, 2))
-        rescue Solve::Errors::InvalidVersionFormat
+          Semverse::Version.split(File.basename(path).slice(CachedCookbook::DIRNAME_REGEXP, 2))
+        rescue Semverse::InvalidVersionFormat
           # Skip cookbooks that were downloaded by an SCM location. These can not be considered
           # complete cookbooks.
           next
@@ -136,12 +136,12 @@ module Berkshelf
     # constraint. Nil is returned if no matching CachedCookbook is found.
     #
     # @param [#to_s] name
-    # @param [Solve::Constraint] constraint
+    # @param [Semverse::Constraint] constraint
     #
     # @return [Berkshelf::CachedCookbook, nil]
     def satisfy(name, constraint)
       graph = Solve::Graph.new
-      cookbooks(name).each { |cookbook| graph.artifacts(name, cookbook.version) }
+      cookbooks(name).each { |cookbook| graph.artifact(name, cookbook.version) }
 
       name, version = Solve.it!(graph, [[name, constraint]], ENV['DEBUG_RESOLVER'] ? { ui: Berkshelf.ui } : {}).first
 

data/lib/berkshelf/dependency.rb

@@ -17,8 +17,6 @@ module Berkshelf
       end
     end
 
-    DEFAULT_CONSTRAINT = '>= 0.0.0'.freeze
-
     # @return [Berkshelf::Berksfile]
     attr_reader :berksfile
     # @return [String]
@@ -27,9 +25,9 @@ module Berkshelf
     attr_reader :groups
     # @return [Berkshelf::Location]
     attr_reader :location
-    # @return [Solve::Version]
+    # @return [Semverse::Version]
     attr_reader :locked_version
-    # @return [Solve::Constraint]
+    # @return [Semverse::Constraint]
     attr_reader :version_constraint
     # @return [Source]
     attr_accessor :source
@@ -39,7 +37,7 @@ module Berkshelf
     # @param [String] name
     #   the name of dependency
     #
-    # @option options [String, Solve::Constraint] :constraint
+    # @option options [String, Semverse::Constraint] :constraint
     #   version constraint for this dependency
     # @option options [String] :git
     #   the Git URL to clone
@@ -62,8 +60,14 @@ module Berkshelf
       @name               = name
       @metadata           = options[:metadata]
       @location           = Location.init(self, options)
-      @locked_version     = Solve::Version.new(options[:locked_version]) if options[:locked_version]
-      @version_constraint = Solve::Constraint.new(options[:constraint] || DEFAULT_CONSTRAINT)
+
+      if options[:locked_version]
+        @locked_version = Semverse::Version.coerce(options[:locked_version])
+      end
+
+      # The coerce method automatically gives us a default constraint of
+      # >= 0.0.0 if the constraint is not set.
+      @version_constraint = Semverse::Constraint.coerce(options[:constraint])
 
       add_group(options[:group]) if options[:group]
       add_group(:default) if groups.empty?
@@ -81,7 +85,7 @@ module Berkshelf
     # @param [#to_s] version
     #   the version to set
     def locked_version=(version)
-      @locked_version = Solve::Version.new(version.to_s)
+      @locked_version = Semverse::Version.coerce(version)
     end
 
     # Set this dependency's constraint(s).
@@ -89,7 +93,7 @@ module Berkshelf
     # @param [#to_s] constraint
     #   the constraint to set
     def version_constraint=(constraint)
-      @version_constraint = Solve::Constraint.new(constraint.to_s)
+      @version_constraint = Semverse::Constraint.coerce(constraint)
     end
 
     def add_group(*local_groups)

data/lib/berkshelf/locations/git.rb

@@ -56,7 +56,7 @@ module Berkshelf
     # a cached git copy and a scratch directory to prevent bad cookbooks from
     # making their way into the cookbook store.
     #
-    # @see BaseLOcation#install
+    # @see BaseLocation#install
     def install
       scratch_path = Pathname.new(Dir.mktmpdir)
 

data/lib/berkshelf/lockfile.rb

@@ -161,7 +161,7 @@ module Berkshelf
         graphed = graph.find(name)
         return false if graphed.nil?
 
-        Solve::Constraint.new(constraint).satisfies?(graphed.version) &&
+        Semverse::Constraint.new(constraint).satisfies?(graphed.version) &&
         satisfies_transitive?(graphed, checked)
       end
     end

data/lib/berkshelf/resolver/graph.rb

@@ -6,10 +6,11 @@ module Berkshelf
         store ||= Berkshelf::CookbookStore.instance
 
         store.cookbooks.each do |cookbook|
-          artifacts(cookbook.cookbook_name, cookbook.version)
+          artifact(cookbook.cookbook_name, cookbook.version)
 
           cookbook.dependencies.each do |dependency, constraint|
-            artifacts(cookbook.cookbook_name, cookbook.version).depends(dependency, constraint)
+            constraint = nil if constraint.empty?
+            artifact(cookbook.cookbook_name, cookbook.version).depends(dependency, constraint)
           end
         end
       end
@@ -23,9 +24,10 @@ module Berkshelf
         name    = cookbook.cookbook_name
         version = cookbook.version
 
-        artifacts(name, version)
+        artifact(name, version)
         cookbook.dependencies.each do |dependency, constraint|
-          artifacts(name, version).depends(dependency, constraint)
+          constraint = nil if constraint.empty?
+          artifact(name, version).depends(dependency, constraint)
         end
       end
 
@@ -34,10 +36,11 @@ module Berkshelf
         universe(sources).each do |cookbook|
           next if has_artifact?(cookbook.name, cookbook.version)
 
-          artifacts(cookbook.name, cookbook.version)
+          artifact(cookbook.name, cookbook.version)
 
           cookbook.dependencies.each do |dependency, constraint|
-            artifacts(cookbook.name, cookbook.version).depends(dependency, constraint)
+            constraint = nil if constraint.empty?
+            artifact(cookbook.name, cookbook.version).depends(dependency, constraint)
           end
         end
       end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = '3.0.0.beta8'
+  VERSION = '3.0.0.beta9'
 end

data/spec/unit/berkshelf/cookbook_store_spec.rb

@@ -38,9 +38,9 @@ describe Berkshelf::CookbookStore do
   describe '#satisfy' do
     let(:name) { 'nginx' }
     let(:version) { '0.101.4' }
-    let(:constraint) { Solve::Constraint.new('~> 0.101.2') }
-    let(:cached_one) { double('cached-one', name: name, version: Solve::Version.new(version)) }
-    let(:cached_two) { double('cached-two', name: 'mysql', version: Solve::Version.new('1.2.6')) }
+    let(:constraint) { Semverse::Constraint.new('~> 0.101.2') }
+    let(:cached_one) { double('cached-one', name: name, version: Semverse::Version.new(version)) }
+    let(:cached_two) { double('cached-two', name: 'mysql', version: Semverse::Version.new('1.2.6')) }
 
     before { subject.stub(:cookbooks).and_return([cached_one, cached_two]) }
 
@@ -61,8 +61,8 @@ describe Berkshelf::CookbookStore do
     end
 
     context 'when there is no matching cookbook for the given name and constraint' do
-      let(:version) { Solve::Version.new('1.0.0') }
-      let(:constraint) { Solve::Constraint.new('= 0.1.0') }
+      let(:version) { Semverse::Version.new('1.0.0') }
+      let(:constraint) { Semverse::Constraint.new('= 0.1.0') }
 
       before { subject.stub(:cookbooks).and_return([ double('badcache', name: 'none', version: version) ]) }
 

data/spec/unit/berkshelf/dependency_spec.rb

@@ -29,7 +29,7 @@ describe Berkshelf::Dependency do
       context 'given a value for :constraint' do
         let(:source) { described_class.new(berksfile, cookbook_name, constraint: '~> 1.0.84') }
 
-        it 'returns a Solve::Constraint for the given version for version_constraint' do
+        it 'returns a Semverse::Constraint for the given version for version_constraint' do
           expect(source.version_constraint.to_s).to eq('~> 1.0.84')
         end
       end

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -58,7 +58,7 @@ describe Berkshelf::Lockfile do
       cookbook = double('apt-1.0.0', dependencies: {})
       apt = double('apt',
         name: 'apt',
-        version_constraint: Solve::Constraint.new('>= 0.0.0'),
+        version_constraint: Semverse::Constraint.new('>= 0.0.0'),
         version: '1.0.0',
         location: 'api',
         dependencies: {},
@@ -76,7 +76,7 @@ describe Berkshelf::Lockfile do
       cookbook = double('apt-1.0.0', dependencies: { 'bacon' => '1.0.0' })
       apt = double('apt',
         name: 'apt',
-        version_constraint: Solve::Constraint.new('>= 0.0.0'),
+        version_constraint: Semverse::Constraint.new('>= 0.0.0'),
         version: '1.0.0',
         location: 'api',
         dependencies: { 'bacon' => '1.0.0' },
@@ -96,7 +96,7 @@ describe Berkshelf::Lockfile do
       cookbook = double('apt-1.0.0', dependencies: { 'bacon' => '1.0.0', 'flip' => '2.0.0' })
       apt = double('apt',
         name: 'apt',
-        version_constraint: Solve::Constraint.new('>= 0.0.0'),
+        version_constraint: Semverse::Constraint.new('>= 0.0.0'),
         version: '1.0.0',
         location: 'api',
         dependencies: { 'bacon' => '1.0.0' },
@@ -132,7 +132,7 @@ describe Berkshelf::Lockfile do
       cookbook = double('apt-1.0.0', dependencies: {})
       apt = double('apt',
         name: 'apt',
-        version_constraint: Solve::Constraint.new('< 1.0.0'),
+        version_constraint: Semverse::Constraint.new('< 1.0.0'),
         version: '1.0.0',
         location: 'api',
         dependencies: {},
@@ -150,7 +150,7 @@ describe Berkshelf::Lockfile do
       cookbook = double('apt-1.0.0', dependencies: {})
       apt = double('apt',
         name: 'apt',
-        version_constraint: Solve::Constraint.new('< 1.0.0'),
+        version_constraint: Semverse::Constraint.new('< 1.0.0'),
         version: '1.0.0',
         location: 'api',
         dependencies: {},

data/spec/unit/berkshelf/resolver/graph_spec.rb

@@ -19,7 +19,7 @@ describe Berkshelf::Resolver::Graph, :not_supported_on_windows do
 
     it "adds the dependencies of each dependency to the graph" do
       subject.populate(sources)
-      expect(subject.artifacts("ruby", "1.0.0").dependencies).to have(1).item
+      expect(subject.artifact("ruby", "1.0.0").dependencies).to have(1).item
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta8
+  version: 3.0.0.beta9
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,300 +12,300 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: berkshelf-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: buff-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: buff-shell_out
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0.alpha7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0.alpha7
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
@@ -320,8 +320,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -355,7 +355,6 @@ files:
 - features/json_formatter.feature
 - features/lifecycle.feature
 - features/lockfile.feature
-- features/resolver.feature
 - features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef/config_steps.rb
 - features/step_definitions/chef_server_steps.rb
@@ -502,17 +501,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
@@ -540,7 +539,6 @@ test_files:
 - features/json_formatter.feature
 - features/lifecycle.feature
 - features/lockfile.feature
-- features/resolver.feature
 - features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef/config_steps.rb
 - features/step_definitions/chef_server_steps.rb

data/features/resolver.feature

@@ -1,28 +0,0 @@
-Feature: Berkshelf resolver
-  Background:
-    * the Berkshelf API server's cache is empty
-    * the Chef Server has cookbooks:
-      | berkshelf | 1.0.0 |
-      | berkshelf | 2.0.0 |
-    * the Berkshelf API server's cache is up to date
-    * I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook 'berkshelf'
-      """
-
-  Scenario: with DEBUG_RESOLVER=1
-    Given the environment variable DEBUG_RESOLVER is "1"
-    When I successfully run `berks install`
-    Then the output should contain:
-      """
-      Attempting to find a solution
-      Adding constraint berkshelf >= 0.0.0 from root
-      """
-
-  Scenario: without DEBUG_RESOLVER
-    Given the environment variable DEBUG_RESOLVER is nil
-    When I successfully run `berks install`
-    Then the output should not contain:
-      """
-      Attempting to find a solution
-      """