gusteau 1.0.0.dev → 1.0.1.dev

data/.travis.yml

@@ -2,8 +2,7 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-  - rbx
-  - jruby
   - 2.0.0
+  - rbx
 env:
   - COVERAGE=coveralls

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 0.5.0
+## 1.0.1.dev / 2013-07-05
+* Fix the project generator bug
+* Make project generator output look nicer
+
+## 1.0.0.dev / 2013-07-04
+* Use the unified `.gusteau.yml` configuration file for all nodes and environments
+* Support more advanced configuration (multiple nodes per environment)
+* Provide 100% test coverage
+* Use omnibus installation if platform is unspecified
+* Update the template to include a test-kitchen setup with serverspec tests
 
-  * Use omibus installation if platform is unspecified
-  * Use the unified `.gusteau.yml` configuration file for all nodes and environments

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Locomote Pty Ltd
+Copyright (c) 2013 Locomote Pty Ltd and Authors.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/README.md

@@ -10,14 +10,20 @@ Gusteau
 Introduction
 ------------
 
-Gusteau is an easy to use configuration manager for Chef Solo and Vagrant. It provides an efficient interface to Chef Solo as well as some nice features:
+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.
 
-* Uses YAML for readable server configuration definitions
-* Uses a single SSH connection to stream compressed files and commands
-* Allows you to use normal Chef flags:
+Some of the features include:
+
+* YAML for readable infrastructure configuration
+* Usage of a single SSH connection to stream compressed files and commands
+* Support for normal Chef CLI flags:
   * `-W` or `--why-run` (dry run mode)
-  * `-l` for setting a log level and `-F` for setting an output formatter
-* Is able to bootstrap CentOS, RHEL, Ubuntu and Gentoo systems with chef-solo.
+  * `-l` for setting a log level and   `-F` for setting an output formatter
+* Bootstrapping target systems with Chef-Omnibus or custom scripts.
 
 Gettings started
 ----------------
@@ -25,10 +31,18 @@ Gettings started
 Gusteau is a Ruby gem:
 
 ```
-gem install gusteau --pre
+gem install gusteau
+```
+
+The following command generates an example Chef-repo:
+
 ```
+gusteau init project-name
+```
+
+Make sure you read through `project-name/README.md` first.
 
-A typical Gusteau configuration looks like this:
+A typical `.gusteau.yml` looks like this:
 
 ```
 environments:
@@ -52,26 +66,17 @@ environments:
         password: omgsecret
 ```
 
-Gusteau only needs a single node definition to run, but you'll need a few cookbooks to actually cook something :)
-The following command generates an example configuration to get you started:
-
-```
-gusteau init project-name
-```
-
-Next, `cd project-name` and see `.gusteau.yml`.
-
 
 Converging a server
 ----------
 
-The following command will run all roles and recipes from node's YAML file.
+The following command will run the whole run_list on the node.
 
 ```
 gusteau converge development-playground
 ```
 
-Use the `--bootstrap` or `-b` flag to bootstrap chef-solo (for the first time run).
+Use the `--bootstrap` or `-b` flag to bootstrap chef-solo (e.g. during the first run).
 
 Applying individual recipes
 -----------
@@ -99,18 +104,20 @@ gusteau ssh_config >> ~/.ssh/config
 
 Using with 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 yml files.
+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.
 
 ```
 ...
-vagrant:
-  IP: 192.168.100.20
-  cpus: 1
-  memory: 512
-  box_url: 'https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box'
+nodes:
+  www:
+    vagrant:
+      IP: 192.168.100.20
+      cpus: 1
+      memory: 512
+      box_url: 'https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box'
 ```
 
-The following bit will configure Vagrant for all Gusteau nodes which have `vagrant` section defined.
+The following snippet configures Vagrant for all Gusteau nodes which have `vagrant` sections defined.
 
 ```
 Vagrant.configure('2') do |config|
@@ -124,7 +131,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`.
-* If you'd like to use Vagrant's own automatic `chef_solo` provisioner, set `provision` to `true`.
+* 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:
 
