gusteau 1.0.3.dev → 1.0.4.dev

data/CHANGELOG.md

@@ -1,5 +1,10 @@
+## 1.0.4.dev / 2013-07-08
+* 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)
+* 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/bin/gusteau

@@ -40,21 +40,31 @@ class Gusteau::CLI < Optitron::CLI
 
   desc 'Lists all known nodes'
   def list
-    puts "Known nodes are:\n - #{nodes.keys.join("\n - ")}"
+    puts nodes_list
+  end
+
+  desc 'Show the configuration of a specific node'
+  def show(node_name)
+    puts node(node_name).config.to_yaml
   end
 
   private
 
   def node(node_name)
     unless node = nodes[node_name]
-      abort "Node '#{node_name}' is unknown. Known nodes are #{nodes.keys.join(', ')}."
+      abort "Node '#{node_name}' is unknown. #{nodes_list}"
     else
       node
     end
   end
 
   def nodes
-    @nodes ||= Gusteau::Config.nodes(".gusteau.yml")
+    Gusteau::Config.read('.gusteau.yml')
+    Gusteau::Config.nodes
+  end
+
+  def nodes_list
+    "Known nodes are:\n - #{nodes.keys.join("\n - ")}"
   end
 
 end

data/lib/gusteau/chef.rb

@@ -26,14 +26,12 @@ module Gusteau
     private
 
     def src_files(dna_path)
-      %W(
+      list = %W(
         #{dna_path}
         #{File.expand_path("../../../bootstrap", __FILE__)}
-        ./cookbooks
-        ./site-cookbooks
-        ./roles
-        ./data_bags
-      ).select { |file| File.exists? file }
+        data_bags
+      ) + Gusteau::Config.settings['cookbooks_path'] + [ Gusteau::Config.settings['roles_path']]
+      list.select { |file| File.exists? file }
     end
   end
 end

data/lib/gusteau/config.rb

@@ -2,42 +2,66 @@ require 'gusteau/erb'
 require 'hash_deep_merge'
 
 module Gusteau
-  module Config
-    extend self
-    extend Gusteau::ERB
-
-    def nodes(config_path)
-      if File.exists?(config_path)
-        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(config, node_name, env_hash, node_hash)
-            end
-          end
-          nodes
-        end
+  class Config
+    include Gusteau::ERB
+
+    def self.read(config_path)
+      @instance = Gusteau::Config.new(config_path)
+    end
+
+    def self.nodes
+      @instance.send(:nodes)
+    end
+
+    def self.settings
+      @instance.send(:settings)
+    end
+
+    def initialize(config_path)
+      @config = if File.exists?(config_path)
+        read_erb_yaml(config_path)
       else
         abort ".gusteau.yml not found"
       end
     end
 
+    private
+
+    def nodes
+      env_config = @config['environments']
+
+      @nodes ||= 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)
+          end
+        end
+        nodes
+      end
+    end
+
+    def settings
+      {
+        'cookbooks_path' => @config['cookbooks_path'] || ['cookbooks', 'site-cookbooks'],
+        'roles_path'     => @config['roles_path'] || 'roles'
+      }
+    end
+
     #
     # 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(config, node_name, env_hash, node_hash)
-      config = {
+    def build_node(node_name, env_hash, node_hash)
+      node_config = {
         'server'     => node_hash,
         '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']
+        'run_list'   => node_hash['run_list']   || env_hash['run_list'],
+        'before'     => env_hash['before']      || @config['before'],
+        'after'      => env_hash['after']       || @config['after']
       }
-      Gusteau::Node.new(node_name, config)
+      Gusteau::Node.new(node_name, node_config)
     end
   end
 end

data/lib/gusteau/node.rb

@@ -1,5 +1,4 @@
 require 'gusteau/server'
-require 'gusteau/chef'
 
 module Gusteau
   class Node
@@ -7,11 +6,11 @@ module Gusteau
 
     attr_reader :name, :config, :server
 
