berkshelf 7.0.7 → 7.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0302691c0c7919915b431f9317cb068196609e0328b332a31dc8f0d6238ab7a1'
-  data.tar.gz: 615306cfb0d62b5fe127ccd70b1d1f576bd4aa982b9d83a79124833f94f1e89b
+  metadata.gz: 7106f564a5687739b6b869ddb82caab720210cb55ceaec843de5864321752591
+  data.tar.gz: 4196d7280ddf0bcec16c38c6cde5b9829a8e7d37b3aed818671e23294d1af301
 SHA512:
-  metadata.gz: 7cfcaba8dbd5f319d237817f98bb671cfbf431e9da5be4d9a9f6034055537fbed559104e04f8e3a64dcdbf3c2401da5da943f9f3986fce6606b670a064a95971
-  data.tar.gz: 6ecf7fffe3a862ac1c7ea3b2e7b1c41d6304782b7f4eb1c754a5b5ae082af29c825e1a477276154760201577b4e41bab861eabc13b225cf0499aee93e21e6fa0
+  metadata.gz: ba89f50812a6ffa647fc6c9cb349ce169e9fbb2c641d635157ed4410e75363f5eb2a4ab817002de907965bde4234fd9d7930dfe1a3f76bd8997aa4f2efe30a72
+  data.tar.gz: 51c592e399c3213ec72755dca557b7926e1d8abd14659bcc6e2547d032b018eac8c4b3fb69037e4c26fefe7611b0d3c96465af6fe7f67e62915107476b6018d7

data/Rakefile

@@ -8,7 +8,7 @@ rescue LoadError
   task :spec
 end
 
-WINDOWS_PLATFORM = /mswin|win32|mingw/ unless defined? WINDOWS_PLATFORM
+WINDOWS_PLATFORM = /mswin|win32|mingw/.freeze unless defined? WINDOWS_PLATFORM
 
 begin
   require "cucumber"

data/berkshelf.gemspec

@@ -17,27 +17,26 @@ Gem::Specification.new do |s|
     "sethvargo@gmail.com",
   ]
 
