gusteau 0.4.5 → 0.4.6

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - rbx
   - jruby
-  - ree
-  - ruby-head
   - 2.0.0

data/bootstrap/centos.sh

@@ -1,7 +1,17 @@
 #!/bin/sh
 
+install_sh="https://www.opscode.com/chef/install.sh"
+version="11.4.4"
+
 if type -p chef-solo > /dev/null; then
-  echo "Using chef-solo at `which chef-solo`"
+  echo "Using chef-solo $(chef-solo --v | awk '{print $2}') at $(which chef-solo)"
 else
-  curl -L https://www.opscode.com/chef/install.sh | bash
+  if command -v curl &>/dev/null; then
+    curl -L "$install_sh" | sudo bash -s -- -v "$version"
+  elif command -v wget &>/dev/null; then
+    wget -qO- "$install_sh" | sudo bash -s -- -v "$version"
+  else
+    echo "Neither wget nor curl found. Please install one." >&2
+    exit 1
+  fi
 fi

data/bootstrap/gentoo.sh

@@ -1,17 +1,16 @@
 #!/bin/sh
 
 if type -p chef-solo > /dev/null; then
-  echo "Using chef-solo at `which chef-solo`"
+  echo "Using chef-solo $(chef-solo --v | awk '{print $2}') at $(which chef-solo)"
 else
-  emerge --sync
+  emerge layman
+  echo "source /var/lib/layman/make.conf" >> /etc/portage/make.conf
 
-  echo 'RUBY_TARGETS="ruby19"' >> /etc/make.conf
+  layman -o https://raw.github.com/lxmx/gentoo-overlay/master/overlay.xml -f -a lxmx
+  layman -S
 
-  CONFIG_PROTECT_MASK="/etc/portage/" emerge --autounmask-write ruby:1.9
-  emerge -uDN ruby:1.9
-  revdep-rebuild
-
-  gem install chef ruby-shadow --no-ri --no-rdoc --version "=11.4.0"
+  echo "app-admin/chef-omnibus ~amd64" >> /etc/portage/package.keywords
+  emerge app-admin/chef-omnibus
 
   # Make non-interactive SSH sessions see environment variables
   if [[ ! `which chef-solo` ]]; then

data/bootstrap/omnibus.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+install_sh="https://www.opscode.com/chef/install.sh"
+version="11.4.4"
+
+if type -p chef-solo > /dev/null; then
+  echo "Using chef-solo $(chef-solo --v | awk '{print $2}') at $(which chef-solo)"
+else
+  if command -v curl &>/dev/null; then
+    curl -L "$install_sh" | sudo bash -s -- -v "$version"
+  elif command -v wget &>/dev/null; then
+    wget -qO- "$install_sh" | sudo bash -s -- -v "$version"
+  else
+    echo "Neither wget nor curl found. Please install one." >&2
+    exit 1
+  fi
+fi

data/bootstrap/redhat.sh

@@ -1,7 +1,17 @@
 #!/bin/sh
 
+install_sh="https://www.opscode.com/chef/install.sh"
+version="11.4.4"
+
 if type -p chef-solo > /dev/null; then
-  echo "Using chef-solo at `which chef-solo`"
+  echo "Using chef-solo $(chef-solo --v | awk '{print $2}') at $(which chef-solo)"
 else
-  curl -L https://www.opscode.com/chef/install.sh | bash
+  if command -v curl &>/dev/null; then
+    curl -L "$install_sh" | sudo bash -s -- -v "$version"
+  elif command -v wget &>/dev/null; then
+    wget -qO- "$install_sh" | sudo bash -s -- -v "$version"
+  else
+    echo "Neither wget nor curl found. Please install one." >&2
+    exit 1
+  fi
 fi

data/bootstrap/ubuntu.sh

@@ -1,8 +1,17 @@
 #!/bin/sh
 
+install_sh="https://www.opscode.com/chef/install.sh"
+version="11.4.4"
+
 if type -p chef-solo > /dev/null; then
-  echo "Using chef-solo at `which chef-solo`"
+  echo "Using chef-solo $(chef-solo --v | awk '{print $2}') at $(which chef-solo)"
 else
-  apt-get install -y ruby ruby-dev libopenssl-ruby rdoc ri irb build-essential wget ssl-cert curl rubygems
-  gem install chef --no-ri --no-rdoc --version "=11.4.0"
+  if command -v curl &>/dev/null; then
+    curl -L "$install_sh" | sudo bash -s -- -v "$version"
+  elif command -v wget &>/dev/null; then
+    wget -qO- "$install_sh" | sudo bash -s -- -v "$version"
+  else
+    echo "Neither wget nor curl found. Please install one." >&2
+    exit 1
+  fi
 fi

data/lib/gusteau/vagrant.rb

@@ -40,8 +40,7 @@ module Gusteau
           vb.customize ['modifyvm', :id,
             '--memory', config[:memory],
             '--name',   config[:label],
-            '--cpus',   config[:cpus],
-            '--natdnsproxy1', 'on'
+            '--cpus',   config[:cpus]
           ]
         end
         instance.vm.network :private_network, :ip => config[:ip]

data/lib/gusteau/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -144,6 +144,7 @@ files:
 - bin/gusteau_ssh_expect
 - bootstrap/centos.sh
 - bootstrap/gentoo.sh
+- bootstrap/omnibus.sh
 - bootstrap/redhat.sh
 - bootstrap/solo.rb
 - bootstrap/ubuntu.sh