@@ -136,5 +143,5 @@ Notes
 -----
 
 * Feel free to contribute a [bootstrap script](https://github.com/locomote/gusteau/tree/master/bootstrap) for your platform.
-* Gusteau uploads `./cookbooks` and `./site-cookbooks` from the current working directory.
+
 

data/bin/gusteau

@@ -20,7 +20,7 @@ class Gusteau::CLI < Optitron::CLI
 
   desc 'Apply a run_list'
   def apply(node_name, run_list)
-    node(node_name).apply(params, run_list.split(","))
+    node(node_name).apply(run_list.split(","), params)
   end
 
   desc 'SSH into a node'
@@ -38,6 +38,11 @@ class Gusteau::CLI < Optitron::CLI
     Gusteau::Bureau.new(bureau_name).generate!
   end
 
+  desc 'Lists all known nodes'
+  def list
+    puts "Known nodes are:\n - #{nodes.keys.join("\n - ")}"
+  end
+
   private
 
   def node(node_name)

data/lib/gusteau/bureau.rb

@@ -22,7 +22,7 @@ module Gusteau
       yaml_template '.gusteau.yml'
       text_template 'README.md'
       json_template "data_bags/users/#{@login}.json", "data_bags/users/user.json.erb"
-      Dir.chdir(name) { system "bash ./init.sh ; rm ./init.sh" } if(init)
+      Dir.chdir(@name) { exec "bash ./init.sh #{@name} ; rm ./init.sh" } if(init)
     end
 
     private

data/lib/gusteau/node.rb

@@ -17,7 +17,7 @@ module Gusteau
       server.chef.run opts, dna
     end
 
-    def apply(opts = {}, run_list)
+    def apply(run_list, opts = {})
       server.chef.run opts, dna(run_list)
     end
 

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "1.0.0.dev"
+  VERSION = "1.0.1.dev"
 end

data/spec/lib/gusteau/node_spec.rb

@@ -44,7 +44,7 @@ describe Gusteau::Node do
         }
       }
       node.server.chef.expects(:run).with({}, dna)
-      node.apply({}, [ "recipe[nagios]", "role[base]" ])
+      node.apply([ "recipe[nagios]", "role[base]" ], {})
     end
   end
 

data/template/README.md.erb

@@ -67,4 +67,3 @@ To run the tests:
 bundle exec kitchen test
 ```
 
-*Happy cooking with Chef and Gusteau!*

data/template/init.sh

@@ -1,13 +1,17 @@
-#!/bin/bash
+#!/bin/bash -e
 
-echo "Installing gem dependencies"
+info()  { echo -e "\033[00;35m-----> $1\033[0m"; }
+error() { echo -e "\033[00;31m$1\033[0m"; }
+ok()    { echo -e "\033[00;32m$1\033[0m"; }
+
+info "Installing gem dependencies..."
 bundle
 
-echo "Downloading cookbooks"
+info "Downloading cookbooks..."
 bundle exec berks install --path ./cookbooks
 
 if [ ! $(vagrant -v | cut -f3 -d ' ' | cut -f2 -d '.') = "2" ]; then
-  echo "Sorry, 'gusteau init' only works with Vagrant 1.2.x"
+  error "Sorry, 'gusteau init' only works with Vagrant 1.2.x"
   exit 1
 fi
 
@@ -15,13 +19,20 @@ vagrant_boxes_dir="~/.vagrant.d/boxes"
 if [ -d "$vagrant_boxes_dir/opscode-ubuntu-13.04" ] &&
    [ ! -d "$vagrant_boxes_dir/example-box"]; then
 
-    echo "Found the opscode-ubuntu-13.04 box, creating a copy"
+    info "Found the opscode-ubuntu-13.04 box, creating a copy"
     cp -R "$vagrant_boxes_dir/{opscode-ubuntu-13.04,example-box}"
 fi
 
-echo "Installing Vagrant plugins"
+info "Installing Vagrant plugins..."
 vagrant plugin install vagrant-omnibus
 vagrant plugin install gusteau
 
-echo "Done!"
-echo "You can now run 'vagrant up' and then 'gusteau converge example-box'"
+info "Done!\n"
+
+ok "Happy cooking with\n"
+ok "             _/_          "
+ok " _,  , , (   /  _  __,  , ,"
+ok "(_)_(_/_/_)_(__(/_(_/(_(_/_"
+ok " /|                        "
+ok "(/"
+ok "\nYou can now 'cd $1/', 'vagrant up' and then 'gusteau converge example-box'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.0.0.dev
+  version: 1.0.1.dev
   prerelease: 6
 platform: ruby
 authors: