berkshelf 7.0.8 → 7.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7106f564a5687739b6b869ddb82caab720210cb55ceaec843de5864321752591
-  data.tar.gz: 4196d7280ddf0bcec16c38c6cde5b9829a8e7d37b3aed818671e23294d1af301
+  metadata.gz: 1f8c64894fa5e6b2ec2e82b6cc2f4835d67faf33204e5bf1412e4a5eea9fb0b0
+  data.tar.gz: 3dd04763b8ac3735045e7296e498d112dcba3d34fef9c32263f7f8b557faa149
 SHA512:
-  metadata.gz: ba89f50812a6ffa647fc6c9cb349ce169e9fbb2c641d635157ed4410e75363f5eb2a4ab817002de907965bde4234fd9d7930dfe1a3f76bd8997aa4f2efe30a72
-  data.tar.gz: 51c592e399c3213ec72755dca557b7926e1d8abd14659bcc6e2547d032b018eac8c4b3fb69037e4c26fefe7611b0d3c96465af6fe7f67e62915107476b6018d7
+  metadata.gz: 16a792fea670f247f48880b806f47fa2c50c55aa5cc1c255f2a7f47232adea30eb6360c7f2c957b51c380555dc9aaa6ec242f657ec88101dc5804a4147220954
+  data.tar.gz: 15e850ce857ec01c3b42f319fc159169d7211bf5eb2ed828dec7b4010607860ba47abab36269f1a8fd83817e3310a5b299ed2a32f6de8e7ca4ff412e8534fb51

data/Gemfile

@@ -13,6 +13,7 @@ end
 group :development do
   # these all deliberately float because berkshelf has a Gemfile.lock that
   # equality pins them.  temporarily pin as necessary for API breaks.
+  gem "chef-bin" # for the proxy tests
   gem "aruba",         ">= 0.10.0"
   gem "cucumber-expressions", "= 5.0.13"
   gem "chef-zero",     ">= 4.0"

data/Rakefile

@@ -35,7 +35,7 @@ begin
 rescue LoadError
 end
 
-task default: [:spec, :features]
+task default: %i{spec features}
 task :ci do
   ENV["CI"] = "true"
   Rake::Task[:spec].invoke

data/lib/berkshelf.rb

@@ -23,7 +23,7 @@ JSON.create_id = nil
 
 require_relative "berkshelf/core_ext"
 require_relative "berkshelf/thor_ext"
-require "berkshelf/chef_config_compat"
+require_relative "berkshelf/chef_config_compat"
 
 module Berkshelf
   Encoding.default_external = Encoding::UTF_8

data/lib/berkshelf/api_client/chef_server_connection.rb

@@ -1,4 +1,4 @@
-require "berkshelf/ridley_compat"
+require_relative "../ridley_compat"
 
 module Berkshelf
   module APIClient
@@ -19,7 +19,8 @@ module Berkshelf
           response.each do |name, versions|
             versions.each do |version, attributes|
               attributes[:location_path] = @url
-              cookbooks << RemoteCookbook.new(name, version, attributes) end
+              cookbooks << RemoteCookbook.new(name, version, attributes)
+            end
           end
         end
       rescue Ridley::Errors::HTTPNotFound

data/lib/berkshelf/api_client/connection.rb

@@ -1,4 +1,4 @@
-require "berkshelf/ridley_compat"
+require_relative "../ridley_compat"
 
 module Berkshelf
   module APIClient

data/lib/berkshelf/berksfile.rb

@@ -13,7 +13,7 @@ module Berkshelf
       def from_options(options = {})
         options[:berksfile] ||= File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
         symbolized = Hash[options.map { |k, v| [k.to_sym, v] }]
-        from_file(options[:berksfile], symbolized.select { |k,| [:except, :only, :delete].include? k })
+        from_file(options[:berksfile], symbolized.select { |k,| %i{except only delete}.include? k })
       end
 
       # @param [#to_s] file
