Merge pull request #99 from Nordstrom/feature/update_ohai_plugin_syntax

Release 1.5.4
Nordstrom · Feb 18, 2016 · d03035b · d03035b
2 parents ae33f19 + 0eaeafc
commit d03035b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -4,19 +4,22 @@ DEPENDENCIES
     metadata: true
 
 GRAPH
-  build-essential (2.2.4)
-  chef_handler (1.2.0)
-  chefdk_bootstrap (1.5.3)
+  7-zip (1.0.2)
+    windows (>= 1.2.2)
+  build-essential (2.3.1)
+    7-zip (>= 0.0.0)
+  chef_handler (1.3.0)
+  chefdk_bootstrap (1.5.4)
     chocolatey (~> 0.6)
     homebrew (~> 2.0)
-    vagrant (~> 0.4)
+    vagrant (~> 0.5)
     windows (~> 1.39)
   chocolatey (0.6.2)
     windows (~> 1.38)
   dmg (2.3.0)
-  homebrew (2.0.4)
+  homebrew (2.0.5)
     build-essential (>= 2.1.2)
-  vagrant (0.4.2)
+  vagrant (0.5.0)
     dmg (>= 2.2.2)
     windows (~> 1.38)
   windows (1.39.1)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Revision History for chefdk_bootstrap
 
-## Unreleased
+## 1.5.4
 * Use sudo to remove temporary directory
 * Switch .kitchen.yml to use @mwrockx's Windows2012R2 Atlas Vagrant box.
 * Mac: Fix #81 by hiding script download progress from curl
 * Improve spec coverage from 46% to 87%
+* Bootstrap now writes correct Ohai disabled_plugins syntax to remove deprecation warning.
 
 ## 1.5.3
 * Mac: Don't create directories which homebrew cookbook already creates

diff --git a/bootstrap b/bootstrap
@@ -62,7 +62,7 @@ EOF
 # create client.rb file so that Chef client can find its dependant cookbooks
 cat > "${tempInstallDir}/client.rb" <<EOF;
 cookbook_path File.join(Dir.pwd, 'berks-cookbooks')
-Ohai::Config[:disabled_plugins] = [:Passwd]
+ohai.disabled_plugins = [:Passwd]
 EOF
 
 cat <<EOF;

diff --git a/bootstrap.ps1 b/bootstrap.ps1
@@ -65,6 +65,7 @@ cookbook '$bootstrapCookbook'
 
 $chefConfig = @"
 cookbook_path File.join(Dir.pwd, 'berks-cookbooks')
+ohai.disabled_plugins = [:Passwd]
 "@
 
 $introduction = @"

diff --git a/metadata.rb b/metadata.rb
@@ -18,14 +18,14 @@
 maintainer_email 'techcheftm@nordstrom.com'
 license          'Apache 2.0'
 description      'Bootstrap a developer workstation for local Chef development using the ChefDK'
-version          '1.5.3'
+version          '1.5.4'
 
 supports 'windows'
 supports 'mac_os_x'
 
 depends 'chocolatey', '~> 0.6'
 depends 'homebrew', '~> 2.0'
-depends 'vagrant', '~> 0.4'
+depends 'vagrant', '~> 0.5'
 depends 'windows', '~> 1.39'
 
 source_url 'https://github.com/Nordstrom/chefdk_bootstrap'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -68,8 +68,8 @@
   # get run.
   if ENV['CI']
     config.before(:example, :focus) do
-      fail ArgumentError,
-           'Failing the CI build because you have focused specs. See https://github.com/rspec/rspec-core/issues/1747.'
+      raise ArgumentError,
+            'Failing the CI build because you have focused specs. See https://github.com/rspec/rspec-core/issues/1747.'
     end
   else
     config.filter_run :focus