-    def initialize(name, config)
-      @name   = name
-      @config = config
+    def initialize(node_name, node_config)
+      @name   = node_name
+      @config = node_config
 
-      @server = Server.new(@config['server']) if @config['server']
+      @server = Server.new(@config['server'])
       @dna_path = '/tmp/dna.json'
     end
 

data/lib/gusteau/server.rb

@@ -1,5 +1,6 @@
-require 'gusteau/log'
+require 'gusteau/chef'
 require 'gusteau/ssh'
+require 'gusteau/log'
 
 module Gusteau
   class Server
@@ -8,12 +9,12 @@ module Gusteau
 
     attr_reader :host, :port, :user, :password, :chef
 
-    def initialize(config, opts={})
+    def initialize(config)
       @host     = config['host']
       @port     = config['port'] || 22
       @user     = config['user'] || 'root'
       @password = config['password']
-      @chef = Gusteau::Chef.new(self, config['platform'])
+      @chef     = Gusteau::Chef.new(self, config['platform'])
     end
 
     def upload(files_and_dirs, dest_dir, opts={})

data/lib/gusteau/vagrant.rb

@@ -9,7 +9,7 @@ module Gusteau
     extend Gusteau::Log
 
     def detect(config)
-      options = Hashie::Mash.new
+      options          = Hashie::Mash.new
       options.defaults = Hashie::Mash.new
 
       yield options if block_given?
@@ -17,7 +17,9 @@ module Gusteau
     end
 
     def define_nodes(config, options, prefix = nil)
-      Gusteau::Config.nodes(options[:config_path] || ".gusteau.yml").each_pair do |name, node|
+      Gusteau::Config.read(options[:config_path] || ".gusteau.yml")
+
+      Gusteau::Config.nodes.each_pair do |name, node|
         if node.config['server']['vagrant']
           define_vm config, node, options
         end
@@ -75,10 +77,10 @@ module Gusteau
     def define_provisioner(instance, node)
       instance.vm.provision 'chef_solo' do |chef|
         chef.data_bags_path = 'data_bags'
-        chef.cookbooks_path = ['cookbooks', 'site-cookbooks']
-        chef.roles_path     = 'roles'
-        chef.json     = node.config['attributes'] || {}
-        chef.run_list = node.config['run_list'] || []
+        chef.cookbooks_path = Gusteau::Config.settings['cookbooks_path']
+        chef.roles_path     = Gusteau::Config.settings['roles_path']
+        chef.json           = node.config['attributes'] || {}
+        chef.run_list       = node.config['run_list']   || []
       end
     end
   end

data/lib/gusteau/version.rb

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

data/spec/config/emile.yml

@@ -0,0 +1,5 @@
+cookbooks_path:
+  - private-cookbooks
+  - /home/user/.cookbooks
+
+roles_path: basic-roles

data/spec/lib/gusteau/chef_spec.rb

@@ -1,6 +1,8 @@
 require './spec/spec_helper.rb'
 
 describe Gusteau::Chef do
+  before { Gusteau::Config.read('./spec/config/emile.yml') }
+
   let(:platform)  { 'centos' }
   let(:server)    { Gusteau::Server.new('host' => 'example.com', 'platform' => platform) }
   let(:chef)      { Gusteau::Chef.new(server, platform) }

data/spec/lib/gusteau/config_spec.rb

@@ -2,7 +2,7 @@ require './spec/spec_helper'
 
 describe Gusteau::Config do
   context "config not found" do
-    subject { Gusteau::Config.nodes("/tmp/nonexistent/nonsence111") }
+    subject { Gusteau::Config.read("/tmp/nonexistent/nonsence111") }
 
     it "should exit with an error" do
       proc { subject }.must_raise SystemExit
@@ -10,27 +10,49 @@ describe Gusteau::Config do
   end
 
   context "config is found" do
-    let(:nodes) { Gusteau::Config.nodes("./spec/config/remi.yml") }
+    before { Gusteau::Config.read("./spec/config/remi.yml") }
 
