gusteau 1.0.2.dev → 1.0.3.dev

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.3.dev / 2013-07-07
+* Implement 'before' and 'after' hooks (global and environment-based)
+
 ## 1.0.2.dev / 2013-07-06
 * Fix Ruby 1.8.7 and Rubinius compatibility
 

data/README.md

@@ -12,7 +12,7 @@ Introduction
 
 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.
 
@@ -45,6 +45,9 @@ Make sure you read through `project-name/README.md` first.
 A typical `.gusteau.yml` looks like this:
 
 ```
+before:
+  - bundle exec berks install --path ./cookbooks
+
 environments:
   development:
     attributes:

data/lib/gusteau/chef.rb

@@ -6,7 +6,7 @@ module Gusteau
       @dest_dir = dest_dir
     end
 
-    def run(opts, dna)
+    def run(dna, opts)
       @server.run "rm -rf #{@dest_dir} && mkdir #{@dest_dir} && mkdir -p /tmp/chef"
 
       @server.upload(src_files(dna[:path]), @dest_dir, :exclude => '.git/')

data/lib/gusteau/config.rb

@@ -8,12 +8,14 @@ module Gusteau
 
     def nodes(config_path)
       if File.exists?(config_path)
-        env_config = read_erb_yaml(config_path)['environments']
+        config = read_erb_yaml(config_path)
+        env_config = config['environments']
+
         env_config.inject({}) do |nodes, (env_name, env_hash)|
           if env_hash['nodes']
             env_hash['nodes'].each_pair do |node_name, node_hash|
               node_name = "#{env_name}-#{node_name}"
-              nodes[node_name] = build_node(node_name, env_hash, node_hash)
+              nodes[node_name] = build_node(config, node_name, env_hash, node_hash)
             end
           end
           nodes
@@ -26,12 +28,14 @@ module Gusteau
     #
     # Node attributes get deep-merged with the environment ones
     # Node run_list overrides the environment one
+    # Environment before hooks override global ones
     #
-    def build_node(node_name, env_hash, node_hash)
+    def build_node(config, node_name, env_hash, node_hash)
       config = {
         'server'     => node_hash,
-        'attributes' => env_hash['attributes'].deep_merge(node_hash['attributes'] || {}),
-        'run_list'   => node_hash['run_list'] || env_hash['run_list']
+        'attributes' => (env_hash['attributes'] || {}).deep_merge(node_hash['attributes'] || {}),
+        'run_list'   => node_hash['run_list'] || env_hash['run_list'],
+        'before'     => env_hash['before'] || config['before']
       }
       Gusteau::Node.new(node_name, config)
     end

data/lib/gusteau/node.rb

@@ -3,6 +3,8 @@ require 'gusteau/chef'
 
 module Gusteau
   class Node
+    include Gusteau::Log
+
     attr_reader :name, :config, :server
 
     def initialize(name, config)
@@ -14,11 +16,15 @@ module Gusteau
     end
 
     def converge(opts = {})
-      server.chef.run opts, dna
+      with_hooks do
+        server.chef.run dna, opts
+      end
     end
 
     def apply(run_list, opts = {})
-      server.chef.run opts, dna(run_list)
+      with_hooks do
+        server.chef.run dna(run_list), opts
+      end
     end
 
     def ssh
@@ -27,6 +33,22 @@ module Gusteau
 
     private
 
+    def with_hooks(&block)
+      hook 'before'
+      yield
+      hook 'after'
+    end
+
+    def hook(hook_type)
+      (@config[hook_type] || []).each do |cmd|
+        Kernel.system cmd
+        unless $?.exitstatus == 0
+          log_error "Error executing a #{hook_type} hook: '#{cmd}'"
+          exit 1
+        end
+      end
+    end
+
     def dna(run_list = nil)
       node_dna = {
         :path => @dna_path,

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "1.0.2.dev"
+  VERSION = "1.0.3.dev"
 end

data/spec/config/remi.yml

@@ -2,7 +2,12 @@ default_node: &default_node
   platform: centos
   user: billy
 
+before:
+  - bundle exec berks install
+
 environments:
+  staging: { before: [ echo "Hello World!" ], nodes:  { vm: { host: '192.168.1.15'} } }
+
   production:
     attributes:
       users:

data/spec/lib/gusteau/chef_spec.rb

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

data/spec/lib/gusteau/config_spec.rb

@@ -13,7 +13,7 @@ describe Gusteau::Config do
     let(:nodes) { Gusteau::Config.nodes("./spec/config/remi.yml") }
 
     it "should name nodes as per environment-node" do
-      nodes.keys.sort.must_equal ["production-db", "production-www"]
+      nodes.keys.sort.must_equal ["production-db", "production-www", "staging-vm"]
     end
 
     it "should override run_list if defined for a node" do
@@ -27,5 +27,10 @@ describe Gusteau::Config do
         'mysql' => {'server_port' => 3307, 'server_root_password' => 'prodsecret' }
       })
     end
+
+    it "should override the global before hook with an environment one" do
+      nodes['production-www'].config['before'].must_equal(['bundle exec berks install'])
+      nodes['staging-vm'].config['before'].must_equal(['echo "Hello World!"'])
+    end
   end
 end

data/spec/lib/gusteau/node_spec.rb

@@ -12,39 +12,49 @@ describe Gusteau::Node do
     end
   end
 
+  let(:before_hooks) { ['bundle', 'vagrant up'] }
+
   let(:node) do
     config = {
       'run_list' => [ "recipe[zsh]", "recipe[git]" ],
-      'server' => { 'host' => 'example.com' }
+      'server' => { 'host' => 'example.com' },
+      'before' => before_hooks
     }
     Gusteau::Node.new 'test', config
   end
 
-  describe "#converge" do
-    it "should run chef with the full run_list" do
-      dna = {
-        :path => '/tmp/dna.json',
-        :hash => {
-          :instance_role => 'test',
-          :run_list => ['recipe[zsh]', 'recipe[git]']
+  describe "provisioning" do
+    before do
+      node.expects(:hook).once.with 'before'
+      node.expects(:hook).once.with 'after'
+    end
+
+    describe "#converge" do
+      it "should run chef with the full run_list" do
+        dna = {
+          :path => '/tmp/dna.json',
+          :hash => {
+            :instance_role => 'test',
+            :run_list => ['recipe[zsh]', 'recipe[git]']
+          }
         }
-      }
-      node.server.chef.expects(:run).with({}, dna)
-      node.converge
+        node.server.chef.expects(:run).with(dna, {})
+        node.converge
+      end
     end
-  end
 
-  describe "#apply" do
-    it "should run chef with the specific run_list" do
-      dna = {
-        :path => '/tmp/dna.json',
-        :hash => {
-          :instance_role => 'test',
-          :run_list => ['recipe[nagios]', 'role[base]']
+    describe "#apply" do
+      it "should run chef with the specific run_list" do
+        dna = {
+          :path => '/tmp/dna.json',
+          :hash => {
+            :instance_role => 'test',
+            :run_list => ['recipe[nagios]', 'role[base]']
+          }
         }
-      }
-      node.server.chef.expects(:run).with({}, dna)
-      node.apply([ "recipe[nagios]", "role[base]" ], {})
+        node.server.chef.expects(:run).with(dna, {})
+        node.apply([ "recipe[nagios]", "role[base]" ], {})
+      end
     end
   end
 
@@ -54,4 +64,21 @@ describe Gusteau::Node do
       node.ssh
     end
   end
+
+  describe "#hook" do
+    it "should execute system commands" do
+      Kernel.expects(:system).with('bundle')
+      Kernel.expects(:system).with('vagrant up')
+      node.server.chef.expects(:run)
+      node.apply([], {})
+    end
+
+    context "command doesn't succeed" do
+      let(:before_hooks) { %w{ohwhatthehellerror} }
+
+      it "should exit with error" do
+        proc { node.apply([], {}) }.must_raise SystemExit
+      end
+    end
+  end
 end

data/template/.gusteau.yml.erb

@@ -1,3 +1,6 @@
+before:
+ - bundle exec berks install --path ./cookbooks
+
 environments:
   example:
     attributes:

data/template/.kitchen.yml

@@ -4,7 +4,7 @@ driver_plugin: vagrant
 platforms:
 - name: ubuntu-13.04
   driver_config:
-    box: opscode-ubuntu-13.04
+    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
 

data/template/Gemfile

@@ -6,6 +6,6 @@ gem 'berkshelf'
 gem 'gusteau'
 
 group :integration do
-  gem 'test-kitchen', github: 'opscode/test-kitchen'
+  gem 'test-kitchen', '~> 1.0.0.alpha.7'
   gem 'kitchen-vagrant', '~> 0.10.0'
 end

data/template/init.sh

@@ -7,9 +7,6 @@ ok()    { echo -e "\033[00;32m$1\033[0m"; }
 info "Installing gem dependencies..."
 bundle
 
-info "Downloading cookbooks..."
-bundle exec berks install --path ./cookbooks
-
 if [ ! $(vagrant -v | cut -f3 -d ' ' | cut -f2 -d '.') = "2" ]; then
   error "Sorry, 'gusteau init' only works with Vagrant 1.2.x"
   exit 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.0.2.dev
+  version: 1.0.3.dev
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -285,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1972838977099657427
+      hash: -1682856364526822878
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: