gusteau 1.1.1 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.0 / 2013-07-17
+* Add ability to configure the version of Chef which will be bootstrapped - [@ctaintor][], [#30][]
+* Add 'box' configuration option for vagrant VMs - [@ctaintor][], [#29][]
+* RVM related issue ([CHEF-3581](http://tickets.opscode.com/browse/CHEF-3581)) work around: run chef-solo without `GEM_HOME` `GEM_PATH` - [@locochris][], [#26][]
+
 ## 1.1.1 / 2013-07-14
 * Bugfix: environment attributes got altered by node ones
 
@@ -19,6 +24,7 @@
 * Bugfix: `after` hook was not taking effect
 * Add a quick `show nodename` subcommand for printing out individual node configuration
 * Add an ability to configure `cookbooks_path` and `roles_path` from within `.gusteau.yml`
+
 ## 1.0.3.dev / 2013-07-07
 * Implement `before` and `after` hooks (global and environment-based)
 
@@ -36,3 +42,9 @@
 * Use omnibus installation if platform is unspecified
 * Update the template to include a test-kitchen setup with serverspec tests
 
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#26]: https://github.com/locomote/gusteau/issues/26
+[#29]: https://github.com/locomote/gusteau/issues/29
+[#30]: https://github.com/locomote/gusteau/issues/30
+[@ctaintor]: https://github.com/ctaintor
+[@locochris]: https://github.com/locochris

data/README.md

@@ -116,7 +116,7 @@ nodes:
 
 The following snippet configures Vagrant for all Gusteau nodes which have `vagrant` sections defined.
 
-```
+```ruby
 Vagrant.configure('2') do |config|
   Gusteau::Vagrant.detect(config) do |setup|
     setup.prefix = 'loco'
@@ -126,7 +126,7 @@ end
 ```
 
 * The `prefix` option lets you prepend your VirtualBox VMs names, e.g. `loco-nodename`.
-* The `defaults` one lets you provide default values for `cpus`, `memory`, `box_url`.
+* The `defaults` one lets you provide default values for `cpus`, `memory`, `box_url`, `box`.
 
 Please note that the add-on only works with Vagrant ~> 1.2 and needs gusteau to be installed as a Vagrant plugin:
 
@@ -169,7 +169,13 @@ You can also override `run_list` for specific nodes.
 
 ### Bootstrap script
 
-By default, Gusteau installs the [Omnibus Chef](http://www.opscode.com/chef/install/). However if you're targetting an unsupported platform you might want to specify the `platform` value for a node: this invokes a specific [script](https://github.com/locomote/gusteau/tree/master/bootstrap).
+By default, Gusteau installs the [Omnibus Chef](http://www.opscode.com/chef/install/) 11.4.4. You can also set the Omnibus Chef version explicitly by specifying it in `.gusteau.yml`:
+
+```
+chef_version: 10.26.0
+```
+
+If you're targeting a non Omnibus-supported platform you might want to specify the `platform` value for a node: this invokes a specific [script](https://github.com/locomote/gusteau/tree/master/bootstrap).
 
 Alternatively, you can specify a custom script in `.gusteau.yml`:
 
@@ -177,6 +183,7 @@ Alternatively, you can specify a custom script in `.gusteau.yml`:
 bootstrap: ./scripts/freebsd.sh
 ```
 
+
 ### Custom cookbooks path
 
 By default, Gusteau uploads and sets Chef Solo up to use cookbooks from `./cookbooks` and `./site-cookbooks` directories. If it doesn't work for you, you can override these values in `.gusteau.yml`:

data/bootstrap/omnibus.sh

@@ -1,15 +1,19 @@
 #!/bin/sh
+# Usage: omnibus.sh VERSION - installs the requested version of Chef, skipping if it's already installed
 
 install_sh="https://www.opscode.com/chef/install.sh"
-version="11.4.4"
+requested_version=$1
 
 if type -p chef-solo > /dev/null; then
-  echo "Using chef-solo $(chef-solo --v | awk '{print $2}') at $(which chef-solo)"
+  installed_version=$(chef-solo --v | awk '{print $2}')
+fi
+if [ $installed_version == $requested_version ]; then
+  echo "Using chef-solo $installed_version at $(which chef-solo)"
 else
   if command -v curl &>/dev/null; then
-    curl -L "$install_sh" | sudo bash -s -- -v "$version"
+    curl -L "$install_sh" | sudo bash -s -- -v "$requested_version"
   elif command -v wget &>/dev/null; then
-    wget -qO- "$install_sh" | sudo bash -s -- -v "$version"
+    wget -qO- "$install_sh" | sudo bash -s -- -v "$requested_version"
   else
     echo "Neither wget nor curl found. Please install one." >&2
     exit 1

data/lib/gusteau/chef.rb

@@ -14,9 +14,9 @@ module Gusteau
         @server.upload [dir], @dest_dir, :exclude => '.git/', :strip_c => 2
       end
 
-      @server.run "sh /etc/chef/bootstrap.sh" if opts['bootstrap']
+      @server.run "sh /etc/chef/bootstrap.sh #{Gusteau::Config.settings['chef_version']}" if opts['bootstrap']
 
-      cmd  = "chef-solo -c #{@dest_dir}/solo.rb -j #{@dest_dir}/dna.json --color"
+      cmd  = "unset GEM_HOME; unset GEM_PATH; chef-solo -c #{@dest_dir}/solo.rb -j #{@dest_dir}/dna.json --color"
       cmd << " -F #{opts['format']}"    if opts['format']
       cmd << " -l #{opts['log_level']}" if opts['log_level']
       cmd << " -W"                      if opts['why-run']

data/lib/gusteau/config.rb

@@ -3,6 +3,8 @@ require 'gusteau/helpers'
 
 module Gusteau
   class Config
+    DEFAULT_CHEF_VERSION = '11.4.4'
+
     include Gusteau::ERB
 
     def self.read(config_path)
@@ -45,7 +47,8 @@ module Gusteau
       {
         'cookbooks_path' => @config['cookbooks_path'] || ['cookbooks', 'site-cookbooks'],
         'roles_path'     => @config['roles_path'] || 'roles',
-        'bootstrap'      => @config['bootstrap']
+        'bootstrap'      => @config['bootstrap'],
+        'chef_version'   => @config['chef_version'] || DEFAULT_CHEF_VERSION
       }
     end
 

data/lib/gusteau/vagrant.rb

@@ -40,9 +40,14 @@ module Gusteau
         defaults[:box_url]
       end
 
+      # If no one set the VirtualBox box name explicitly, use the end of the box_url
+      # as the box name
+      box_name = config.fetch('box', defaults[:box] || box_url.sub(/.*\/([^\/]+).box$/,'\1'))
+
       {
         :name    => node.name,
         :label   => label,
+        :box     => box_name,
         :box_url => box_url,
         :ip      => config['IP']     || defaults[:ip],
         :cpus    => config['cpus']   || defaults[:cpus]   || 1,
@@ -54,7 +59,7 @@ module Gusteau
       vm_config = vm_config(node, options)
 
       config.vm.define vm_config[:name] do |instance|
-        instance.vm.box     = vm_config[:name]
+        instance.vm.box     = vm_config[:box]
         instance.vm.box_url = vm_config[:box_url]
 
         instance.vm.provider :virtualbox do |vb|

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/config/emile.yml

@@ -5,3 +5,5 @@ cookbooks_path:
 roles_path: basic-roles
 
 bootstrap: ./bootstrap/osx.sh
+
+chef_version: 10.26.0

data/spec/lib/gusteau/chef_spec.rb

@@ -31,7 +31,7 @@ describe Gusteau::Chef do
       let(:bootstrap) { true }
 
       it "should run the bootstrap script and chef solo" do
-        server.expects(:run).with('sh /etc/chef/bootstrap.sh')
+        server.expects(:run).with('sh /etc/chef/bootstrap.sh 10.26.0')
         expects_run_chef_solo
         chef.run({ :path => '/tmp/node.json' }, opts)
       end

data/spec/lib/gusteau/config_spec.rb

@@ -41,18 +41,20 @@ describe Gusteau::Config do
     describe "#settings" do
       let(:settings) { Gusteau::Config.settings }
 
-      it "should have defaults for cookbooks_path, roles_path, bootstrap" do
+      it "should have defaults for cookbooks_path, roles_path, bootstrap, chef_version" do
         settings['cookbooks_path'].must_equal ['cookbooks', 'site-cookbooks']
         settings['roles_path'].must_equal 'roles'
         settings['bootstrap'].must_equal nil
+        settings['chef_version'].must_equal Gusteau::Config::DEFAULT_CHEF_VERSION
       end
 
       context "settings defined in the config yml" do
         before { Gusteau::Config.read("./spec/config/emile.yml") }
 
-        it "should have defaults for cookbooks_path, roles_path" do
+        it "should have defaults for cookbooks_path, roles_path, chef_version" do
           settings['cookbooks_path'].must_equal ['private-cookbooks', '/home/user/.cookbooks']
           settings['roles_path'].must_equal 'basic-roles'
+          settings['chef_version'].must_equal '10.26.0'
         end
       end
     end

data/spec/lib/gusteau/vagrant_spec.rb

@@ -21,7 +21,7 @@ describe Gusteau::Vagrant do
     end
 
     it "should define vm instances with correct settings" do
-      subvm.expects('box='.to_sym).with('development-playground')
+      subvm.expects('box='.to_sym).with('b')
       subvm.expects('box_url='.to_sym).with("http://a.com/b.box")
       subvm.expects(:network).with(:private_network, { :ip => '192.168.100.21' })
       subvm.expects(:provision).never
@@ -71,6 +71,7 @@ describe Gusteau::Vagrant do
         {
           :name    => 'development-playground',
           :label   => expected_label,
+          :box     => 'centos-6.4',
           :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box',
           :ip      => '192.168.100.21',
           :cpus    => 2,
@@ -98,6 +99,31 @@ describe Gusteau::Vagrant do
           proc { subject }.must_raise RuntimeError
         end
       end
+
+      context "box specified" do
+        let(:defaults) do
+          {
+            :box     => 'custom_box_name',
+            :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box'
+          }
+        end
+
+        it "should use default attribute" do
+          subject[:box].must_equal "custom_box_name"
+        end
+
+        context "as node attribute" do
+          let(:node) do
+            Gusteau::Config.nodes['development-playground'].tap do |node|
+              node.config['server']['vagrant']['box'] = 'another_box_name'
+            end
+          end
+
+          it "should use node attribute" do
+            subject[:box].must_equal 'another_box_name'
+          end
+        end
+      end
     end
 
     describe "#define_provisioner" do

data/template/Gemfile

@@ -5,4 +5,4 @@ source 'https://rubygems.org'
 gem 'rake'
 gem 'berkshelf'
 gem 'gusteau'
-gem 'serverspec'
+gem 'serverspec', '~> 0.6.30'

data/template/Vagrantfile

@@ -11,6 +11,7 @@ Vagrant.configure('2') do |config|
   config.omnibus.chef_version = '11.4.4'
 
   Gusteau::Vagrant.detect(config) do |setup|
+    setup.defaults.box = 'opscode-ubuntu-13.04'
     setup.defaults.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box'
     setup.prefix = Time.now.to_i
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -302,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -340047835644286635
+      hash: 325111124965789744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -340047835644286635
+      hash: 325111124965789744
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23