berkshelf 7.0.4 → 7.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a9aad824018ff76341d429a3f3d1a56a3a20baa0a47353b71214103dd0b82db
-  data.tar.gz: e99375d510d02668eeb7734aad0dacc173aadd0b8751f0bcea2d6f23821da4b0
+  metadata.gz: a4fbbe4a556c48c3ed25b98b1cf0dd3088d942f2a7e1d559b55fbadc73ddfa33
+  data.tar.gz: 293fc6d34c5802174f8643fa814c65870654cf224f5fe26b3b21ca014d8d3937
 SHA512:
-  metadata.gz: 86965767066caf25df3b87b33d17968d7dde55bf34613d5748fecebba7f00ac36bd0b0c1217f02342435f6c3e6106f9bd019bf687823aac9107ffc6c8e420e85
-  data.tar.gz: 65f4eb23956d447c36eb2fb90b8d96bd89ab39352f1478bed5ff4969479a4b6781a1943009439e5b41c5ea5631dc81fbb44a5ad1c2b10c0fdcd8d18bbc92fb69
+  metadata.gz: 6a426d00f6b0dbeff9b8120fe7a857736ffe2381dbc41b8df90572174661786fbb058000935e7355208c00ff7bfad8d962e29e5bbe978f0219154b284579123b
+  data.tar.gz: e2e7723963c41c211360ef3dab9b210e0078c6e3fc0ca2480010dc3a818c7454c7d2560ab98d88f5e1f6703d1f4ea09de4e63896a624b744769aa6dd902bd3c4

data/.rubocop.yml

@@ -8,3 +8,5 @@ Lint/AmbiguousRegexpLiteral:
   Enabled: false
 Lint/AmbiguousBlockAssociation:
   Enabled: false
+Style/HashSyntax:
+  Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [v7.0.4](https://github.com/berkshelf/berkshelf/tree/v7.0.4) (2018-06-08)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v7.0.3...v7.0.4)
+
+**Merged pull requests:**
+
+- Fix infinite loops in resolving cookbooks in the uploader [\#1781](https://github.com/berkshelf/berkshelf/pull/1781) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v7.0.3](https://github.com/berkshelf/berkshelf/tree/v7.0.3) (2018-06-06)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v7.0.2...v7.0.3)
+
+**Merged pull requests:**
+
+- stringify client\_key option before trying to match on it [\#1779](https://github.com/berkshelf/berkshelf/pull/1779) ([dbresson](https://github.com/dbresson))
+- Provide the name during debug [\#1777](https://github.com/berkshelf/berkshelf/pull/1777) ([martinisoft](https://github.com/martinisoft))
+
 ## [v7.0.2](https://github.com/berkshelf/berkshelf/tree/v7.0.2) (2018-05-02)
 [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v7.0.1...v7.0.2)
 

data/Gemfile

@@ -26,7 +26,7 @@ group :development do
   gem "webmock",       ">= 1.11"
   gem "yard",          ">= 0.8"
   gem "http",          ">= 0.9.8"
-  gem "chefstyle"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]

data/Gemfile.lock

@@ -1,22 +1,22 @@
 GIT
   remote: https://github.com/chef/chef
-  revision: 45084f13cacc8de6c091ec464da0d24ea427019d
+  revision: 975395a2812c20d326a9f83d5510b848dabc79ef
   branch: master
   specs:
-    chef (14.0.218)
+    chef (14.4.22)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.0.218)
+      chef-config (= 14.4.22)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi (< 1.9.22)
+      ffi (~> 1.9, >= 1.9.25)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
-      iso8601 (~> 0.9.1)
+      iso8601 (~> 0.11.0)
       mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 2.0)
+      mixlib-authentication (~> 2.1)
       mixlib-cli (~> 1.7)
       mixlib-log (~> 2.0, >= 2.0.3)
       mixlib-shellout (~> 2.0)
@@ -34,17 +34,25 @@ GIT
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (14.0.218)
+    chef-config (14.4.22)
       addressable
       fuzzyurl
-      mixlib-config (~> 2.0)
+      mixlib-config (>= 2.2.12, < 3.0)
       mixlib-shellout (~> 2.0)
       tomlrb (~> 1.2)
 
+GIT
+  remote: https://github.com/chef/chefstyle.git
+  revision: 121db02686d148ad2c60ac68d2fb7a5ab8e95edb
+  branch: master
+  specs:
+    chefstyle (0.10.0)
+      rubocop (= 0.55.0)
+
 PATH
   remote: .
   specs:
-    berkshelf (7.0.4)
+    berkshelf (7.0.5)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
@@ -68,7 +76,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    aruba (0.14.5)
+    aruba (0.14.6)
       childprocess (>= 0.6.3, < 0.10.0)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -84,8 +92,6 @@ GEM
       mixlib-log (~> 2.0)
       rack (~> 2.0)
       uuidtools (~> 2.1)
-    chefstyle (0.9.0)
-      rubocop (= 0.54.0)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     cleanroom (1.0.0)
@@ -117,18 +123,18 @@ GEM
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    faraday (0.15.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.21)
+    ffi (1.9.25)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuubar (2.3.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
-    gherkin (5.0.0)
+    gherkin (5.1.0)
     github_changelog_generator (1.14.3)
       activesupport
       faraday-http-cache
@@ -147,24 +153,24 @@ GEM
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.0)
+    http-form_data (2.1.1)
     http_parser.rb (0.6.0)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     iniparse (1.4.4)
     ipaddress (0.8.3)
-    iso8601 (0.9.1)
+    iso8601 (0.11.0)
     libyajl2 (1.2.0)
     minitar (0.6.1)
     minitest (5.11.3)
-    mixlib-archive (0.4.4)
+    mixlib-archive (0.4.13)
       mixlib-log
-    mixlib-authentication (2.0.0)
+    mixlib-authentication (2.1.1)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.6)
+    mixlib-config (2.2.13)
       tomlrb
     mixlib-log (2.0.4)
