berkshelf 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3af5dee0897d2bd3bab1e43ed463ddf49de5e7d
-  data.tar.gz: 345cc6d30d16d004d56d4cf129e7ebfdbfb8336a
+  metadata.gz: 25a14291bb2c9d50f4cb89888e7c71e4d06a4bef
+  data.tar.gz: 1fae554e27d90927e4568a808a4694d520306d77
 SHA512:
-  metadata.gz: f822b150ce8ba9a45c5d471ac6432ba88c6585c0883a98501397fcbe0e65decaef4e25c52a9b46ce2493a3831ed4e00ac5cbcc8cafa5fe96a5e2178465e69bbc
-  data.tar.gz: 7795f3dbd3c70e456214c2e7c5b9b6163bc542a35dd70c50c421dd1317fc499d7bfecb6df2d4e5a07cb4a254a959f4a9d8af65b84ad6aa4793343f256d32d29e
+  metadata.gz: 91918e3d292165f595c98a4209eb9e88ad55305eb8e799b7b0af1e33512503332dd7bd2fc15e43b5abb1eb57221d46b2e8737814c9cf33e0f302a6eec86871f3
+  data.tar.gz: 6c0bcf5fa299bfd5722432252aa91a5cde776674b13698f0c12335ec956a478ba59aca6bc08081e0c5223672f3c48fcc6dfaafc475942e7e47eb662217b0953d

data/CHANGELOG.md

@@ -1,12 +1,44 @@
 # Change Log
 
-## [6.0.1](https://github.com/berkshelf/berkshelf/tree/6.0.1) (2017-05-17)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.0.0...6.0.1)
+## [v6.2.0](https://github.com/berkshelf/berkshelf/tree/v6.2.0) (2017-06-22)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.1.1...v6.2.0)
 
