chef 13.1.31 → 13.2.20

data/spec/unit/provider/group/groupadd_spec.rb

@@ -64,7 +64,7 @@ describe Chef::Provider::Group::Groupadd do
 
     it "should combine all the possible options" do
       match_array = []
-      field_list.sort { |a, b| a[0] <=> b[0] }.each do |attribute, option|
+      field_list.sort_by { |a| a[0] }.each do |attribute, option|
         allow(new_resource).to receive(attribute).and_return("hola")
         match_array << option
         match_array << "hola"

data/spec/unit/provider/user/pw_spec.rb

@@ -69,7 +69,7 @@ describe Chef::Provider::User::Pw do
 
     it "should combine all the possible options" do
       match_array = [ "adam" ]
-      field_list.sort { |a, b| a[0] <=> b[0] }.each do |attribute, option|
+      field_list.sort_by { |a| a[0] }.each do |attribute, option|
         allow(@new_resource).to receive(attribute).and_return("hola")
         match_array << option
         match_array << "hola"

data/spec/unit/version_string_spec.rb

@@ -0,0 +1,79 @@
+# Copyright:: Copyright 2017, Noah Kantrowitz
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "chef/version_string"
+
+describe Chef::VersionString do
+  let(:input) { "1.2.3" }
+  subject(:described_object) { described_class.new(input) }
+
+  it { is_expected.to eq "1.2.3" }
+  it { is_expected.to eql "1.2.3" }
+  it { is_expected.to be == "1.2.3" }
+  it { is_expected.to be < "abc" }
+  it { is_expected.to be > "0" }
+  it { is_expected.to eq described_class.new("1.2.3") }
+  it { is_expected.to be == described_class.new("1.2.3") }
+
+  context "with !=" do
+    subject { described_object != "1.2.4" }
+    it { is_expected.to be true }
+  end
+
+  context "with +" do
+    subject { described_object + "asdf" }
+    it { is_expected.to eq "1.2.3asdf" }
+  end
+
+  context "with *" do
+    subject { described_object * 3 }
+    it { is_expected.to eq "1.2.31.2.31.2.3" }
+  end
+
+  context "with version-like comparisons" do
+    subject { described_class.new("1.02.3") }
+
+    it { is_expected.to eq "1.2.3" }
+    it { is_expected.to be > "1.2.2" }
+    it { is_expected.to be > "1.2.3a" }
+    it { is_expected.to be < "1.2.4" }
+  end
+
+  context "with =~ Regexp" do
+    subject { described_object =~ /^1/ }
+    it { is_expected.to eq 0 }
+  end
+
+  context "with =~ Requirement" do
+    subject { described_object =~ Gem::Requirement.create("~> 1.0") }
+    it { is_expected.to be true }
+  end
+
+  context "with =~ String" do
+    subject { described_object =~ "~> 1.0" }
+    it { is_expected.to be true }
+  end
+
+  context "with Regexp =~" do
+    subject { /^2/ =~ described_object }
+    it { is_expected.to be nil }
+  end
+
+  context "with String =~" do
+    subject { "~> 1.0" =~ described_object }
+    it { expect { subject }.to raise_error TypeError }
+  end
+end

data/tasks/dependencies.rb

@@ -15,9 +15,6 @@
 # limitations under the License.
 #
 
-require_relative "bundle"
-require_relative "../version_policy"
-
 desc "Tasks to update and check dependencies"
 namespace :dependencies do
 
@@ -93,47 +90,9 @@ namespace :dependencies do
   berks_update_task :update_kitchen_tests_berksfile_lock, "kitchen-tests"
   berks_update_task :update_audit_tests_berksfile_lock, "kitchen-tests/cookbooks/audit_test"
 
