chef 12.5.0.alpha.1 → 12.5.1

data/tasks/external_tests.rb

@@ -1,29 +1,53 @@
-task :chef_sugar_spec do
-  gem_path = Bundler.environment.specs['chef-sugar'].first.full_gem_path
-  system("cd #{gem_path} && rake")
-end
+require 'tempfile'
 
-task :foodcritic_spec do
-  gem_path = Bundler.environment.specs['foodcritic'].first.full_gem_path
-  system("cd #{gem_path} && rake test")
+def bundle_exec_with_chef(test_gem, commands)
+  gem_path = Bundler.environment.specs[test_gem].first.full_gem_path
+  gemfile_path = File.join(gem_path, 'Gemfile.chef-external-test')
+  gemfile = File.open(gemfile_path, "w")
+  begin
+    IO.read(File.join(gem_path, 'Gemfile')).each_line do |line|
+      if line =~ /^\s*gemspec/
+        next
+      elsif line =~ /^\s*gem 'chef'|\s*gem "chef"/
+        next
+      elsif line =~ /^\s*dev_gem\s*['"](.+)['"]\s*$/
+        line = "gem '#{$1}', github: 'poise/#{$1}'"
+      elsif line =~ /\s*gem\s*['"]#{test_gem}['"]/ # foodcritic
+        next
+      end
+      gemfile.puts(line)
+    end
+    gemfile.puts("gem 'chef', path: #{File.expand_path('../..', __FILE__).inspect}")
+    gemfile.puts("gemspec path: #{gem_path.inspect}")
+    gemfile.close
+    Dir.chdir(gem_path) do
+      system({ 'BUNDLE_GEMFILE' => gemfile.path, 'RUBYOPT' => nil }, "bundle install")
+      Array(commands).each do |command|
+        system({ 'BUNDLE_GEMFILE' => gemfile.path, 'RUBYOPT' => nil }, "bundle exec #{command}")
+      end
+    end
+  ensure
+    File.delete(gemfile_path)
+  end
 end
 
-task :chefspec_spec do
-  gem_path = Bundler.environment.specs['chefspec'].first.full_gem_path
-  system("cd #{gem_path} && rake")
-end
+EXTERNAL_PROJECTS = {
+  "chef-zero"             => [ "rake spec", "rake pedant" ],
+  "cheffish"              => "rake spec",
+  "chef-provisioning"     => "rake spec",
+  "chef-provisioning-aws" => "rake spec",
+  "chef-sugar"            => "rake",
+  "foodcritic"            => "rake test",
+  "chefspec"              => "rake",
+  "chef-rewind"           => "rake spec",
+  "poise"                 => "rake spec",
+  "halite"                => "rake spec"
+}
 
-task :chef_rewind_spec do
-  gem_path = Bundler.environment.specs['chef-rewind'].first.full_gem_path
-  system("cd #{gem_path} && rake spec")
-end
-
-task :poise_spec do
-  gem_path = Bundler.environment.specs['poise'].first.full_gem_path
-  system("cd #{gem_path} && rake spec")
-end
+task :external_specs => EXTERNAL_PROJECTS.keys.map { |g| :"#{g.sub("-","_")}_spec" }
 
-task :halite_spec do
-  gem_path = Bundler.environment.specs['halite'].first.full_gem_path
-  system("cd #{gem_path} && rake spec")
+EXTERNAL_PROJECTS.each do |test_gem, commands|
+  task :"#{test_gem.gsub('-','_')}_spec" do
+    bundle_exec_with_chef(test_gem, commands)
+  end
 end

data/tasks/maintainers.rb

@@ -20,50 +20,191 @@ 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-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"]
+
 begin
   require 'tomlrb'
+  require 'octokit'
+  require 'pp'
   task :default => :generate
 
   namespace :maintainers do
     desc "Generate MarkDown version of MAINTAINERS file"
     task :generate do
-      maintainers = Tomlrb.load_file SOURCE
       out = "<!-- This is a generated file. Please do not edit directly -->\n\n"
-      out << "# " + maintainers["Preamble"]["title"] + "\n\n"
-      out <<  maintainers["Preamble"]["text"] + "\n"
-      out << "# " + maintainers["Org"]["Lead"]["title"] + "\n\n"
-      out << person(maintainers["people"], maintainers["Org"]["Lead"]["person"]) + "\n\n"
-      out << components(maintainers["people"], maintainers["Org"]["Components"])
+      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") { |fn|
         fn.write out
       }
     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 components(list, cmp)
+  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 { |_k, 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
+    puts "failed for #{team}"
+  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.has_key?("text")
+    out << "To mention the team, use @chef/#{cmp.delete("team")}\n\n" if cmp.has_key?("team")
     if cmp.has_key?("lieutenant")
       out << "### Lieutenant\n\n"
-      out << person(list, cmp.delete("lieutenant")) + "\n\n"
+      out << format_person(cmp.delete("lieutenant")) + "\n\n"
     end
-    out << maintainers(list, cmp.delete("maintainers")) + "\n" if cmp.has_key?("maintainers")
+    out << format_maintainers(cmp.delete("maintainers")) + "\n" if cmp.has_key?("maintainers")
     cmp.delete("paths")
-    cmp.each {|k,v| out << components(list, v) }
+    cmp.each {|k,v| out << format_components(v) }
     out
   end
 
-  def maintainers(list, people)
+  def format_maintainers(people)
     o = "### Maintainers\n\n"
     people.each do |p|
-      o << person(list, p) + "\n"
+      o << format_person(p) + "\n"
     end
     o
   end
 
-  def person(list, person)
-    "* [#{list[person]["Name"]}](https://github.com/#{list[person]["GitHub"]})"
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.5.0.alpha.1
+  version: 12.5.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.5.0.alpha.1
+        version: 12.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.5.0.alpha.1
+        version: 12.5.1
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -70,36 +70,36 @@ dependencies:
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.rc.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.rc.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.6.0.alpha.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.6.0.alpha.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +400,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - CONTRIBUTING.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -685,6 +686,7 @@ files:
 - lib/chef/deprecation/mixin/template.rb
 - lib/chef/deprecation/provider/cookbook_file.rb
 - lib/chef/deprecation/provider/file.rb
+- lib/chef/deprecation/provider/remote_directory.rb
 - lib/chef/deprecation/provider/remote_file.rb
 - lib/chef/deprecation/provider/template.rb
 - lib/chef/deprecation/warnings.rb
@@ -774,8 +776,6 @@ files:
 - lib/chef/knife/bootstrap/chef_vault_handler.rb
 - lib/chef/knife/bootstrap/client_builder.rb
 - lib/chef/knife/bootstrap/templates/README.md
-- lib/chef/knife/bootstrap/templates/archlinux-gems.erb
-- lib/chef/knife/bootstrap/templates/chef-aix.erb
 - lib/chef/knife/bootstrap/templates/chef-full.erb
 - lib/chef/knife/client_bulk_delete.rb
 - lib/chef/knife/client_create.rb
@@ -811,7 +811,10 @@ files:
 - lib/chef/knife/cookbook_upload.rb
 - lib/chef/knife/core/bootstrap_context.rb
 - lib/chef/knife/core/cookbook_scm_repo.rb
+- lib/chef/knife/core/custom_manifest_loader.rb
+- lib/chef/knife/core/gem_glob_loader.rb
 - lib/chef/knife/core/generic_presenter.rb
+- lib/chef/knife/core/hashed_command_loader.rb
 - lib/chef/knife/core/node_editor.rb
 - lib/chef/knife/core/node_presenter.rb
 - lib/chef/knife/core/object_loader.rb
@@ -862,6 +865,7 @@ files:
 - lib/chef/knife/node_run_list_remove.rb
 - lib/chef/knife/node_run_list_set.rb
 - lib/chef/knife/node_show.rb
+- lib/chef/knife/null.rb
 - lib/chef/knife/osc_user_create.rb
 - lib/chef/knife/osc_user_delete.rb
 - lib/chef/knife/osc_user_edit.rb
@@ -870,6 +874,7 @@ files:
 - lib/chef/knife/osc_user_show.rb
 - lib/chef/knife/raw.rb
 - lib/chef/knife/recipe_list.rb
+- lib/chef/knife/rehash.rb
 - lib/chef/knife/role_bulk_delete.rb
 - lib/chef/knife/role_create.rb
 - lib/chef/knife/role_delete.rb
@@ -946,13 +951,15 @@ files:
 - lib/chef/mixin/uris.rb
 - lib/chef/mixin/which.rb
 - lib/chef/mixin/why_run.rb
+- lib/chef/mixin/wide_string.rb
 - lib/chef/mixin/windows_architecture_helper.rb
 - lib/chef/mixin/windows_env_helper.rb
-- lib/chef/mixin/wstring.rb
 - lib/chef/mixin/xml_escape.rb
 - lib/chef/mixins.rb
 - lib/chef/monkey_patches/net-ssh-multi.rb
 - lib/chef/monkey_patches/net_http.rb
+- lib/chef/monkey_patches/webrick-utils.rb
+- lib/chef/monkey_patches/win32/registry.rb
 - lib/chef/monologger.rb
 - lib/chef/nil_argument.rb
 - lib/chef/node.rb
@@ -974,6 +981,7 @@ files:
 - lib/chef/platform/resource_priority_map.rb
 - lib/chef/platform/service_helpers.rb
 - lib/chef/policy_builder.rb
+- lib/chef/policy_builder/dynamic.rb
 - lib/chef/policy_builder/expand_node_object.rb
 - lib/chef/policy_builder/policyfile.rb
 - lib/chef/property.rb
@@ -1102,6 +1110,7 @@ files:
 - lib/chef/request_id.rb
 - lib/chef/reserved_names.rb
 - lib/chef/resource.rb
+- lib/chef/resource/action_class.rb
 - lib/chef/resource/apt_package.rb
 - lib/chef/resource/bash.rb
 - lib/chef/resource/batch.rb
@@ -1243,6 +1252,7 @@ files:
 - lib/chef/win32/api/net.rb
 - lib/chef/win32/api/process.rb
 - lib/chef/win32/api/psapi.rb
+- lib/chef/win32/api/registry.rb
 - lib/chef/win32/api/security.rb
 - lib/chef/win32/api/synchronization.rb
 - lib/chef/win32/api/system.rb
@@ -1265,6 +1275,7 @@ files:
 - lib/chef/win32/security/security_descriptor.rb
 - lib/chef/win32/security/sid.rb
 - lib/chef/win32/security/token.rb
+- lib/chef/win32/system.rb
 - lib/chef/win32/unicode.rb
 - lib/chef/win32/version.rb
 - lib/chef/workstation_config_loader.rb
@@ -1382,7 +1393,10 @@ files:
 - spec/data/cookbooks/openldap/recipes/return.rb
 - spec/data/cookbooks/openldap/templates/default/all_windows_line_endings.erb
 - spec/data/cookbooks/openldap/templates/default/helper_test.erb
+- spec/data/cookbooks/openldap/templates/default/helpers.erb
 - spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb
+- spec/data/cookbooks/openldap/templates/default/nested_openldap_partials.erb
+- spec/data/cookbooks/openldap/templates/default/nested_partial.erb
 - spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb
 - spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb
 - spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb
@@ -1394,6 +1408,7 @@ files:
 - spec/data/cookbooks/preseed/templates/default/preseed-template-variables.seed
 - spec/data/cookbooks/preseed/templates/default/preseed-template.seed
 - spec/data/definitions/test.rb
+- spec/data/dsc_lcm.pfx
 - spec/data/environment-config.rb
 - spec/data/file-providers-method-snapshot-chef-11-4.json
 - spec/data/fileedit/blank
@@ -1613,7 +1628,7 @@ files:
 - spec/functional/util/powershell/cmdlet_spec.rb
 - spec/functional/version_spec.rb
 - spec/functional/win32/crypto_spec.rb
-- spec/functional/win32/registry_helper_spec.rb
+- spec/functional/win32/registry_spec.rb
 - spec/functional/win32/security_spec.rb
 - spec/functional/win32/service_manager_spec.rb
 - spec/functional/win32/sid_spec.rb
@@ -1640,7 +1655,10 @@ files:
 - spec/integration/recipes/lwrp_spec.rb
 - spec/integration/recipes/provider_choice.rb
 - spec/integration/recipes/recipe_dsl_spec.rb
+- spec/integration/recipes/remote_directory.rb
 - spec/integration/recipes/resource_action_spec.rb
+- spec/integration/recipes/resource_converge_if_changed_spec.rb
+- spec/integration/recipes/resource_load_spec.rb
 - spec/integration/solo/solo_spec.rb
 - spec/rcov.opts
 - spec/scripts/ssl-serve.rb
@@ -1673,6 +1691,7 @@ files:
 - spec/support/platforms/win32/spec_service.rb
 - spec/support/shared/context/client.rb
 - spec/support/shared/context/config.rb
+- spec/support/shared/context/win32.rb
 - spec/support/shared/examples/client.rb
 - spec/support/shared/functional/diff_disabled.rb
 - spec/support/shared/functional/directory_resource.rb
@@ -1694,6 +1713,7 @@ files:
 - spec/support/shared/unit/execute_resource.rb
 - spec/support/shared/unit/file_system_support.rb
 - spec/support/shared/unit/knife_shared.rb
+- spec/support/shared/unit/mock_shellout.rb
 - spec/support/shared/unit/platform_introspector.rb
 - spec/support/shared/unit/provider/file.rb
 - spec/support/shared/unit/provider/useradd_based_user_provider.rb
@@ -1730,6 +1750,7 @@ files:
 - spec/unit/chef_spec.rb
 - spec/unit/client_spec.rb
 - spec/unit/config_fetcher_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/cookbook/chefignore_spec.rb
 - spec/unit/cookbook/cookbook_version_loader_spec.rb
 - spec/unit/cookbook/file_vendor_spec.rb
@@ -1819,6 +1840,9 @@ files:
 - spec/unit/knife/cookbook_upload_spec.rb
 - spec/unit/knife/core/bootstrap_context_spec.rb
 - spec/unit/knife/core/cookbook_scm_repo_spec.rb
+- spec/unit/knife/core/custom_manifest_loader_spec.rb
+- spec/unit/knife/core/gem_glob_loader_spec.rb
+- spec/unit/knife/core/hashed_command_loader_spec.rb
 - spec/unit/knife/core/object_loader_spec.rb
 - spec/unit/knife/core/subcommand_loader_spec.rb
 - spec/unit/knife/core/ui_spec.rb
@@ -1923,6 +1947,7 @@ files:
 - spec/unit/org_spec.rb
 - spec/unit/platform/query_helpers_spec.rb
 - spec/unit/platform_spec.rb
+- spec/unit/policy_builder/dynamic_spec.rb
 - spec/unit/policy_builder/expand_node_object_spec.rb
 - spec/unit/policy_builder/policyfile_spec.rb
 - spec/unit/policy_builder_spec.rb
@@ -2039,7 +2064,6 @@ files:
 - spec/unit/provider_spec.rb
 - spec/unit/pure_application_spec.rb
 - spec/unit/recipe_spec.rb
-- spec/unit/registry_helper_spec.rb
 - spec/unit/resource/apt_package_spec.rb
 - spec/unit/resource/bash_spec.rb
 - spec/unit/resource/batch_spec.rb
@@ -2150,6 +2174,7 @@ files:
 - spec/unit/version_class_spec.rb
 - spec/unit/version_constraint/platform_spec.rb
 - spec/unit/version_constraint_spec.rb
+- spec/unit/win32/registry_spec.rb
 - spec/unit/windows_service_spec.rb
 - tasks/external_tests.rb
 - tasks/maintainers.rb
@@ -2169,12 +2194,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration