chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

data/acceptance/data-collector/test/integration/helpers/serverspec/Gemfile

@@ -0,0 +1,8 @@
+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"

data/acceptance/omnitruck/.acceptance/acceptance-cookbook/.gitignore

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

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

@@ -0,0 +1 @@
+name 'acceptance-cookbook'

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

@@ -0,0 +1 @@
+log "NOOP 'destroy' recipe from the acceptance-cookbook in directory '#{node['chef-acceptance']['suite-dir']}'"

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

@@ -0,0 +1 @@
+log "NOOP 'provision' recipe from the acceptance-cookbook in directory '#{node['chef-acceptance']['suite-dir']}'"

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

@@ -0,0 +1,61 @@
+control_group "omnitruck" do
+  require 'chef/http'
+  require 'chef/json_compat'
+
+  # We do this to be able to reference 'rest' both inside and outside example
+  # blocks
+  rest = Chef::HTTP.new("https://omnitruck.chef.io/chef/metadata", headers: {"Accept" => "application/json"})
+  let(:rest) { rest }
+
+  def request(url)
+    Chef::JSONCompat.parse(rest.get(url))["sha256"]
+  end
+
+  shared_examples "32 matches 64" do |version|
+    it "only returns 32-bit packages" do
+      sha32 = request("?p=windows&pv=2012r2&v=#{version}&m=i386")
+      sha64 = request("?p=windows&pv=2012r2&v=#{version}&m=x86_64")
+      expect(sha32).to eq(sha64)
+    end
+  end
+
+  context "from the current channel" do
+    it "returns both 32-bit and 64-bit packages" do
+      # We cannot verify from the returned URL if the package is 64 or 32 bit because
+      # it is often lying, so we just make sure they are different.
+      # The current channel is often cleaned so only the latest builds are in
+      # it, so we just request the latest version instead of trying to check
+      # old versions
+      sha32 = request("?p=windows&pv=2012r2&m=i386&prerelease=true")
+      sha64 = request("?p=windows&pv=2012r2&m=x86_64&prerelease=true")
+      expect(sha32).to_not eq(sha64)
+    end
+  end
+
+  context "from the stable channel" do
+    %w{11 12.3 12.4.2 12.6.0 12.8.1}.each do |version|
+      describe "with version #{version}" do
+        include_examples "32 matches 64", version
+      end
+    end
+
+    begin
+      rest.get("?p=windows&pv=2012r2&v=12.9")
+      describe "with version 12.9" do
+        it "returns both 32-bit and 64-bit packages" do
+          sha32 = request("?p=windows&pv=2012r2&v=12.9&m=i386")
+          sha64 = request("?p=windows&pv=2012r2&v=12.9&m=x86_64")
+          expect(sha32).to_not eq(sha64)
+        end
+      end
+    rescue Net::HTTPServerException => e
+      # Once 12.9 is released this will stop 404ing and the example
+      # will be executed
+      unless e.response.code == "404"
+        raise
+      end
+    end
+
+  end
+
+end

data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/.gitignore

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

data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb

@@ -0,0 +1,43 @@
+class CookbookKitchen < KitchenAcceptance::Kitchen
+  resource_name :cookbook_kitchen
+
+  property :command, default: lazy { name.split(" ")[0] }
+  property :kitchen_dir, default: lazy { ::File.join(repository_root, cookbook_relative_dir) }
+  property :test_cookbook, String, default: lazy { name.split(" ")[1] }
+  property :repository, String, default: lazy { "chef-cookbooks/#{test_cookbook}" },
+    coerce: proc { |v|
+      # chef-cookbooks/runit -> https://github.com/chef-cookbooks/runit.git
+      if !v.include?(':')
+        "https://github.com/#{v}.git"
+      else
+        v
+      end
+    }
+  property :repository_root, String, default: lazy { ::File.join(Chef.node["chef-acceptance"]["suite-dir"], "test_run", test_cookbook) }
+  property :branch, String, default: "master"
+  property :cookbook_relative_dir, String, default: ""
+  property :env, default: lazy {
+    {
+      "BUNDLE_GEMFILE" => ::File.expand_path("../Gemfile", Chef.node["chef-acceptance"]["suite-dir"]),
+#      "KITCHEN_GLOBAL_YAML" => ::File.join(kitchen_dir, ".kitchen.yml"),
+      "KITCHEN_YAML" => ::File.join(node["chef-acceptance"]["suite-dir"], ".kitchen.#{test_cookbook}.yml")
+    }
+  }
+
+  action :run do
+    # Ensure the parent directory exists
+    directory ::File.expand_path("..", repository_root) do
+      recursive true
+    end
+
+    # Grab the cookbook
+    # TODO Grab the source URL from supermarket
+    # TODO get git to include its kitchen tests in the cookbook.
+    git repository_root do
+      repository new_resource.repository
+      branch new_resource.branch
+    end
+
+    super()
+  end
+end

data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb

@@ -0,0 +1,41 @@
+class TopCookbooks < Chef::Resource
+  resource_name :top_cookbooks
+
+  property :command, String, name_property: true
+
+  # Disabling all windows tests until winrm issue is properly settled.
+  #
+  action :run do
+  
+    # FIXME: waiting for https://github.com/learn-chef/learn-chef-acceptance/pull/23
+    # cookbook_kitchen "#{command} learn-the-basics-ubuntu" do
+    #   repository "learn-chef/learn-chef-acceptance"
+    #   cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu"
+    # end
+
+    # cookbook_kitchen "#{command} learn-the-basics-windows" do
+    #   repository "learn-chef/learn-chef-acceptance"
+    #   cookbook_relative_dir "cookbooks/learn-the-basics-windows"
+    # end
+
+    cookbook_kitchen "#{command} powershell" do
+    end
+
+    cookbook_kitchen "#{command} iis" do
+    end
+
+    cookbook_kitchen "#{command} sql_server" do
+    end
+
+    cookbook_kitchen "#{command} winbox" do
+      repository "adamedx/winbox"
+    end
+
+    # cookbook_kitchen "#{command} windows" do
+    # end
+
+    # cookbook_kitchen "#{command} chocolatey" do
+    #   repository "chocolatey/chocolatey-cookbook"
+    # end
+  end
+end

data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/metadata.rb

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

data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/destroy.rb

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

data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/provision.rb

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

data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/verify.rb

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

data/acceptance/top-cookbooks/.gitignore

@@ -0,0 +1 @@
+test_run/

data/acceptance/top-cookbooks/.kitchen.chocolatey.yml

@@ -0,0 +1,6 @@
+suites:
+  - name: default
+    run_list:
+      - recipe[chocolatey::default]
+      - recipe[chocolatey_test::default]
+    includes: [windows-2012r2]

data/acceptance/top-cookbooks/.kitchen.iis.yml

@@ -0,0 +1,4 @@
+suites:
+  - name: iis
+    run_list: ["recipe[iis::default]"]
+    includes: [windows-2012r2]

data/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml

@@ -0,0 +1,7 @@
+suites:
+  - name: learn-the-basics-rhel-default
+    run_list:
+      - recipe[learn-the-basics-rhel::setup]
+      - recipe[learn-the-basics-rhel::lesson1]
+      - recipe[learn-the-basics-rhel::lesson2]
+    includes: [el-6]

data/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml

@@ -0,0 +1,7 @@
+suites:
+  - name: learn-the-basics-ubuntu-default
+    run_list:
+      - recipe[learn-the-basics-ubuntu::setup]
+      - recipe[learn-the-basics-ubuntu::lesson1]
+      - recipe[learn-the-basics-ubuntu::lesson2]
+    includes: [ubuntu-14.04]

data/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml

@@ -0,0 +1,7 @@
+suites:
+  - name: learn-the-basics-windows-default
+    run_list:
+      - recipe[learn-the-basics-windows::setup]
+      - recipe[learn-the-basics-windows::lesson1]
+      - recipe[learn-the-basics-windows::lesson2]
+    includes: [windows-2012r2]

data/acceptance/top-cookbooks/.kitchen.powershell.yml

@@ -0,0 +1,4 @@
+suites:
+  - name: powershell
+    run_list: ["recipe[powershell::powershell2]"]
+    includes: [windows-2012r2]

data/acceptance/top-cookbooks/.kitchen.sql_server.yml

@@ -0,0 +1,5 @@
+suites:
+  - name: sql_server
+    run_list: ["recipe[sql_server::default]"]
+    attributes: { sql_server: { accept_eula: true } }
+    includes: [windows-2012r2]

data/acceptance/top-cookbooks/.kitchen.winbox.yml

@@ -0,0 +1,8 @@
+suites:
+  - name: default
+    run_list:
+      - recipe[winbox::default]
+    includes: [windows-2012r2]
+
+verifier:
+  name: dummy

data/acceptance/top-cookbooks/.kitchen.windows.yml

@@ -0,0 +1,38 @@
+suites:
+  # Waiting on https://github.com/chef-cookbooks/windows/pull/350
+  # - name: tasks
+  #   run_list:
+  #     - recipe[windows::default]
+  #     - recipe[minimal::tasks]
+  #   includes: [windows-2012r2]
+  - name: path
+    run_list:
+      - recipe[windows::default]
+      - recipe[minimal::path]
+    includes: [windows-2012r2]
+  - name: certificate
+    run_list:
+      - recipe[windows::default]
+      - recipe[minimal::certificate]
+    includes: [windows-2012r2]
+  # Package is deprecated
+  # - name: package
+  #   run_list:
+  #     - recipe[windows::default]
+  #     - recipe[minimal::package]
+  #   includes: [windows-2012r2]
+  - name: feature
+    run_list:
+      - recipe[windows::default]
+      - recipe[minimal::feature]
+    includes: [windows-2012r2]
+  - name: http_acl
+    run_list:
+      - recipe[windows::default]
+      - recipe[minimal::http_acl]
+    includes: [windows-2012r2]
+  - name: font
+    run_list:
+      - recipe[windows::default]
+      - recipe[minimal::font]
+    includes: [windows-2012r2]

data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore

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

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

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

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

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

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

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

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

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

data/acceptance/trivial/.kitchen.yml

@@ -0,0 +1,7 @@
+verifier:
+  name: inspec
+
+suites:
+  - name: chef-current-install
+    includes: [ubuntu-14.04, windows-server-2012r2]
+    run_list:

data/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb

