gusteau 0.4.8 → 1.0.0.dev

data/lib/gusteau/vagrant.rb

@@ -1,5 +1,5 @@
 require 'hashie'
-require 'gusteau/log'
+require 'gusteau'
 
 class Hash; include Hashie::Extensions::SymbolizeKeys; end
 
@@ -17,14 +17,8 @@ module Gusteau
     end
 
     def define_nodes(config, options, prefix = nil)
-      if prefix
-        options[:prefix] = prefix
-        info "The 'prefix' param is deprecated. Please refer to the new Gusteau::Vagrant syntax."
-      end
-
-      Dir.glob("#{options[:dir] || './nodes'}/**/*.yml").sort.each do |path|
-        node = ::Gusteau::Node.new(path)
-        if node.config['vagrant']
+      Gusteau::Config.nodes(options[:config_path] || ".gusteau.yml").each_pair do |name, node|
+        if node.config['server']['vagrant']
           define_vm config, node, options
         end
       end
@@ -32,7 +26,7 @@ module Gusteau
 
     def vm_config(node, options)
       defaults = options[:defaults] || {}
-      config   = node.config['vagrant']
+      config   = node.config['server']['vagrant']
       label    = options[:prefix] ? "#{options[:prefix]}-#{node.name}" : node.name
 
       config = {} if config == true
@@ -82,30 +76,11 @@ module Gusteau
       instance.vm.provision 'chef_solo' do |chef|
         chef.data_bags_path = 'data_bags'
         chef.cookbooks_path = ['cookbooks', 'site-cookbooks']
-        chef.json = node.config['json'] || {}
-
-        (node.config['recipes'] || []).each { |r| chef.add_recipe(r) }
-        (node.config['roles']   || []).each { |r| chef.add_role(r)   }
+        chef.roles_path     = 'roles'
+        chef.json     = node.config['attributes'] || {}
+        chef.run_list = node.config['run_list'] || []
       end
     end
-
-    def ssh(nodename)
-      vagrant_cmd("ssh #{nodename}")
-    end
-
-    def provision(nodename)
-      vagrant_cmd("provision #{nodename}")
-    end
-
-    def vagrant_cmd(cmd)
-      info "Running 'vagrant #{cmd}'"
-      Kernel.system("vagrant #{cmd}")
-      Kernel.exit $?.exitstatus
-    end
-
-    def run(nodename)
-      Kernel.abort "'run' is not supported for vagrant-only nodes. Please configure 'server' for #{nodename} node"
-    end
   end
 end
 

data/lib/gusteau/version.rb

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

data/spec/config/gusteau.yml

@@ -0,0 +1,60 @@
+default_node: &default_node
+  platform: centos
+  user: billy
+
+environments:
+  development:
+    attributes:
+      mysql:
+        server_root_password: guesswhat
+    run_list:
+      - recipe[zsh]
+      - recipe[mysql::server]
+    nodes:
+      playground:
+        host: 192.168.100.21
+        vagrant:
+          IP: 192.168.100.21
+          cpus: 2
+
+  staging:
+    attributes:
+      users:
+        - alex
+        - mitya
+    run_list:
+      - recipe[basic-system]
+      - recipe[java]
+    nodes:
+      www:
+        <<: *default_node
+        host: staging.myapp.com
+        user: root
+        attributes:
+          java:
+            jdk_version: 7
+        run_list: recipe[jenkins]
+
+  production:
+    attributes:
+      users:
+        - alex
+        - simon
+    run_list:
+      - recipe[git]
+      - recipe[nginx]
+    nodes:
+      db:
+        <<: *default_node
+        host: db.myapp.com
+        attributes:
+          mysql:
+            server_root_password: prodsecret
+        run_list: recipe[mysql::client]
+      www:
+        <<: *default_node
+        host: www.myapp.com
+        attributes:
+          nginx:
+            workers: 4
+        run_list: recipe[varnish], recipe[nginx]

data/spec/config/remi.yml

@@ -0,0 +1,29 @@
+default_node: &default_node
+  platform: centos
+  user: billy
+
+environments:
+  production:
+    attributes:
+      users:
+        - alex
+        - simon
+      mysql:
+        server_port: 3307
+    run_list:
+      - recipe[git]
+      - recipe[postgresql::server]
+    nodes:
+      db:
+        <<: *default_node
+        host: db.myapp.com
+        attributes:
+          mysql:
+            server_root_password: prodsecret
+      www:
+        <<: *default_node
+        host: www.myapp.com
+        attributes:
+          nginx:
+            workers: 4
+        run_list: [ 'recipe[varnish]', 'recipe[nginx]' ]