-    mixlib-shellout (2.3.2)
+    mixlib-shellout (2.4.0)
     molinillo (0.6.5)
     multi_json (1.13.1)
     multi_test (0.1.2)
@@ -179,10 +185,10 @@ GEM
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
-    octokit (4.8.0)
+    net-telnet (0.2.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.0.29)
+    ohai (14.3.0)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -198,7 +204,7 @@ GEM
     parser (2.5.1.0)
       ast (~> 2.4.0)
     plist (3.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     proxifier (1.0.3)
     public_suffix (3.0.2)
     rack (2.0.5)
@@ -206,26 +212,26 @@ GEM
     rake (12.3.1)
     retriable (2.1.0)
     retryable (2.0.4)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.54.0)
+    rubocop (0.55.0)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -247,29 +253,29 @@ GEM
     solve (4.0.0)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.73.3)
+    specinfra (2.75.1)
       net-scp
-      net-ssh (>= 2.7, < 5.0)
+      net-ssh (>= 2.7)
       net-telnet
       sfl
     syslog-logger (1.6.8)
     systemu (2.6.5)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tomlrb (1.2.6)
+    tomlrb (1.2.7)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)
     uuidtools (2.1.5)
-    webmock (3.4.1)
+    webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     wmi-lite (1.0.0)
-    yard (0.9.12)
+    yard (0.9.14)
 
 PLATFORMS
   ruby
@@ -279,7 +285,7 @@ DEPENDENCIES
   berkshelf!
   chef!
   chef-zero (>= 4.0)
-  chefstyle
+  chefstyle!
   cucumber-expressions (= 5.0.13)
   dep_selector (>= 1.0)
   fuubar (>= 2.0)

data/features/support/env.rb

@@ -43,7 +43,7 @@ Before do
   Berkshelf::CachedCookbook.instance_variable_set(:@loaded_cookbooks, nil)
 
   # This appears to be dead code
-  #endpoints = [
+  # endpoints = [
   #  {
   #    type: "chef_server",
   #    options: {
@@ -52,7 +52,7 @@ Before do
   #      client_key: File.expand_path("spec/config/berkshelf.pem"),
   #    },
   #  },
-  #]
+  # ]
 
   Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
 