@@ -66,8 +66,8 @@ module Berkshelf
     #   group to be installed and all others to be ignored
     def initialize(path, options = {})
       @filepath         = File.expand_path(path)
-      @dependencies     = Hash.new
-      @sources          = Hash.new
+      @dependencies     = {}
+      @sources          = {}
       @delete           = options[:delete]
 
       # defaults for what solvers to use
@@ -146,7 +146,7 @@ module Berkshelf
     #   @see PathLocation
     #   @see GitLocation
     def cookbook(*args)
-      options = args.last.is_a?(Hash) ? args.pop : Hash.new
+      options = args.last.is_a?(Hash) ? args.pop : {}
       name, constraint = args
 
       options[:path] &&= File.expand_path(options[:path], File.dirname(filepath))
@@ -176,10 +176,10 @@ module Berkshelf
     # @option options [String] :path
     #   path to the metadata file
     def metadata(options = {})
-      path          = options[:path] || File.dirname(filepath)
+      path = options[:path] || File.dirname(filepath)
 
       loader = Chef::Cookbook::CookbookVersionLoader.new(path)
-      loader.load_cookbooks
+      loader.load!
       cookbook_version = loader.cookbook_version
       metadata = cookbook_version.metadata
 
@@ -282,7 +282,7 @@ module Berkshelf
       if @dependencies[name]
         # Only raise an exception if the dependency is a true duplicate
         groups = (options[:group].nil? || options[:group].empty?) ? [:default] : options[:group]
-        if !(@dependencies[name].groups & groups).empty?
+        unless (@dependencies[name].groups & groups).empty?
           raise DuplicateDependencyDefined.new(name)
         end
       end
@@ -500,7 +500,7 @@ module Berkshelf
           latest = cookbooks.select do |cookbook|
             (include_non_satisfying || dependency.version_constraint.satisfies?(cookbook.version)) &&
               Semverse::Version.coerce(cookbook.version) > dependency.locked_version
-          end.sort_by { |cookbook| cookbook.version }.last
+          end.sort_by(&:version).last
 
           unless latest.nil?
             hash[name] ||= {
@@ -659,7 +659,7 @@ module Berkshelf
           files.reject! { |file_path| chefignore.ignored?(file_path) }
 
           # convert Pathname objects back to strings
-          files.map! { |f| f.to_s }
+          files.map!(&:to_s)
 
           # copy each file to destination
           files.each do |rpath|
@@ -748,6 +748,7 @@ module Berkshelf
       # @return [true]
     def validate_lockfile_present!
       raise LockfileNotFound unless lockfile.present?
+
       true
     end
 
@@ -761,6 +762,7 @@ module Berkshelf
       # @return [true]
     def validate_lockfile_trusted!
       raise LockfileOutOfSync unless lockfile.trusted?
+
       true
     end
 

data/lib/berkshelf/cached_cookbook.rb

@@ -1,6 +1,6 @@
 require "chef/cookbook/cookbook_version_loader"
 require "chef/cookbook/syntax_check"
-require "berkshelf/errors"
+require_relative "errors"
 require "chef/json_compat"
 
 module Berkshelf
@@ -66,7 +66,7 @@ module Berkshelf
       @loader ||=
         begin
           loader = Chef::Cookbook::CookbookVersionLoader.new(@path)
-          loader.load_cookbooks
+          loader.load!
           loader
         end
     end
@@ -151,7 +151,8 @@ module Berkshelf
     def validate
       raise IOError, "No Cookbook found at: #{path}" unless path.exist?
 
-      syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cookbook_name, path)
+      syntax_checker = Chef::Cookbook::SyntaxCheck.new(path.to_path)
+
       unless syntax_checker.validate_ruby_files
         raise Berkshelf::Errors::CookbookSyntaxError, "Invalid ruby files in cookbook: #{cookbook_name} (#{version})."
       end
@@ -166,6 +167,7 @@ module Berkshelf
       json_file = "#{path}/metadata.json"
       rb_file = "#{path}/metadata.rb"
       return nil if File.exist?(json_file)
