berkshelf 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a3f9e9bd7d92a7838beb8793edcd04cc798c02d
-  data.tar.gz: a672c2e4b45781178d2cb349cb223ca6dffd3d0b
+  metadata.gz: 76fea59944506c666666757823f166119c9bf4c8
+  data.tar.gz: fa4472c072c5acbc9ecceaa121b3ad25812e8519
 SHA512:
-  metadata.gz: 3c3144282091497c4ea2ea80e2e360b365a7731123b16184af5aac29fc430265d940c1c5464a2d5d82942055eda7243f67aa47d163bf8e157d1678016f05c7c7
-  data.tar.gz: '01729fc8d5d3f4c946cdc507e0b727a0bb808d0cda011d6455b73c0c44338dbe6d76db3bb6f568d6bd9b3ba7dafc88905815bfa2d70c6fe11a04c41311e1bb4c'
+  metadata.gz: fdceb6ac85c361ba183083a888a9b932517564e316717e80942424a9a6d541868ec3c448c05a9ea0184436a4d22ee24a9bfea2de5e96cb64d29f257abbeddf29
+  data.tar.gz: 74a4f37b94b1afabe8ff22ba7ca5ac3ec7edc19171cffbf7d3256121709fd1e14d9d9bbdecfc6e73b2f94713d94b595ece75da67703b2dd78b219a94a9120d61

data/CHANGELOG.md

@@ -1,10 +1,28 @@
 # Change Log
 
-## [5.4.0](https://github.com/berkshelf/berkshelf/tree/5.4.0) (2017-01-19)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.3.0...5.4.0)
+## [5.6.0](https://github.com/berkshelf/berkshelf/tree/5.6.0) (2017-02-02)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.5.0...5.6.0)
 
 **Merged pull requests:**
 
+- Bump Mixlib-Archive to 0.4 [\#1666](https://github.com/berkshelf/berkshelf/pull/1666) ([thommay](https://github.com/thommay))
+- chefstyle fixes [\#1662](https://github.com/berkshelf/berkshelf/pull/1662) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v5.5.0](https://github.com/berkshelf/berkshelf/tree/v5.5.0) (2017-01-24)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.4.0...v5.5.0)
+
+**Merged pull requests:**
+
+- remove Thread.exclusive [\#1661](https://github.com/berkshelf/berkshelf/pull/1661) ([lamont-granquist](https://github.com/lamont-granquist))
+- Revert vendoring metadata.rb file [\#1660](https://github.com/berkshelf/berkshelf/pull/1660) ([lamont-granquist](https://github.com/lamont-granquist))
+- bundle update [\#1659](https://github.com/berkshelf/berkshelf/pull/1659) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v5.4.0](https://github.com/berkshelf/berkshelf/tree/v5.4.0) (2017-01-19)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.3.0...v5.4.0)
+
+**Merged pull requests:**
+
+- Prepare for 5.4.0 [\#1658](https://github.com/berkshelf/berkshelf/pull/1658) ([thommay](https://github.com/thommay))
 - vendor the metadata.rb file [\#1652](https://github.com/berkshelf/berkshelf/pull/1652) ([lamont-granquist](https://github.com/lamont-granquist))
 - Add a format option to berkz viz that outputs a dotfile [\#1646](https://github.com/berkshelf/berkshelf/pull/1646) ([borntyping](https://github.com/borntyping))
 
@@ -1373,4 +1391,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
@@ -7,51 +7,51 @@ group :changelog do
 end
 
 group :guard do
-  gem 'coolline'
-  gem 'guard'
-  gem 'guard-cucumber'
-  gem 'guard-rspec'
-  gem 'guard-spork'
+  gem "coolline"
+  gem "guard"
+  gem "guard-cucumber"
+  gem "guard-rspec"
+  gem "guard-spork"
 
-  require 'rbconfig'
+  require "rbconfig"
 
-  if RbConfig::CONFIG['target_os'] =~ /darwin/i
-    gem 'growl', require: false
-    gem 'rb-fsevent', require: false
+  if RbConfig::CONFIG["target_os"] =~ /darwin/i
+    gem "growl", require: false
+    gem "rb-fsevent", require: false
 
-    if `uname`.strip == 'Darwin' && `sw_vers -productVersion`.strip >= '10.8'
-      gem 'terminal-notifier-guard', '~> 1.5.3', require: false
+    if `uname`.strip == "Darwin" && `sw_vers -productVersion`.strip >= "10.8"
+      gem "terminal-notifier-guard", "~> 1.5.3", require: false
     end rescue Errno::ENOENT
 
-  elsif RbConfig::CONFIG['target_os'] =~ /linux/i
-    gem 'libnotify',  '~> 0.8.0', require: false
-    gem 'rb-inotify', require: false
+  elsif RbConfig::CONFIG["target_os"] =~ /linux/i
+    gem "libnotify",  "~> 0.8.0", require: false
+    gem "rb-inotify", require: false
 
-  elsif RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
-    gem 'rb-notifu', '>= 0.0.4', require: false
-    gem 'wdm', require: false
-    gem 'win32console', require: false
+  elsif RbConfig::CONFIG["target_os"] =~ /mswin|mingw/i
+    gem "rb-notifu", ">= 0.0.4", require: false
+    gem "wdm", require: false
+    gem "win32console", require: false
   end
 end
 
 group :build do
-  gem 'rake',          '>= 10.1'
+  gem "rake",          ">= 10.1"
 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 'aruba',         '>= 0.10.0'
-  gem 'chef-zero',     '>= 4.0'
-  gem 'dep_selector',  '>= 1.0'
-  gem 'fuubar',        '>= 2.0'
-  gem 'rspec',         '>= 3.0'
-  gem 'spork',         '>= 0.9'
-  gem 'test-kitchen',  '>= 1.2'
-  gem 'webmock',       '>= 1.11'
-  gem 'yard',          '>= 0.8'
-  gem 'http',          '>= 0.9.8'
-  gem 'activesupport', '~> 4.0'  # pinning for ruby 2.1.x
+  gem "aruba",         ">= 0.10.0"
+  gem "chef-zero",     ">= 4.0"
+  gem "dep_selector",  ">= 1.0"
+  gem "fuubar",        ">= 2.0"
+  gem "rspec",         ">= 3.0"
+  gem "spork",         ">= 0.9"
+  gem "test-kitchen",  ">= 1.2"
+  gem "webmock",       ">= 1.11"
+  gem "yard",          ">= 0.8"
+  gem "http",          ">= 0.9.8"
+  gem "activesupport", "~> 4.0" # pinning for ruby 2.1.x
 end
 
 group :test do

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (5.5.0)
+    berkshelf (5.6.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -44,7 +44,7 @@ PATH
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
-      mixlib-archive (~> 0.1)
+      mixlib-archive (~> 0.4)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
@@ -213,7 +213,7 @@ GEM
     method_source (0.8.2)
     minitar (0.5.4)
     minitest (5.10.1)
-    mixlib-archive (0.3.0)
+    mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log

data/Guardfile

@@ -1,23 +1,23 @@
-guard 'spork' do
-  watch('Gemfile')
-  watch('spec/spec_helper.rb')  { :rspec }
+guard "spork" do
+  watch("Gemfile")
+  watch("spec/spec_helper.rb")  { :rspec }
   watch(%r{^features/support/}) { :cucumber }
 end
 
-rspec_cli = '--color --drb --format Fuubar'
-rspec_cli += ' --tag ~@api_client --tag ~@not_supported_on_windows' if RUBY_PLATFORM =~ /mswin|mingw|windows/
-guard 'rspec', cli: rspec_cli, all_on_start: false, all_after_pass: false do
+rspec_cli = "--color --drb --format Fuubar"
+rspec_cli += " --tag ~@api_client --tag ~@not_supported_on_windows" if RUBY_PLATFORM =~ /mswin|mingw|windows/
+guard "rspec", cli: rspec_cli, all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')       { 'spec' }
+  watch("spec/spec_helper.rb")       { "spec" }
 end
 
-cucumber_cli = '--drb --format pretty --tags ~@no_run --tags ~@wip'
-cucumber_cli += ' --tags ~@spawn --tags ~@api_server' if RUBY_PLATFORM =~ /mswin|mingw|windows/
-guard 'cucumber', cli: cucumber_cli, all_on_start: false, all_after_pass: false do
+cucumber_cli = "--drb --format pretty --tags ~@no_run --tags ~@wip"
+cucumber_cli += " --tags ~@spawn --tags ~@api_server" if RUBY_PLATFORM =~ /mswin|mingw|windows/
+guard "cucumber", cli: cucumber_cli, all_on_start: false, all_after_pass: false do
   watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})                      { 'features' }
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+  watch(%r{^features/support/.+$})                      { "features" }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || "features" }
 
-  watch(%r{^lib/berkshelf/cli.rb})                      { 'features' }
+  watch(%r{^lib/berkshelf/cli.rb})                      { "features" }
 end

data/Rakefile

@@ -28,6 +28,7 @@ begin
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.future_release = Berkshelf::VERSION
     config.issues = false
+    config.max_issues = 0
     config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
     config.bug_labels = "bug,Bug,Improvement".split(",")
     config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Upstream Bug,Discussion".split(",")

data/Thorfile

@@ -1,26 +1,26 @@
 # encoding: utf-8
-$:.unshift File.expand_path('../lib', __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
 
-require 'bundler'
-require 'thor/rake_compat'
+require "bundler"
+require "thor/rake_compat"
 
 class Gem < Thor
   include Thor::RakeCompat
   Bundler::GemHelper.install_tasks
 
-  desc 'build', "Build berkshelf-#{Berkshelf::VERSION}.gem into the pkg directory"
+  desc "build", "Build berkshelf-#{Berkshelf::VERSION}.gem into the pkg directory"
   def build
-    Rake::Task['build'].execute
+    Rake::Task["build"].execute
   end
 
-  desc 'install', "Build and install berkshelf-#{Berkshelf::VERSION}.gem into system gems"
+  desc "install", "Build and install berkshelf-#{Berkshelf::VERSION}.gem into system gems"
   def install
-    Rake::Task['install'].execute
+    Rake::Task["install"].execute
   end
 
-  desc 'release', "Create tag v#{Berkshelf::VERSION} and build and push berkshelf-#{Berkshelf::VERSION}.gem to Rubygems"
+  desc "release", "Create tag v#{Berkshelf::VERSION} and build and push berkshelf-#{Berkshelf::VERSION}.gem to Rubygems"
   def release
-    Rake::Task['release'].execute
+    Rake::Task["release"].execute
   end
 end
 
@@ -28,34 +28,34 @@ class Spec < Thor
   include Thor::Actions
   default_task :all
 
-  desc 'all', 'Run all specs and features'
+  desc "all", "Run all specs and features"
   def all
     exit(units_command && acceptance_command)
   end
 
-  desc 'ci', 'Run tests on Travis'
+  desc "ci", "Run tests on Travis"
   def ci
-    ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
+    ENV["CI"] = "true" # Travis-CI also sets this, but set it here for local testing
     all
   end
 
-  desc 'unit', 'Run unit tests'
+  desc "unit", "Run unit tests"
   def unit
     exit(units_command)
   end
 
-  desc 'acceptance', 'Run acceptance tests'
+  desc "acceptance", "Run acceptance tests"
   def acceptance
     exit(acceptance_command)
   end
 
   no_tasks do
     def units_command
-      run('rspec --color --format progress spec/unit')
+      run("rspec --color --format progress spec/unit")
     end
 
     def acceptance_command
-      run('cucumber --color --format progress --tags ~@no_run --strict')
+      run("cucumber --color --format progress --tags ~@no_run --strict")
     end
   end
 end

data/berkshelf.gemspec

@@ -1,48 +1,48 @@
 # -*- encoding: utf-8; mode: ruby -*-
-require File.expand_path('../lib/berkshelf/version', __FILE__)
+require File.expand_path("../lib/berkshelf/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.authors               = [
-    'Jamie Winsor',
-    'Josiah Kiehl',
-    'Michael Ivey',
-    'Justin Campbell',
-    'Seth Vargo'
+  s.authors = [
+    "Jamie Winsor",
+    "Josiah Kiehl",
+    "Michael Ivey",
+    "Justin Campbell",
+    "Seth Vargo",
   ]
-  s.email                 = [
-    'jamie@vialstudios.com',
-    'jkiehl@riotgames.com',
-    'michael.ivey@riotgames.com',
-    'justin@justincampbell.me',
-    'sethvargo@gmail.com'
+  s.email = [
+    "jamie@vialstudios.com",
+    "jkiehl@riotgames.com",
+    "michael.ivey@riotgames.com",
+    "justin@justincampbell.me",
+    "sethvargo@gmail.com",
   ]
 
   s.description               = %q{Manages a Cookbook's, or an Application's, Cookbook dependencies}
   s.summary                   = s.description
-  s.homepage                  = 'http://berkshelf.com'
-  s.license                   = 'Apache 2.0'
+  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.executables               = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.test_files                = s.files.grep(%r{^(test|spec|features)/})
-  s.name                      = 'berkshelf'
-  s.require_paths             = ['lib']
+  s.name                      = "berkshelf"
+  s.require_paths             = ["lib"]
   s.version                   = Berkshelf::VERSION
-  s.required_ruby_version     = '>= 2.2.0'
-  s.required_rubygems_version = '>= 2.0.0'
+  s.required_ruby_version     = ">= 2.2.0"
+  s.required_rubygems_version = ">= 2.0.0"
 
-  s.add_dependency 'addressable',          '~> 2.3', '>= 2.3.4'
-  s.add_dependency 'berkshelf-api-client', '>= 2.0.2', '< 4.0'
-  s.add_dependency 'buff-config',          '~> 2.0'
-  s.add_dependency 'buff-extensions',      '~> 2.0'
-  s.add_dependency 'buff-shell_out',       '~> 1.0'
-  s.add_dependency 'cleanroom',            '~> 1.0'
-  s.add_dependency 'faraday',              '~> 0.9'
-  s.add_dependency 'httpclient',           '~> 2.7'
-  s.add_dependency 'minitar',              '~> 0.5', '>= 0.5.4'
-  s.add_dependency 'retryable',            '~> 2.0'
-  s.add_dependency 'ridley',               '~> 5.0'
-  s.add_dependency 'solve',                '> 2.0', '< 4.0'
-  s.add_dependency 'thor',                 '~> 0.19', '< 0.19.2'
-  s.add_dependency 'octokit',              '~> 4.0'
-  s.add_dependency 'mixlib-archive',       '~> 0.1'
+  s.add_dependency "addressable",          "~> 2.3", ">= 2.3.4"
+  s.add_dependency "berkshelf-api-client", ">= 2.0.2", "< 4.0"
+  s.add_dependency "buff-config",          "~> 2.0"
+  s.add_dependency "buff-extensions",      "~> 2.0"
+  s.add_dependency "buff-shell_out",       "~> 1.0"
+  s.add_dependency "cleanroom",            "~> 1.0"
+  s.add_dependency "faraday",              "~> 0.9"
+  s.add_dependency "httpclient",           "~> 2.7"
+  s.add_dependency "minitar",              "~> 0.5", ">= 0.5.4"
+  s.add_dependency "retryable",            "~> 2.0"
+  s.add_dependency "ridley",               "~> 5.0"
+  s.add_dependency "solve",                "> 2.0", "< 4.0"
+  s.add_dependency "thor",                 "~> 0.19", "< 0.19.2"
+  s.add_dependency "octokit",              "~> 4.0"
+  s.add_dependency "mixlib-archive",       "~> 0.4"
 end

data/features/step_definitions/chef/config_steps.rb

@@ -1,12 +1,12 @@
 Given(/^I do not have a Berkshelf config$/) do
-  FileUtils.rm_f(ENV['BERKSHELF_CONFIG'])
+  FileUtils.rm_f(ENV["BERKSHELF_CONFIG"])
 end
 
 Given /^I do not have a Chef config$/ do
-  path = tmp_path.join('knife.rb').to_s
+  path = tmp_path.join("knife.rb").to_s
   Berkshelf.chef_config = Ridley::Chef::Config.new(path)
   Berkshelf.chef_config.save
 
-  ENV['BERKSHELF_CHEF_CONFIG'] = path
-  set_environment_variable 'BERKSHELF_CHEF_CONFIG', path
+  ENV["BERKSHELF_CHEF_CONFIG"] = path
+  set_environment_variable "BERKSHELF_CHEF_CONFIG", path
 end

data/features/step_definitions/chef_server_steps.rb

@@ -9,27 +9,27 @@ Given /^the Chef Server has cookbooks:$/ do |cookbooks|
     metadata = []
     metadata << "name '#{name}'"
     metadata << "version '#{version}'"
-    dependencies.to_s.split(',').map { |d| d.split(' ', 2) }.each do |(name, constraint)|
+    dependencies.to_s.split(",").map { |d| d.split(" ", 2) }.each do |(name, constraint)|
       metadata << "depends '#{name}', '#{constraint}'"
     end
 
-    chef_cookbook(name, { 'metadata.rb' => metadata.join("\n") })
+    chef_cookbook(name, { "metadata.rb" => metadata.join("\n") })
   end
 end
 
 Given /^the Chef Server has frozen cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
-    chef_cookbook(name, { 'metadata.rb' => "version '#{version}'", frozen: true })
+    chef_cookbook(name, { "metadata.rb" => "version '#{version}'", frozen: true })
   end
 end
 
 Given(/^the Chef Server has an environment named "(.*?)"$/) do |name|
-  chef_environment(name, { 'description' => 'This is an environment' })
+  chef_environment(name, { "description" => "This is an environment" })
 end
 
 Given(/^the Chef Server does not have an environment named "(.*?)"$/) do |name|
-  if chef_server.data_store.exists?(['organizations', 'chef', 'environments', name])
-    chef_server.data_store.delete(['organizations', 'chef', 'environments', name])
+  if chef_server.data_store.exists?(["organizations", "chef", "environments", name])
+    chef_server.data_store.delete(["organizations", "chef", "environments", name])
   end
 end
 

data/features/step_definitions/cli_steps.rb

@@ -1,18 +1,18 @@
 Then /^the exit status should be "(.+)"$/ do |name|
-  error = name.split('::').reduce(Berkshelf) { |klass, id| klass.const_get(id) }
+  error = name.split("::").reduce(Berkshelf) { |klass, id| klass.const_get(id) }
   expect(last_command_started).to have_exit_status(error.status_code)
 end
 
 Then /^the results should have the cookbooks:$/ do |cookbooks|
   list = last_command_started.stdout
   cookbooks.split("\n").each do |cookbook|
-    expect(list).to  include(cookbook)
+    expect(list).to include(cookbook)
   end
 end
 
 Then /^the results should each start with "(.+)"$/ do |prefix|
   list = last_command_started.stdout
   list.split("\n").each do |cookbook|
-    expect(cookbook).to  start_with(prefix)
+    expect(cookbook).to start_with(prefix)
   end
 end

data/features/step_definitions/config_steps.rb

@@ -1,21 +1,21 @@
-require 'tempfile'
+require "tempfile"
 
 Given /^I already have a Berkshelf config file$/ do
-  path   = Tempfile.new('berkshelf').path
+  path   = Tempfile.new("berkshelf").path
   config = Berkshelf::Config.new(path)
   config.save
 
   Berkshelf.config = config
 
-  ENV['BERKSHELF_CONFIG'] = path
-  set_environment_variable 'BERKSHELF_CONFIG', path
+  ENV["BERKSHELF_CONFIG"] = path
+  set_environment_variable "BERKSHELF_CONFIG", path
 end
 
 Given /^I have a Berkshelf config file containing:$/ do |contents|
   path = Berkshelf.config.path
   FileUtils.mkdir_p(Pathname.new(path).dirname.to_s)
 
-  File.open(path, 'w+') { |f| f.write(contents) }
+  File.open(path, "w+") { |f| f.write(contents) }
 
   Berkshelf.config = Berkshelf::Config.from_file(path)
 end