data/lib/berkshelf/api_client/connection.rb

@@ -31,7 +31,7 @@ module Berkshelf
         # 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)
+        # @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
 

data/lib/berkshelf/api_client/version.rb

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

data/lib/berkshelf/berksfile.rb

@@ -288,9 +288,9 @@ module Berkshelf
       end
 
       # this appears to be dead code
-      #if options[:path]
+      # if options[:path]
       #  metadata_file = File.join(options[:path], "metadata.rb")
-      #end
+      # end
 
       options[:constraint] = constraint
 

data/lib/berkshelf/config.rb

@@ -87,6 +87,14 @@ module Berkshelf
       @path = File.expand_path(path)
       @klass.from_file(@path) if File.exist?(@path)
       # yeah, if !File.exist?() you just get back an empty config object
+
+      Berkshelf.ui.warn "The `cookbook.copyright' config is deprecated and will be removed in a future release." unless cookbook.copyright.nil?
+      Berkshelf.ui.warn "The `cookbook.email' config is deprecated and will be removed in a future release." unless cookbook.email.nil?
+      Berkshelf.ui.warn "The `cookbook.license' config is deprecated and will be removed in a future release." unless cookbook.license.nil?
+      Berkshelf.ui.warn "The `vagrant.vm.box' config is deprecated and will be removed in a future release." unless vagrant.vm.box.nil?
+      Berkshelf.ui.warn "The `vagrant.vm.forward_port' config is deprecated and will be removed in a future release." unless vagrant.vm.forward_port.nil?
+      Berkshelf.ui.warn "The `vagrant.vm.provision' config is deprecated and will be removed in a future release." unless vagrant.vm.provision.nil?
+      Berkshelf.ui.warn "The `vagrant.vm.omnibus.version' config is deprecated and will be removed in a future release." unless vagrant.vm.omnibus.version.nil?
     end
 
     def method_missing(method, *args, &block)
@@ -110,19 +118,19 @@ module Berkshelf
             default :artifactory_api_key, Berkshelf.chef_config.artifactory_api_key
           end
           config_context :cookbook do
-            default :copyright, Berkshelf.chef_config.cookbook_copyright
-            default :email, Berkshelf.chef_config.cookbook_email
-            default :license, Berkshelf.chef_config.cookbook_license
+            default :copyright, nil
+            default :email, nil
+            default :license, nil
           end
           default :allowed_licenses, Array.new
           default :raise_license_exception, false
           config_context :vagrant do
             config_context :vm do
-              default :box, "bento/ubuntu-14.04"
-              default :forward_port, Hash.new
-              default :provision, "chef_solo"
+              default :box, nil
+              default :forward_port, nil
+              default :provision, nil
               config_context :omnibus do
-                default :version, "latest"
+                default :version, nil
               end
             end
           end

data/lib/berkshelf/core_ext/file_utils.rb

@@ -16,7 +16,7 @@ module FileUtils
     def mv(src, dest, options = {})
       old_mv(src, dest, options)
     rescue Errno::EACCES, Errno::ENOENT
-      options.delete(:force) if options.has_key?(:force)
+      options.delete(:force) if options.key?(:force)
       FileUtils.cp_r(src, dest, options)
       FileUtils.rm_rf(src)
     end

data/lib/berkshelf/downloader.rb

@@ -34,7 +34,7 @@ module Berkshelf
     # @return [String]
     def download(*args, &block)
       # options are ignored
-      #options = args.last.is_a?(Hash) ? args.pop : Hash.new
+      # options = args.last.is_a?(Hash) ? args.pop : Hash.new
       dependency, version = args
 
       sources.each do |source|

data/lib/berkshelf/locations/github.rb

@@ -1,6 +1,6 @@
 module Berkshelf
   class GithubLocation < GitLocation
-    HOST = "github.com"
+    HOST = "github.com".freeze
     def initialize(dependency, options = {})
       protocol = Berkshelf::Config.instance.github_protocol || :https
       case protocol

data/lib/berkshelf/ridley_compat.rb

@@ -3,6 +3,7 @@ require "chef/http/simple_json"
 require "chef/http/simple"
 require "berkshelf/api_client/errors"
 require "chef/config"