+
       md = Chef::Cookbook::Metadata.new
       md.from_file(rb_file)
       f = File.open(json_file, "w")

data/lib/berkshelf/chef_repo_universe.rb

@@ -1,5 +1,5 @@
-require "berkshelf/api_client/remote_cookbook"
-require "berkshelf/cached_cookbook"
+require_relative "api_client/remote_cookbook"
+require_relative "cached_cookbook"
 
 module Berkshelf
   # Shim to look like a Berkshelf::APIClient but for a chef repo folder.
@@ -15,8 +15,10 @@ module Berkshelf
     def universe
       Dir.entries(cookbooks_path).sort.each_with_object([]) do |entry, cookbooks|
         next if entry[0] == "." # Skip hidden folders.
+
         entry_path = "#{cookbooks_path}/#{entry}"
         next unless File.directory?(entry_path) # Skip non-dirs.
+
         cookbook = begin
           Berkshelf::CachedCookbook.from_path(entry_path)
                    rescue IOError

data/lib/berkshelf/cli.rb

@@ -1,4 +1,4 @@
-require "berkshelf"
+require_relative "../berkshelf"
 require_relative "config"
 require_relative "commands/shelf"
 

data/lib/berkshelf/commands/shelf.rb

@@ -13,7 +13,7 @@ module Berkshelf
       else
         Berkshelf.formatter.msg "Cookbooks in the Berkshelf shelf:"
         cookbooks.sort.each do |cookbook, versions|
-          Berkshelf.formatter.msg("  * #{cookbook} (#{versions.sort.join(', ')})")
+          Berkshelf.formatter.msg("  * #{cookbook} (#{versions.sort.join(", ")})")
         end
       end
     end

data/lib/berkshelf/community_rest.rb

@@ -69,10 +69,10 @@ module Berkshelf
     #   how often we should pause between retries
     def initialize(uri = V1_API, options = {})
       options = options.dup
-      options         = { retries: 5, retry_interval: 0.5, ssl: Berkshelf::Config.instance.ssl }.merge(options)
-      @api_uri        = uri
+      options = { retries: 5, retry_interval: 0.5, ssl: Berkshelf::Config.instance.ssl }.merge(options)
+      @api_uri = uri
       options[:server_url] = uri
-      @retries        = options.delete(:retries)
+      @retries = options.delete(:retries)
       @retry_interval = options.delete(:retry_interval)
 
       @connection = Berkshelf::RidleyCompatJSON.new(options)

data/lib/berkshelf/config.rb

@@ -122,7 +122,7 @@ module Berkshelf
             default :email, nil
             default :license, nil
           end
-          default :allowed_licenses, Array.new
+          default :allowed_licenses, []
           default :raise_license_exception, false
           config_context :vagrant do
             config_context :vm do

data/lib/berkshelf/core_ext.rb

@@ -1,3 +1,3 @@
 Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
-  require_relative "core_ext/#{File.basename(path, '.rb')}"
+  require_relative "core_ext/#{File.basename(path, ".rb")}"
 end

data/lib/berkshelf/dependency.rb

@@ -171,7 +171,7 @@ module Berkshelf
         "#{name} (#{version_constraint})",
         "locked_version: #{locked_version.inspect}",
         "groups: #{groups}",
-        "location: #{location || 'default'}>",
+        "location: #{location || "default"}>",
       ].join(", ")
     end
 

data/lib/berkshelf/downloader.rb

@@ -1,6 +1,7 @@
 require "net/http"
 require "mixlib/archive"
-require "berkshelf/ssl_policies"
+require_relative "ssl_policies"
+require "faraday"
 
 module Berkshelf
   class Downloader
@@ -120,7 +121,7 @@ module Berkshelf
         )
 
         begin
