gusteau 0.4.4 → 0.4.5

data/README.md

@@ -98,13 +98,36 @@ gusteau ssh_config >> ~/.ssh/config
 
 Using with Vagrant
 ------------------
-At the moment Gusteau doesn't come with Vagrant integration. However, using it with Vagrant is easy, just make sure that you provide the correct IP address of the VM in node's YAML file.
+Gusteau comes with partial Vagrant integration. It enables you to move node-specific Vagrant configuration away from the Vagrantfile into node yml files, e.g.
 
+```YAML
+...
+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'
 ```
-vagrant up
-gusteau node-name provision
+
+This way you can tidy up your Vagrantfile:
+
+```ruby
+Vagrant.require_plugin 'gusteau'
+
+Vagrant.configure('2') do |config|
+  defaults = { :box_url => 'http://www.something.com/different.box' } # optional
+  Gusteau::Vagrant.define_nodes config, defaults
+end
 ```
 
+Please note that this feature only works with Vagrant ~> 1.2 and needs gusteau to be installed as a Vagrant plugin:
+
+```
+vagrant plugin install gusteau
+```
+
+Gusteau doesn't automatically provision your Vagrant nodes.
+
 Notes
 -----
 

data/bootstrap/centos.sh

@@ -3,13 +3,5 @@
 if type -p chef-solo > /dev/null; then
   echo "Using chef-solo at `which chef-solo`"
 else
-  rpm -Uvh http://rbel.frameos.org/rbel6
-  yum-config-manager --enable rhel-6-server-optional-rpms
-  yum install -y ruby ruby-devel ruby-ri ruby-rdoc ruby-shadow gcc gcc-c++ automake autoconf make curl dmidecode
-  cd /tmp
-  curl -O http://production.cf.rubygems.org/rubygems/rubygems-1.8.10.tgz
-  tar zxf rubygems-1.8.10.tgz
-  cd rubygems-1.8.10
-  ruby setup.rb --no-format-executable
-  gem install chef --no-ri --no-rdoc --version "=11.4.0"
+  curl -L https://www.opscode.com/chef/install.sh | bash
 fi

data/bootstrap/redhat.sh

@@ -3,13 +3,5 @@
 if type -p chef-solo > /dev/null; then
   echo "Using chef-solo at `which chef-solo`"
 else
-  rpm -Uvh http://rbel.frameos.org/rbel6
-  yum-config-manager --enable rhel-6-server-optional-rpms
-  yum install -y ruby ruby-devel ruby-ri ruby-rdoc ruby-shadow gcc gcc-c++ automake autoconf make curl dmidecode
-  cd /tmp
-  curl -O http://production.cf.rubygems.org/rubygems/rubygems-1.8.10.tgz
-  tar zxf rubygems-1.8.10.tgz
-  cd rubygems-1.8.10
-  ruby setup.rb --no-format-executable
-  gem install chef --no-ri --no-rdoc --version "=11.4.0"
+  curl -L https://www.opscode.com/chef/install.sh | bash
 fi

data/lib/gusteau.rb

@@ -4,4 +4,5 @@ module Gusteau
   require 'gusteau/node'
   require 'gusteau/bureau'
   require 'gusteau/ssh_config'
+  require 'gusteau/vagrant'
 end

data/lib/gusteau/vagrant.rb

@@ -0,0 +1,60 @@
+module Gusteau
+  module Vagrant
+    extend self
+
+    def complete_defaults(d)
+      d[:ip]     ||= '33.33.33.99'
+      d[:memory] ||= 1024
+      d[:cpus]   ||= 1
+      d
+    end
+
+    def vagrant_config(config_path, defaults, label)
+      if config = YAML::load_file(config_path)['vagrant']
+        name  = File.basename(config_path, '.yml')
+        label = label.nil? ? name : "#{label}-#{name}"
+
+        box_url = config.fetch 'box_url' do
+          raise "Box url can't be determined for #{name}" unless defaults[:box_url]
+          defaults[:box_url]
+        end
+
+        defaults = complete_defaults(defaults)
+        {
+          :name    => name,
+          :label   => label,
+          :box_url => box_url,
+          :ip      => config.fetch('IP',      defaults[:ip]),
+          :cpus    => config.fetch('cpus',    defaults[:cpus]),
+          :memory  => config.fetch('memory',  defaults[:memory])
+        }
+      end
+    end
+
+    def define_vm(c, config)
+      c.vm.define config[:name] do |instance|
+        instance.vm.box     = config[:name]
+        instance.vm.box_url = config[:box_url]
+
+        instance.vm.provider :virtualbox do |vb|
+          vb.customize ['modifyvm', :id,
+            '--memory', config[:memory],
+            '--name',   config[:label],
+            '--cpus',   config[:cpus],
+            '--natdnsproxy1', 'on'
+          ]
+        end
+        instance.vm.network :private_network, :ip => config[:ip]
+      end
+    end
+
+    def define_nodes(c, defaults = {}, label = nil)
+      Dir.glob("./nodes/**/*.yml").sort.each do |path|
+        if config = vagrant_config(path, defaults, label)
+          define_vm c, config
+        end
+      end
+    end
+
+  end
+end

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/lib/gusteau/ssh_config_spec.rb

