chef 14.14.29 → 14.15.6

data/spec/unit/util/editor_spec.rb

@@ -9,7 +9,7 @@ describe Chef::Util::Editor do
     end
 
     it "makes a copy of an Array" do
-      array = Array.new
+      array = []
       editor = described_class.new(array)
       expect(editor.lines).to_not be(array)
     end

data/spec/unit/util/powershell/ps_credential_spec.rb

@@ -29,8 +29,9 @@ describe Chef::Util::Powershell::PSCredential do
       it "should create the script to create a PSCredential when calling" do
         allow(ps_credential).to receive(:encrypt).with(password).and_return("encrypted")
         expect(ps_credential.to_psobject).to eq(
-        "New-Object System.Management.Automation.PSCredential("\
-            "'#{username}',('encrypted' | ConvertTo-SecureString))")
+          "New-Object System.Management.Automation.PSCredential("\
+              "'#{username}',('encrypted' | ConvertTo-SecureString))"
+        )
       end
     end
 

data/spec/unit/util/threaded_job_queue_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Util::ThreadedJobQueue do
   let(:queue) { Chef::Util::ThreadedJobQueue.new }
 
   it "should pass mutex to jobs with an arity of 1" do
-    job = double()
+    job = double
     expect(job).to receive(:arity).at_least(:once).and_return(1)
     expect(job).to receive(:call).exactly(5).times.with(an_instance_of(Mutex))
 
@@ -31,7 +31,7 @@ describe Chef::Util::ThreadedJobQueue do
   end
 
   it "should pass nothing to jobs with an arity of 0" do
-    job = double()
+    job = double
     expect(job).to receive(:arity).at_least(:once).and_return(0)
     expect(job).to receive(:call).exactly(5).times.with(no_args)
 

data/spec/unit/version_class_spec.rb

@@ -105,7 +105,7 @@ describe Chef::Version do
       a = %w{0.0.0 0.0.1 0.1.0 0.1.1 1.0.0 1.1.0 1.1.1}.map do |s|
         Chef::Version.new(s)
       end
-      got = a.sort.map { |v| v.to_s }
+      got = a.sort.map(&:to_s)
       expect(got).to eq(%w{0.0.0 0.0.1 0.1.0 0.1.1 1.0.0 1.1.0 1.1.1})
     end
 
@@ -113,7 +113,7 @@ describe Chef::Version do
       a = %w{9.8.7 1.0.0 1.2.3 4.4.6 4.5.6 0.8.6 4.5.5 5.9.8 3.5.7}.map do |s|
         Chef::Version.new(s)
       end
-      got = a.sort.map { |v| v.to_s }
+      got = a.sort.map(&:to_s)
       expect(got).to eq(%w{0.8.6 1.0.0 1.2.3 3.5.7 4.4.6 4.5.5 4.5.6 5.9.8 9.8.7})
     end
 
@@ -160,9 +160,9 @@ describe Chef::Version do
        [ "1.2.2", :<=, "1.2.1", false ],
        [ "1.2.2", :<, "1.2.1", false ],
       ].each do |spec|
-        it "(#{spec.first(3).join(' ')}) should be #{spec[3]}" do
+        it "(#{spec.first(3).join(" ")}) should be #{spec[3]}" do
           got = Chef::Version.new(spec[0]).send(spec[1],
-                                                Chef::Version.new(spec[2]))
+            Chef::Version.new(spec[2]))
           expect(got).to eq(spec[3])
         end
       end

data/spec/unit/win32/registry_spec.rb

@@ -29,7 +29,7 @@ describe Chef::Win32::Registry do
   let(:key_to_delete) { "OpscodeNumbers" }
   let(:sub_key) { "OpscodePrimes" }
   let(:missing_key_path) { 'HKCU\Software' }
-  let(:registry) { Chef::Win32::Registry.new() }
+  let(:registry) { Chef::Win32::Registry.new }
   let(:hive_mock) { double("::Win32::Registry::KHKEY_CURRENT_USER") }
   let(:reg_mock) { double("reg") }
 
@@ -252,7 +252,7 @@ describe Chef::Win32::Registry do
       expect(registry).to receive(:key_exists!).with(key_path).and_return(true)
       expect(registry).to receive(:get_hive_and_key).with(key_path).and_return([hive_mock, key])
       expect(hive_mock).to receive(:open).with(key, ::Win32::Registry::KEY_READ | registry.registry_system_architecture).and_yield(reg_mock)