@@ -0,0 +1,5 @@
+chef_version = ENV["KITCHEN_CHEF_VERSION"].split("+")[0]
+describe command("chef-client -v") do
+  its("exit_status") { should eq 0 }
+  its(:stdout) { should match /Chef: #{chef_version}/ } if chef_version != "latest"
+end

data/acceptance/windows-service/.acceptance/acceptance-cookbook/.gitignore

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

data/acceptance/windows-service/.acceptance/acceptance-cookbook/metadata.rb

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

data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb

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

data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb

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

data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb

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

data/acceptance/windows-service/.kitchen.yml

@@ -0,0 +1,7 @@
+verifier:
+  name: inspec
+
+suites:
+  - name: chef-windows-service
+    includes: [windows-2012r2]
+    run_list:

data/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb

@@ -0,0 +1,58 @@
+only_if do
+  os["family"] == "windows"
+end
+
+describe command("chef-service-manager") do
+  it { should exist }
+  its("exit_status") { should eq 0 }
+end
+
+describe service("chef-client") do
+  it { should_not be_enabled }
+  it { should_not be_installed }
+  it { should_not be_running }
+end
+
+describe command("/opscode/chef/bin/chef-service-manager.bat -a install") do
+  its("exit_status") { should eq 0 }
+  its(:stdout) { should match /Service 'chef-client' has successfully been installed./ }
+end
+
+describe service("chef-client") do
+  it { should be_enabled }
+  it { should be_installed }
+  it { should_not be_running }
+end
+
+describe command("/opscode/chef/bin/chef-service-manager.bat -a start") do
+  its("exit_status") { should eq 0 }
+  its(:stdout) { should match /Service 'chef-client' is now 'running'/ }
+end
+
+describe service("chef-client") do
+  it { should be_enabled }
+  it { should be_installed }
+  it { should be_running }
+end
+
+describe command("/opscode/chef/bin/chef-service-manager.bat -a stop") do
+  its("exit_status") { should eq 0 }
+  its(:stdout) { should match /Service 'chef-client' is now 'stopped'/ }
+end
+
+describe service("chef-client") do
+  it { should be_enabled }
+  it { should be_installed }
+  it { should_not be_running }
+end
+
+describe command("/opscode/chef/bin/chef-service-manager.bat -a uninstall") do
+  its("exit_status") { should eq 0 }
+  its(:stdout) { should match /Service chef-client deleted/ }
+end
+
+describe service("chef-client") do
+  it { should_not be_enabled }
+  it { should_not be_installed }
+  it { should_not be_running }
+end

data/chef-universal-mingw32.gemspec

@@ -12,11 +12,11 @@ gemspec.add_dependency "win32-eventlog", "0.6.3"
 gemspec.add_dependency "win32-mmap", "~> 0.4.1"
 gemspec.add_dependency "win32-mutex", "~> 0.4.2"
 gemspec.add_dependency "win32-process", "~> 0.8.2"
-gemspec.add_dependency "win32-service", "~> 1.0"
+gemspec.add_dependency "win32-service", "~> 0.8.7"
 gemspec.add_dependency "windows-api", "~> 0.4.4"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.extensions << "ext/win32-eventlog/Rakefile"
-gemspec.files += Dir.glob("{distro,ext}/**/*")
+gemspec.files += %w{ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man}
 
 gemspec.executables += %w{ chef-service-manager chef-windows-service }
 

data/chef.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name = "chef"
   s.version = Chef::VERSION
   s.platform = Gem::Platform::RUBY
-  s.extra_rdoc_files = ["README.md", "LICENSE" ]
+  s.extra_rdoc_files = ["README.md", "CONTRIBUTING.md", "LICENSE" ]
   s.summary = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
   s.description = s.summary
   s.license = "Apache-2.0"
@@ -13,34 +13,34 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://www.chef.io"
 
-  s.required_ruby_version = ">= 2.3.0"
+  s.required_ruby_version = ">= 2.4.0"
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
 
   s.add_dependency "mixlib-cli", "~> 1.7"
-  s.add_dependency "mixlib-log", "~> 1.3"
+  s.add_dependency "mixlib-log", "~> 2.0", ">= 2.0.3"
   s.add_dependency "mixlib-authentication", "~> 1.4"
-  s.add_dependency "mixlib-shellout", "~> 2.4"
+  s.add_dependency "mixlib-shellout", "~> 2.0"
   s.add_dependency "mixlib-archive", "~> 0.4"
-  s.add_dependency "ohai", "~> 13.0"
+  s.add_dependency "ohai", "~> 14.0"
 
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "net-ssh", ">= 2.9", "< 5.0"
+  s.add_dependency "net-ssh", "~> 4.2"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
   s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
   s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
   s.add_dependency "erubis", "~> 2.7"
   s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
 
-  s.add_dependency "chef-zero", "~> 13.0"
+  s.add_dependency "chef-zero", ">= 13.0"
 
   s.add_dependency "plist", "~> 3.2"
   s.add_dependency "iniparse", "~> 1.4"
   s.add_dependency "addressable"
-  s.add_dependency "iso8601", "~> 0.12.1"
+  s.add_dependency "iso8601", "~> 0.9.1"
 
   # Audit mode requires these, so they are non-developmental dependencies now
-  %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5", "< 3.8" }
+  %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" }
   s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
   s.add_dependency "serverspec", "~> 2.7"
   s.add_dependency "specinfra", "~> 2.10"
@@ -58,5 +58,5 @@ Gem::Specification.new do |s|
   s.executables  = %w{ chef-client chef-solo knife chef-shell chef-apply }
 
   s.require_paths = %w{ lib }
-  s.files = %w{Gemfile Rakefile LICENSE README.md} + Dir.glob("{lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + Dir.glob("*.gemspec")
+  s.files = %w{Gemfile Rakefile LICENSE README.md CONTRIBUTING.md VERSION} + Dir.glob("{distro,lib,lib-backcompat,tasks,acceptance,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + Dir.glob("*.gemspec")
 end