chef 14.15.6-universal-mingw32 → 15.0.293-universal-mingw32

data/tasks/announce.rb

@@ -1,51 +1,51 @@
-#
-# Copyright:: Copyright 2016-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 "date"
-require "erb"
-
-class ReleaseAnnouncement
-  include ERB::Util
-  attr_accessor :type, :version, :maj_minor, :date, :release_notes
-
-  def initialize(version, date, type)
-    @version = version
-    @maj_minor = version.split(".")[0..1].join(".")
-    @date = Date.parse(date) unless date.nil?
-    @release_notes = release_notes_from_file
-    @type = type
-  end
-
-  def render
-    puts "-" * 30
-    puts ERB.new(template_for(@type)).result(binding)
-    puts "-" * 30
-  end
-
-  def template_for(type)
-    File.read("tasks/templates/#{type}.md.erb")
-  end
-
-  def release_notes_from_file
-    File.read("RELEASE_NOTES.md").match(/^# Chef Infra Client Release Notes #{@maj_minor}:\n\n(.*)/m)[1]
-  end
-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
+#
+# Copyright:: Copyright 2016-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 "date"
+require "erb"
+
+class ReleaseAnnouncement
+  include ERB::Util
+  attr_accessor :type, :version, :maj_minor, :date, :release_notes
+
+  def initialize(version, date, type)
+    @version = version
+    @maj_minor = version.split(".")[0..1].join(".")
+    @date = Date.parse(date) unless date.nil?
+    @release_notes = release_notes_from_file
+    @type = type
+  end
+
+  def render
+    puts "-" * 30
+    puts ERB.new(template_for(@type)).result(binding)
+    puts "-" * 30
+  end
+
+  def template_for(type)
+    File.read("tasks/templates/#{type}.md.erb")
+  end
+
+  def release_notes_from_file
+    File.read("RELEASE_NOTES.md").match(/^# Chef Infra Client Release Notes #{@maj_minor}:\n\n(.*)/m)[1]
+  end
+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

data/tasks/bin/run_external_test

@@ -1,29 +1,33 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.expand_path("../../lib", File.dirname(__FILE__)))
-
-require "tmpdir"
-require "bundler"
-require "chef/mixin/shell_out"
-
-include Chef::Mixin::ShellOut
-
-github_repo = ARGV.shift
-git_thing = ARGV.shift
-
-build_dir = File.expand_path(ENV["TRAVIS_BUILD_DIR"] || Dir.pwd)
-
-env = { "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'" }
-
-Dir.mktmpdir("chef-external-test") do |dir|
-  git_url = "https://github.com/#{github_repo}"
-  Dir.rmdir dir
-  shell_out!("git clone #{git_url} #{dir}", live_stream: STDOUT)
-  Dir.chdir(dir) do
-    shell_out!("git checkout #{git_thing}", live_stream: STDOUT)
-    Bundler.with_clean_env do
-      shell_out!("bundle install", live_stream: STDOUT, env: env)
-      shell_out!("bundle exec #{ARGV.join(" ")}", live_stream: STDOUT, env: env)
-    end
-  end
-end
+#!/usr/bin/env ruby
+
+$:.unshift(File.expand_path("../../lib", File.dirname(__FILE__)))
+
+require "tmpdir"
+require "bundler"
+require "chef/mixin/shell_out"
+
+include Chef::Mixin::ShellOut
+
+github_repo = ARGV.shift
+git_thing = ARGV.shift
+
+build_dir = File.expand_path(ENV["TRAVIS_BUILD_DIR"] || Dir.pwd)
+
+env = {
+  "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'; " \
+    "gem 'ohai', git: 'https://github.com/chef/ohai.git'",
+  "CHEF_LICENSE" => "accept-no-persist",
+}
+
+Dir.mktmpdir("chef-external-test") do |dir|
+  git_url = "https://github.com/#{github_repo}"
+  Dir.rmdir dir
+  shell_out!("git clone #{git_url} #{dir}", live_stream: STDOUT)
+  Dir.chdir(dir) do
+    shell_out!("git checkout #{git_thing}", live_stream: STDOUT)
+    Bundler.with_clean_env do
+      shell_out!("bundle install", live_stream: STDOUT, env: env)
+      shell_out!("bundle exec #{ARGV.join(" ")}", live_stream: STDOUT, env: env)
+    end
+  end
+end

data/tasks/dependencies.rb

@@ -1,58 +1,58 @@
-#
-# Copyright:: Copyright (c) 2016-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 "bundler"
-
-desc "Tasks to update and check dependencies"
-namespace :dependencies do
-
-  # Update all dependencies to the latest constraint-matching version
-  desc "Update all dependencies."
-  task update: %w{
-                    dependencies:update_gemfile_lock
-                    dependencies:update_omnibus_gemfile_lock
-                  }
-
-  def bundle_update_locked_multiplatform_task(task_name, dir)
-    desc "Update #{dir}/Gemfile.lock."
-    task task_name do
-      Dir.chdir(dir) do
-        Bundler.with_clean_env do
-          rm_f "#{dir}/Gemfile.lock"
-          sh "bundle lock --update --add-platform ruby"
-          sh "bundle lock --update --add-platform x64-mingw32"
-          sh "bundle lock --update --add-platform x86-mingw32"
-        end
-      end
-    end
-  end
-
-  def bundle_update_task(task_name, dir)
-    desc "Update #{dir}/Gemfile.lock."
-    task task_name do
-      Dir.chdir(dir) do
-        Bundler.with_clean_env do
-          sh "bundle update"
-        end
-      end
-    end
-  end
-
-  bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
-  bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
-
-end
+#
+# Copyright:: Copyright (c) 2016-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 "bundler"
+
+desc "Tasks to update and check dependencies"
+namespace :dependencies do
+
+  # Update all dependencies to the latest constraint-matching version
+  desc "Update all dependencies."
+  task update: %w{
+                    dependencies:update_gemfile_lock
+                    dependencies:update_omnibus_gemfile_lock
+                  }
+
+  def bundle_update_locked_multiplatform_task(task_name, dir)
+    desc "Update #{dir}/Gemfile.lock."
+    task task_name do
+      Dir.chdir(dir) do
+        Bundler.with_clean_env do
+          rm_f "#{dir}/Gemfile.lock"
+          sh "bundle lock --update --add-platform ruby"
+          sh "bundle lock --update --add-platform x64-mingw32"
+          sh "bundle lock --update --add-platform x86-mingw32"
+        end
+      end
+    end
+  end
+
+  def bundle_update_task(task_name, dir)
+    desc "Update #{dir}/Gemfile.lock."
+    task task_name do
+      Dir.chdir(dir) do
+        Bundler.with_clean_env do
+          sh "bundle update"
+        end
+      end
+    end
+  end
+
+  bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
+  bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
+
+end

data/tasks/rspec.rb

@@ -1,90 +1,90 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2008-2016, 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 "rubygems"
-require "rake"
-
-CHEF_ROOT = File.join(File.dirname(__FILE__), "..")
-
-begin
-  require "rspec/core/rake_task"
-
-  desc "Run specs for Chef's Components (chef-config)"
-  task :component_specs do
-    Dir.chdir("chef-config") do
-      Bundler.with_clean_env do
-        sh("bundle install")
-        sh("bundle exec rake spec")
-      end
-    end
-  end
-
-  task default: :spec
-
-  task spec: :component_specs
-
-  desc "Run standard specs (minus long running specs)"
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = %w{--profile}
-    # right now this just limits to functional + unit, but could also remove
-    # individual tests marked long-running
-    t.pattern = FileList["spec/**/*_spec.rb"]
-  end
-
-  namespace :spec do
-    desc "Run all specs in spec directory with RCov"
-    RSpec::Core::RakeTask.new(:rcov) do |t|
-      t.rspec_opts = %w{--profile}
-      t.pattern = FileList["spec/**/*_spec.rb"]
-      t.rcov = true
-      t.rcov_opts = lambda do
-        IO.readlines("#{CHEF_ROOT}/spec/rcov.opts").map { |l| l.chomp.split " " }.flatten
-      end
-    end
-
-    desc "Run all specs in spec directory"
-    RSpec::Core::RakeTask.new(:all) do |t|
-      t.rspec_opts = %w{--profile}
-      t.pattern = FileList["spec/**/*_spec.rb"]
-    end
-
-    desc "Print Specdoc for all specs"
-    RSpec::Core::RakeTask.new(:doc) do |t|
-      t.rspec_opts = %w{--format specdoc --dry-run --profile}
-      t.pattern = FileList["spec/**/*_spec.rb"]
-    end
-
-    desc "Run the specs under spec/unit with activesupport loaded"
-    RSpec::Core::RakeTask.new(:activesupport) do |t|
-      t.rspec_opts = %w{--require active_support/core_ext --profile}
-      # Only node_spec and role_spec specifically have issues, target those tests
-      t.pattern = FileList["spec/unit/node_spec.rb", "spec/unit/role_spec.rb"]
-    end
-
-    [:unit, :functional, :integration, :stress].each do |sub|
-      desc "Run the specs under spec/#{sub}"
-      RSpec::Core::RakeTask.new(sub) do |t|
-        t.rspec_opts = %w{--profile}
-        t.pattern = FileList["spec/#{sub}/**/*_spec.rb"]
-      end
-    end
-  end
-rescue LoadError
-  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2008-2016, 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 "rubygems"
+require "rake"
+
+CHEF_ROOT = File.join(File.dirname(__FILE__), "..")
+
+begin
+  require "rspec/core/rake_task"
+
+  desc "Run specs for Chef's Components (chef-config)"
+  task :component_specs do
+    Dir.chdir("chef-config") do
+      Bundler.with_clean_env do
+        sh("bundle install")
+        sh("bundle exec rake spec")
+      end
+    end
+  end
+
+  task default: :spec
+
+  task spec: :component_specs
+
+  desc "Run standard specs (minus long running specs)"
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.rspec_opts = %w{--profile}
+    # right now this just limits to functional + unit, but could also remove
+    # individual tests marked long-running
+    t.pattern = FileList["spec/**/*_spec.rb"]
+  end
+
+  namespace :spec do
+    desc "Run all specs in spec directory with RCov"
+    RSpec::Core::RakeTask.new(:rcov) do |t|
+      t.rspec_opts = %w{--profile}
+      t.pattern = FileList["spec/**/*_spec.rb"]
+      t.rcov = true
+      t.rcov_opts = lambda do
+        IO.readlines("#{CHEF_ROOT}/spec/rcov.opts").map { |l| l.chomp.split " " }.flatten
+      end
+    end
+
+    desc "Run all specs in spec directory"
+    RSpec::Core::RakeTask.new(:all) do |t|
+      t.rspec_opts = %w{--profile}
+      t.pattern = FileList["spec/**/*_spec.rb"]
+    end
+
+    desc "Print Specdoc for all specs"
+    RSpec::Core::RakeTask.new(:doc) do |t|
+      t.rspec_opts = %w{--format specdoc --dry-run --profile}
+      t.pattern = FileList["spec/**/*_spec.rb"]
+    end
+
+    desc "Run the specs under spec/unit with activesupport loaded"
+    RSpec::Core::RakeTask.new(:activesupport) do |t|
+      t.rspec_opts = %w{--require active_support/core_ext --profile}
+      # Only node_spec and role_spec specifically have issues, target those tests
+      t.pattern = FileList["spec/unit/node_spec.rb", "spec/unit/role_spec.rb"]
+    end
+
+    [:unit, :functional, :integration, :stress].each do |sub|
+      desc "Run the specs under spec/#{sub}"
+      RSpec::Core::RakeTask.new(sub) do |t|
+        t.rspec_opts = %w{--profile}
+        t.pattern = FileList["spec/#{sub}/**/*_spec.rb"]
+      end
+    end
+  end
+rescue LoadError
+  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
+end