-          url = URI(github_client.archive_link(cookbook_uri.path.gsub(/^\//, ""), ref: "v#{version}"))
+          url = URI(github_client.archive_link(cookbook_uri.path.gsub(%r{^/}, ""), ref: "v#{version}"))
         rescue Octokit::Unauthorized
           return nil
         end
@@ -131,6 +132,7 @@ module Berkshelf
         http.verify_mode = (options["ssl_verify"].nil? || options["ssl_verify"]) ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
         resp = http.get(url.request_uri)
         return nil unless resp.is_a?(Net::HTTPSuccess)
+
         open(archive_path, "wb") { |file| file.write(resp.body) }
 
         Mixlib::Archive.new(archive_path).extract(unpack_dir)
@@ -183,6 +185,7 @@ module Berkshelf
 
         resp = connection.get(cookbook_uri.request_uri + "&private_token=" + options["private_token"])
         return nil unless resp.status == 200
+
         open(archive_path, "wb") { |file| file.write(resp.body) }
 
         Mixlib::Archive.new(archive_path).extract(unpack_dir)

data/lib/berkshelf/errors.rb

@@ -83,7 +83,7 @@ module Berkshelf
 
     def to_s
       @original_exception.to_s +
-        "Unable to find a solution for demands: #{demands.join(', ')}"
+        "Unable to find a solution for demands: #{demands.join(", ")}"
     end
 
     alias_method :message, :to_s
@@ -372,7 +372,7 @@ module Berkshelf
 
     def to_s
       "Unknown license: '#{license}'\n" +
-        "Available licenses: #{CookbookGenerator::LICENSES.join(', ')}"
+        "Available licenses: #{CookbookGenerator::LICENSES.join(", ")}"
     end
 
     alias_method :message, :to_s

data/lib/berkshelf/formatters/human.rb

@@ -68,7 +68,7 @@ module Berkshelf
 
         hash.each do |name, info|
           info["remote"].each do |remote_source, remote_version|
-            out = "  * #{name} (#{info['local']} => #{remote_version})"
+            out = "  * #{name} (#{info["local"]} => #{remote_version})"
 
             unless remote_source.default?
               out << " [#{remote_source.uri}]"

data/lib/berkshelf/formatters/json.rb

@@ -12,7 +12,7 @@ module Berkshelf
         messages: [],
         warnings: [],
       }
-      @cookbooks = Hash.new
+      @cookbooks = {}
 
       Berkshelf.ui.mute { super }
     end

data/lib/berkshelf/installer.rb

@@ -1,4 +1,4 @@
-require "berkshelf/api-client"
+require_relative "api-client"
 require "concurrent/executors"
 require "concurrent/future"
 

data/lib/berkshelf/lockfile.rb

@@ -228,7 +228,7 @@ module Berkshelf
 
     # @return [Array<CachedCookbook>]
     def cached
-      graph.locks.values.collect { |dependency| dependency.cached_cookbook }
+      graph.locks.values.collect(&:cached_cookbook)
     end
 
     # The list of dependencies constrained in this lockfile.
@@ -570,7 +570,7 @@ module Berkshelf
               end
             end
 
-            graph << "  #{name} (#{info['locked_version']})\n"
+            graph << "  #{name} (#{info["locked_version"]})\n"
           end
 
           contents = "#{dependencies}\n#{graph}"

data/lib/berkshelf/logger.rb

@@ -3,7 +3,7 @@ module Berkshelf
     def initialize(device = STDOUT)
       super
       self.level = Logger::WARN
-      @filter_params = Array.new
+      @filter_params = []
     end
 
     # Reimplements Logger#add adding message filtering. The info,
@@ -28,6 +28,7 @@ module Berkshelf
       if @logdev.nil? || severity < (@level)
         return true
       end
+
       progname ||= @progname
       if message.nil?
         if block_given?
@@ -38,7 +39,8 @@ module Berkshelf
         end
       end
       @logdev.write(
-        format_message(format_severity(severity), Time.now, progname, filter(message)))
+        format_message(format_severity(severity), Time.now, progname, filter(message))
+      )
       true
     end
 

data/lib/berkshelf/mixin/git.rb

@@ -1,4 +1,4 @@
-require "berkshelf/shell_out"
+require_relative "../shell_out"
 
 module Berkshelf
   module Mixin

data/lib/berkshelf/resolver.rb

@@ -21,7 +21,7 @@ module Berkshelf
     def initialize(berksfile, demands = [])
       @berksfile = berksfile
       @graph     = Graph.new
-      @demands   = Array.new
+      @demands   = []
 
       Array(demands).each { |demand| add_demand(demand) }
       compute_solver_engine(berksfile)

data/lib/berkshelf/ridley_compat.rb

@@ -1,7 +1,7 @@
 require "chef/server_api"
 require "chef/http/simple_json"
 require "chef/http/simple"
-require "berkshelf/api_client/errors"
+require_relative "api_client/errors"
 require "chef/config"
 require "chef/cookbook_manifest"
 

data/lib/berkshelf/shell.rb

@@ -15,6 +15,7 @@ module Berkshelf
 
     def say(*args)
       return if quiet?
+
       super(*args)
     end
     alias_method :info, :say

data/lib/berkshelf/source.rb

@@ -1,6 +1,6 @@
-require "berkshelf/api-client"
-require "berkshelf/chef_repo_universe"
-require "berkshelf/ssl_policies"
+require_relative "api-client"
+require_relative "chef_repo_universe"
+require_relative "ssl_policies"
 require "openssl"
 
 module Berkshelf
@@ -84,7 +84,7 @@ module Berkshelf
     def build_universe
       @universe = api_client.universe
     rescue => ex
-      @universe = Array.new
+      @universe = []
       raise ex
     end
 
@@ -154,7 +154,7 @@ module Berkshelf
     end
 
     def inspect
-      "#<#{self.class.name} #{type}: #{uri.to_s.inspect}, #{options.map { |k, v| "#{k}: #{v.inspect}" }.join(', ')}>"
+      "#<#{self.class.name} #{type}: #{uri.to_s.inspect}, #{options.map { |k, v| "#{k}: #{v.inspect}" }.join(", ")}>"
     end
 
     def hash
@@ -163,6 +163,7 @@ module Berkshelf
 
     def ==(other)
       return false unless other.is_a?(self.class)
+
       type == other.type && uri == other.uri
     end
 

data/lib/berkshelf/ssl_policies.rb

@@ -8,9 +8,7 @@ module Berkshelf
     attr_reader :store
 
     def initialize
-      @store = OpenSSL::X509::Store.new.tap do |store|
-        store.set_default_paths
-      end
+      @store = OpenSSL::X509::Store.new.tap(&:set_default_paths)
 
       set_custom_certs if ::File.exist?(trusted_certs_dir)
     end

data/lib/berkshelf/thor.rb

@@ -1 +1 @@
-require "berkshelf/cli"
+require_relative "cli"

data/lib/berkshelf/thor_ext.rb

@@ -1,3 +1,3 @@
 Dir["#{File.dirname(__FILE__)}/thor_ext/*.rb"].sort.each do |path|
-  require_relative "thor_ext/#{File.basename(path, '.rb')}"
+  require_relative "thor_ext/#{File.basename(path, ".rb")}"
 end

data/lib/berkshelf/uploader.rb

@@ -32,7 +32,7 @@ module Berkshelf
                     Berkshelf.log.debug "  No names given, using all cookbooks"
                     filtered_cookbooks
                   else
-                    Berkshelf.log.debug "  Names given (#{names.join(', ')})"
+                    Berkshelf.log.debug "  Names given (#{names.join(", ")})"
                     names.map { |name| lockfile.retrieve(name) }
                   end
 
@@ -75,13 +75,15 @@ module Berkshelf
                 [ cookbook_version ],
                 force: options[:force],
                 concurrency: 1, # sadly
-                rest: connection
+                rest: connection,
+                skip_syntax_check: options[:skip_syntax_check]
               ).upload_cookbooks
               Berkshelf.formatter.uploaded(cookbook, connection)
             rescue Chef::Exceptions::CookbookFrozen
               if options[:halt_on_frozen]
                 raise FrozenCookbook.new(cookbook)
               end
