Pick up latest version of mixlib-install.

chef-cookbooks · Dec 3, 2015 · 000aebc · 000aebc
1 parent 7418a77
commit 000aebc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,7 @@ before_script:
   # We have to install chef-sugar for ChefSpec
   - /opt/chefdk/embedded/bin/chef gem install chef-sugar
   - /opt/chefdk/embedded/bin/chef gem install mixlib-versioning
+  - /opt/chefdk/embedded/bin/chef gem install mixlib-install --pre
 script:
   - /opt/chefdk/embedded/bin/chef --version
   - /opt/chefdk/embedded/bin/rubocop --version

diff --git a/Gemfile b/Gemfile
@@ -9,9 +9,7 @@ end
 
 group :unit do
   gem 'mixlib-versioning'
-  # gem 'mixlib-install'
-  # TODO: Remove local gem installation
-  gem 'mixlib-install', path: '../../mixlib-install'
+  gem 'mixlib-install', '~> 0.8.0.alpha'
   gem 'chef-sugar'
   gem 'chefspec'
   gem 'chef-dk'

diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -80,7 +80,7 @@ def ensure_mixlib_versioning_gem_installed!
     #
     def ensure_mixlib_install_gem_installed!
       node.run_state[:mixlib_install_gem_installed] ||= begin # ~FC001
-        install_gem_from_rubygems('mixlib-install', '0.8.0.alpha.0')
+        install_gem_from_rubygems('mixlib-install', '0.8.0.alpha.1')
 
         require 'mixlib/install'
         require 'mixlib/install/product'

diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb
@@ -9,11 +9,11 @@
     its(:exit_status) { should eq 0 }
   end
 
-  describe package('opscode-manage') do
+  describe package('chef-manage') do
     it { should be_installed }
   end
 
-  describe command('opscode-manage-ctl test') do
+  describe command('chef-manage-ctl test') do
     its(:exit_status) { should eq 0 }
   end
 end