chef-dk 2.6.2 → 3.0.36

data/spec/unit/shell_out_spec.rb

@@ -1,34 +1,34 @@
-#
-# Copyright:: Copyright (c) 2014 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 "spec_helper"
-require "chef-dk/shell_out"
-
-describe ChefDK::ShellOut do
-
-  describe "providing the API expected by CookbookOmnifetch" do
-
-    it "provides a `shell_out` class method" do
-      expect(described_class).to respond_to(:shell_out)
-    end
-
-    it "responds to #success?" do
-      expect(described_class.new("echo 'foo'")).to respond_to(:success?)
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 2014-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 "spec_helper"
+require "chef-dk/shell_out"
+
+describe ChefDK::ShellOut do
+
+  describe "providing the API expected by CookbookOmnifetch" do
+
+    it "provides a `shell_out` class method" do
+      expect(described_class).to respond_to(:shell_out)
+    end
+
+    it "responds to #success?" do
+      expect(described_class.new("echo 'foo'")).to respond_to(:success?)
+    end
+
+  end
+end

data/tasks/announce.rb

@@ -1,57 +1,57 @@
-#
-# 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 "date"
-require "erb"
-
-class ReleaseAnnouncement
-  include ERB::Util
-  attr_accessor :type, :version, :maj_minor, :date, :release_notes
-
-  def initialize(version, date, type)
-    @version = version
-    @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(/^# ChefDK #{@version} Release Notes\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
-end
+#
+# 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 "date"
+require "erb"
+
+class ReleaseAnnouncement
+  include ERB::Util
+  attr_accessor :type, :version, :maj_minor, :date, :release_notes
+
+  def initialize(version, date, type)
+    @version = version
+    @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(/^# ChefDK #{@version} Release Notes\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
+end

data/tasks/bin/bundle-platform.bat

@@ -1,2 +1,2 @@
-@ECHO OFF
-ruby "%~dpn0" %*
+@ECHO OFF
+ruby "%~dpn0" %*

data/tasks/dependencies.rb

@@ -1,89 +1,89 @@
-#
-# 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.
-#
-
-desc "Tasks to update and check dependencies"
-namespace :dependencies do
-
-  # Running update_ci on your local system wont' work. The best way to update
-  # dependencies locally is by running the dependency update script.
-  desc "Update all dependencies. dependencies:update to update as little as possible."
-  task :update do |t, rake_args|
-    # FIXME: probably broken, and needs less indirection
-    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
-  end
-
-  desc "Force update (when adding new gems to Gemfiles)"
-  task :force_update do |t, rake_args|
-    # FIXME: probably broken, and needs less indirection
-    FileUtils.rm_f(File.join(Dir.pwd, ".bundle", "config"))
-    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
-  end
-
-  # Update all dependencies to the latest constraint-matching version
-  desc "Update all dependencies. dependencies:update to update as little as possible (CI-only)."
-  task :update_ci => %w{
-                    dependencies:update_gemfile_lock
-                    dependencies:update_omnibus_gemfile_lock
-                    dependencies:update_acceptance_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
-
-  def berks_update_task(task_name, dir)
-    desc "Update #{dir}/Berksfile.lock."
-    task task_name do
-      FileUtils.rm_f("#{dir}/Berksfile.lock")
-      Dir.chdir(dir) do
-        Bundler.with_clean_env do
-          sh "bundle exec berks install"
-        end
-      end
-    end
-  end
-
-  bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
-  bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
-  bundle_update_task :update_acceptance_gemfile_lock, "acceptance"
-end
-
-desc "Update all dependencies and check for outdated gems."
-task :dependencies_ci => [ "dependencies:update_ci" ]
-task :dependencies => [ "dependencies:update" ]
-task :update => [ "dependencies:update" ]
+#
+# 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.
+#
+
+desc "Tasks to update and check dependencies"
+namespace :dependencies do
+
+  # Running update_ci on your local system wont' work. The best way to update
+  # dependencies locally is by running the dependency update script.
+  desc "Update all dependencies. dependencies:update to update as little as possible."
+  task :update do |t, rake_args|
+    # FIXME: probably broken, and needs less indirection
+    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
+  end
+
+  desc "Force update (when adding new gems to Gemfiles)"
+  task :force_update do |t, rake_args|
+    # FIXME: probably broken, and needs less indirection
+    FileUtils.rm_f(File.join(Dir.pwd, ".bundle", "config"))
+    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
+  end
+
+  # Update all dependencies to the latest constraint-matching version
+  desc "Update all dependencies. dependencies:update to update as little as possible (CI-only)."
+  task :update_ci => %w{
+                    dependencies:update_gemfile_lock
+                    dependencies:update_omnibus_gemfile_lock
+                    dependencies:update_acceptance_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
+
+  def berks_update_task(task_name, dir)
+    desc "Update #{dir}/Berksfile.lock."
+    task task_name do
+      FileUtils.rm_f("#{dir}/Berksfile.lock")
+      Dir.chdir(dir) do
+        Bundler.with_clean_env do
+          sh "bundle exec berks install"
+        end
+      end
+    end
+  end
+
+  bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
+  bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
+  bundle_update_task :update_acceptance_gemfile_lock, "acceptance"
+end
+
+desc "Update all dependencies and check for outdated gems."
+task :dependencies_ci => [ "dependencies:update_ci" ]
+task :dependencies => [ "dependencies:update" ]
+task :update => [ "dependencies:update" ]

data/tasks/templates/prerelease.md.erb

@@ -1,35 +1,35 @@
-Ohai Chefs!
-
-We have selected <%= @version %> as our ChefDK 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-dk/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/chefdk/current/<%= @version %>) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
-
-```shell
-$ mixlib-install download chefdk -v <%= @version %> -c current
-```
-
-Alternatively, you can install ChefDK using one of the following command options:
-
-```shell
-# In Shell
-$ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chefdk -v <%= @version %> -c current
-
-# In Windows Powershell
-. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chefdk -version <%= @version %> -channel current
-```
-
-If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
-
-```yaml
-provisioner:
-  product_name: chefdk
-  channel: current
-  product_version: <%= @version %>
-```
+Ohai Chefs!
+
+We have selected <%= @version %> as our ChefDK 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-dk/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/chefdk/current/<%= @version %>) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
+
+```shell
+$ mixlib-install download chefdk -v <%= @version %> -c current
+```
+
+Alternatively, you can install ChefDK using one of the following command options:
+
+```shell
+# In Shell
+$ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chefdk -v <%= @version %> -c current
+
+# In Windows Powershell
+. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chefdk -version <%= @version %> -channel current
+```
+
+If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
+
+```yaml
+provisioner:
+  product_name: chefdk
+  channel: current
+  product_version: <%= @version %>
+```

data/tasks/templates/release.md.erb

@@ -1,34 +1,34 @@
-Ohai Chefs!
-
-We're happy to announce the release of ChefDK v<%= @maj_minor %>!
-
-# Release Highlights
-
-<%= @release_notes %>
-
-Please see the [CHANGELOG](https://github.com/chef/chef-dk/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/chefdk/<%= @version %>) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
-
-```shell
-$ mixlib-install download chefdk -v <%= @version %>
-```
-
-Alternatively, you can install ChefDK using one of the following command options:
-
-```shell
-# In Shell
-$ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chefdk -v <%= @version %>
-
-# In Windows Powershell
-. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chefdk -version <%= @version %>
-```
-
-If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
-
-```yaml
-provisioner:
-  product_name: chefdk
-  product_version: <%= @version %>
-```
+Ohai Chefs!
+
+We're happy to announce the release of ChefDK v<%= @maj_minor %>!
+
+# Release Highlights
+
+<%= @release_notes %>
+
+Please see the [CHANGELOG](https://github.com/chef/chef-dk/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/chefdk/<%= @version %>) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
+
+```shell
+$ mixlib-install download chefdk -v <%= @version %>
+```
+
+Alternatively, you can install ChefDK using one of the following command options:
+
+```shell
+# In Shell
+$ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chefdk -v <%= @version %>
+
+# In Windows Powershell
+. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chefdk -version <%= @version %>
+```
+
+If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
+
+```yaml
+provisioner:
+  product_name: chefdk
+  product_version: <%= @version %>
+```