+
               Berkshelf.formatter.skipping(cookbook, connection)
             end
           ensure

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.0.8".freeze
+  VERSION = "7.0.9".freeze
 end

data/lib/berkshelf/visualizer.rb

@@ -1,6 +1,6 @@
 require "set"
 require "tempfile"
-require "berkshelf/shell_out"
+require_relative "shell_out"
 
 module Berkshelf
   class Visualizer

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/support/chef_server.rb

@@ -10,11 +10,11 @@ module Berkshelf
         attr_reader :server
 
         def clear_request_log
-          @request_log = Array.new
+          @request_log = []
         end
 
         def request_log
-          @request_log ||= Array.new
+          @request_log ||= []
         end
 
         def server_url

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -200,10 +200,10 @@ describe Berkshelf::Berksfile do
 
   describe "#dependencies" do
     let(:groups) do
-      [
-        :nautilus,
-        :skarner,
-      ]
+      %i{
+        nautilus
+        skarner
+      }
     end
 
     it "returns all Berkshelf::Dependencys added to the instance of Berksfile" do
@@ -235,8 +235,8 @@ describe Berkshelf::Berksfile do
   describe "#groups" do
     before do
       allow(subject).to receive(:dependencies) { [dependency_one, dependency_two] }
-      allow(dependency_one).to receive(:groups) { [:nautilus, :skarner] }
-      allow(dependency_two).to receive(:groups) { [:nautilus, :riven] }
+      allow(dependency_one).to receive(:groups) { %i{nautilus skarner} }
+      allow(dependency_two).to receive(:groups) { %i{nautilus riven} }
     end
 
     it "returns a hash containing keys for every group a dependency is a member of" do