-  desc "Update omnibus overrides, including versions in version_policy.rb and latest version of gems: #{OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.keys}."
-  task :update_omnibus_overrides do |t, rake_args|
-    puts ""
-    puts "-------------------------------------------------------------------"
-    puts "Updating omnibus_overrides.rb ..."
-    puts "-------------------------------------------------------------------"
-
-    # Generate the new overrides file
-    overrides = "# DO NOT EDIT. Generated by \"rake dependencies\". Edit version_policy.rb instead.\n"
-
-    # Replace the bundler and rubygems versions
-    OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.each do |override_name, gem_name|
-      # Get the latest bundler version
-      puts "Running gem list -r #{gem_name} ..."
-      gem_list = `gem list -r #{gem_name}`
-      unless gem_list =~ /^#{gem_name}\s*\(([^)]*)\)$/
-        raise "gem list -r #{gem_name} failed with output:\n#{gem_list}"
-      end
-
-      # Emit it
-      puts "Latest version of #{gem_name} is #{$1}"
-      overrides << "override #{override_name.inspect}, version: #{$1.inspect}\n"
-    end
-
-    # Add explicit overrides
-    OMNIBUS_OVERRIDES.each do |override_name, version|
-      overrides << "override #{override_name.inspect}, version: #{version.inspect}\n"
-    end
-
-    # Write the file out (if changed)
-    overrides_path = File.expand_path("../../omnibus_overrides.rb", __FILE__)
-    if overrides != IO.read(overrides_path)
-      puts "Overrides changed!"
-      puts `git diff #{overrides_path}`
-      puts "Writing modified #{overrides_path} ..."
-      IO.write(overrides_path, overrides)
-    end
-  end
 end
 
 desc "Update all dependencies and check for outdated gems."
-task :dependencies_ci => [ "dependencies:update_ci", "bundle:outdated" ]
+task :dependencies_ci => [ "dependencies:update_ci" ]
 task :dependencies => [ "dependencies:update" ]
 task :update => [ "dependencies:update" ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 13.1.31
+  version: 13.2.20
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-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.1.31
+        version: 13.2.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.1.31
+        version: 13.2.20
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -467,49 +467,6 @@ 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
@@ -528,25 +485,6 @@ 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
@@ -567,18 +505,6 @@ 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/.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
@@ -1554,6 +1480,7 @@ files:
 - lib/chef/version_class.rb
 - lib/chef/version_constraint.rb
 - lib/chef/version_constraint/platform.rb
+- lib/chef/version_string.rb
 - lib/chef/whitelist.rb
 - lib/chef/win32/api.rb
 - lib/chef/win32/api/crypto.rb
@@ -2664,13 +2591,13 @@ files:
 - spec/unit/version_class_spec.rb
 - spec/unit/version_constraint/platform_spec.rb
 - spec/unit/version_constraint_spec.rb
+- spec/unit/version_string_spec.rb
 - spec/unit/win32/error_spec.rb
 - spec/unit/win32/registry_spec.rb
 - spec/unit/win32/security_spec.rb
 - spec/unit/windows_service_spec.rb
 - tasks/announce.rb
 - tasks/bin/run_external_test
-- tasks/bundle.rb
 - tasks/cbgb.rb
 - tasks/changelog.rb
 - tasks/dependencies.rb

data/acceptance/.bundle/config

@@ -1,2 +0,0 @@
----
-BUNDLE_BIN: "bin"

data/acceptance/bin/aws.rb

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'aws.rb' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("aws-sdk-core", "aws.rb")

data/acceptance/bin/berks

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'berks' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("berkshelf", "berks")

data/acceptance/bin/bundler

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("bundler", "bundler")

data/acceptance/bin/chef-acceptance

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'chef-acceptance' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("chef-acceptance", "chef-acceptance")

data/acceptance/bin/coderay

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'coderay' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("coderay", "coderay")

data/acceptance/bin/erubis

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'erubis' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("erubis", "erubis")

data/acceptance/bin/htmldiff

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("diff-lcs", "htmldiff")

data/acceptance/bin/httpclient

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'httpclient' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("httpclient", "httpclient")