-  s.description               = %q{Manages a Cookbook's, or an Application's, Cookbook dependencies}
+  s.description               = %q{Manages a Chef cookbook's dependencies}
   s.summary                   = s.description
-  s.homepage                  = "http://berkshelf.com"
-  s.license                   = "Apache 2.0"
-  s.files                     = `git ls-files`.split($\)
-  s.executables               = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  s.test_files                = s.files.grep(%r{^(test|spec|features)/})
+  s.homepage                  = "https://docs.chef.io/berkshelf.html"
+  s.license                   = "Apache-2.0"
+  s.files                     = %w{LICENSE Gemfile Rakefile} + Dir.glob("*.gemspec") + Dir.glob("{lib,spec, features}/**/*")
+  s.executables               = Dir.glob("bin/**/*").map { |f| File.basename(f) }
   s.name                      = "berkshelf"
   s.require_paths             = ["lib"]
   s.version                   = Berkshelf::VERSION
   s.required_ruby_version     = ">= 2.4.0"
   s.required_rubygems_version = ">= 2.0.0"
 
-  s.add_dependency "mixlib-shellout",      "~> 2.0"
+  s.add_dependency "mixlib-shellout",      ">= 2.0", "< 4.0"
   s.add_dependency "cleanroom",            "~> 1.0"
   s.add_dependency "minitar",              ">= 0.6"
-  s.add_dependency "retryable",            "~> 2.0"
+  s.add_dependency "retryable",            ">= 2.0", "< 4.0"
   s.add_dependency "solve",                "~> 4.0"
   s.add_dependency "thor",                 ">= 0.20"
   s.add_dependency "octokit",              "~> 4.0"
-  s.add_dependency "mixlib-archive",       "~> 0.4"
+  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-config"

data/bin/berks

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+$:.push File.expand_path("../../lib", __FILE__)
+require "berkshelf/cli"
+
+Berkshelf::Cli::Runner.new(ARGV.dup).execute!

data/lib/berkshelf/cached_cookbook.rb

@@ -94,7 +94,7 @@ module Berkshelf
       [cookbook_name, version] <=> [other.cookbook_name, other.version]
     end
 
-    DIRNAME_REGEXP = /^(.+)-(.+)$/
+    DIRNAME_REGEXP = /^(.+)-(.+)$/.freeze
 
     extend Forwardable
 

data/lib/berkshelf/chef_config_compat.rb

@@ -13,6 +13,7 @@ module Berkshelf
       ChefConfig::WorkstationConfigLoader.new(path).load
       ChefConfig::Config.merge!(options)
       ChefConfig::Config.export_proxies # Set proxy settings as environment variables
+      ChefConfig::Config.init_openssl # setup openssl + fips mode
     end
 
     # Keep defaults that aren't in ChefConfig::Config

data/lib/berkshelf/chef_repo_universe.rb

@@ -19,8 +19,8 @@ module Berkshelf
         next unless File.directory?(entry_path) # Skip non-dirs.
         cookbook = begin
           Berkshelf::CachedCookbook.from_path(entry_path)
-        rescue IOError
-          next # It wasn't a cookbook.
+                   rescue IOError
+                     next # It wasn't a cookbook.
         end
         cookbooks << Berkshelf::APIClient::RemoteCookbook.new(
           cookbook.cookbook_name,

data/lib/berkshelf/formatters/json.rb

@@ -8,9 +8,9 @@ module Berkshelf
     def initialize
       @output = {
         cookbooks: [],
-        errors:    [],
-        messages:  [],
-        warnings:  [],
+        errors: [],
+        messages: [],
+        warnings: [],
       }
       @cookbooks = Hash.new
 

data/lib/berkshelf/lockfile.rb

@@ -515,9 +515,9 @@ module Berkshelf
       # 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.
       #

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

data/lib/berkshelf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.7
+  version: 7.0.8
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,22 +12,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cleanroom
   requirement: !ruby/object:Gem::Requirement
@@ -60,16 +66,22 @@ dependencies:
   name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -116,16 +128,22 @@ dependencies:
   name: mixlib-archive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +200,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.5
-description: Manages a Cookbook's, or an Application's, Cookbook dependencies
+description: Manages a Chef cookbook's dependencies
 email:
 - jamie@vialstudios.com
 - jkiehl@riotgames.com
@@ -194,60 +212,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/lock.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
-- CHANGELOG.legacy.md
-- CHANGELOG.md
-- CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
-- PLUGINS.md
-- README.md
 - Rakefile
-- Thorfile
-- appveyor.yml
 - berkshelf.gemspec
 - bin/berks
-- docs/berkshelf_for_newcomers.md
-- features/artifactory.feature
-- features/berksfile.feature
-- features/commands/apply.feature
-- features/commands/contingent.feature
-- features/commands/info.feature
-- features/commands/install.feature
-- features/commands/list.feature
-- features/commands/outdated.feature
-- features/commands/package.feature
-- features/commands/search.feature
-- features/commands/shelf/list.feature
-- features/commands/shelf/show.feature
-- features/commands/shelf/uninstall.feature
-- features/commands/show.feature
-- features/commands/update.feature
-- features/commands/upload.feature
-- features/commands/vendor.feature
-- features/commands/verify.feature
-- features/commands/viz.feature
-- features/community_site.feature
-- features/help.feature
-- features/json_formatter.feature
-- features/lifecycle.feature
-- features/lockfile.feature
-- features/step_definitions/berksfile_steps.rb
-- features/step_definitions/chef/config_steps.rb
-- features/step_definitions/chef_server_steps.rb
-- features/step_definitions/cli_steps.rb
-- features/step_definitions/config_steps.rb
-- features/step_definitions/environment_steps.rb
-- features/step_definitions/filesystem_steps.rb
-- features/step_definitions/gem_steps.rb
-- features/step_definitions/json_steps.rb
-- features/step_definitions/utility_steps.rb
-- features/support/aruba.rb
-- features/support/env.rb
 - lib/berkshelf.rb
 - lib/berkshelf/api-client.rb
 - lib/berkshelf/api_client.rb
@@ -326,8 +295,6 @@ files:
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
-- spec/fixtures/cookbooks/example_cookbook/.gitignore
-- spec/fixtures/cookbooks/example_cookbook/.kitchen.yml
 - spec/fixtures/cookbooks/example_cookbook/Berksfile
 - spec/fixtures/cookbooks/example_cookbook/Berksfile.lock
 - spec/fixtures/cookbooks/example_cookbook/README.md
@@ -388,9 +355,9 @@ files:
 - spec/unit/berkshelf/validator_spec.rb
 - spec/unit/berkshelf/visualizer_spec.rb
 - spec/unit/berkshelf_spec.rb
-homepage: http://berkshelf.com
+homepage: https://docs.chef.io/berkshelf.html
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -407,129 +374,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
-test_files:
-- features/artifactory.feature
-- features/berksfile.feature
-- features/commands/apply.feature
-- features/commands/contingent.feature
-- features/commands/info.feature
-- features/commands/install.feature
-- features/commands/list.feature
-- features/commands/outdated.feature
-- features/commands/package.feature
-- features/commands/search.feature
-- features/commands/shelf/list.feature
-- features/commands/shelf/show.feature
-- features/commands/shelf/uninstall.feature
-- features/commands/show.feature
-- features/commands/update.feature
-- features/commands/upload.feature
-- features/commands/vendor.feature
-- features/commands/verify.feature
-- features/commands/viz.feature
-- features/community_site.feature
-- features/help.feature
-- features/json_formatter.feature
-- features/lifecycle.feature
-- features/lockfile.feature
-- features/step_definitions/berksfile_steps.rb
-- features/step_definitions/chef/config_steps.rb
-- features/step_definitions/chef_server_steps.rb
-- features/step_definitions/cli_steps.rb
-- features/step_definitions/config_steps.rb
-- features/step_definitions/environment_steps.rb
-- features/step_definitions/filesystem_steps.rb
-- features/step_definitions/gem_steps.rb
-- features/step_definitions/json_steps.rb
-- features/step_definitions/utility_steps.rb
-- features/support/aruba.rb
-- features/support/env.rb
-- spec/config/berkshelf.pem
-- spec/config/knife.rb
-- spec/config/validator.pem
-- spec/data/trusted_certs/example.crt
-- spec/fixtures/Berksfile
-- spec/fixtures/berksfiles/default
-- spec/fixtures/complex-cookbook-path/cookbooks/app/metadata.rb
-- spec/fixtures/complex-cookbook-path/cookbooks/jenkins-config/metadata.rb
-- spec/fixtures/complex-cookbook-path/cookbooks/jenkins/metadata.rb
-- spec/fixtures/cookbook-path-uploader/apt-2.3.6/metadata.rb
-- spec/fixtures/cookbook-path-uploader/build-essential-1.4.2/metadata.rb
-- spec/fixtures/cookbook-path-uploader/jenkins-2.0.3/metadata.rb
-- spec/fixtures/cookbook-path-uploader/jenkins-config-0.1.0/metadata.rb
-- spec/fixtures/cookbook-path-uploader/runit-1.5.8/metadata.rb
-- spec/fixtures/cookbook-path-uploader/yum-3.0.6/metadata.rb
-- spec/fixtures/cookbook-path-uploader/yum-epel-0.2.0/metadata.rb
-- spec/fixtures/cookbook-path/jenkins-config/metadata.rb
-- spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb
-- spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
-- spec/fixtures/cookbooks/example_cookbook/.gitignore
-- spec/fixtures/cookbooks/example_cookbook/.kitchen.yml
-- spec/fixtures/cookbooks/example_cookbook/Berksfile
-- spec/fixtures/cookbooks/example_cookbook/Berksfile.lock
-- spec/fixtures/cookbooks/example_cookbook/README.md
-- spec/fixtures/cookbooks/example_cookbook/metadata.rb
-- spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
-- spec/fixtures/lockfiles/2.0.lock
-- spec/fixtures/lockfiles/blank.lock
-- spec/fixtures/lockfiles/default.lock
-- spec/fixtures/lockfiles/empty.lock
-- spec/fixtures/lockfiles/orphans.lock
-- spec/spec_helper.rb
-- spec/support/chef_api.rb
-- spec/support/chef_server.rb
-- spec/support/git.rb
-- spec/support/kitchen.rb
-- spec/support/matchers/file_system_matchers.rb
-- spec/support/matchers/filepath_matchers.rb
-- spec/support/path_helpers.rb
-- spec/support/shared_examples/formatter.rb
-- 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
-- spec/unit/berkshelf/berkshelf/api_client_spec.rb
-- spec/unit/berkshelf/cached_cookbook_spec.rb
-- spec/unit/berkshelf/chef_repo_universe_spec.rb
-- spec/unit/berkshelf/cli_spec.rb
-- spec/unit/berkshelf/community_rest_spec.rb
-- spec/unit/berkshelf/config_spec.rb
-- spec/unit/berkshelf/cookbook_store_spec.rb
-- spec/unit/berkshelf/core_ext/file_utils_spec.rb
-- spec/unit/berkshelf/core_ext/pathname_spec.rb
-- spec/unit/berkshelf/dependency_spec.rb
-- spec/unit/berkshelf/downloader_spec.rb
-- spec/unit/berkshelf/errors_spec.rb
-- spec/unit/berkshelf/file_syncer_spec.rb
-- spec/unit/berkshelf/formatters/base_spec.rb
-- spec/unit/berkshelf/formatters/human_spec.rb
-- spec/unit/berkshelf/formatters/json_spec.rb
-- spec/unit/berkshelf/formatters/null_spec.rb
-- spec/unit/berkshelf/installer_spec.rb
-- spec/unit/berkshelf/location_spec.rb
-- spec/unit/berkshelf/locations/base_spec.rb
-- spec/unit/berkshelf/locations/git_spec.rb
-- spec/unit/berkshelf/locations/path_spec.rb
-- spec/unit/berkshelf/lockfile_parser_spec.rb
-- spec/unit/berkshelf/lockfile_spec.rb
-- spec/unit/berkshelf/logger_spec.rb
-- spec/unit/berkshelf/mixin/logging_spec.rb
-- 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
-- spec/unit/berkshelf/ssl_policies_spec.rb
-- spec/unit/berkshelf/uploader_spec.rb
-- spec/unit/berkshelf/validator_spec.rb
-- spec/unit/berkshelf/visualizer_spec.rb
-- spec/unit/berkshelf_spec.rb
+summary: Manages a Chef cookbook's dependencies
+test_files: []