@@ -255,7 +255,7 @@ describe Berkshelf::Berksfile do
   describe "#add_dependency" do
     let(:name) { "cookbook_one" }
     let(:constraint) { "= 1.2.0" }
-    let(:options) { Hash.new }
+    let(:options) { {} }
 
     before(:each) do
       subject.add_dependency(name, constraint, options)

data/spec/unit/berkshelf/cli_spec.rb

@@ -13,8 +13,7 @@ module Berkshelf
     describe "#upload" do
       it "calls to upload with params if passed in cli" do
         expect(berksfile).to receive(:upload).with(cookbooks,
-          include(skip_syntax_check: true, freeze: false)
-        )
+          include(skip_syntax_check: true, freeze: false))
 
         subject.options[:skip_syntax_check] = true
         subject.options[:no_freeze]         = true

data/spec/unit/berkshelf/community_rest_spec.rb

@@ -68,7 +68,7 @@ describe Berkshelf::CommunityREST do
     let(:archive) { double("archive", path: "/foo/bar", unlink: true) }
 
     before do
-      allow(subject).to receive(:stream).with(any_args()).and_return(archive)
+      allow(subject).to receive(:stream).with(any_args).and_return(archive)
       allow(Berkshelf::CommunityREST).to receive(:unpack)
         .and_return("/some/path")
     end

data/spec/unit/berkshelf/dependency_spec.rb

@@ -71,7 +71,7 @@ describe Berkshelf::Dependency do
         end
 
         context "given a group option containing an array of groups" do
-          let(:groups) { [ :development, :test ] }
+          let(:groups) { %i{development test} }
           let(:source) { described_class.new(berksfile, cookbook_name, group: groups) }
 
           it "assigns all the groups to the group attribute" do
@@ -95,24 +95,24 @@ describe Berkshelf::Dependency do
   describe "#add_group" do
     it "stores strings as symbols" do
       subject.add_group "foo"
-      expect(subject.groups).to eq([:default, :foo])
+      expect(subject.groups).to eq(%i{default foo})
     end
 
     it "does not store duplicate groups" do
       subject.add_group "bar"
       subject.add_group "bar"
       subject.add_group :bar
-      expect(subject.groups).to eq([:default, :bar])
+      expect(subject.groups).to eq(%i{default bar})
     end
 
     it "adds multiple groups" do
       subject.add_group "baz", "quux"