-- Relax ruby dependency to 2.3.1
+**Merged pull requests:**
+
+- pull in berkshelf-api-client and bump deps [\#1707](https://github.com/berkshelf/berkshelf/pull/1707) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v6.1.1](https://github.com/berkshelf/berkshelf/tree/v6.1.1) (2017-06-20)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.1.0...v6.1.1)
+
+**Merged pull requests:**
+
+- bumping cookstyle deps and others [\#1708](https://github.com/berkshelf/berkshelf/pull/1708) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v6.1.0](https://github.com/berkshelf/berkshelf/tree/v6.1.0) (2017-05-31)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.0.1...v6.1.0)
+
+**Merged pull requests:**
+
+- Release 6.1.0 [\#1704](https://github.com/berkshelf/berkshelf/pull/1704) ([thommay](https://github.com/thommay))
+- remove TK dep and undocumented 'berks test' command [\#1702](https://github.com/berkshelf/berkshelf/pull/1702) ([lamont-granquist](https://github.com/lamont-granquist))
+- remove direct use of buff-shell\_out [\#1701](https://github.com/berkshelf/berkshelf/pull/1701) ([lamont-granquist](https://github.com/lamont-granquist))
+- guard seems to be a lot more trouble than its worth [\#1700](https://github.com/berkshelf/berkshelf/pull/1700) ([lamont-granquist](https://github.com/lamont-granquist))
+- bump deps \(faraday+ridley\) [\#1699](https://github.com/berkshelf/berkshelf/pull/1699) ([lamont-granquist](https://github.com/lamont-granquist))
+- replace celluloid with concurrent-ruby futures [\#1698](https://github.com/berkshelf/berkshelf/pull/1698) ([lamont-granquist](https://github.com/lamont-granquist))
+- Switch off open-uri for community site downloads [\#1697](https://github.com/berkshelf/berkshelf/pull/1697) ([coderanger](https://github.com/coderanger))
+- Add chef\_repo source [\#1696](https://github.com/berkshelf/berkshelf/pull/1696) ([coderanger](https://github.com/coderanger))
+- Pass along an artifactory\_api\_key attribute from a Chef config [\#1693](https://github.com/berkshelf/berkshelf/pull/1693) ([RoboticCheese](https://github.com/RoboticCheese))
+- add chefstyle enforcement [\#1663](https://github.com/berkshelf/berkshelf/pull/1663) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v6.0.1](https://github.com/berkshelf/berkshelf/tree/v6.0.1) (2017-05-17)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.0.0...v6.0.1)
+
+**Merged pull requests:**
+
+- update travis rvm versions [\#1692](https://github.com/berkshelf/berkshelf/pull/1692) ([thommay](https://github.com/thommay))
 
-## [6.0.0](https://github.com/berkshelf/berkshelf/tree/6.0.0) (2017-05-17)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.5...6.0.0)
+## [v6.0.0](https://github.com/berkshelf/berkshelf/tree/v6.0.0) (2017-05-17)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.5...v6.0.0)
 
 **Merged pull requests:**
 
@@ -1439,4 +1471,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -22,10 +22,5 @@ group :development do
   gem "webmock",       ">= 1.11"
   gem "yard",          ">= 0.8"
   gem "http",          ">= 0.9.8"
-  gem "activesupport", "~> 4.0" # pinning for ruby 2.1.x
   gem "chefstyle"
 end
-
-group :test do
-  gem "berkshelf-api", git: "https://github.com/berkshelf/berkshelf-api.git", ref: "9fb3d95779c4ff72b0074072105caaf70b978bf0"
-end

data/Gemfile.lock

@@ -1,30 +1,10 @@
-GIT
-  remote: https://github.com/berkshelf/berkshelf-api.git
-  revision: 9fb3d95779c4ff72b0074072105caaf70b978bf0
-  ref: 9fb3d95779c4ff72b0074072105caaf70b978bf0
-  specs:
-    berkshelf-api (3.0.0)
-      archive (= 0.0.6)
-      buff-config (>= 1.0, < 3.0)
-      celluloid (~> 0.16)
-      celluloid-io (~> 0.16)
-      grape (~> 0.14)
-      grape-msgpack (~> 0.1)
-      hashie (>= 2.0.4, < 4.0.0)
-      octokit (>= 3.0.0, < 5.0.0)
-      reel (~> 0.6.0)
-      ridley (>= 4.0, < 6.0)
-      semverse (>= 1.0, < 3.0)
-      varia_model (~> 0.4)
-
 PATH
   remote: .
   specs:
-    berkshelf (6.2.0)
-      addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (>= 4.0.0)
+    berkshelf (6.2.1)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
+      chef (>= 12.7.2)
       cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
@@ -41,15 +21,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.8)
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    archive (0.0.6)
-      ffi (~> 1.9.3)
     aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
@@ -58,12 +36,6 @@ GEM
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
     ast (2.3.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    berkshelf-api-client (4.0.0)
-      chef (>= 12.0)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
       varia_model (~> 0.6)
@@ -78,10 +50,10 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (13.1.31)
+    chef (13.2.20)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.1.31)
+      chef-config (= 13.2.20)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -108,12 +80,12 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (13.1.31)
+    chef-config (13.2.20)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (13.0.0)
+    chef-zero (13.1.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
@@ -124,8 +96,6 @@ GEM
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     cleanroom (1.0.0)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.0.5)
     contracts (0.16.0)
     crack (0.4.3)
@@ -145,12 +115,9 @@ GEM
     dep_selector (1.0.5)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    equalizer (0.0.11)
     erubis (2.7.0)
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
@@ -172,21 +139,8 @@ GEM
       rainbow (>= 2.1)
       rake (>= 10.0)
       retriable (~> 2.1)
-    grape (0.19.2)
-      activesupport
-      builder
-      hashie (>= 2.1.0)
-      multi_json (>= 1.3.2)
-      multi_xml (>= 0.5.2)
-      mustermann-grape (~> 1.0.0)
-      rack (>= 1.3.0)
-      rack-accept
-      virtus (>= 1.0.0)
-    grape-msgpack (0.2.0)
-      grape (>= 0.16.1)
-      msgpack (>= 0.7.4)
     hashdiff (0.3.4)
-    hashie (3.5.5)
+    hashie (3.5.6)
     highline (1.7.8)
     hitimes (1.2.5)
     http (2.2.2)
@@ -199,9 +153,8 @@ GEM
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (0.8.4)
-    ice_nine (0.11.2)
-    iniparse (1.4.3)
+    i18n (0.8.6)
+    iniparse (1.4.4)
     ipaddress (0.8.3)
     iso8601 (0.9.1)
     json (2.1.0)
@@ -217,14 +170,9 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     molinillo (0.5.7)
-    msgpack (1.1.0)
     multi_json (1.12.1)
     multi_test (0.1.2)
-    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (1.0.0)
-    mustermann-grape (1.0.0)
-      mustermann (~> 1.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -239,7 +187,7 @@ GEM
     nio4r (2.1.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (13.1.0)
+    ohai (13.2.0)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -259,17 +207,9 @@ GEM
     proxifier (1.0.3)
     public_suffix (2.0.5)
     rack (2.0.3)
-    rack-accept (0.4.5)
-      rack (>= 0.4)
     rainbow (2.2.2)
       rake
     rake (12.0.0)
-    reel (0.6.1)
-      celluloid (>= 0.15.1)
-      celluloid-io (>= 0.15.0)
-      http (>= 0.6.0.pre)
-      http_parser.rb (>= 0.6.0)
-      websocket-driver (>= 0.5.1)
     retriable (2.1.0)
     retryable (2.0.4)
     ridley (5.1.1)
@@ -331,7 +271,7 @@ GEM
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.68.0)
+    specinfra (2.69.0)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -352,18 +292,10 @@ GEM
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
     webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
     wmi-lite (1.0.0)
     yard (0.9.9)
 
@@ -371,10 +303,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 4.0)
   aruba (>= 0.10.0)
   berkshelf!
-  berkshelf-api!
   chef-zero (>= 4.0)
   chefstyle
   dep_selector (>= 1.0)

data/berkshelf.gemspec

@@ -30,8 +30,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = ">= 2.3.1"
   s.required_rubygems_version = ">= 2.0.0"
 
-  s.add_dependency "addressable",          "~> 2.3", ">= 2.3.4"
-  s.add_dependency "berkshelf-api-client", ">= 4.0.0"
   s.add_dependency "buff-config",          "~> 2.0"
   s.add_dependency "buff-extensions",      "~> 2.0"
   s.add_dependency "mixlib-shellout",      "~> 2.0"
@@ -46,4 +44,5 @@ Gem::Specification.new do |s|
   s.add_dependency "octokit",              "~> 4.0"
   s.add_dependency "mixlib-archive",       "~> 0.4"
   s.add_dependency "concurrent-ruby",      "~> 1.0"
+  s.add_dependency "chef",                 ">= 12.7.2"
 end

data/features/commands/contingent.feature

@@ -1,6 +1,5 @@
 Feature: berks contingent
   Background:
-    * the Berkshelf API server's cache is empty
     * the Chef Server is empty
     * the cookbook store is empty
 

data/features/commands/install.feature

@@ -1,6 +1,5 @@
 Feature: berks install
   Background:
-    * the Berkshelf API server's cache is empty
     * the Chef Server is empty
     * the cookbook store is empty
 
@@ -12,7 +11,6 @@ Feature: berks install
     And the Chef Server has cookbooks:
       | berkshelf | 1.0.0 |
       | berkshelf | 2.0.0 |
-    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -29,7 +27,6 @@ Feature: berks install
     And the Chef Server has cookbooks:
       | berkshelf | 1.0.0 |
       | berkshelf | 2.0.0 |
-    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -52,7 +49,6 @@ Feature: berks install
     And the Chef Server has cookbooks:
       | ruby   | 1.0.0 |
       | elixir | 1.0.0 |
-    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain "Installing elixir (1.0.0)"
     And the output should contain "Installing ruby (1.0.0)"
@@ -71,7 +67,6 @@ Feature: berks install
       | hostsfile | = 1.0.1 |
     And the cookbook store has the cookbooks:
       | hostsfile | 1.0.1 |
-    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -135,7 +130,6 @@ Feature: berks install
       """
       cookbook 'example_cookbook', path: '../../spec/fixtures/cookbooks/example_cookbook-0.5.0'
       """
-    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -160,7 +154,6 @@ Feature: berks install
       """
       cookbook 'example_cookbook', path: '../../spec/fixtures/cookbooks/example_cookbook-0.5.0'
       """
-    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the output should contain:
       """
@@ -175,7 +168,6 @@ Feature: berks install
       cookbook 'example_cookbook', path: '../../spec/fixtures/cookbooks/example_cookbook-0.5.0'
       cookbook 'other_cookbook'
       """
-    And the Berkshelf API server's cache is up to date
     When I run `berks install`
     Then the output should contain:
       """
@@ -204,7 +196,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at master)
-      Fetching cookbook index from http://127.0.0.1:26210...
+      Fetching cookbook index from http://127.0.0.1:26310...
       Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at master)
       """
 
@@ -235,7 +227,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at rel/cookbooks/berkshelf-cookbook-fixture)
-      Fetching cookbook index from http://127.0.0.1:26210...
+      Fetching cookbook index from http://127.0.0.1:26310...
       Using berkshelf-cookbook-fixture (1.0.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at rel/cookbooks/berkshelf-cookbook-fixture)
       """
 
@@ -263,7 +255,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
-      Fetching cookbook index from http://127.0.0.1:26210...
+      Fetching cookbook index from http://127.0.0.1:26310...
       Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
       """
 
@@ -278,7 +270,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
-      Fetching cookbook index from http://127.0.0.1:26210...
+      Fetching cookbook index from http://127.0.0.1:26310...
       Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
       """
 
@@ -293,7 +285,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
-      Fetching cookbook index from http://127.0.0.1:26210...
+      Fetching cookbook index from http://127.0.0.1:26310...
       Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
       """
 
@@ -308,7 +300,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
-      Fetching cookbook index from http://127.0.0.1:26210...
+      Fetching cookbook index from http://127.0.0.1:26310...
       Using berkshelf-cookbook-fixture (0.2.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
       """
 
@@ -323,7 +315,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
-      Fetching cookbook index from http://127.0.0.1:26210...
+      Fetching cookbook index from http://127.0.0.1:26310...
       Using berkshelf-cookbook-fixture (0.2.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
       """
 
@@ -357,7 +349,6 @@ Feature: berks install
       | bacon | 0.1.0 |
       | bacon | 0.2.0 |
       | bacon | 1.0.0 |
-    And the Berkshelf API server's cache is up to date
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'bacon', '~> 0.1'
@@ -420,7 +411,6 @@ Feature: berks install
     Given the Chef Server has cookbooks:
       | foo | 0.3.0 |
       | foo | 0.2.0 |
-    And the Berkshelf API server's cache is up to date
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'foo'
@@ -476,7 +466,7 @@ Feature: berks install
     Then the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v1.0.0)
-      Fetching cookbook index from http://127.0.0.1:26210...
+      Fetching cookbook index from http://127.0.0.1:26310...
       Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v1.0.0)
       """
 
@@ -506,7 +496,6 @@ Feature: berks install
       | bacon | 0.1.0 |
       | bacon | 0.2.0 |
       | bacon | 1.0.0 |
-    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
     Then the cookbook store should have the cookbooks:
       | bacon | 0.2.0 |

data/features/commands/outdated.feature

@@ -3,7 +3,6 @@ Feature: berks outdated
     Given the Chef Server has cookbooks:
       | bacon | 1.0.0 |
       | bacon | 1.1.0 |
-    And the Berkshelf API server's cache is up to date
     And the cookbook store has the cookbooks:
       | bacon | 1.1.0 |
     And I have a Berksfile pointing at the local Berkshelf API with:
@@ -29,7 +28,6 @@ Feature: berks outdated
     Given the Chef Server has cookbooks:
       | bacon | 1.0.0 |
       | bacon | 1.1.0 |
-    And the Berkshelf API server's cache is up to date
     And the cookbook store has the cookbooks:
       | bacon | 1.0.0 |
     And I have a Berksfile pointing at the local Berkshelf API with:
@@ -56,7 +54,6 @@ Feature: berks outdated
       | bacon | 1.1.0 |
       | bacon | 1.2.1 |
       | bacon | 1.5.8 |
-    And the Berkshelf API server's cache is up to date
     And the cookbook store has the cookbooks:
       | bacon | 1.0.0 |
     And I have a Berksfile pointing at the local Berkshelf API with:

data/features/commands/vendor.feature

@@ -1,10 +1,8 @@
 Feature: Vendoring cookbooks to a directory
   Background:
-    * the Berkshelf API server's cache is empty
     * the Chef Server has cookbooks:
       | fake | 1.0.0 |
       | ekaf | 2.0.0 |
-    * the Berkshelf API server's cache is up to date
 
   Scenario: successfully vendoring a Berksfile with multiple cookbook demands
     Given I have a Berksfile pointing at the local Berkshelf API with:

data/features/json_formatter.feature

@@ -1,6 +1,5 @@
 Feature: --format json
   Background:
-    * the Berkshelf API server's cache is empty
     * the Chef Server is empty
     * the cookbook store is empty
 
@@ -11,15 +10,14 @@ Feature: --format json
       """
     And the Chef Server has cookbooks:
       | berkshelf | 1.0.0 |
-    And the Berkshelf API server's cache is up to date
     When I successfully run `berks install --format json`
     Then the output should contain JSON:
       """
       {
         "cookbooks": [
           {
-            "api_source": "http://127.0.0.1:26210",
-            "location_path": "http://localhost:26310/",
+            "api_source": "http://127.0.0.1:26310",
+            "location_path": "http://127.0.0.1:26310/cookbooks/berkshelf/1.0.0",
             "version": "1.0.0",
             "name": "berkshelf"
           }
@@ -27,7 +25,7 @@ Feature: --format json
         "errors": [],
         "messages": [
           "Resolving cookbook dependencies...",
-          "Fetching cookbook index from http://127.0.0.1:26210..."
+          "Fetching cookbook index from http://127.0.0.1:26310..."
         ],
         "warnings": []
       }
@@ -53,7 +51,7 @@ Feature: --format json
         "errors": [],
         "messages": [
           "Resolving cookbook dependencies...",
-          "Fetching cookbook index from http://127.0.0.1:26210..."
+          "Fetching cookbook index from http://127.0.0.1:26310..."
         ],
         "warnings": []
       }
@@ -128,7 +126,6 @@ Feature: --format json
       | seth | 0.1.0 |
       | seth | 0.2.9 |
       | seth | 1.0.0 |
-    And the Berkshelf API server's cache is up to date
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'seth', '~> 0.1'
@@ -149,7 +146,7 @@ Feature: --format json
           {
             "local": "0.1.0",
             "remote": {
-              "http://127.0.0.1:26210": "0.2.9"
+              "http://127.0.0.1:26310": "0.2.9"
             },
             "name": "seth"
           }

data/features/support/env.rb

@@ -6,19 +6,22 @@ require "aruba/cucumber"
 require "aruba/in_process"
 require "aruba/spawn_process"
 require "cucumber/rspec/doubles"
-require "berkshelf/api/rspec" unless windows?
-require "berkshelf/api/cucumber" unless windows?
 
 Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
 World(Berkshelf::RSpec::PathHelpers)
 
+# these tests used to start a chef-zero server on one port, and a berks-api server on another port
+# they now start a chef-zero server that supports the universe endpoint on one port.
+#
+# if there becomes a need to integration test talking to a supermarket/universe endpoint and then
+# talking to a separate chef-server, then these features could be split back up again, but the
+# Berkshelf::RSpec::ChefServer helper class would need to support managing multiple chef-zero servers.
 CHEF_SERVER_PORT = 26310
-BERKS_API_PORT   = 26210
+BERKS_API_PORT   = 26310
 
 at_exit do
   Berkshelf::RSpec::ChefServer.stop
-  Berkshelf::API::RSpec::Server.stop unless windows?
 end
 
 Before do
@@ -51,7 +54,6 @@ Before do
   ]
 
   Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
-  Berkshelf::API::RSpec::Server.start(port: BERKS_API_PORT, endpoints: endpoints) unless windows?
 
   aruba.config.io_wait_timeout = Cucumber::JRUBY ? 7 : 5
   @aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15

data/lib/berkshelf/api-client.rb

@@ -0,0 +1 @@
+require_relative "api_client"

data/lib/berkshelf/api_client.rb

@@ -0,0 +1,24 @@
+module Berkshelf
+  # Used to communicate with a remotely hosted [Berkshelf API Server](https://github.com/berkshelf/berkshelf-api).
+  #
+  # @example
+  #   client = Berkshelf::APIClient.new("https://api.berkshelf.com")
+  #   client.universe #=> [...]
+  module APIClient
+    require_relative "api_client/version"
+    require_relative "api_client/errors"
+    require_relative "api_client/remote_cookbook"
+    require_relative "api_client/connection"
+    require_relative "api_client/chef_server_connection"
+
+    class << self
+      def new(*args)
+        Connection.new(*args)
+      end
+
+      def chef_server(*args)
+        ChefServerConnection.new(*args)
+      end
+    end
+  end
+end

data/lib/berkshelf/api_client/chef_server_connection.rb

@@ -0,0 +1,28 @@
+require "berkshelf/ridley_compat"
+
+module Berkshelf::APIClient
+  require_relative "errors"
+
+  class ChefServerConnection
+    attr_reader :client
+
+    def initialize(*args)
+      @client = Berkshelf::RidleyCompat.new(*args)
+      @url = args[0][:server_url]
+    end
+
+    def universe
+      response = client.get("universe")
+
+      [].tap do |cookbooks|
+        response.each do |name, versions|
+          versions.each do |version, attributes|
+            attributes[:location_path] = @url
+            cookbooks << RemoteCookbook.new(name, version, attributes) end
+        end
+      end
+    rescue Ridley::Errors::HTTPNotFound
+      raise ServiceNotFound, "service not found at: #{@url}"
+    end
+  end
+end

data/lib/berkshelf/api_client/connection.rb

@@ -0,0 +1,55 @@
+require "berkshelf/ridley_compat"
+
+module Berkshelf::APIClient
+  require_relative "errors"
+
+  class Connection
+    # @return [String]
+    attr_reader :url
+
+    # @return [Integer]
+    #   how many retries to attempt on HTTP requests
+    attr_reader :retries
+
+    # @return [Float]
+    #   time to wait between retries
+    attr_reader :retry_interval
+
+    # @param [String, Addressable::URI] url
+    #
+    # @option options [Integer] :open_timeout (3)
+    #   how long to wait (in seconds) for connection open to the API server
+    # @option options [Integer] :timeout (30)
+    #   how long to wait (in seconds) before getting a response from the API server
+    # @option options [Integer] :retries (3)
+    #   how many retries to perform before giving up
+    # @option options [Float] :retry_interval (0.5)
+    #   how long to wait (in seconds) between each retry
+    def initialize(url, options = {})
+      # it looks like Faraday mutates the URI argument it is given, when we ripped Faraday out of this
+      # API it stopped doing that.  this may or may not be a breaking change (it broke some fairly
+      # brittle berkshelf tests).  if it causes too much berkshelf chaos we could revert by uncommenting
+      # the next line.  as it is removing this behavior feels more like fixing a bug.
+      #@url = url.normalize! if url.is_a?(Addressable::URI)
+      options = { retries: 3, retry_interval: 0.5, open_timeout: 30, timeout: 30 }.merge(options)
+      options[:server_url] = url
+
+      @client = Berkshelf::RidleyCompatJSON.new(**options)
+    end
+
+    # Retrieves the entire universe of known cookbooks from the API source
+    #
+    # @raise [APIClient::TimeoutError]
+    #
+    # @return [Array<APIClient::RemoteCookbook>]
+    def universe
+      response = @client.get("universe")
+
+      [].tap do |cookbooks|
+        response.each do |name, versions|
+          versions.each { |version, attributes| cookbooks << RemoteCookbook.new(name, version, attributes) }
+        end
+      end
+    end
+  end
+end

data/lib/berkshelf/api_client/errors.rb

@@ -0,0 +1,10 @@
+module Berkshelf
+  class APIClientError < StandardError; end
+
+  module APIClient
+    class TimeoutError < APIClientError; end
+    class BadResponse < APIClientError; end
+    class ServiceUnavailable < APIClientError; end
+    class ServiceNotFound < APIClientError; end
+  end
+end

data/lib/berkshelf/api_client/remote_cookbook.rb

@@ -0,0 +1,54 @@
+require "json"
+require "chef/mash"
+
+module Berkshelf::APIClient
+  # A representation of cookbook metadata indexed by a Berkshelf API Server. Returned
+  # by sending messages to a {Berkshelf::APIClient} and used to download cookbooks
+  # indexed by the Berkshelf API Server.
+  class RemoteCookbook
+    # @return [String]
+    attr_reader :name
+    # @return [String]
+    attr_reader :version
+
+    # @param [String] name
+    # @param [String] version
+    # @param [Hash] attributes
+    def initialize(name, version, attributes = {})
+      @name       = name
+      @version    = version
+      @attributes = ::Mash.new(attributes)
+    end
+
+    # @return [Hash]
+    def dependencies
+      @attributes[:dependencies]
+    end
+
+    # @return [Hash]
+    def platforms
+      @attributes[:platforms]
+    end
+
+    # @return [Symbol]
+    def location_type
+      @attributes[:location_type].to_sym
+    end
+
+    # @return [String]
+    def location_path
+      @attributes[:location_path]
+    end
+
+    def to_hash
+      {
+        name: name,
+        version: version,
+      }
+    end
+
+    def to_json(options = {})
+      ::JSON.pretty_generate(to_hash, options)
+    end
+  end
+end

data/lib/berkshelf/api_client/version.rb

@@ -0,0 +1,5 @@
+module Berkshelf
+  module APIClient
+    VERSION = "4.0.1"
+  end
+end

data/lib/berkshelf/ridley_compat.rb

@@ -0,0 +1,78 @@
+require "chef/server_api"
+require "chef/http/simple_json"
+require "chef/http/simple"
+require "berkshelf/api_client/errors"
+
+module Berkshelf
+  module RidleyCompatAPI
+    def initialize(**opts)
+      opts = opts.dup
+      opts[:ssl] ||= {}
+      chef_opts = {
+        rest_timeout: opts[:timeout], # opts[:open_timeout] is ignored on purpose
+        headers: opts[:headers],
+        client_name: opts[:client_name],
+        signing_key_filename: opts[:client_key],
+        ssl_verify_mode: opts[:verify] ? :verify_none : :verify_peer,
+        ssl_ca_path: opts[:ssl][:ca_path],
+        ssl_ca_file: opts[:ssl][:ca_file],
+        ssl_client_cert: opts[:ssl][:client_cert],
+        ssl_client_key: opts[:ssl][:client_key],
+      }
+      super(opts[:server_url].to_s, **chef_opts)
+    end
+
+    def get(url)
+      super(url)
+    rescue Net::HTTPExceptions => e
+      case e.response.code
+      when "404"
+        raise Berkshelf::APIClient::ServiceNotFound, "service not found at: #{url}"
+      when /^5/
+        raise Berkshelf::APIClient::ServiceUnavailable, "service unavailable at: #{url}"
+      else
+        raise Berkshelf::APIClient::BadResponse, "bad response #{e.response}"
+      end
+    rescue Errno::ETIMEDOUT, Timeout::Error
+      raise Berkshelf::APIClient::TimeoutError, "Unable to connect to: #{url}"
+    rescue Errno::EHOSTUNREACH, Errno::ECONNREFUSED => e
+      raise Berkshelf::APIClient::ServiceUnavailable, e
+    end
+  end
+
+  # This is for simple HTTP
+  class RidleyCompatSimple < Chef::ServerAPI
+    use Chef::HTTP::Decompressor
+    use Chef::HTTP::CookieManager
+    use Chef::HTTP::ValidateContentLength
+
+    include RidleyCompatAPI
+  end
+
+  # This is for JSON-REST
+  class RidleyCompatJSON < Chef::HTTP::SimpleJSON
+    use Chef::HTTP::JSONInput
+    use Chef::HTTP::JSONOutput
+    use Chef::HTTP::CookieManager
+    use Chef::HTTP::Decompressor
+    use Chef::HTTP::RemoteRequestID
+    use Chef::HTTP::ValidateContentLength
+
+    include RidleyCompatAPI
+  end
+
+  # RidleyCompat is the ServerAPI, but we inherit from Chef::HTTP::Simple and then include all our middlewares
+  # and then need to include our own CompatAPI.  The end result is a ridley-esque way of talking to a chef server.
+  class RidleyCompat < Chef::HTTP::Simple
+    use Chef::HTTP::JSONInput
+    use Chef::HTTP::JSONOutput
+    use Chef::HTTP::CookieManager
+    use Chef::HTTP::Decompressor
+    use Chef::HTTP::Authenticator
+    use Chef::HTTP::RemoteRequestID
+    use Chef::HTTP::APIVersions if defined?(Chef::HTTP::APIVersions)
+    use Chef::HTTP::ValidateContentLength
+
+    include RidleyCompatAPI
+  end
+end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "6.2.0"
+  VERSION = "6.2.1"
 end

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ require "rspec"
 require "cleanroom/rspec"
 require "webmock/rspec"
 require "rspec/its"
-require "berkshelf/api/rspec" unless windows?
 
 Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
@@ -18,7 +17,6 @@ RSpec.configure do |config|
   config.include Berkshelf::RSpec::ChefServer
   config.include Berkshelf::RSpec::Git
   config.include Berkshelf::RSpec::PathHelpers
-  config.include Berkshelf::API::RSpec unless windows?
 
   config.expect_with :rspec do |c|
     c.syntax = :expect
@@ -36,9 +34,8 @@ RSpec.configure do |config|
   end
 
   config.before(:suite) do
-    WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
+    WebMock.disable_net_connect!(allow_localhost: false, net_http_connect_on_start: true)
     Berkshelf::RSpec::ChefServer.start
-    Berkshelf::API::RSpec::Server.start unless windows?
   end
 
   config.before(:all) do
@@ -46,7 +43,6 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    Berkshelf::API::RSpec::Server.clear_cache unless windows?
     clean_tmp_path
     Berkshelf.initialize_filesystem
     Berkshelf::CookbookStore.instance.initialize_filesystem

data/spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb

@@ -0,0 +1,100 @@
+require "spec_helper"
+
+describe Berkshelf::APIClient::Connection do
+  let(:instance) { described_class.new("http://supermarket.getchef.com") }
+
+  describe "#universe" do
+    before do
+      body_response = %q{{"ruby":{"1.2.3":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{"CentOS":"= 6.0.0"},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+
+      stub_request(:get, "http://supermarket.getchef.com/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
+    end
+
+    subject { instance.universe }
+
+    it "returns an array of APIClient::RemoteCookbook" do
+      expect(subject).to be_a(Array)
+
+      subject.each do |remote|
+        expect(remote).to be_a(Berkshelf::APIClient::RemoteCookbook)
+      end
+    end
+
+    it "contains a item for each dependency" do
+      expect(subject.size).to eq(3)
+      expect(subject[0].name).to eql("ruby")
+      expect(subject[0].version).to eql("1.2.3")
+      expect(subject[1].name).to eql("ruby")
+      expect(subject[1].version).to eql("2.0.0")
+      expect(subject[2].name).to eql("elixir")
+      expect(subject[2].version).to eql("1.0.0")
+    end
+
+    it "has the dependencies for each" do
+      expect(subject[0].dependencies).to include("build-essential" => ">= 1.2.2")
+      expect(subject[1].dependencies).to include("build-essential" => ">= 1.2.2")
+      expect(subject[2].dependencies).to be_empty
+    end
+
+    it "has the platforms for each" do
+      expect(subject[0].platforms).to be_empty
+      expect(subject[1].platforms).to be_empty
+      expect(subject[2].platforms).to include("CentOS" => "= 6.0.0")
+    end
+
+    it "has a location_path for each" do
+      subject.each do |remote|
+        expect(remote.location_path).to_not be_nil
+      end
+    end
+
+    it "has a location_type for each" do
+      subject.each do |remote|
+        expect(remote.location_type).to_not be_nil
+      end
+    end
+  end
+
+  describe "non-200s" do
+    before do
+      Chef::Config[:http_retry_delay] = 0.001
+      Chef::Config[:http_retry_count] = 0
+    end
+
+    subject { instance.universe }
+
+    it "follows 301 redirects correctly" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => 301, :headers => { "Location" => "http://arglebargle.com/universe" })
+      body_response = %q{{"ruby":{"1.2.3":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{"CentOS":"= 6.0.0"},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+      stub_request(:get, "http://arglebargle.com/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
+      expect(subject.size).to eq(3)
+    end
+
+    it "raises Berkshelf::APIClient::ServiceUnavailable for 500s" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => [500, "Internal Server Error"])
+      expect { subject }.to raise_error(Berkshelf::APIClient::ServiceUnavailable)
+    end
+
+    it "raises Berkshelf::APIClient::ServiceNotFound for 404s" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => [404, "Not Found"])
+      expect { subject }.to raise_error(Berkshelf::APIClient::ServiceNotFound)
+    end
+
+    it "raises Net::HTTPBadRequest for 400s" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => [400, "Bad Request"])
+      expect { subject }.to raise_error(Berkshelf::APIClient::BadResponse)
+    end
+
+    it "raises Berkshelf::APIClient::TimeoutError for timeouts" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_timeout
+      expect { subject }.to raise_error(Berkshelf::APIClient::TimeoutError)
+    end
+
+    it "raises Berkshelf::APIClient::TimeoutError for timeouts" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_raise(Errno::ECONNREFUSED)
+      expect { subject }.to raise_error(Berkshelf::APIClient::ServiceUnavailable)
+    end
+  end
+end

data/spec/unit/berkshelf/berkshelf/api_client/remote_cookbook_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe Berkshelf::APIClient::RemoteCookbook do
+  let(:name) { "ruby" }
+  let(:version) { "1.2.3" }
+  let(:dependencies) { double("dependencies") }
+  let(:platforms) { double("platforms") }
+  let(:location_type) { "chef_server" }
+  let(:location_path) { "http://localhost:8080" }
+
+  let(:attributes) do
+    { dependencies: dependencies, platforms: platforms, location_path: location_path, location_type: location_type }
+  end
+
+  subject { described_class.new(name, version, attributes) }
+
+  its(:name) { should eql(name) }
+  its(:version) { should eql(version) }
+  its(:dependencies) { should eql(dependencies) }
+  its(:platforms) { should eql(platforms) }
+  its(:location_type) { should eql(:chef_server) }
+  its(:location_path) { should eql(location_path) }
+end

data/spec/unit/berkshelf/berkshelf/api_client_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+describe Berkshelf::APIClient do
+  describe "::new" do
+    it "returns an instance of Berkshelf::APIClient::Connection" do
+      expect(described_class.new("http://localhost:26210")).to be_a(Berkshelf::APIClient::Connection)
+    end
+  end
+end

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

@@ -5,12 +5,12 @@ describe Berkshelf::Resolver::Graph, :not_supported_on_windows do
   subject { described_class.new }
 
   describe "#populate" do
-    let(:sources) { Berkshelf::Source.new(berksfile, "http://localhost:26210") }
+    let(:sources) { Berkshelf::Source.new(berksfile, "http://supermarket.getchef.com") }
 
     before do
-      berks_dependency("ruby", "1.0.0", dependencies: { "elixir" => ">= 0.1.0" })
-      berks_dependency("ruby", "2.0.0")
-      berks_dependency("elixir", "1.0.0")
+      body_response = %q{{"ruby":{"1.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"elixir":">= 0.1.0"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+      stub_request(:get, "http://supermarket.getchef.com/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
     end
 
     it "adds each dependency to the graph" do
@@ -25,11 +25,12 @@ describe Berkshelf::Resolver::Graph, :not_supported_on_windows do
   end
 
   describe "#universe" do
-    let(:sources) { Berkshelf::Source.new(berksfile, "http://localhost:26210") }
+    let(:sources) { Berkshelf::Source.new(berksfile, "http://supermarket.getchef.com") }
 
     before do
-      berks_dependency("ruby", "1.0.0")
-      berks_dependency("elixir", "1.0.0")
+      body_response = %q{{"ruby":{"1.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+      stub_request(:get, "http://supermarket.getchef.com/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
     end
 
     it "returns an array of APIClient::RemoteCookbook" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,42 +12,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-07-18 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'
-    - - ">="
-      - !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'
-    - - ">="
-      - !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: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +228,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.7.2
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - jamie@vialstudios.com
@@ -348,6 +328,13 @@ files:
 - generator_files/licenses/reserved.erb
 - generator_files/metadata.rb.erb
 - lib/berkshelf.rb
+- lib/berkshelf/api-client.rb
+- lib/berkshelf/api_client.rb
+- lib/berkshelf/api_client/chef_server_connection.rb
+- lib/berkshelf/api_client/connection.rb
+- lib/berkshelf/api_client/errors.rb
+- lib/berkshelf/api_client/remote_cookbook.rb
+- lib/berkshelf/api_client/version.rb
 - lib/berkshelf/base_generator.rb
 - lib/berkshelf/berksfile.rb
 - lib/berkshelf/cached_cookbook.rb
@@ -385,6 +372,7 @@ files:
 - lib/berkshelf/packager.rb
 - lib/berkshelf/resolver.rb
 - lib/berkshelf/resolver/graph.rb
+- lib/berkshelf/ridley_compat.rb
 - lib/berkshelf/shell.rb
 - lib/berkshelf/shell_out.rb
 - lib/berkshelf/source.rb
@@ -435,6 +423,9 @@ files:
 - spec/support/path_helpers.rb
 - spec/support/shared_examples/formatter.rb
 - spec/unit/berkshelf/berksfile_spec.rb
+- spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb
+- spec/unit/berkshelf/berkshelf/api_client/remote_cookbook_spec.rb
+- spec/unit/berkshelf/berkshelf/api_client_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/chef_repo_universe_spec.rb
 - spec/unit/berkshelf/cli_spec.rb
@@ -574,6 +565,9 @@ test_files:
 - spec/support/path_helpers.rb
 - spec/support/shared_examples/formatter.rb
 - spec/unit/berkshelf/berksfile_spec.rb
+- spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb
+- spec/unit/berkshelf/berkshelf/api_client/remote_cookbook_spec.rb
+- spec/unit/berkshelf/berkshelf/api_client_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/chef_repo_universe_spec.rb
 - spec/unit/berkshelf/cli_spec.rb