@@ -7,6 +7,11 @@ describe Gusteau::SSHConfig do
     <<-eos
 # BEGIN GUSTEAU NODES
 
+Host development
+  HostName 192.168.100.21
+  Port 2222
+  User developer
+
 Host production
   HostName www.example.com
   Port 22

data/spec/lib/gusteau/vagrant_spec.rb

@@ -0,0 +1,74 @@
+require './spec/spec_helper.rb'
+
+describe Gusteau::Vagrant do
+  let(:defaults) do
+    {
+      :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box',
+      :cpus    => 64
+    }
+  end
+  let(:label) { 'hyper' }
+
+  describe "#vagrant_config" do
+    subject { Gusteau::Vagrant.vagrant_config(config_path, defaults, label) }
+
+    context "non-vagrant node" do
+      let(:config_path) { './spec/nodes/staging.yml' }
+
+      it "should return nil" do
+        subject.must_equal nil
+      end
+    end
+
+    context "vagrant node" do
+      let(:config_path) { './spec/nodes/development.yml' }
+
+      let(:expected_label)  { 'hyper-development' }
+      let(:expected_memory) { 1024 }
+
+      let(:expected_config) do
+        {
+          :name    => 'development',
+          :label   => expected_label,
+          :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box',
+          :ip      => '192.168.100.21',
+          :cpus    => 4,
+          :memory  => expected_memory
+        }
+      end
+
+      def config_expectation
+        subject.must_equal(expected_config)
+      end
+
+      specify { config_expectation }
+
+      context "label not specified" do
+        let(:label) { nil }
+        let(:expected_label) { 'development' }
+
+        specify { config_expectation }
+      end
+
+      context "different memory defaults" do
+        let(:defaults) do
+          {
+            :memory => 4096,
+            :box_url => 'https://opscode.s3.amazonaws.com/centos-6.4.box',
+          }
+        end
+        let(:expected_memory) { 4096 }
+
+        specify { config_expectation }
+      end
+
+      context "box_url not specified" do
+        let(:defaults) { {} }
+
+        it "should raise an exception" do
+          proc { subject }.must_raise RuntimeError
+        end
+      end
+    end
+  end
+end

data/spec/nodes/development.yml

@@ -0,0 +1,17 @@
+json:
+  mysql:
+    server_root_password: guesswhat
+
+recipes:
+  - zsh
+  - mysql::server
+
+server:
+  host: 192.168.100.21
+  port: 2222
+  user: developer
+  platform: centos
+
+vagrant:
+  IP: 192.168.100.21
+  cpus: 4

data/spec/nodes/staging.yml

@@ -3,7 +3,7 @@ json:
     server_root_password: correcthorsebatterystaple
 
 recipes:
-  - mysql::serverr
+  - mysql::server
 
 server:
   host: staging.example.com

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -158,11 +158,14 @@ files:
 - lib/gusteau/server.rb
 - lib/gusteau/ssh.rb
 - lib/gusteau/ssh_config.rb
+- lib/gusteau/vagrant.rb
 - lib/gusteau/version.rb
 - spec/lib/gusteau/chef_spec.rb
 - spec/lib/gusteau/node_spec.rb
 - spec/lib/gusteau/server_spec.rb
 - spec/lib/gusteau/ssh_config_spec.rb
+- spec/lib/gusteau/vagrant_spec.rb
+- spec/nodes/development.yml
 - spec/nodes/production.yml
 - spec/nodes/staging.yml
 - spec/spec_helper.rb
@@ -204,6 +207,8 @@ test_files:
 - spec/lib/gusteau/node_spec.rb
 - spec/lib/gusteau/server_spec.rb
 - spec/lib/gusteau/ssh_config_spec.rb
+- spec/lib/gusteau/vagrant_spec.rb
+- spec/nodes/development.yml
 - spec/nodes/production.yml
 - spec/nodes/staging.yml
 - spec/spec_helper.rb