-    it "should name nodes as per environment-node" do
-      nodes.keys.sort.must_equal ["production-db", "production-www", "staging-vm"]
-    end
+    describe "#nodes" do
+      let(:nodes) { Gusteau::Config.nodes }
 
-    it "should override run_list if defined for a node" do
-      nodes['production-db'].config['run_list'].must_equal(["recipe[git]", "recipe[postgresql::server]"])
-      nodes['production-www'].config['run_list'].must_equal(["recipe[varnish]", "recipe[nginx]"])
-    end
+      it "should name nodes as per environment-node" do
+        nodes.keys.sort.must_equal ["production-db", "production-www", "staging-vm"]
+      end
+
+      it "should override run_list if defined for a node" do
+        nodes['production-db'].config['run_list'].must_equal(["recipe[git]", "recipe[postgresql::server]"])
+        nodes['production-www'].config['run_list'].must_equal(["recipe[varnish]", "recipe[nginx]"])
+      end
+
+      it "should deeply merge the attributes" do
+        nodes['production-db'].config['attributes'].must_equal({
+          'users' => ['alex', 'simon'],
+          'mysql' => {'server_port' => 3307, 'server_root_password' => 'prodsecret' }
+        })
+      end
 
-    it "should deeply merge the attributes" do
-      nodes['production-db'].config['attributes'].must_equal({
-        'users' => ['alex', 'simon'],
-        'mysql' => {'server_port' => 3307, 'server_root_password' => 'prodsecret' }
-      })
+      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
 
-    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!"'])
+    describe "#settings" do
+      let(:settings) { Gusteau::Config.settings }
+
+      it "should have defaults for cookbooks_path, roles_path" do
+        settings['cookbooks_path'].must_equal ['cookbooks', 'site-cookbooks']
+        settings['roles_path'].must_equal 'roles'
+      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
+          settings['cookbooks_path'].must_equal ['private-cookbooks', '/home/user/.cookbooks']
+          settings['roles_path'].must_equal 'basic-roles'
+        end
+      end
     end
   end
 end

data/spec/lib/gusteau/ssh_config_spec.rb

@@ -1,8 +1,9 @@
 require './spec/spec_helper.rb'
 
 describe Gusteau::SSHConfig do
-  let(:nodes) { Gusteau::Config.nodes("./spec/config/gusteau.yml") }
-  subject { Gusteau::SSHConfig.new(nodes) }
+  before { Gusteau::Config.read("./spec/config/gusteau.yml") }
+
+  subject { Gusteau::SSHConfig.new(Gusteau::Config.nodes) }
 
   let(:config) do
     <<-eos

data/spec/lib/gusteau/vagrant_spec.rb

@@ -49,73 +49,76 @@ describe Gusteau::Vagrant do
     end
   end
 
-  describe "#vm_config" do
-    let(:node) { Gusteau::Config.nodes("./spec/config/gusteau.yml")['development-playground'] }
-    subject { Gusteau::Vagrant.vm_config(node, options) }
-
-    let(:defaults) do
-      {
-        :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box',
-        :cpus    => 64,
-        :memory  => 4096,
-      }
-    end
-    let(:prefix)  { 'hyper' }
-    let(:options) { { :defaults => defaults, :prefix => prefix } }
-
-    let(:expected_label) { 'hyper-development-playground' }
-    let(:expected_config) do
-      {
-        :name    => 'development-playground',
-        :label   => expected_label,
-        :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box',
-        :ip      => '192.168.100.21',
-        :cpus    => 2,
-        :memory  => 4096
-      }
-    end
+  describe "internal methods" do
+    before { Gusteau::Config.read("./spec/config/gusteau.yml") }
+    let(:node) { Gusteau::Config.nodes['development-playground'] }
+
+    describe "#vm_config" do
+      subject { Gusteau::Vagrant.vm_config(node, options) }
+
+      let(:defaults) do
+        {
+          :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box',
+          :cpus    => 64,
+          :memory  => 4096,
+        }
+      end
+      let(:prefix)  { 'hyper' }
+      let(:options) { { :defaults => defaults, :prefix => prefix } }
+
+      let(:expected_label) { 'hyper-development-playground' }
+      let(:expected_config) do
+        {
+          :name    => 'development-playground',
+          :label   => expected_label,
+          :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box',
+          :ip      => '192.168.100.21',
+          :cpus    => 2,
+          :memory  => 4096
+        }
+      end
 