data/spec/lib/gusteau/bureau_spec.rb

@@ -0,0 +1,52 @@
+require './spec/spec_helper'
+require 'fileutils'
+require 'etc'
+
+describe Gusteau::Bureau do
+
+  let(:login) { Etc.getlogin }
+  let(:bureau_path) { "/tmp/gusteau-test/bureau" }
+
+  before { FileUtils.mkdir_p("/tmp/gusteau-test") }
+  after  { FileUtils.rm_rf(bureau_path) }
+
+  subject { Gusteau::Bureau.new(bureau_path) }
+
+  it "should obtain the correct user login" do
+    subject.instance_variable_get("@login").must_equal login
+  end
+
+  describe "#generate!" do
+    before { subject.generate!(false) }
+    it "should create a basic structure" do
+      assert Dir.exists?(bureau_path)
+
+      %w{ Berksfile Vagrantfile .kitchen.yml }.each do |f|
+        assert File.exists?("#{bureau_path}/#{f}")
+      end
+
+      %w{ data_bags site-cookbooks test }.each do |d|
+        assert Dir.exists?("#{bureau_path}/#{d}")
+      end
+    end
+
+    it "should process the README template" do
+      readme_path = "#{bureau_path}/README.md"
+      assert File.exists?(readme_path)
+      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}")
+    end
+
+    it "should process the user data_bag template" do
+      config_path = "#{bureau_path}/data_bags/users/#{login}.json"
+      assert File.exists?(config_path)
+      assert File.read(config_path).include?(login)
+    end
+  end
+
+end

data/spec/lib/gusteau/compressed_tar_stream_spec.rb

@@ -0,0 +1,31 @@
+require './spec/spec_helper'
+
+describe Gusteau::CompressedTarStream do
+
+  let(:compressor_class) do
+    class Example
+      include Gusteau::Log
+      include Gusteau::CompressedTarStream
+      attr_accessor :host, :port, :user, :password
+    end
+    Example
+  end
+
+  let(:compressor) { compressor_class.new }
+
+  describe "#compressed_tar_stream" do
+    let(:tp) { "/tmp/gusteau-spec-11" }
+
+    before do
+      FileUtils.mkdir_p(tp)
+      %w{ a b c }.each { |l| FileUtils.touch("#{tp}/#{l}.rb") }
+    end
+
+    after { FileUtils.rm_rf(tp) }
+
+    it "should compress the files" do
+      res = compressor.send(:compressed_tar_stream, ["#{tp}/a.rb", "#{tp}/b.rb", "#{tp}/c.rb"])
+      assert res.length > 0
+    end
+  end
+end

data/spec/lib/gusteau/config_spec.rb

@@ -0,0 +1,31 @@
+require './spec/spec_helper'
+
+describe Gusteau::Config do
+  context "config not found" do
+    subject { Gusteau::Config.nodes("/tmp/nonexistent/nonsence111") }
+
+    it "should exit with an error" do
+      proc { subject }.must_raise SystemExit
+    end
+  end
+
+  context "config is found" do
+    let(:nodes) { Gusteau::Config.nodes("./spec/config/remi.yml") }
+
+    it "should name nodes as per environment-node" do
+      nodes.keys.must_equal ["production-db", "production-www"]
+    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
+  end
+end

data/spec/lib/gusteau/log_spec.rb

@@ -0,0 +1,34 @@
+require './spec/spec_helper'
+
+describe Gusteau::Log do
+
+  let(:fixed_time)   { Time.new(2013,7,25, 14,40,23, "+00:00") }
+
+  let(:logger_class) { class Example; include Gusteau::Log; end }
+  let(:logger)       { logger_class.new }
+
+  before do
+    Time.expects(:now).at_least_once.returns fixed_time
+  end
+
+  describe "#log" do
+    it "should log start and end when block is given" do
+      Inform.expects(:info).with('%{prompt}test', {:prompt => '[2013-07-25T14:40:23] GUSTEAU: '})
+      Inform.expects(:info).with('%{prompt}DONE (in 0.00s)', {:prompt => '[2013-07-25T14:40:23] GUSTEAU: '})
+      logger.log('test') { true }
+    end
+
+    it "should only log start when block isn't given" do
+      Inform.expects(:info).with('%{prompt}hehe', {:prompt => '[2013-07-25T14:40:23] GUSTEAU: '})
+      logger.log('hehe')
+    end
+  end
+
+  describe "#log_error" do
+    it "should output the prompt followed by a message" do
+      Inform.expects(:error).with('%{prompt}error!', {:prompt => '[2013-07-25T14:40:23] GUSTEAU: '})
+      logger.log_error('error!')
+    end
+  end
+
+end

