toque 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f761384eb96137f039fca62a1392d589c551e24b
-  data.tar.gz: a1fdae68c2bac72044d822a0efa92ecf8b187529
+  metadata.gz: d8c361fa7700cd4c77e837ec39883387620295eb
+  data.tar.gz: e233b14828e321676ec9c1ed46abf52ad45c3a5c
 SHA512:
-  metadata.gz: e8b70c8223223cc0e57d6eb28ce4b8258f7d31911212555c657fe25aa926ae3fc09571f5219baf669dadcc50be1021aa2d480161fd128161939f6465f1efc5f7
-  data.tar.gz: d183c37658c21a9271305fa9880618f97a550d03ecbde72d11234f5ecbb7a9edbfc6b46e8eb3d863370b000d2860dc611f9d7961270b3a347c4014ff84dc8aac
+  metadata.gz: 7dc8ce01d37c3668901bcbe13a1a0fb612ac43018a48d4f10f112d29d307f6bf38253b5911d65f14440b49efeacfce91fd542fac89fc17cadfcefdb80dbaaea4
+  data.tar.gz: 0774dbe0fb9c3dad72d75e63ea950122ba1b87b358c4fdb1b31be8cabd5a6679f0165f595dc76f1bb338b5e78a7c1535b097afab82bff76eaea9bb949eee7f56

data/README.md

@@ -30,8 +30,9 @@ installed on first `run_list` call. **Toque** uses chef omnibus installer to
 install a complete self-contained embedded chef environment.
 
 You can specify a specific chef version by setting `:chef_version` to
-something different to `:latest` or `nil`. An already installed version of
-chef will not be upgraded.
+something different to `nil`. If an already install with a different version
+exists **toque** will run omnibus installer with specified version to
+override installed chef.
 
 See `cap toque:config` for more options.
 

data/lib/toque/chef.rb

@@ -15,7 +15,7 @@ module Toque
             set_default :chef_omnibus_installer_url, 'http://www.opscode.com/chef/install.sh'
             set_default :cookbooks_paths, %w(config/cookbooks vendor/cookbooks)
             set_default :databags_path, 'config/databags'
-            set_default :chef_version, :latest
+            set_default :chef_version, '10.24.0'
             set_default :chef_debug, false
             set_default :chef_solo, '/opt/chef/bin/chef-solo'
 
@@ -65,10 +65,16 @@ module Toque
             #
             def install_command
               cmd = "#{top.sudo} bash"
-              cmd += " -s -- -v #{fetch :chef_version}" unless fetch(:chef_version) == :latest or fetch(:chef_version).nil?
+              cmd += " -s -- -v #{required_version}" unless required_version.nil?
               cmd
             end
 
+            # Return required chef version.
+            #
+            def required_version
+              fetch(:chef_version) || nil
+            end
+
             #
             # Tasks
             #
@@ -76,6 +82,7 @@ module Toque
             desc 'Install chef via omnibus installed if not preset.'
             task :check do
               install unless installed?
+              install unless installed_version != required_version && !required_version.nil?
             end
 
             desc 'Installs chef using omnibus installer.'

data/lib/toque/version.rb

@@ -1,7 +1,7 @@
 module Toque
   module VERSION
     MAJOR = 1
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     STAGE = nil
 

data/spec/toque/chef_spec.rb

@@ -130,7 +130,7 @@ describe Toque::Chef, 'loaded into capistrano' do
 
     it 'should install chef using omnibus installer' do
       @configuration.toque.chef.install
-      expect(@configuration).to have_run("sudo -p 'sudo password: ' true && curl -L http://www.opscode.com/chef/install.sh | sudo -p 'sudo password: ' bash")
+      expect(@configuration).to have_run("sudo -p 'sudo password: ' true && curl -L http://www.opscode.com/chef/install.sh | sudo -p 'sudo password: ' bash -s -- -v 10.24.0")
     end
 
     context 'with custom installer URL' do
@@ -138,7 +138,7 @@ describe Toque::Chef, 'loaded into capistrano' do
 
       it 'should install chef using custom omnibus installer' do
         @configuration.toque.chef.install
-        expect(@configuration).to have_run("sudo -p 'sudo password: ' true && curl -L http://mysrv.tld/inst.sh | sudo -p 'sudo password: ' bash")
+        expect(@configuration).to have_run("sudo -p 'sudo password: ' true && curl -L http://mysrv.tld/inst.sh | sudo -p 'sudo password: ' bash -s -- -v 10.24.0")
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toque
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jan Graichen