-      expect(reg_mock).to receive(:each_key).and_return(no_args())
+      expect(reg_mock).to receive(:each_key).and_return(no_args)
       expect(registry.has_subkeys?(key_path)).to eq(false)
     end
 
@@ -290,7 +290,7 @@ describe Chef::Win32::Registry do
       expect(registry).to receive(:key_exists!).with(key_path).and_return(true)
       expect(registry).to receive(:get_hive_and_key).with(key_path).and_return([hive_mock, key])
       expect(hive_mock).to receive(:open).with(key, ::Win32::Registry::KEY_READ | registry.registry_system_architecture).and_yield(reg_mock)
-      expect(reg_mock).to receive(:any?).and_yield(no_args())
+      expect(reg_mock).to receive(:any?).and_yield(no_args)
       registry.value_exists?(key_path, value1) == false
     end
   end
@@ -305,7 +305,7 @@ describe Chef::Win32::Registry do
       expect(registry).to receive(:key_exists!).with(key_path).and_return(true)
       expect(registry).to receive(:get_hive_and_key).with(key_path).and_return([hive_mock, key])
       expect(registry).to receive(:get_type_from_name).with(:string).and_return(1)
-      expect(reg_mock).to receive(:each).with(no_args()).and_yield("one", 1, "1")
+      expect(reg_mock).to receive(:each).with(no_args).and_yield("one", 1, "1")
       expect(hive_mock).to receive(:open).with(key, ::Win32::Registry::KEY_READ | registry.registry_system_architecture).and_yield(reg_mock)
       expect(registry.data_exists?(key_path, value1)).to eq(true)
     end
@@ -315,7 +315,7 @@ describe Chef::Win32::Registry do
       expect(registry).to receive(:get_hive_and_key).with(key_path).and_return([hive_mock, key])
       expect(hive_mock).to receive(:open).with(key, ::Win32::Registry::KEY_READ | registry.registry_system_architecture).and_yield(reg_mock)
       expect(registry).to receive(:get_type_from_name).with(:string).and_return(1)
-      expect(reg_mock).to receive(:each).with(no_args()).and_yield("one", 1, "2")
+      expect(reg_mock).to receive(:each).with(no_args).and_yield("one", 1, "2")
       expect(registry.data_exists?(key_path, value1)).to eq(false)
     end
   end

data/spec/unit/win32/security_spec.rb

@@ -98,7 +98,8 @@ describe "Chef::Win32::Security", :windows_only do
     let(:token) do
       Chef::ReservedNames::Win32::Security.open_process_token(
         Chef::ReservedNames::Win32::Process.get_current_process,
-        token_rights)
+        token_rights
+      )
     end
 
     it "raises error if GetTokenInformation fails" do

data/tasks/announce.rb

@@ -41,18 +41,11 @@ class ReleaseAnnouncement
   end
 
   def release_notes_from_file
-    File.read("RELEASE_NOTES.md").match(/^# Chef Client Release Notes #{@maj_minor}:\n\n(.*)/m)[1]
+    File.read("RELEASE_NOTES.md").match(/^# Chef Infra Client Release Notes #{@maj_minor}:\n\n(.*)/m)[1]
   end
 end
 
-namespace :announce do
-  desc "Generate the Prerelease Announcement (version: X.Y.Z, release_date: YYYY-MM-DD)"
-  task :prerelease, :version, :release_date do |t, args|
-    ReleaseAnnouncement.new(args[:version], args[:release_date], "prerelease").render
-  end
-
-  desc "Generate the Release Announcement (version: X.Y.Z)"
-  task :release, :version do |t, args|
-    ReleaseAnnouncement.new(args[:version], nil, "release").render
-  end
+desc "Generate the Release Announcement (version: X.Y.Z)"
+task :announce_release, :version do |t, args|
+  ReleaseAnnouncement.new(args[:version], nil, "release").render
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 14.14.29
+  version: 14.15.6
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 14.14.29
+        version: 14.15.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 14.14.29
+        version: 14.15.6
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +281,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -288,6 +291,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -2551,9 +2557,7 @@ files:
 - tasks/announce.rb
 - tasks/bin/run_external_test
 - tasks/dependencies.rb
-- tasks/maintainers.rb
 - tasks/rspec.rb
-- tasks/templates/prerelease.md.erb
 - tasks/templates/release.md.erb
 homepage: https://www.chef.io
 licenses:

data/tasks/maintainers.rb

@@ -1,211 +0,0 @@
-#
-# Copyright:: Copyright 2015-2018, 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 "rake"
-
-SOURCE = File.join(File.dirname(__FILE__), "..", "MAINTAINERS.toml")
-TARGET = File.join(File.dirname(__FILE__), "..", "MAINTAINERS.md")
-
-# The list of repositories that teams should own
-REPOSITORIES = ["chef/chef", "chef/chef-dk", "chef/chef-census", "chef/chef-repo",
-                "chef/client-docs", "chef/ffi-yajl", "chef/libyajl2-gem",
-                "chef/mixlib-authentication", "chef/mixlib-cli",
-                "chef/mixlib-config", "chef/mixlib-install", "chef/mixlib-log",
-                "chef/mixlib-shellout", "chef/ohai", "chef/omnibus-chef"].freeze
-
-begin
-  require "tomlrb"
-  require "octokit"
-  require "pp"
-
-  namespace :maintainers do
-    task default: :generate
-
-    desc "Generate MarkDown version of MAINTAINERS file"
-    task :generate do
-      out = "<!-- This is a generated file. Please do not edit directly -->\n\n"
-      out << "# " + source["Preamble"]["title"] + "\n\n"
-      out << source["Preamble"]["text"] + "\n"
-
-      # The project lead is a special case
-      out << "# " + source["Org"]["Lead"]["title"] + "\n\n"
-      out << format_person(source["Org"]["Lead"]["person"]) + "\n\n"
-
-      out << format_components(source["Org"]["Components"])
-      File.open(TARGET, "w") do |fn|
-        fn.write out
-      end
-    end
-
-    desc "Synchronize GitHub teams"
-    # there's a special @chef/client-maintainers team that's everyone
-    # and then there's a team per component
-    task :synchronize do
-      Octokit.auto_paginate = true
-      get_github_teams
-      prepare_teams(source["Org"]["Components"].dup)
-      sync_teams!
-    end
-  end
-
-  def github
-    @github ||= Octokit::Client.new(netrc: true)
-  end
-
-  def source
-    @source ||= Tomlrb.load_file SOURCE
-  end
-
-  def teams
-    @teams ||= { "client-maintainers" => { "title" => "Client Maintainers" } }
-  end
-
-  def add_members(team, name)
-    teams["client-maintainers"]["members"] ||= []
-    teams["client-maintainers"]["members"] << name
-    teams[team] ||= {}
-    teams[team]["members"] ||= []
-    teams[team]["members"] << name
-  end
-
-  def set_team_title(team, title)
-    teams[team] ||= {}
-    teams[team]["title"] = title
-  end
-
-  def gh_teams
-    @gh_teams ||= {}
-  end
-
-  # we have to resolve team names to ids. While we're at it, we can get the privacy
-  # setting, so we know whether we need to update it
-  def get_github_teams
-    github.org_teams("chef").each do |team|
-      gh_teams[team[:slug]] = { "id" => team[:id], "privacy" => team[:privacy] }
-    end
-  end
-
-  def get_github_team(team)
-    github.team_members(gh_teams[team]["id"]).map do |member|
-      member[:login]
-    end.sort.uniq.map(&:downcase)
-  rescue
-    []
-  end
-
-  def create_team(team)
-    puts "creating new github team: #{team} with title: #{teams[team]["title"]} "
-    t = github.create_team("chef", name: team, description: teams[team]["title"],
-                                   privacy: "closed", repo_names: REPOSITORIES,
-                                   accept: "application/vnd.github.ironman-preview+json")
-    gh_teams[team] = { "id" => t[:id], "privacy" => t[:privacy] }
-  end
-
-  def compare_teams(current, desired)
-    # additions are the subtraction of the current state from the desired state
-    # deletions are the subtraction of the desired state from the current state
-    [desired - current, current - desired]
-  end
-
-  def prepare_teams(cmp)
-    %w{text paths}.each { |k| cmp.delete(k) }
-    if cmp.key?("team")
-      team = cmp.delete("team")
-      add_members(team, cmp.delete("lieutenant")) if cmp.key?("lieutenant")
-      add_members(team, cmp.delete("maintainers")) if cmp.key?("maintainers")
-      set_team_title(team, cmp.delete("title"))
-    else
-      %w{maintainers lieutenant title}.each { |k| cmp.delete(k) }
-    end
-    cmp.each_value { |v| prepare_teams(v) }
-  end
-
-  def update_team(team, additions, deletions)
-    create_team(team) unless gh_teams.key?(team)
-    update_team_privacy(team)
-    add_team_members(team, additions)
-    remove_team_members(team, deletions)
-  rescue => e
-    puts "failed for #{team}: #{e.message}"
-  end
-
-  def update_team_privacy(team)
-    return if gh_teams[team]["privacy"] == "closed"
-    puts "Setting #{team} privacy to closed from #{gh_teams[team]["privacy"]}"
-    github.update_team(gh_teams[team]["id"], privacy: "closed",
-                                             accept: "application/vnd.github.ironman-preview+json")
-  end
-
-  def add_team_members(team, additions)
-    additions.each do |member|
-      puts "Adding #{member} to #{team}"
-      github.add_team_membership(gh_teams[team]["id"], member, role: "member",
-                                                               accept: "application/vnd.github.ironman-preview+json")
-    end
-  end
-
-  def remove_team_members(team, deletions)
-    deletions.each do |member|
-      puts "Removing #{member} from #{team}"
-      github.remove_team_membership(gh_teams[team]["id"], member,
-                                    accept: "application/vnd.github.ironman-preview+json")
-    end
-  end
-
-  def sync_teams!
-    teams.each do |name, details|
-      current = get_github_team(name)
-      desired = details["members"].flatten.sort.uniq.map(&:downcase)
-      additions, deletions = compare_teams(current, desired)
-      update_team(name, additions, deletions)
-    end
-  end
-
-  def get_person(person)
-    source["people"][person]
-  end
-
-  def format_components(cmp)
-    out = "## " + cmp.delete("title") + "\n\n"
-    out << cmp.delete("text") + "\n" if cmp.key?("text")
-    out << "To mention the team, use @chef/#{cmp.delete("team")}\n\n" if cmp.key?("team")
-    if cmp.key?("lieutenant")
-      out << "### Lieutenant\n\n"
-      out << format_person(cmp.delete("lieutenant")) + "\n\n"
-    end
-    out << format_maintainers(cmp.delete("maintainers")) + "\n" if cmp.key?("maintainers")
-    cmp.delete("paths")
-    cmp.each_value { |v| out << format_components(v) }
-    out
-  end
-
-  def format_maintainers(people)
-    o = "### Maintainers\n\n"
-    people.each do |p|
-      o << format_person(p) + "\n"
-    end
-    o
-  end
-
-  def format_person(person)
-    mnt = get_person(person)
-    "* [#{mnt["Name"]}](https://github.com/#{mnt["GitHub"]})"
-  end
-
-rescue LoadError
-  STDERR.puts "\n*** TomlRb not available.\n\n"
-end

data/tasks/templates/prerelease.md.erb

@@ -1,35 +0,0 @@
-Ohai Chefs!
-
-We have selected <%= @version %> as our Chef v<%= @maj_minor %> release candidate which is scheduled for release on <%= @date.strftime('%A %B %-d, %Y') %>.
-
-# Release Highlights
-
-<%= @release_notes %>
-
-Please see the [CHANGELOG](https://github.com/chef/chef/blob/master/CHANGELOG.md) for the complete list of changes.
-
-# Get the Build
-As always, you can download binaries directly from [downloads.chef.io](https://downloads.chef.io/chef/current/<%= @version %>) or by using the `mixlib-install` command line utility:
-
-```shell
-$ mixlib-install download chef -v <%= @version %> -c current
-```
-
-Alternatively, you can install Chef using one of the following command options:
-
-```shell
-# In Shell
-$ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef -v <%= @version %> -c current
-
-# In Windows PowerShell
-. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version <%= @version %> -channel current
-```
-
-If you want to give this version a spin in Test Kitchen, create or add the following to your `kitchen.yml` file:
-
-```yaml
-provisioner:
-  product_name: chef
-  channel: current
-  product_version: <%= @version %>
-```