data/spec/lib/gusteau/node_spec.rb

@@ -1,102 +1,57 @@
 require './spec/spec_helper'
 
 describe Gusteau::Node do
-  it "should raise if node yaml doesn't exist" do
-    proc { Gusteau::Node.new('spec/nodes/void.yml') }.must_raise RuntimeError
-  end
-
-  describe "#dna" do
-    let(:node) { Gusteau::Node.new('spec/nodes/production.yml') }
-
-    let(:dna)         { node.send(:dna, include_all, recipes) }
-    let(:include_all) { true }
-    let(:recipes)     { [] }
 
-    let(:path) { '/tmp/testdna.json' }
-    let(:json) { JSON::parse(File.read dna[:path]) }
-
-    it "should create a new dna file" do
-      File.exists?(dna[:path]).must_equal true
+  describe "#initialize" do
+    let(:node) do
+      Gusteau::Node.new 'test', { 'server' => { 'host' => 'example.com' } }
     end
 
-    it "should support ERB" do
-      json['environment'].must_equal "production"
-    end
-
-    context "recipes not specified" do
-      it "should contain a full run_list" do
-        json['run_list'].must_equal ["role[redhat]", "recipe[rvm]", "recipe[ntp]", "recipe[rails::apps]"]
-      end
+    it "should create a server attribute" do
+      node.server.host.must_equal 'example.com'
     end
+  end
 
-    context "recipes specified" do
-      let(:include_all) { false }
-      let(:recipes)     { ['rvm', 'rails::apps'] }
+  let(:node) do
+    config = {
+      'run_list' => [ "recipe[zsh]", "recipe[git]" ],
+      'server' => { 'host' => 'example.com' }
+    }
+    Gusteau::Node.new 'test', config
+  end
 
-      it "should only include the specified item into run_list" do
-        json['run_list'].must_equal ["recipe[rvm]", "recipe[rails::apps]"]
-      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
     end
   end
 
-  describe "#vagrant_wrap" do
-    let(:node) { Gusteau::Node.new('spec/nodes/development.yml') }
-
-    describe "#ssh" do
-      context "server is defined" do
-        it "should call server.ssh" do
-          node.server.expects(:ssh)
-          node.ssh
-        end
-      end
-
-      context "vagrant is defined, server is not" do
-        before do
-          node.stubs(:server).returns(nil)
-        end
-
-        it "should call 'vagrant ssh'" do
-          Kernel.expects(:system).with("vagrant ssh development")
-          Kernel.expects(:exit)
-          node.ssh
-        end
-      end
-
-      context "neither server nor vagrant are defined" do
-        before do
-          node.stubs(:server).returns(nil)
-          node.config['vagrant'] = nil
-        end
-
-        it "should exit with an error" do
-          Kernel.expects(:abort)
-          node.ssh
-        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]']
+        }
+      }
+      node.server.chef.expects(:run).with({}, dna)
+      node.apply({}, [ "recipe[nagios]", "role[base]" ])
     end
+  end
 
-    describe "#run" do
-      context "server is defined" do
-        it "should call server.chef.run" do
-          chef = mock()
-          node.server.expects(:chef).returns(chef)
-          chef.expects(:run)
-
-          node.run('test')
-        end
-      end
-
-      context "vagrant is defined, server is not" do
-        before do
-          node.stubs(:server).returns(nil)
-        end
-
-        it "should exit with an error" do
-          Kernel.expects(:abort).with("'run' is not supported for vagrant-only nodes. Please configure 'server' for development node")
-          node.run('test')
-        end
-      end
-
+  describe "#ssh" do
+    it "should call server.ssh" do
+      node.server.expects(:ssh)
+      node.ssh
     end
   end
 end