gusteau 1.0.6.dev → 1.0.7.dev

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.7.dev / 2013-07-10
+* Replace the fully-blown test-kitchen with a simpler serverspec setup
+* Randomise Vagrant IP address in the template
+* Add timestamp to generated vm names in the template to avoid naming conflicts
+
 ## 1.0.6.dev / 2013-07-09
 * Bugfix: Ruby 1.8.7 and Rubinius compatibility
 * Highlight node yaml with Coderay in `gusteau show`.
@@ -11,7 +16,6 @@
 * 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)
 

data/README.md

@@ -1,5 +1,4 @@
-Gusteau
-=======
+# Gusteau
 
 *"Anyone can cook."*
 
@@ -7,14 +6,13 @@ Gusteau
 [![Coverage Status](https://coveralls.io/repos/locomote/gusteau/badge.png)](https://coveralls.io/r/locomote/gusteau)
 [![Dependency Status](https://gemnasium.com/locomote/gusteau.png)](https://gemnasium.com/locomote/gusteau)
 
-Introduction
 ------------
 
-Gusteau is an easy to use configuration manager for Chef Solo and Vagrant.
-It aims to:
+Gusteau is an easy to use configuration manager for Chef Solo and Vagrant. It aims to:
 
-1. Provide Chef Solo users with a more efficient workflow
-2. Encourage new users to try and to switch to Chef by avoiding the complexity of Chef Server.
+* Provide existing Chef Solo users with a more efficient workflow
+* Make Chef Solo usable for a small to mid scale multi-node setup
+* Make Chef Solo more accessible for the new users
 
 Some of the features include:
 
@@ -25,8 +23,8 @@ Some of the features include:
   * `-l` for setting a log level and   `-F` for setting an output formatter
 * Bootstrapping target systems with Chef-Omnibus or custom scripts.
 
-Gettings started
-----------------
+
+## Getting started
 
 Gusteau is a Ruby gem:
 
@@ -70,8 +68,7 @@ environments:
 ```
 
 
-Converging a server
-----------
+## Converging a server
 
 The following command will run the whole run_list on the node.
 
@@ -81,16 +78,16 @@ gusteau converge development-playground
 
 Use the `--bootstrap` or `-b` flag to bootstrap chef-solo (e.g. during the first run).
 
-Applying individual recipes
------------
+## Applying individual recipes
+
 You may choose to run a custom run_list instead of the full convergence.
 
 ```
 gusteau apply development-playground "role[base],recipe[oh-my-zsh]"
 ```
 
-SSH
----
+## SSH
+
 Gusteau provides a useful shortcut that you may use to ssh into a node. If you haven't got passwordless authentication set up, Gusteau will use `user` and `password` values from the node configuration.
 
 ```
@@ -105,12 +102,11 @@ If you prefer calling ssh directly, you will find the `gusteau ssh_config` subco
 gusteau ssh_config >> ~/.ssh/config
 ```
 
-Using with Vagrant
-------------------
+## Vagrant
+
 Gusteau can save you from writing some Vagrantfile boilerplate code. It also enables you to move node-specific Vagrant configuration away from the Vagrantfile into node definitions.
 
 ```
-...
 nodes:
   www:
     vagrant:
@@ -127,14 +123,12 @@ Vagrant.configure('2') do |config|
   Gusteau::Vagrant.detect(config) do |setup|
     setup.prefix = 'loco'
     setup.defaults.box_url = 'http://example.com/vm/opscode_centos-6.4.box'
-    setup.provision = false
   end
 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`.
-* If you'd like to use Vagrant's own automatic `chef_solo` provisioner, set `provision` to `true`. *Not recommended* unless you really know what you are doing.
 
 Please note that the add-on only works with Vagrant ~> 1.2 and needs gusteau to be installed as a Vagrant plugin:
 
@@ -142,17 +136,7 @@ Please note that the add-on only works with Vagrant ~> 1.2 and needs gusteau to
 vagrant plugin install gusteau
 ```
 
-Notes
------
-### Bootstrapping
-
-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).
-
-Alternatively, you can specify a custom script in `.gusteau.yml`:
-
-```
-bootstrap: ./scripts/freebsd.sh
-```
+## Configuration
 
 ### Before and after hooks
 
@@ -166,6 +150,35 @@ after:
   - bundle exec rake spec
 ```
 
+### Attributes
+In addition to specifying `attributes` for environments you can set node-specifc ones. They will be deep-merged with environment ones:
+
+```
+environments:
+  staging:
+    attributes:    
+      hostname: staging
+    nodes:
+      one:
+        attributes: { hostname: staging-one }
+      two:
+        attributes: { hostname: staging-two }
+```
+
+### Run lists
+
+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).
+
+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`:
@@ -173,4 +186,4 @@ By default, Gusteau uploads and sets Chef Solo up to use cookbooks from `./cookb
 ```
 cookbooks_path: [ './my-cookbooks', '../something-else' ]
 roles_path: './base-roles'
-```
+```

data/lib/gusteau/bureau.rb

@@ -19,40 +19,28 @@ module Gusteau
 
     def generate!(init = true)
       FileUtils.cp_r(@template_path, @name)
-      yaml_template '.gusteau.yml'
-      text_template 'README.md'
-      json_template "data_bags/users/#{@login}.json", "data_bags/users/user.json.erb"
+      template '.gusteau.yml'
+      template 'README.md'
+      template 'spec/example-box/platform_spec.rb'
+      template "data_bags/users/#{@login}.json", "data_bags/users/user.json.erb"
       Dir.chdir(@name) { exec "bash ./init.sh #{@name} ; rm ./init.sh" } if(init)
     end
 
     private
 
-    def yaml_template(file)
-      replace_template file do |f|
-        read_erb_yaml("#{@template_path}/#{file}.erb").tap { |c| f.write(c.to_yaml) }
-      end
-    end
-
-    def json_template(file, src)
-      replace_template file, src do |f|
-        read_erb_json("#{@template_path}/#{src}").tap { |c| f.write JSON::pretty_generate(c) }
-      end
-    end
+    def template(dest, src = nil)
+      src = "#{dest}.erb" unless src
 
-    def text_template(file)
-      replace_template file do |f|
-        read_erb("#{@template_path}/#{file}.erb").tap { |t| f.write t }
+      replace_template dest, src do |f|
+        read_erb("#{@template_path}/#{src}").tap { |t| f.write(t) }
       end
     end
 
-    def replace_template(file, src = nil)
-      dest = "#{@name}/#{file}"
-      src  = "#{@name}/#{src}" if(src)
-
-      File.open(dest, 'w+') do |f|
+    def replace_template(dest, src)
+      File.open("#{@name}/#{dest}", 'w+') do |f|
         yield f
         f.close
-        FileUtils.rm(src || "#{dest}.erb")
+        FileUtils.rm("#{@name}/#{src}")
       end
     end
 

data/lib/gusteau/erb.rb

@@ -11,9 +11,5 @@ module Gusteau
     def read_erb_yaml(path)
       YAML::load(read_erb path)
     end
-
-    def read_erb_json(path)
-      JSON::parse(read_erb path)
-    end
   end
 end

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "1.0.6.dev"
+  VERSION = "1.0.7.dev"
 end

data/spec/lib/gusteau/bureau_spec.rb

@@ -21,11 +21,11 @@ describe Gusteau::Bureau do
     it "should create a basic structure" do
       assert File.exists?(bureau_path)
 
-      %w{ Berksfile Vagrantfile .kitchen.yml }.each do |f|
+      %w{ Berksfile Vagrantfile }.each do |f|
         assert File.exists?("#{bureau_path}/#{f}")
       end
 
-      %w{ data_bags site-cookbooks test }.each do |d|
+      %w{ data_bags site-cookbooks spec }.each do |d|
         assert File.exists?("#{bureau_path}/#{d}")
       end
     end
@@ -36,10 +36,34 @@ describe Gusteau::Bureau do
       assert File.read(readme_path).include?("Welcome to your example Chef-Repo, #{login}")
     end
 
-    it "should process the .gusteau.yml template" do
-      config_path = "#{bureau_path}/.gusteau.yml"
-      assert File.exists?(config_path)
-      assert File.read(config_path).include?("Good job, #{login}")
+    describe ".gusteau.yml" do
+      let(:config_path) { "#{bureau_path}/.gusteau.yml" }
+
+      it "should should exist" do
+        assert File.exists?(config_path)
+      end
+
+      describe "template contents" do
+        before     { Gusteau::Config.read(config_path) }
+        let(:node) { Gusteau::Config.nodes['example-box'] }
+
+        let(:server)     { node.config['server'] }
+        let(:attributes) { node.config['attributes'] }
+
+        it "should contain a personalized greeting" do
+          attributes['cowsay']['greeting'].must_equal "Good job, #{login}!"
+        end
+
+        it "should invoke user creation" do
+          attributes['users'].must_equal [ login ]
+        end
+
+        it "should set a randomized ip address" do
+          ip_regexp = /33\.33\.\d{1,3}\.\d{1,3}/
+          server['host'].must_match ip_regexp
+          server['vagrant']['IP'].must_match ip_regexp
+        end
+      end
     end
 
     it "should process the user data_bag template" do

data/template/.gusteau.yml.erb

@@ -1,5 +1,7 @@
 before:
  - bundle exec berks install --path ./cookbooks
+after:
+ - bundle exec rake spec
 
 environments:
   example:
@@ -12,13 +14,13 @@ environments:
     run_list:
       - recipe[platform]
       - recipe[cowsay]
-
+    <% ip = "33.33.#{rand(0..255)}.#{rand(2..255)}" %>
     nodes:
       box:
-        host: 33.33.33.10
+        host: <%= ip %>
         user: vagrant
         password: vagrant
         vagrant:
-          IP: 33.33.33.10
+          IP: <%= ip %>
           cpu: 1
           memory: 256

data/template/Gemfile

@@ -2,10 +2,7 @@
 
 source 'https://rubygems.org'
 
+gem 'rake'
 gem 'berkshelf'
 gem 'gusteau'
-
-group :integration do
-  gem 'test-kitchen', '~> 1.0.0.alpha.7'
-  gem 'kitchen-vagrant', '~> 0.10.0'
-end
+gem 'serverspec'

data/template/Rakefile

@@ -0,0 +1,6 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end

data/template/Vagrantfile

@@ -12,5 +12,6 @@ Vagrant.configure('2') do |config|
 
   Gusteau::Vagrant.detect(config) do |setup|
     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
 end

data/template/{test/integration/default/serverspec/localhost/platform_spec.rb → spec/example-box/platform_spec.rb.erb}

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe 'platform role' do
-
+describe 'platform' do
   describe 'build-essential' do
     describe package('build-essential') do
       it { should be_installed }
@@ -16,10 +15,10 @@ describe 'platform role' do
     end
   end
 
-  describe user('remi') do
+  describe user("<%= @login %>") do
     it { should exist }
-    it { should belong_to_group 'wheel' }
+    it { should belong_to_group "<%= @login %>" }
     it { should have_login_shell '/bin/bash' }
-    it { should have_authorized_key 'ABC123' }
+    it { should have_authorized_key "<%= @ssh_key %>" }
   end
 end

data/template/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+require 'serverspec'
+require 'pathname'
+require 'net/ssh'
+require 'gusteau'
+
+include Serverspec::Helper::Ssh
+include Serverspec::Helper::DetectOS
+
+RSpec.configure do |c|
+  c.color = true
+  c.formatter = :doc
+
+  c.before :all do
+    block = self.class.metadata[:example_group_block]
+    file = block.source_location.first
+    nodename = File.basename(Pathname.new(file).dirname)
+
+    Gusteau::Config.read('.gusteau.yml')
+    server = Gusteau::Config.nodes[nodename].config['server']
+
+    if c.host != server['host']
+      c.ssh.close if c.ssh
+      c.host = server['host']
+      user   = server['user'] || 'root'
+      opts   = server['password'] ? { :password => server['password'] } : {}
+      c.ssh  = Net::SSH.start(c.host, user, opts)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.0.6.dev
+  version: 1.0.7.dev
   prerelease: 6
 platform: ruby
 authors:
@@ -272,10 +272,10 @@ files:
 - spec/spec_helper.rb
 - template/.gitignore
 - template/.gusteau.yml.erb
-- template/.kitchen.yml
 - template/Berksfile
 - template/Gemfile
 - template/README.md.erb
+- template/Rakefile
 - template/Vagrantfile
 - template/data_bags/users/user.json.erb
 - template/init.sh
@@ -284,10 +284,9 @@ files:
 - template/site-cookbooks/cowsay/recipes/default.rb
 - template/site-cookbooks/platform/metadata.rb
 - template/site-cookbooks/platform/recipes/default.rb
-- template/test/integration/data_bags/users/remi.json
-- template/test/integration/default/serverspec/localhost/cowsay_spec.rb
-- template/test/integration/default/serverspec/localhost/platform_spec.rb
-- template/test/integration/default/serverspec/spec_helper.rb
+- template/spec/example-box/cowsay_spec.rb
+- template/spec/example-box/platform_spec.rb.erb
+- template/spec/spec_helper.rb
 homepage: http://gusteau.gs
 licenses: []
 post_install_message: 
@@ -302,7 +301,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2949705327041746768
+      hash: -925332581546681744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/template/.kitchen.yml

@@ -1,20 +0,0 @@
----
-driver_plugin: vagrant
-
-platforms:
-- name: ubuntu-13.04
-  driver_config:
-    box: example-box # opscode-ubuntu-13.04
-    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box
-    require_chef_omnibus: true
-
-suites:
-- name: default
-  attributes:
-    users:
-    - remi
-    cowsay:
-      greeting: "Hello test-kitchen"
-  run_list:
-  - recipe[platform]
-  - recipe[cowsay]

data/template/test/integration/data_bags/users/remi.json

@@ -1,7 +0,0 @@
-{
-  "id"      : "remi",
-  "home"    : "/home/remi",
-  "shell"   : "/bin/bash",
-  "groups"  : ["remi", "wheel"],
-  "ssh_keys": ["ABC123"]
-}

data/template/test/integration/default/serverspec/spec_helper.rb

@@ -1,9 +0,0 @@
-require 'serverspec'
-
-include Serverspec::Helper::Exec
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.color = true
-  c.formatter = :doc
-end