+require "chef/cookbook_manifest"
 
 module Berkshelf
   module RidleyCompatAPI
@@ -20,6 +21,7 @@ module Berkshelf
       chef_opts[:ssl_ca_file]          = opts[:ssl][:ca_file] if opts[:ssl][:ca_file]
       chef_opts[:ssl_client_cert]      = opts[:ssl][:client_cert] if opts[:ssl][:client_cert]
       chef_opts[:ssl_client_key]       = opts[:ssl][:client_key] if opts[:ssl][:client_key]
+      chef_opts[:version_class]        = opts[:version_class] if opts[:version_class]
       # chef/http/ssl_policies.rb reads only from Chef::Config and not from the opts in the constructor
       Chef::Config[:verify_api_cert] = chef_opts[:verify_api_cert]
       Chef::Config[:ssl_verify_mode] = chef_opts[:ssl_verify_mode]
@@ -97,5 +99,11 @@ module Berkshelf
     use Chef::HTTP::ValidateContentLength
 
     include RidleyCompatAPI
+
+    def initialize(**opts)
+      opts[:version_class] = Chef::CookbookManifestVersions
+      super(**opts)
+    end
+
   end
 end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.0.4"
+  VERSION = "7.0.5".freeze
 end

data/spec/config/knife.rb

@@ -6,5 +6,5 @@ validation_client_name   "validator"
 validation_key           File.expand_path("spec/config/validator.pem")
 chef_server_url          "http://localhost:26310"
 cache_type               "BasicFile"
-cache_options( :path => "#{ENV['HOME']}/.chef/checksums" )
+cache_options( path: "#{ENV['HOME']}/.chef/checksums" )
 cookbook_path []

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -370,7 +370,7 @@ describe Berkshelf::Berksfile do
     let(:raw_metadata_files) { [File.join(cached_cookbook.cookbook_name, "metadata.rb")] }
 
     let(:destination) { "/a/destination/path" }
