berkshelf 7.0.8 → 7.2.1

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

@@ -1,4 +1,4 @@
-require "thor"
+require "thor" unless defined?(Thor)
 
 module Berkshelf
   # Subclass the current shell (which is different based on the OS)
@@ -15,6 +15,7 @@ module Berkshelf
 
     def say(*args)
       return if quiet?
+
       super(*args)
     end
     alias_method :info, :say

data/lib/berkshelf/shell_out.rb

@@ -1,4 +1,4 @@
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module Berkshelf
   module ShellOut
@@ -8,8 +8,9 @@ module Berkshelf
       cmd
     end
 
-    def shell_out!(*args)
-      cmd = shell_out(*args)
+    def shell_out!(*args, **options)
+      cmd = Mixlib::ShellOut.new(*args, **options)
+      cmd.run_command
       cmd.error!
       cmd
     end

data/lib/berkshelf/source.rb

@@ -1,7 +1,7 @@
-require "berkshelf/api-client"
-require "berkshelf/chef_repo_universe"
-require "berkshelf/ssl_policies"
-require "openssl"
+require_relative "api-client"
+require_relative "chef_repo_universe"
+require_relative "ssl_policies"
+require "openssl" unless defined?(OpenSSL)
 
 module Berkshelf
   class Source
@@ -84,7 +84,7 @@ module Berkshelf
     def build_universe
       @universe = api_client.universe
     rescue => ex
-      @universe = Array.new
+      @universe = []
       raise ex
     end
 
@@ -132,7 +132,7 @@ module Berkshelf
     #
     # @return [APIClient::RemoteCookbook]
     def latest(name)
-      versions(name).sort.last
+      versions(name).max
     end
 
     # @param [String] name
@@ -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/source_uri.rb

@@ -1,4 +1,4 @@
-require "addressable/uri"
+require "addressable/uri" unless defined?(Addressable::URI)
 
 module Berkshelf
   class SourceURI < Addressable::URI

data/lib/berkshelf/ssl_policies.rb

@@ -1,4 +1,4 @@
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 
 module Berkshelf
   class SSLPolicy
@@ -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
@@ -31,11 +29,9 @@ module Berkshelf
     end
 
     def set_custom_certs
-      Dir.chdir(trusted_certs_dir) do
-        ::Dir.glob("{*.crt,*.pem}").each do |cert|
-          cert = OpenSSL::X509::Certificate.new(IO.read(cert))
-          add_trusted_cert(cert)
-        end
+      ::Dir.glob("#{trusted_certs_dir}/{*.crt,*.pem}").each do |cert|
+        cert = OpenSSL::X509::Certificate.new(IO.read(cert))
+        add_trusted_cert(cert)
       end
     end
   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
 
@@ -45,10 +45,10 @@ module Berkshelf
 
     private
 
-      # Upload the list of cookbooks to the Chef Server, with some exception
-      # wrapping.
-      #
-      # @param [Array<String>] cookbooks
+    # Upload the list of cookbooks to the Chef Server, with some exception
+    # wrapping.
+    #
+    # @param [Array<String>] cookbooks
     def upload(cookbooks)
       Berkshelf.log.info "Starting upload"
 
@@ -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/validator.rb

@@ -22,15 +22,9 @@ module Berkshelf
       #  the Cookbook(s) to validate
       def validate_files(cookbooks)
         Array(cookbooks).each do |cookbook|
-          path = cookbook.path.to_s
+          base, name = Pathname.new(cookbook.path.to_s).split
 
-          files = Dir.chdir(path) do
-            Dir.glob(File.join("**", "*.rb")).select do |f|
-              f = File.join(path, f)
-              parent = Pathname.new(path).dirname.to_s
-              f.gsub(parent, "") =~ /[[:space:]]/
-            end
-          end
+          files = Dir.glob("#{name}/**/*.rb", base: base.to_s).select { |f| f =~ /[[:space:]]/ }
 
           raise InvalidCookbookFiles.new(cookbook, files) unless files.empty?
         end

data/lib/berkshelf/version.rb

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

data/lib/berkshelf/visualizer.rb

@@ -1,6 +1,6 @@
-require "set"
-require "tempfile"
-require "berkshelf/shell_out"
+require "set" unless defined?(Set)
+require "tempfile" unless defined?(Tempfile)
+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/spec_helper.rb

@@ -2,7 +2,7 @@ def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
-BERKS_SPEC_DATA = File.expand_path("../data", __FILE__)
+BERKS_SPEC_DATA = File.expand_path("data", __dir__)
 
 require "rspec"
 require "cleanroom/rspec"

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

@@ -84,26 +84,26 @@ module Berkshelf
 
       private
 
-        # The path to store the local git clones.
-        #
-        # @return [Pathname]
+      # The path to store the local git clones.
+      #
+      # @return [Pathname]
       def clones
         ensure_and_return(tmp_path.join("clones"))
       end
 
-        # The path to store the git remotes.
-        #
-        # @return [Pathname]
+      # The path to store the git remotes.
+      #
+      # @return [Pathname]
       def remotes
         ensure_and_return(tmp_path.join("remotes"))
       end
 
-        # Generate a cookbook by the given name.
-        #
-        # @param [#to_s] name
-        #   the name of the cookbook to create
-        # @param [Hash] options
-        #   the list ooptions to pass to the generator
+      # Generate a cookbook by the given name.
+      #
+      # @param [#to_s] name
+      #   the name of the cookbook to create
+      # @param [Hash] options
+      #   the list ooptions to pass to the generator
       def generate_git_cookbook(name, options = {})
         options = {
           skip_vagrant: true,
@@ -114,12 +114,12 @@ module Berkshelf
         Berkshelf::Cli.new.invoke(:cookbook, [name.to_s], options)
       end
 
-        # Make sure the given path exists and return the path
-        #
-        # @param [#to_s] path
-        #   the path to create and return
-        #
-        # @return [Pathname]
+      # Make sure the given path exists and return the path
+      #
+      # @param [#to_s] path
+      #   the path to create and return
+      #
+      # @return [Pathname]
       def ensure_and_return(path)
         FileUtils.mkdir(path) unless File.exist?(path)
         Pathname.new(path).expand_path

data/spec/support/path_helpers.rb

@@ -50,10 +50,10 @@ module Berkshelf
 
       private
 
-        # This is the magical "reset" function that gives us a clean working
-        # directory on each run.
-        #
-        # @return [nil]
+      # This is the magical "reset" function that gives us a clean working
+      # directory on each run.
+      #
+      # @return [nil]
       def reload_configs
         Berkshelf.chef_config = chef_config
 

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/core_ext/file_utils_spec.rb

@@ -7,12 +7,12 @@ describe FileUtils do
     let(:options) { {} }
 
     it "uses mv by default" do
-      expect(FileUtils).to receive(:old_mv).with(src, dest, options)
+      expect(FileUtils).to receive(:old_mv).with(src, dest, **options)
       FileUtils.mv(src, dest, options)
     end
 
     it "replaces mv with cp_r and rm_rf" do
-      expect(FileUtils).to receive(:cp_r).with(src, dest, options)
+      expect(FileUtils).to receive(:cp_r).with(src, dest, **options)
       expect(FileUtils).to receive(:rm_rf).with(src)
 
       FileUtils.mv(src, dest, options)

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