-      expect(subject.groups).to eq([:default, :baz, :quux])
+      expect(subject.groups).to eq(%i{default baz quux})
     end
 
     it "handles multiple groups as an array" do
       subject.add_group %w{baz quux}
-      expect(subject.groups).to eq([:default, :baz, :quux])
+      expect(subject.groups).to eq(%i{default baz quux})
     end
   end
 

data/spec/unit/berkshelf/downloader_spec.rb

@@ -5,14 +5,12 @@ module Berkshelf
     let(:berksfile) do
       double(Berksfile,
         lockfile: lockfile,
-        dependencies: []
-      )
+        dependencies: [])
     end
 
     let(:lockfile) do
       double(Lockfile,
-        graph: graph
-      )
+        graph: graph)
     end
 
     let(:graph) { double(Lockfile::Graph, locks: {}) }
@@ -124,15 +122,13 @@ module Berkshelf
             cookbook_copyright: "user",
             cookbook_email: "user@example.com",
             cookbook_license: "apachev2",
-            trusted_certs_dir: self_signed_crt_path
-          )
+            trusted_certs_dir: self_signed_crt_path)
         end
 
         let(:berkshelf_config) do
           double(Config,
             ssl:  double(verify: true),
-            chef: chef_config
-          )
+            chef: chef_config)
         end
 
         before do

data/spec/unit/berkshelf/locations/base_spec.rb

@@ -46,8 +46,7 @@ module Berkshelf
         let(:cookbook) do
           double("cookbook",
             cookbook_name: "cookbook",
-            version: "0.1.0"
-          )
+            version: "0.1.0")
         end
 
         before do

data/spec/unit/berkshelf/locations/path_spec.rb

@@ -8,8 +8,7 @@ module Berkshelf
       double("dependency",
         name: "nginx",
         version_constraint: constraint,
-        berksfile: berksfile
-      )
+        berksfile: berksfile)
     end
     let(:path) { fixtures_path.join("cookbooks", "example_cookbook") }
     let(:relative_path) { Pathname.new("../../../fixtures/cookbooks/example_cookbook") }

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -8,8 +8,7 @@ describe Berkshelf::Lockfile do
     let(:lock_path) { File.absolute_path("/path/to/Bacon") }
     let(:berksfile) do
       double("Berksfile",
-        filepath: lock_path
-      )
+        filepath: lock_path)
     end
 
     subject { described_class.from_berksfile(berksfile) }
@@ -77,8 +76,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: {},
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt)
@@ -95,8 +93,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: { "bacon" => "1.0.0" },
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       bacon = double(name: "bacon", version: "1.0.0", dependencies: {})
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
@@ -115,15 +112,13 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: { "bacon" => "1.0.0" },
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       bacon = double("bacon",
         name: "bacon",
         version_constraint: Semverse::Constraint.new(">= 0.0.0"),
         version: "1.0.0",
         location: "api",
-        dependencies: { "apt" => "1.0.0" }
-      )
+        dependencies: { "apt" => "1.0.0" })
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt)
@@ -141,8 +136,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: { "bacon" => "1.0.0" },
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt)
@@ -177,8 +171,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: {},
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt)
@@ -195,8 +188,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: {},
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       apt_master = apt.dup
       allow(apt_master).to receive_messages(location: "github")
       allow(apt_master).to receive_messages(cached_cookbook: cookbook)
@@ -393,8 +385,7 @@ describe Berkshelf::Lockfile::Graph do
         name: "test-0.0.1",
         version: "0.0.1",
         cookbook_name: "test",
-        dependencies: {}
-      )
+        dependencies: {})
       subject.update([cookbook])
 
       expect(subject.locks.keys).to include(cookbook.cookbook_name)

data/spec/unit/berkshelf/ridley_compat_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "chef/cookbook_manifest"
 
 describe Berkshelf::RidleyCompat do
-  let(:opts) { Hash.new }
+  let(:opts) { {} }
 
   subject { described_class.new(opts) }
 

