chef 13.1.31-universal-mingw32 → 13.2.20-universal-mingw32

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: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-07-04 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
@@ -1715,6 +1715,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
@@ -2825,13 +2826,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/tasks/bundle.rb

@@ -1,73 +0,0 @@
-#
-# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
-# 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_relative "../version_policy"
-require "fileutils"
-
-desc "Tasks to work with the main Gemfile and Gemfile.<platform>"
-namespace :bundle do
-  desc "Update Gemfile.lock and all Gemfile.<platform>.locks (or one or more gems via bundle:update gem1 gem2 ...)."
-  task :update, [:args] do |t, rake_args|
-    args = rake_args[:args] || ""
-    Bundler.with_clean_env do
-      sh "bundle update #{args}"
-    end
-  end
-
-  desc "Conservatively update Gemfile.lock and all Gemfile.<platform>.locks"
-  task :install, [:args] do |t, rake_args|
-    args = rake_args[:args] || ""
-    args = rake_args[:args] || ""
-    Bundler.with_clean_env do
-      sh "bundle install #{args}"
-    end
-  end
-
-  def parse_bundle_outdated(bundle_outdated_output)
-    result = []
-    bundle_outdated_output.each_line do |line|
-      if line =~ /^\s*\* (.+) \(newest ([^,]+), installed ([^,)])*/
-        gem_name, newest_version, installed_version = $1, $2, $3
-        result << [ line, gem_name ]
-      end
-    end
-    result
-  end
-
-  # Find out if we're using the latest gems we can (so we don't regress versions)
-  desc "Check for gems that are not at the latest released version, and report if anything not in ACCEPTABLE_OUTDATED_GEMS (version_policy.rb) is out of date."
-  task :outdated do
-    bundle_outdated = ""
-    Bundler.with_clean_env do
-      bundle_outdated = `bundle outdated`
-      puts bundle_outdated
-    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) }
-    unless outdated_gems.empty?
-      raise "ERROR: outdated gems: #{outdated_gems.join(", ")}. Either fix them or add them to ACCEPTABLE_OUTDATED_GEMS in #{__FILE__}."
-    end
-  end
-end
-
-desc "Run bundle with arbitrary args"
-task :bundle, [:args] do |t, rake_args|
-  args = rake_args[:args] || ""
-  Bundler.with_clean_env do
-    sh "bundle #{args}"
-  end
-end