-    let(:options) { { :exclude => Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
+    let(:options) { { exclude: Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
 
     before do
       allow(Berkshelf::Installer).to receive(:new).and_return(installer)

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

@@ -122,7 +122,7 @@ describe Berkshelf::APIClient::Connection do
     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" })
+      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" })
@@ -130,17 +130,17 @@ describe Berkshelf::APIClient::Connection do
     end
 
     it "raises Berkshelf::APIClient::ServiceUnavailable for 500s" do
-      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => [500, "Internal Server Error"])
+      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"])
+      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"])
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: [400, "Bad Request"])
       expect { subject }.to raise_error(Berkshelf::APIClient::BadResponse)
     end
 

data/spec/unit/berkshelf/config_spec.rb

@@ -22,10 +22,7 @@ describe Berkshelf::Config do
           client_key: "client-key",
           node_name: "fake-client",
           trusted_certs_dir: "/tmp/fakecerts",
-          artifactory_api_key: "secret",
-          cookbook_copyright: "user",
-          cookbook_email: "user@example.com",
-          cookbook_license: "apachev2"
+          artifactory_api_key: "secret"
         )
       end
 
@@ -46,16 +43,6 @@ describe Berkshelf::Config do
           expect(Berkshelf::Config.instance.chef.send(attr)).to eq(default)
         end
       end
-
-      {
-        copyright: "user",
-        email: "user@example.com",
-        license: "apachev2",
-      }.each do |attr, default|
-        it "should have a default cookbook.#{attr}" do
-          expect(Berkshelf::Config.instance.cookbook.send(attr)).to eq(default)
-        end
-      end
     end
   end
 

data/spec/unit/berkshelf/file_syncer_spec.rb

@@ -267,7 +267,7 @@ module Berkshelf
         end
 
         it "copies relative and absolute symlinks when destination is a relative path" do
-          described_class.sync(source, "#{destination.gsub(Dir.pwd, '.')}")
+          described_class.sync(source, (destination.gsub(Dir.pwd, ".")).to_s)
 
           expect("#{destination}/links/index.html").to be_a_symlink_to("./home.html")
           expect("#{destination}/links/default.html").to be_a_symlink_to("./home.html")

data/spec/unit/berkshelf/ridley_compat_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+require "chef/cookbook_manifest"
+
+describe Berkshelf::RidleyCompat do
+  let(:opts) { Hash.new }
+
+  subject { described_class.new(opts) }
+
+  context "default" do
+    it "has a cookbook version_class" do
+      expect(subject.options).to have_key(:version_class)
+      expect(subject.options[:version_class])
+        .to eq(Chef::CookbookManifestVersions)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.0.5
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -248,23 +248,6 @@ files:
 - features/step_definitions/utility_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
-- generator_files/Berksfile.erb
-- generator_files/CHANGELOG.md.erb
-- generator_files/Gemfile.erb
-- generator_files/README.md.erb
-- generator_files/Thorfile.erb
-- generator_files/Vagrantfile.erb
-- generator_files/chefignore
-- generator_files/default_recipe.erb
-- generator_files/default_test.rb.erb
-- generator_files/gitignore.erb
-- generator_files/helpers.rb.erb
-- generator_files/licenses/apachev2.erb
-- generator_files/licenses/gplv2.erb
-- generator_files/licenses/gplv3.erb
-- generator_files/licenses/mit.erb
-- generator_files/licenses/reserved.erb
-- generator_files/metadata.rb.erb
 - lib/berkshelf.rb
 - lib/berkshelf/api-client.rb
 - lib/berkshelf/api_client.rb
@@ -396,6 +379,7 @@ files:
 - spec/unit/berkshelf/packager_spec.rb
 - spec/unit/berkshelf/resolver/graph_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
+- spec/unit/berkshelf/ridley_compat_spec.rb
 - spec/unit/berkshelf/shell_spec.rb
 - spec/unit/berkshelf/source_spec.rb
 - spec/unit/berkshelf/source_uri_spec.rb
@@ -540,6 +524,7 @@ test_files:
 - spec/unit/berkshelf/packager_spec.rb
 - spec/unit/berkshelf/resolver/graph_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
+- spec/unit/berkshelf/ridley_compat_spec.rb
 - spec/unit/berkshelf/shell_spec.rb
 - spec/unit/berkshelf/source_spec.rb
 - spec/unit/berkshelf/source_uri_spec.rb

data/generator_files/Berksfile.erb

@@ -1,11 +0,0 @@
-source "https://supermarket.chef.io"
-<% if options[:chef_minitest] -%>
-
-group :integration do
-  cookbook 'minitest-handler'
-end
-<% end -%>
-<% if options[:metadata_entry] -%>
-
-metadata
-<% end -%>

data/generator_files/CHANGELOG.md.erb

@@ -1,3 +0,0 @@
-# 0.1.0
-
-Initial release of <%= name %>

data/generator_files/Gemfile.erb

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-<% if options[:foodcritic] -%>
-gem 'thor-foodcritic'
-<% end -%>
-<% if options[:scmversion] -%>
-gem 'thor-scmversion'
-<% end -%>

data/generator_files/README.md.erb

@@ -1,42 +0,0 @@
-# <%= name %>-cookbook
-
-TODO: Enter the cookbook description here.
-
-## Supported Platforms
-
-TODO: List your supported platforms.
-
-## Attributes
-
-<table>
-  <tr>
-    <th>Key</th>
-    <th>Type</th>
-    <th>Description</th>
-    <th>Default</th>
-  </tr>
-  <tr>
-    <td><tt>['<%= name %>']['bacon']</tt></td>
-    <td>Boolean</td>
-    <td>whether to include bacon</td>
-    <td><tt>true</tt></td>
-  </tr>
-</table>
-
-## Usage
-
-### <%= name %>::default
-
-Include `<%= name %>` in your node's `run_list`:
-
-```json
-{
-  "run_list": [
-    "recipe[<%= name %>::default]"
-  ]
-}
-```
-
-## License and Authors
-
-Author:: <%= maintainer %> (<<%= maintainer_email %>>)

data/generator_files/Thorfile.erb

@@ -1,11 +0,0 @@
-# encoding: utf-8
-
-require 'bundler'
-require 'bundler/setup'
-<% if options[:foodcritic] -%>
-require 'thor/foodcritic'
-<% end -%>
-<% if options[:scmversion] -%>
-require 'thor/scmversion'
-<% end -%>
-require 'berkshelf/thor'

data/generator_files/Vagrantfile.erb

@@ -1,117 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = '2'
-
-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.
-
-  config.vm.hostname = '<%= "#{cookbook_name.gsub('_','-')}-berkshelf" %>'
-
-  # Set the version of chef to install using the vagrant-omnibus plugin
-  # NOTE: You will need to install the vagrant-omnibus plugin:
-  #
-  #   $ vagrant plugin install vagrant-omnibus
-  #
-  if Vagrant.has_plugin?("vagrant-omnibus")
-    config.omnibus.chef_version = '<%= berkshelf_config.vagrant.omnibus.version %>'
-  end
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  # If this value is a shorthand to a box in Vagrant Cloud then
-  # config.vm.box_url doesn't need to be specified.
-  config.vm.box = '<%= berkshelf_config.vagrant.vm.box %>'
-
-<% unless berkshelf_config.vagrant.vm.box_url.nil? -%>
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # is not a Vagrant Cloud box and if it doesn't already exist on the
-  # user's system.
-  config.vm.box_url = '<%= berkshelf_config.vagrant.vm.box_url %>'
-<% end -%>
-
-  # Assign this VM to a host-only network IP, allowing you to access it
-  # 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.
-  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,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-<% berkshelf_config.vagrant.vm.forward_port.each do |guest, host| %>
-  config.vm.network :forwarded_port, guest: <%= guest %>, host: <%= host %>
-<% end -%>
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider :virtualbox do |vb|
-  #   # Don't boot with headless mode
-  #   vb.gui = true
-  #
-  #   # Use VBoxManage to customize the VM. For example to change memory:
-  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
-  #
-  # View the documentation for the provider you're using for more
-  # information on available options.
-
-  # The path to the Berksfile to use with Vagrant Berkshelf
-  # config.berkshelf.berksfile_path = "./Berksfile"
-
-  # Enabling the Berkshelf plugin. To enable this globally, add this configuration
-  # option to your ~/.vagrant.d/Vagrantfile file
-  config.berkshelf.enabled = true
-
-  # An array of symbols representing groups of cookbook described in the Vagrantfile
-  # to exclusively install and copy to Vagrant's shelf.
-  # config.berkshelf.only = []
-
-  # An array of symbols representing groups of cookbook described in the Vagrantfile
-  # to skip installing and copying to Vagrant's shelf.
-  # config.berkshelf.except = []
-
-<% if berkshelf_config.vagrant.vm.provision == 'chef_client' -%>
-  config.vm.provision :chef_client do |chef|
-    chef.chef_server_url        = '<%= berkshelf_config.chef.chef_server_url %>'
-    chef.validation_client_name = '<%= berkshelf_config.chef.validation_client_name %>'
-    chef.validation_key_path    = '<%= berkshelf_config.chef.validation_key_path %>'
-
-    chef.run_list = [
-<% if options[:chef_minitest] %>
-      'recipe[minitest-handler::default]',
-<% end -%>
-      'recipe[<%= cookbook_name %>::default]'
-    ]
-  end
-<% elsif berkshelf_config.vagrant.vm.provision == 'chef_solo' -%>
-  config.vm.provision :chef_solo do |chef|
-    chef.json = {
-      mysql: {
-        server_root_password: 'rootpass',
-        server_debian_password: 'debpass',
-        server_repl_password: 'replpass'
-      }
-    }
-
-    chef.run_list = [
-<% if options[:chef_minitest] %>
-      'recipe[minitest-handler::default]',
-<% end -%>
-      'recipe[<%= cookbook_name %>::default]'
-    ]
-  end
-<% end -%>
-end

data/generator_files/chefignore

@@ -1,94 +0,0 @@
-# Put files/directories that should be ignored in this file when uploading
-# or sharing to the community site.
-# Lines that start with '# ' are comments.
-
-# OS generated files #
-######################
-.DS_Store
-Icon?
-nohup.out
-ehthumbs.db
-Thumbs.db
-
-# SASS #
-########
-.sass-cache
-
-# EDITORS #
-###########
-\#*
-.#*
-*~
-*.sw[a-z]
-*.bak
-REVISION
-TAGS*
-tmtags
-*_flymake.*
-*_flymake
-*.tmproj
-.project
-.settings
-mkmf.log
-
-## COMPILED ##
-##############
-a.out
-*.o
-*.pyc
-*.so
-*.com
-*.class
-*.dll
-*.exe
-*/rdoc/
-
-# Testing #
-###########
-.watchr
-.rspec
-spec/*
-spec/fixtures/*
-test/*
-features/*
-Guardfile
-Procfile
-
-# SCM #
-#######
-.git
-*/.git
-.gitignore
-.gitmodules
-.gitconfig
-.gitattributes
-.svn
-*/.bzr/*
-*/.hg/*
-*/.svn/*
-
-# Berkshelf #
-#############
-cookbooks/*
-tmp
-
-# Cookbooks #
-#############
-CONTRIBUTING
-CHANGELOG*
-
-# Strainer #
-############
-Colanderfile
-Strainerfile
-.colander
-.strainer
-
-# Vagrant #
-###########
-.vagrant
-Vagrantfile
-
-# Travis #
-##########
-.travis.yml

data/generator_files/default_recipe.erb

@@ -1,6 +0,0 @@
-#
-# Cookbook Name:: <%= name %>
-# Recipe:: default
-#
-<%= commented(license) %>
-#

data/generator_files/default_test.rb.erb

@@ -1,11 +0,0 @@
-require File.expand_path('../support/helpers', __FILE__)
-
-describe '<%= cookbook_name %>::default' do
-
-  include Helpers::<%= cookbook_name.capitalize.gsub('-','_') %>
-
-  # Example spec tests can be found at http://git.io/Fahwsw
-  it 'runs no tests by default' do
-  end
-
-end

data/generator_files/gitignore.erb

@@ -1,23 +0,0 @@
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-pkg/
-
-# Berkshelf
-.vagrant
-/cookbooks
-<% unless options[:pattern] == "environment" -%>
-Berksfile.lock
-<% end -%>
-
-# Bundler
-Gemfile.lock
-bin/*
-.bundle/*
-
-<% if options[:scmversion] -%>
-VERSION
-<% end -%>

data/generator_files/helpers.rb.erb

@@ -1,7 +0,0 @@
-module Helpers
-  module <%= cookbook_name.capitalize.gsub('-','_') %>
-    include MiniTest::Chef::Assertions
-    include MiniTest::Chef::Context
-    include MiniTest::Chef::Resources
-  end
-end

data/generator_files/licenses/apachev2.erb

@@ -1,13 +0,0 @@
-Copyright (C) <%= copyright_year %> <%= maintainer %>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

data/generator_files/licenses/gplv2.erb

@@ -1,15 +0,0 @@
-Copyright (C) <%= copyright_year %> <%= maintainer %>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

data/generator_files/licenses/gplv3.erb

@@ -1,14 +0,0 @@
-Copyright (C) <%= copyright_year %> <%= maintainer %>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/generator_files/licenses/mit.erb

@@ -1,20 +0,0 @@
-Copyright (C) <%= copyright_year %> <%= maintainer %>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/generator_files/licenses/reserved.erb

@@ -1,3 +0,0 @@
-Copyright (C) <%= copyright_year %> <%= maintainer %>
-
-All rights reserved - Do Not Redistribute

data/generator_files/metadata.rb.erb

@@ -1,11 +0,0 @@
-name             '<%= name %>'
-maintainer       '<%= maintainer %>'
-maintainer_email '<%= maintainer_email %>'
-license          '<%= license_name %>'
-description      'Installs/Configures <%= name %>'
-long_description 'Installs/Configures <%= name %>'
-<% if options[:scmversion] -%>
-version          IO.read(File.join(File.dirname(__FILE__), 'VERSION'))
-<% else -%>
-version          '0.1.0'
-<% end -%>