-    it "should merge in defaults" do
-      subject.must_equal(expected_config)
-    end
+      it "should merge in defaults" do
+        subject.must_equal(expected_config)
+      end
 
-    context "prefix not specified" do
-      let(:prefix) { nil }
-      let(:expected_label) { 'development-playground' }
+      context "prefix not specified" do
+        let(:prefix) { nil }
+        let(:expected_label) { 'development-playground' }
 
-      it "should omit the prefix" do
-        subject.must_equal(expected_config)
+        it "should omit the prefix" do
+          subject.must_equal(expected_config)
+        end
       end
-    end
 
-    context "box_url not specified" do
-      let(:defaults) { {} }
+      context "box_url not specified" do
+        let(:defaults) { {} }
 
-      it "should raise an exception" do
-        proc { subject }.must_raise RuntimeError
+        it "should raise an exception" do
+          proc { subject }.must_raise RuntimeError
+        end
       end
     end
-  end
 
-  describe "#define_provisioner" do
-    let(:node) { Gusteau::Config.nodes("./spec/config/gusteau.yml")['development-playground'] }
-    let(:chef) { stub_everything('chef') }
+    describe "#define_provisioner" do
+      let(:chef) { stub_everything('chef') }
 
-    before do
-      def subvm.provision(provider); yield chef; end
-      subvm.expects(:chef).returns(chef)
+      before do
+        def subvm.provision(provider); yield chef; end
+        subvm.expects(:chef).returns(chef)
 
-      instance.expects(:vm).at_least_once.returns(subvm)
-    end
+        instance.expects(:vm).at_least_once.returns(subvm)
+      end
 
-    it "should set the correct Chef JSON" do
-      chef.expects('json='.to_sym).with({"mysql"=>{"server_root_password"=>"guesswhat"}})
-      Gusteau::Vagrant.define_provisioner(instance, node)
-    end
+      it "should set the correct Chef JSON" do
+        chef.expects('json='.to_sym).with({"mysql"=>{"server_root_password"=>"guesswhat"}})
+        Gusteau::Vagrant.define_provisioner(instance, node)
+      end
 
-    it "should set the correct Chef run_list" do
-      chef.expects('run_list='.to_sym).with(["recipe[zsh]", "recipe[mysql::server]"])
-      Gusteau::Vagrant.define_provisioner(instance, node)
+      it "should set the correct Chef run_list" do
+        chef.expects('run_list='.to_sym).with(["recipe[zsh]", "recipe[mysql::server]"])
+        Gusteau::Vagrant.define_provisioner(instance, node)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.0.3.dev
+  version: 1.0.4.dev
   prerelease: 6
 platform: ruby
 authors:
@@ -240,6 +240,7 @@ files:
 - lib/gusteau/ssh_config.rb
 - lib/gusteau/vagrant.rb
 - lib/gusteau/version.rb
+- spec/config/emile.yml
 - spec/config/gusteau.yml
 - spec/config/remi.yml
 - spec/lib/gusteau/bureau_spec.rb
@@ -285,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1682856364526822878
+      hash: 201267403645685756
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -299,6 +300,7 @@ signing_key:
 specification_version: 3
 summary: Making servers provisioning enjoyable since 2013.
 test_files:
+- spec/config/emile.yml
 - spec/config/gusteau.yml
 - spec/config/remi.yml
 - spec/lib/gusteau/bureau_spec.rb