chef 13.0.118 → 13.1.31

data/spec/unit/resource/breakpoint_spec.rb

@@ -17,31 +17,48 @@
 #
 
 require "spec_helper"
-require "support/shared/unit/resource/static_provider_resolution"
 
 describe Chef::Resource::Breakpoint do
 
-  static_provider_resolution(
-    resource: Chef::Resource::Breakpoint,
-    provider: Chef::Provider::Breakpoint,
-    name: :breakpoint,
-    action: :break
-  )
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:collection) { double("resource collection") }
+  let(:resource) { Chef::Resource::Breakpoint.new("name", run_context) }
+  let(:provider) { resource.provider_for_action(:break) }
 
   before do
-    @breakpoint = Chef::Resource::Breakpoint.new
+    allow(run_context).to receive(:resource_collection).and_return(collection)
+  end
+
+  it "gets the iterator from @collection and pauses it" do
+    allow(Shell).to receive(:running?).and_return(true)
+    iterator = double("stepable_iterator")
+    allow(collection).to receive(:iterator).and_return(iterator)
+    expect(iterator).to receive(:pause)
+    provider.action_break
+    expect(resource).to be_updated
+  end
+
+  it "doesn't pause the iterator if chef-shell isn't running" do
+    allow(Shell).to receive(:running?).and_return(false)
+    iterator = double("stepable_iterator")
+    allow(collection).to receive(:iterator).and_return(iterator)
+    expect(iterator).not_to receive(:pause)
+    provider.action_break
   end
 
   it "allows the action :break" do
-    expect(@breakpoint.allowed_actions).to include(:break)
+    expect(resource.allowed_actions).to include(:break)
   end
 
   it "defaults to the break action" do
-    expect(@breakpoint.action).to eq([:break])
+    expect(resource.action).to eq([:break])
   end
 
   it "names itself after the line number of the file where it's created" do
-    expect(@breakpoint.name).to match(/breakpoint_spec\.rb\:[\d]{2}\:in \`new\'$/)
+    resource = Chef::Resource::Breakpoint.new
+    expect(resource.name).to match(/breakpoint_spec\.rb\:[\d]{2}\:in \`new\'$/)
   end
 
 end

data/spec/unit/resource/windows_task_spec.rb

@@ -166,8 +166,8 @@ describe Chef::Resource::WindowsTask do
   end
 
   context "#validate_create_day" do
-    it "raises error if frequency is not :weekly" do
-      expect  { resource.send(:validate_create_day, "Mon", :monthly) }.to raise_error("day attribute is only valid for tasks that run weekly")
+    it "raises error if frequency is not :weekly or :monthly" do
+      expect  { resource.send(:validate_create_day, "Mon", :once) }.to raise_error("day attribute is only valid for tasks that run monthly or weekly")
     end
 
     it "accepts a valid single day" do

data/spec/unit/runner_spec.rb

@@ -98,6 +98,10 @@ describe Chef::Runner do
     run_context.resource_collection << first_resource
   end
 
+  it "runner sets up a pointer back to itself in the run_context" do
+    expect(runner).to eql(run_context.runner)
+  end
+
   context "when we are doing dynamic provider resolution" do
 
     it "should pass each resource in the collection to a provider" do

data/tasks/bin/run_external_test

@@ -1,47 +1,25 @@
-#!/bin/bash
+#!/usr/bin/env ruby
 
-# Fail fast (e) and echo commands (vx)
-set -evx
+$:.unshift(File.expand_path("../../lib", File.dirname(__FILE__)))
 
-# Arguments
-TEST_GEM=$1
-shift
+require "tmpdir"
+require "bundler"
+require "chef/mixin/shell_out"
 
-PROJECT_ROOT=$(pwd)
-PROJECT_BUNDLE_PATH=${BUNDLE_PATH:-$(grep BUNDLE_PATH: $PROJECT_ROOT/.bundle/config | cut -d' ' -f2-)}
-if [ -n "$PROJECT_BUNDLE_PATH" ]; then
-  PROJECT_BUNDLE_PATH=$PROJECT_ROOT/$PROJECT_BUNDLE_PATH
-fi
+include Chef::Mixin::ShellOut
 
-TEST_GEM_ROOT=$(bundle show $TEST_GEM)
+github_repo = ARGV.shift
+git_thing = ARGV.shift
 
-# Make a copy of the original Gemfile and stitch in our Gemfile.lock
-TEST_GEMFILE=$TEST_GEM_ROOT/Gemfile
-MODIFIED_TEST_GEMFILE=$TEST_GEMFILE.externaltest
-cat <<EOM > $MODIFIED_TEST_GEMFILE
-require_relative "$PROJECT_ROOT/tasks/gemfile_util"
-GemfileUtil.include_locked_gemfile(self, "$PROJECT_ROOT/Gemfile", gems: ["$TEST_GEM"] + "$TEST_WITH_GEMS".split(/\s+/))
-$TEST_GEM_OVERRIDES
-EOM
-cat $TEST_GEMFILE >> $MODIFIED_TEST_GEMFILE
-if [ -f $TEST_GEMFILE.lock ]; then
-  cp $TEST_GEMFILE.lock $MODIFIED_TEST_GEMFILE.lock
-elif [ -f $MODIFIED_TEST_GEMFILE.lock ]; then
-  rm -f $MODIFIED_TEST_GEMFILE.lock
-fi
-
-# Run the bundle install
-cd $TEST_GEM_ROOT
-export BUNDLE_GEMFILE=$MODIFIED_TEST_GEMFILE
-# Don't read from the project .bundle/config, just our env vars
-export BUNDLE_IGNORE_CONFIG=true
-# Use the top level bundle cache so we don't have to reinstall their packages
-if [ -n "$PROJECT_BUNDLE_PATH" ]; then
-  export BUNDLE_PATH=$PROJECT_BUNDLE_PATH
-fi
-export BUNDLE_FROZEN=
-bundle install
-export BUNDLE_FROZEN=true
-
-bundle config
-bundle exec $@
+Dir.mktmpdir("chef-external-test") do |dir|
+  git_url = "https://github.com/#{github_repo}"
+  Dir.rmdir dir
+  shell_out!("git clone #{git_url} #{dir}", live_stream: STDOUT)
+  Dir.chdir(dir) do
+    shell_out!("git checkout #{git_thing}", live_stream: STDOUT)
+    Bundler.with_clean_env do
+      shell_out!("bundle install", live_stream: STDOUT)
+      shell_out!("bundle exec #{ARGV.join(" ")}", live_stream: STDOUT)
+    end
+  end
+end

data/tasks/bundle.rb

@@ -24,9 +24,7 @@ namespace :bundle do
   task :update, [:args] do |t, rake_args|
     args = rake_args[:args] || ""
     Bundler.with_clean_env do
-      sh "bundle config --local frozen '0'"
       sh "bundle update #{args}"
-      sh "bundle config --local frozen '1'"
     end
   end
 
@@ -35,9 +33,7 @@ namespace :bundle do
     args = rake_args[:args] || ""
     args = rake_args[:args] || ""
     Bundler.with_clean_env do
-      sh "bundle config --local frozen '0'"
       sh "bundle install #{args}"
-      sh "bundle config --local frozen '1'"
     end
   end
 
@@ -57,10 +53,8 @@ namespace :bundle do
   task :outdated do
     bundle_outdated = ""
     Bundler.with_clean_env do
-      sh "bundle config --local frozen '0'"
       bundle_outdated = `bundle outdated`
       puts bundle_outdated
-      sh "bundle config --local frozen '1'"
     end
     outdated_gems = parse_bundle_outdated(bundle_outdated).map { |line, gem_name| gem_name }
     outdated_gems = outdated_gems.reject { |gem_name| ACCEPTABLE_OUTDATED_GEMS.include?(gem_name) }
@@ -74,8 +68,6 @@ desc "Run bundle with arbitrary args"
 task :bundle, [:args] do |t, rake_args|
   args = rake_args[:args] || ""
   Bundler.with_clean_env do
-    sh "bundle config --local frozen '0'"
     sh "bundle #{args}"
-    sh "bundle config --local frozen '1'"
   end
 end

data/tasks/changelog.rb

@@ -4,7 +4,11 @@ begin
 
   namespace :changelog do
     # Fetch the latest version from mixlib-install
-    latest_stable_version = Mixlib::Install.available_versions("chef", "stable").last
+    def latest_stable_version
+      # for 13.1, a 12.20 release was made after 13.0, which is busting the changelog generator. Reset this post 13.1 release
+      "13.0.118"
+      # Mixlib::Install.available_versions("chef", "stable").last
+    end
 
     # Take the changelog from the latest stable release and put it into history.
     task :archive do

data/tasks/dependencies.rb

@@ -25,11 +25,13 @@ namespace :dependencies do
   # dependencies locally is by running the dependency update script.
   desc "Update all dependencies. dependencies:update to update as little as possible."
   task :update do |t, rake_args|
+    # FIXME: probably broken, and needs less indirection
     system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
   end
 
   desc "Force update (when adding new gems to Gemfiles)"
   task :force_update do |t, rake_args|
+    # FIXME: probably broken, and needs less indirection
     FileUtils.rm_f(File.join(Dir.pwd, ".bundle", "config"))
     system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
   end
@@ -51,10 +53,10 @@ namespace :dependencies do
     task task_name do
       Dir.chdir(dir) do
         Bundler.with_clean_env do
-          sh "bundle config --local frozen '0'"
+          rm_f "#{dir}/Gemfile.lock"
           sh "bundle lock --update --add-platform ruby"
+          sh "bundle lock --update --add-platform x64-mingw32"
           sh "bundle lock --update --add-platform x86-mingw32"
-          sh "bundle config --local frozen '1'"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 13.0.118
+  version: 13.1.31
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.118
+        version: 13.1.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.118
+        version: 13.1.31
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -467,6 +467,49 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- acceptance/.acceptance_data/chef/fips/provision/.chef/config.rb
+- acceptance/.acceptance_data/chef/fips/provision/cache/chef-client-running.pid
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/acceptance-cookbook/.gitignore
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/acceptance-cookbook/metadata.rb
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/acceptance-cookbook/recipes/destroy.rb
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/acceptance-cookbook/recipes/provision.rb
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/acceptance-cookbook/recipes/verify.rb
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/kitchen_acceptance/.kitchen.digitalocean.yml
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/kitchen_acceptance/.kitchen.ec2.yml
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/kitchen_acceptance/.kitchen.vagrant.yml
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/kitchen_acceptance/libraries/kitchen.rb
+- acceptance/.acceptance_data/chef/fips/provision/cache/cookbooks/kitchen_acceptance/metadata.rb
+- acceptance/.acceptance_data/chef/fips/provision/cache/failed-audit-data.json
+- acceptance/.acceptance_data/chef/fips/provision/dna.json
+- acceptance/.acceptance_data/chef/fips/provision/nodes/remtmay02.json
+- acceptance/.acceptance_data/chef/fips/verify/.chef/config.rb
+- acceptance/.acceptance_data/chef/fips/verify/cache/chef-client-running.pid
+- acceptance/.acceptance_data/chef/fips/verify/cache/chef-stacktrace.out
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/acceptance-cookbook/.gitignore
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/acceptance-cookbook/metadata.rb
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/acceptance-cookbook/recipes/destroy.rb
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/acceptance-cookbook/recipes/provision.rb
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/acceptance-cookbook/recipes/verify.rb
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/kitchen_acceptance/.kitchen.digitalocean.yml
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/kitchen_acceptance/.kitchen.ec2.yml
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/kitchen_acceptance/.kitchen.vagrant.yml
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/kitchen_acceptance/libraries/kitchen.rb
+- acceptance/.acceptance_data/chef/fips/verify/cache/cookbooks/kitchen_acceptance/metadata.rb
+- acceptance/.acceptance_data/chef/fips/verify/cache/failed-audit-data.json
+- acceptance/.acceptance_data/chef/fips/verify/dna.json
+- acceptance/.acceptance_data/chef/fips/verify/nodes/remtmay02.json
+- acceptance/.acceptance_data/logs/acceptance.log
+- acceptance/.acceptance_data/logs/fips/converge/fips-integration-centos-6.log
+- acceptance/.acceptance_data/logs/fips/converge/fips-integration-windows-2012r2.log
+- acceptance/.acceptance_data/logs/fips/converge/fips-unit-functional-centos-6.log
+- acceptance/.acceptance_data/logs/fips/converge/kitchen.log
+- acceptance/.acceptance_data/logs/fips/provision.log
+- acceptance/.acceptance_data/logs/fips/verify.log
+- acceptance/.acceptance_data/logs/fips/verify/fips-integration-centos-6.log
+- acceptance/.acceptance_data/logs/fips/verify/fips-integration-windows-2012r2.log
+- acceptance/.acceptance_data/logs/fips/verify/fips-unit-functional-centos-6.log
+- acceptance/.acceptance_data/logs/fips/verify/kitchen.log
+- acceptance/.bundle/config
 - acceptance/.gitignore
 - acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml
 - acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml
@@ -485,6 +528,25 @@ files:
 - acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb
 - acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb
 - acceptance/basics/test/integration/helpers/serverspec/Gemfile
+- acceptance/bin/aws.rb
+- acceptance/bin/berks
+- acceptance/bin/bundler
+- acceptance/bin/chef-acceptance
+- acceptance/bin/coderay
+- acceptance/bin/erubis
+- acceptance/bin/htmldiff
+- acceptance/bin/httpclient
+- acceptance/bin/inspec
+- acceptance/bin/kitchen
+- acceptance/bin/ldiff
+- acceptance/bin/nokogiri
+- acceptance/bin/pry
+- acceptance/bin/rake
+- acceptance/bin/rspec
+- acceptance/bin/rwinrm
+- acceptance/bin/rwinrmcp
+- acceptance/bin/safe_yaml
+- acceptance/bin/thor
 - acceptance/data-collector/.acceptance/acceptance-cookbook/.gitignore
 - acceptance/data-collector/.acceptance/acceptance-cookbook/metadata.rb
 - acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/destroy.rb
@@ -505,16 +567,18 @@ files:
 - acceptance/data-collector/Berksfile
 - acceptance/data-collector/test/integration/default/serverspec/default_spec.rb
 - acceptance/data-collector/test/integration/helpers/serverspec/Gemfile
-- acceptance/fips/.acceptance/acceptance-cookbook/.gitignore
-- acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb
-- acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb
-- acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb
-- acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb
-- acceptance/fips/.kitchen.yml
-- acceptance/fips/test/integration/fips-integration/serverspec/Gemfile
-- acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb
-- acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile
-- acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb
+- acceptance/fips/.kitchen/fips-unit-functional-centos-6.yml
+- acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/action_set_name
+- acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/creator_uid
+- acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/id
+- acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/index_uuid
+- acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/private_key
+- acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/synced_folders
+- acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/Vagrantfile
+- acceptance/fips/.kitchen/logs/fips-integration-centos-6.log
+- acceptance/fips/.kitchen/logs/fips-integration-windows-2012r2.log
+- acceptance/fips/.kitchen/logs/fips-unit-functional-centos-6.log
+- acceptance/fips/.kitchen/logs/kitchen.log
 - acceptance/omnitruck/.acceptance/acceptance-cookbook/.gitignore
 - acceptance/omnitruck/.acceptance/acceptance-cookbook/metadata.rb
 - acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/destroy.rb
@@ -1200,7 +1264,6 @@ files:
 - lib/chef/provider/apt_repository.rb
 - lib/chef/provider/apt_update.rb
 - lib/chef/provider/batch.rb
-- lib/chef/provider/breakpoint.rb
 - lib/chef/provider/cookbook_file.rb
 - lib/chef/provider/cookbook_file/content.rb
 - lib/chef/provider/cron.rb
@@ -1949,6 +2012,7 @@ files:
 - spec/functional/resource/user/windows_spec.rb
 - spec/functional/resource/windows_package_spec.rb
 - spec/functional/resource/windows_service_spec.rb
+- spec/functional/resource/windows_task_spec.rb
 - spec/functional/root_alias_spec.rb
 - spec/functional/run_lock_spec.rb
 - spec/functional/shell_spec.rb
@@ -2355,7 +2419,6 @@ files:
 - spec/unit/property_spec.rb
 - spec/unit/provider/apt_repository_spec.rb
 - spec/unit/provider/apt_update_spec.rb
-- spec/unit/provider/breakpoint_spec.rb
 - spec/unit/provider/cookbook_file/content_spec.rb
 - spec/unit/provider/cookbook_file_spec.rb
 - spec/unit/provider/cron/unix_spec.rb
@@ -2465,6 +2528,7 @@ files:
 - spec/unit/provider/systemd_unit_spec.rb
 - spec/unit/provider/template/content_spec.rb
 - spec/unit/provider/template_spec.rb
+- spec/unit/provider/user/aix_spec.rb
 - spec/unit/provider/user/dscl_spec.rb
 - spec/unit/provider/user/linux_spec.rb
 - spec/unit/provider/user/pw_spec.rb
@@ -2605,13 +2669,11 @@ files:
 - spec/unit/win32/security_spec.rb
 - spec/unit/windows_service_spec.rb
 - tasks/announce.rb
-- tasks/bin/create-override-gemfile
 - tasks/bin/run_external_test
 - tasks/bundle.rb
 - tasks/cbgb.rb
 - tasks/changelog.rb
 - tasks/dependencies.rb
-- tasks/gemfile_util.rb
 - tasks/maintainers.rb
 - tasks/rspec.rb
 - tasks/templates/prerelease.md.erb
@@ -2625,7 +2687,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- lib-backcompat
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/acceptance/fips/.acceptance/acceptance-cookbook/.gitignore

@@ -1,2 +0,0 @@
-nodes/
-tmp/

data/acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb

@@ -1,2 +0,0 @@
-name "acceptance-cookbook"
-depends "kitchen_acceptance"

data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -1 +0,0 @@
-kitchen "destroy"

data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -1 +0,0 @@
-kitchen "converge"

data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -1 +0,0 @@
-kitchen "verify"

data/acceptance/fips/.kitchen.yml

@@ -1,8 +0,0 @@
-suites:
-  - name: fips-unit-functional
-    includes: [centos-6]
-    run_list:
-
-  - name: fips-integration
-    includes: [centos-6, windows-2012r2]
-    run_list:

data/acceptance/fips/test/integration/fips-integration/serverspec/Gemfile

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-# Until https://github.com/test-kitchen/busser-serverspec/pull/42 is merged and
-# released, we need to include rake and rspec-core in the Gemfile
-gem "rake"
-gem "rspec-core"
-gem "busser-serverspec"
-gem "serverspec"
-gem "mixlib-shellout"