data/spec/unit/berkshelf/source_spec.rb

@@ -110,12 +110,12 @@ module Berkshelf
         # Check all baseline values.
         its([:timeout]) { is_expected.to eq 30 }
         its([:open_timeout]) { is_expected.to eq 3 }
-        its([:ssl, :verify]) { is_expected.to be true }
-        its([:ssl, :ca_file]) { is_expected.to be_nil }
-        its([:ssl, :ca_path]) { is_expected.to be_nil }
-        its([:ssl, :client_cert]) { is_expected.to be_nil }
-        its([:ssl, :client_key]) { is_expected.to be_nil }
-        its([:ssl, :cert_store]) { is_expected.to be_a(OpenSSL::X509::Store) }
+        its(%i{ssl verify}) { is_expected.to be true }
+        its(%i{ssl ca_file}) { is_expected.to be_nil }
+        its(%i{ssl ca_path}) { is_expected.to be_nil }
+        its(%i{ssl client_cert}) { is_expected.to be_nil }
+        its(%i{ssl client_key}) { is_expected.to be_nil }
+        its(%i{ssl cert_store}) { is_expected.to be_a(OpenSSL::X509::Store) }
       end
 
       context "with a string argument and options" do
@@ -198,7 +198,8 @@ module Berkshelf
         [
         APIClient::RemoteCookbook.new("cb1", "1.0.8"),
         APIClient::RemoteCookbook.new("cb1", "1.0.22"),
-      ] end
+      ]
+      end
 
       before do
         allow_any_instance_of(APIClient::Connection).to receive(:universe).and_return(cookbooks)

data/spec/unit/berkshelf/ssl_policies_spec.rb

@@ -16,19 +16,17 @@ describe Berkshelf::SSLPolicy do
       cookbook_copyright: "user",
       cookbook_email: "user@example.com",
       cookbook_license: "apachev2",
-      trusted_certs_dir: self_signed_crt_path
-    )
+      trusted_certs_dir: self_signed_crt_path)
   end
 
   let(:berkshelf_config) do
     double(Berkshelf::Config,
       ssl:  double(verify: true),
-      chef: chef_config
-    )
+      chef: chef_config)
   end
 
   subject do
-    Berkshelf::SSLPolicy.new()
+    Berkshelf::SSLPolicy.new
   end
 
   before do

data/spec/unit/berkshelf/uploader_spec.rb

@@ -5,14 +5,12 @@ module Berkshelf
     let(:berksfile) do
       double(Berksfile,
         lockfile: lockfile,
-        dependencies: []
-      )
+        dependencies: [])
     end
 
     let(:lockfile) do
       double(Lockfile,
-        graph: graph
-      )
+        graph: graph)
     end
 
     let(:graph) { double(Lockfile::Graph, locks: {}) }
@@ -48,7 +46,7 @@ module Berkshelf
     end
 
     describe "#run" do
-      let(:options) { Hash.new }
+      let(:options) { {} }
 
       let(:chef_config) do
         double(Berkshelf::ChefConfigCompat,
@@ -61,15 +59,13 @@ module Berkshelf
           cookbook_copyright: "user",
           cookbook_email: "user@example.com",
           cookbook_license: "apachev2",
-          trusted_certs_dir: self_signed_crt_path
-        )
+          trusted_certs_dir: self_signed_crt_path)
       end
 
       let(:berkshelf_config) do
         double(Config,
           ssl:  double(verify: true),
-          chef: chef_config
-        )
+          chef: chef_config)
       end
 
       let(:default_ridley_options) do
@@ -211,7 +207,7 @@ module Berkshelf
         subject { described_class.new(berksfile).send(:lookup_dependencies, "runit") }
 
         it "returns array of cookbook's dependencies and their dependencies" do
-          expect(subject).to eq ["build-essential", "yum", "yum-epel"]
+          expect(subject).to eq %w{build-essential yum yum-epel}
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.8
+  version: 7.0.9
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout