berkshelf 7.0.10 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1209065e8abc3141efc5b789c212f990184a652cd89a0414ba4fefb2bc9c419
-  data.tar.gz: 627233958a52340668fcc510f5142eaf37a8dec3130dd8f99d389004f26a7d8d
+  metadata.gz: db4572fef41dd9da70dbc590f97cac73ff70ef9c5206ae82dca20145f2d64da7
+  data.tar.gz: b31969725a11b43359027fa3e729381bc1515fdc8845601d473aac647f521b7e
 SHA512:
-  metadata.gz: 6a41ffac6b3b389d138f2bd430520b1e64257455f6b3332058d6f07bd7a52d0a60d24063206ffb54fb87c3645a92ef9087d0b653fc332bbc57f6335501bdbac6
-  data.tar.gz: 667994356ccb8b8be2b2be7ff191b5da06e4d95d75f98f7ef6124a404b8b5ee1397236f335cfd7317e8fb21b3df8f242d1e6f30e62c617f2360cfb3e5a61d590
+  metadata.gz: f760c4eca41839953b82dc30c4cb50ef60aff3ec7fc7c13a80d313f72d4d0ce775a61ae4c49b95de52d5a29f963d6a0d70d5a511af37d8aca900f05f72ef7f7d
+  data.tar.gz: 40f5a28f40e62e91c0b69ac8020611f9513cf03fc4e376c3edb1d60ad327288ecb3060daf4b4fd3e392e2a068838ccc7b0e9da72d3be6a0620835bbc9e0783fa

data/Gemfile

@@ -11,10 +11,9 @@ group :build do
 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 "aruba",         "~> 0.10" # Stay below 1 until aruba/in_process monkeypatching stops
+  gem "cucumber",      "< 4.0" # until we identify what is generating the ~@no_run tag in CI
   gem "cucumber-expressions", "= 5.0.13"
   gem "chef-zero",     ">= 4.0"
   gem "dep_selector",  ">= 1.0"

data/berkshelf.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency "octokit",              "~> 4.0"
   s.add_dependency "mixlib-archive",       ">= 0.4", "< 2.0"
   s.add_dependency "concurrent-ruby",      "~> 1.0"
-  s.add_dependency "chef",                 ">= 13.6.52"
+  s.add_dependency "chef",                 ">= 15.7.32" # needed for --skip-syntax-check
   s.add_dependency "chef-config"
   # this is required for Mixlib::Config#from_json
   s.add_dependency "mixlib-config", ">= 2.2.5"

data/lib/berkshelf.rb

@@ -169,7 +169,7 @@ module Berkshelf
         raise ChefConnectionError, "Missing required attribute in your Berkshelf configuration: chef.client_key"
       end
 
-      RidleyCompat.new_client(ridley_options, &block)
+      RidleyCompat.new_client(**ridley_options, &block)
     rescue ChefConnectionError, BerkshelfError
       raise
     rescue => ex

data/lib/berkshelf/berksfile.rb

@@ -740,41 +740,41 @@ module Berkshelf
 
     private
 
-      # Ensure the lockfile is present on disk.
-      #
-      # @raise [LockfileNotFound]
-      #   if the lockfile does not exist on disk
-      #
-      # @return [true]
+    # Ensure the lockfile is present on disk.
+    #
+    # @raise [LockfileNotFound]
+    #   if the lockfile does not exist on disk
+    #
+    # @return [true]
     def validate_lockfile_present!
       raise LockfileNotFound unless lockfile.present?
 
       true
     end
 
-      # Ensure that all dependencies defined in the Berksfile exist in this
-      # lockfile.
-      #
-      # @raise [LockfileOutOfSync]
-      #   if there are dependencies specified in the Berksfile which do not
-      #   exist (or are not satisifed by) the lockfile
-      #
-      # @return [true]
+    # Ensure that all dependencies defined in the Berksfile exist in this
+    # lockfile.
+    #
+    # @raise [LockfileOutOfSync]
+    #   if there are dependencies specified in the Berksfile which do not
+    #   exist (or are not satisifed by) the lockfile
+    #
+    # @return [true]
     def validate_lockfile_trusted!
       raise LockfileOutOfSync unless lockfile.trusted?
 
       true
     end
 
-      # Ensure that all dependencies in the lockfile are installed on this
-      # system. You should validate that the lockfile can be trusted before
-      # using this method.
-      #
-      # @raise [DependencyNotInstalled]
-      #   if the dependency in the lockfile is not in the Berkshelf shelf on
-      #   this system
-      #
-      # @return [true]
+    # Ensure that all dependencies in the lockfile are installed on this
+    # system. You should validate that the lockfile can be trusted before
+    # using this method.
+    #
+    # @raise [DependencyNotInstalled]
+    #   if the dependency in the lockfile is not in the Berkshelf shelf on
+    #   this system
+    #
+    # @return [true]
     def validate_dependencies_installed!
       lockfile.graph.locks.each do |_, dependency|
         unless dependency.installed?
@@ -785,13 +785,13 @@ module Berkshelf
       true
     end
 
-      # Determine if any cookbooks were specified that aren't in our shelf.
-      #
-      # @param [Array<String>] names
-      #   a list of cookbook names
-      #
-      # @raise [DependencyNotFound]
-      #   if a cookbook name is given that does not exist
+    # Determine if any cookbooks were specified that aren't in our shelf.
+    #
+    # @param [Array<String>] names
+    #   a list of cookbook names
+    #
+    # @raise [DependencyNotFound]
+    #   if a cookbook name is given that does not exist
     def validate_cookbook_names!(names)
       missing = names - lockfile.graph.locks.keys
 

data/lib/berkshelf/cli.rb

@@ -419,11 +419,11 @@ module Berkshelf
 
     private
 
-      # Print a list of the given cookbooks. This is used by various
-      # methods like {list} and {contingent}.
-      #
-      # @param [Array<CachedCookbook>] cookbooks
-      #
+    # Print a list of the given cookbooks. This is used by various
+    # methods like {list} and {contingent}.
+    #
+    # @param [Array<CachedCookbook>] cookbooks
+    #
     def print_list(cookbooks)
       Array(cookbooks).sort.each do |cookbook|
         Berkshelf.formatter.msg "  * #{cookbook.cookbook_name} (#{cookbook.version})"

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

@@ -511,8 +511,8 @@ 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}$/.freeze
@@ -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/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/uploader.rb

@@ -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"
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.0.10".freeze
+  VERSION = "7.1.0".freeze
 end

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/tmp/berkshelf/cookbooks/dep-1.0.0/metadata.rb

@@ -0,0 +1,2 @@
+name     'dep'
+version  '1.0.0'

data/spec/tmp/berkshelf/cookbooks/ekaf-1.0.0/metadata.rb

@@ -0,0 +1,3 @@
+name     'ekaf'
+version  '1.0.0'
+depends 'dep', '~> 1.0.0'

data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/metadata.rb

@@ -0,0 +1,3 @@
+name     'fake'
+version  '1.0.0'
+depends 'dep', '~> 1.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.10
+  version: 7.1.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.6.52
+        version: 15.7.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.6.52
+        version: 15.7.32
 - !ruby/object:Gem::Dependency
   name: chef-config
   requirement: !ruby/object:Gem::Requirement
@@ -314,6 +314,21 @@ files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/support/path_helpers.rb
 - spec/support/shared_examples/formatter.rb
+- spec/tmp/berkshelf/cookbooks/dep-1.0.0/attributes/default.rb
+- spec/tmp/berkshelf/cookbooks/dep-1.0.0/files/default/file.h
+- spec/tmp/berkshelf/cookbooks/dep-1.0.0/metadata.rb
+- spec/tmp/berkshelf/cookbooks/dep-1.0.0/recipes/default.rb
+- spec/tmp/berkshelf/cookbooks/dep-1.0.0/templates/default/template.erb
+- spec/tmp/berkshelf/cookbooks/ekaf-1.0.0/attributes/default.rb
+- spec/tmp/berkshelf/cookbooks/ekaf-1.0.0/files/default/file.h
+- spec/tmp/berkshelf/cookbooks/ekaf-1.0.0/metadata.rb
+- spec/tmp/berkshelf/cookbooks/ekaf-1.0.0/recipes/default.rb
+- spec/tmp/berkshelf/cookbooks/ekaf-1.0.0/templates/default/template.erb
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/attributes/default.rb
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/files/default/file.h
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/metadata.rb
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/recipes/default.rb
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/templates/default/template.erb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb
 - spec/unit/berkshelf/berkshelf/api_client/remote_cookbook_spec.rb