berkshelf 7.0.6 → 7.1.0

data/lib/berkshelf/community_rest.rb

@@ -69,13 +69,13 @@ 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)
+      @connection = Berkshelf::RidleyCompatJSON.new(**options)
     end
 
     # Download and extract target cookbook archive to the local file system,

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

@@ -14,10 +14,10 @@ module FileUtils
     # symlink on Linux
     # @see {FileUtils::mv}
     def mv(src, dest, options = {})
-      old_mv(src, dest, options)
+      old_mv(src, dest, **options)
     rescue Errno::EACCES, Errno::ENOENT
       options.delete(:force) if options.key?(:force)
-      FileUtils.cp_r(src, dest, options)
+      FileUtils.cp_r(src, dest, **options)
       FileUtils.rm_rf(src)
     end
   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
@@ -68,7 +69,11 @@ module Berkshelf
         if source.type == :artifactory
           options[:headers] = { "X-Jfrog-Art-Api" => source.options[:api_key] }
         end
-        CommunityREST.new(remote_cookbook.location_path, options).download(name, version)
+
+        # Allow Berkshelf install to function if a relative url exists in location_path
+        path = URI.parse(remote_cookbook.location_path).absolute? ? remote_cookbook.location_path : "#{source.uri_string}#{remote_cookbook.location_path}"
+
+        CommunityREST.new(path, options).download(name, version)
       when :chef_server
         tmp_dir      = Dir.mktmpdir
         unpack_dir   = Pathname.new(tmp_dir) + "#{name}-#{version}"
@@ -116,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
@@ -127,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)
@@ -179,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

@@ -8,11 +8,11 @@ module Berkshelf
     def initialize
       @output = {
         cookbooks: [],
-        errors:    [],
-        messages:  [],
-        warnings:  [],
+        errors: [],
+        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/location.rb

@@ -28,9 +28,9 @@ module Berkshelf
 
       private
 
-        # Load the correct location from the given options.
-        #
-        # @return [Class, nil]
+      # Load the correct location from the given options.
+      #
+      # @return [Class, nil]
       def klass_from_options(options)
         options.each do |key, _|
           id = key.to_s.capitalize

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.
@@ -511,13 +511,13 @@ module Berkshelf
       "#<Berkshelf::Lockfile #{Pathname.new(filepath).basename}, dependencies: #{dependencies.inspect}>"
     end
 
-      # The class responsible for parsing the lockfile and turning it into a
-      # useful data structure.
+    # The class responsible for parsing the lockfile and turning it into a
+    # useful data structure.
     class LockfileParser
       NAME_VERSION         = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'.freeze
-      DEPENDENCY_PATTERN   = /^ {2}#{NAME_VERSION}$/
-      DEPENDENCIES_PATTERN = /^ {4}#{NAME_VERSION}$/
-      OPTION_PATTERN       = /^ {4}(.+)\: (.+)/
+      DEPENDENCY_PATTERN   = /^ {2}#{NAME_VERSION}$/.freeze
+      DEPENDENCIES_PATTERN = /^ {4}#{NAME_VERSION}$/.freeze
+      OPTION_PATTERN       = /^ {4}(.+)\: (.+)/.freeze
 
       # Create a new lockfile parser.
       #
@@ -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}"
@@ -599,9 +599,9 @@ module Berkshelf
 
       private
 
-        # Parse a dependency line.
-        #
-        # @param [String] line
+      # Parse a dependency line.
+      #
+      # @param [String] line
       def parse_dependency(line)
         if line =~ DEPENDENCY_PATTERN
           name, version = $1, $2
@@ -615,9 +615,9 @@ module Berkshelf
         end
       end
 
-        # Parse a graph line.
-        #
-        # @param [String] line
+      # Parse a graph line.
+      #
+      # @param [String] line
       def parse_graph(line)
         if line =~ DEPENDENCY_PATTERN
           name, version = $1, $2
@@ -631,7 +631,7 @@ module Berkshelf
       end
     end
 
-      # The class representing an internal graph.
+    # The class representing an internal graph.
     class Graph
       include Enumerable
 

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/packager.rb

@@ -64,10 +64,10 @@ module Berkshelf
 
     private
 
-      # @return [String]
+    # @return [String]
     attr_reader :out_dir
 
-      # @return [String]
+    # @return [String]
     attr_reader :filename
   end
 end

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

@@ -16,10 +16,10 @@ module Berkshelf
       opts       = args.last.respond_to?(:to_hash) ? args.pop.to_hash.each_with_object({}) { |(k, v), m| m[k.to_sym] = v } : {}
 
       @options = {
-        force:          false,
-        freeze:         true,
+        force: false,
+        freeze: true,
         halt_on_frozen: false,
-        validate:       true,
+        validate: true,
       }.merge(opts)
 
       @names = Array(args).flatten
@@ -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/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.0.6".freeze
+  VERSION = "7.1.0".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 []