blimpy 0.6.4 → 0.6.5

data/lib/blimpy/livery/puppet.rb

@@ -44,7 +44,7 @@ module Blimpy
         run_sudo = ''
         run_sudo = 'sudo' if use_sudo?(box)
 
-        box.ssh_into("cd #{dir_name} && #{run_sudo} ./gempath.sh #{command}")
+        box.ssh_into("cd #{dir_name} && chmod 755 ./gempath.sh #{command} && #{run_sudo} ./gempath.sh #{command}")
       end
 
       def postflight(box)

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/scripts/puppet.sh

@@ -1,18 +1,26 @@
 #!/bin/sh -x
 
 OSNAME=`uname`
+LINUXFLAVOR=`lsb_release -is`
+PROG=`basename $0`
 
-if [ "${OSNAME}" = "FreeBSD" ]; then
+Info () {
+  echo "$PROG : $*"
+}
 
-  which pkg > /dev/null
+Fatal () {
+  echo "$PROG : FATAL: $*"
+  exit 1
+}
 
+Info "Begin"
+if [ "${OSNAME}" = "FreeBSD" ]; then
+  which pkg > /dev/null 2>&1
   if [ $? -ne 0 ]; then
-    echo "pkgng is not installed!"
+    Info "pkgng is not installed!"
     ftp -V ftp://anonymous:ec2@ftp.freebsd.org/pub/FreeBSD/ports/amd64/packages-9-stable/Latest/pkg.tbz
     pkg_add ./pkg.tbz
-
     echo "PACKAGESITE : http://pkgbeta.freebsd.org/freebsd-9-amd64/latest/" > /usr/local/etc/pkg.conf
-
     pkg update -q
     # Update pkgng itself
     pkg install -y pkg
@@ -20,23 +28,38 @@ if [ "${OSNAME}" = "FreeBSD" ]; then
     pkg install -y rsync
     # Install puppet so we can get that up and running
     pkg install -y puppet
-  fi;
-
-else
-
-  export PATH=/var/lib/gems/1.8/bin:/usr/local/bin:$PATH
-
-  which puppet
-
-  if [ $? -ne 0 ]; then
-      apt-get update
-
-      apt-get install -y ruby1.8 \
-                      ruby1.8-dev \
-                      libopenssl-ruby1.8 \
-                      rubygems
-
-      gem install puppet --version "~> 2.7" --no-ri --no-rdoc
   fi
-
+else
+  case "$LINUXFLAVOR" in
+    RedHat*) # Extract the major version number
+             VERSION=`lsb_release -ids | sed 's/.*release \([0-9]\).*/\1/'`
+             if [ $VERSION -eq 5 ]; then
+               rpm -ivh http://yum.puppetlabs.com/el/5/products/i386/puppetlabs-release-5-6.noarch.rpm
+             elif [ $VERSION -eq 6 ]; then
+               rpm -ivh http://yum.puppetlabs.com/el/6/products/i386/puppetlabs-release-6-6.noarch.rpm
+             else
+               Fatal "Unsupported Red Hat release: $VERSION"
+             fi
+             # Disable EPEL if for some reason it is configured on this host
+             # as we don't want to get some old Puppet from there.
+             if [ -f /etc/yum.repos.d/epel.repo ]; then
+               yum install -y puppet --disablerepo=epel
+             else
+               yum install -y puppet
+             fi
+             ;;
+    Ubuntu) export PATH=/var/lib/gems/1.8/bin:/usr/local/bin:$PATH
+            which puppet > /dev/null 2>&1
+            if [ $? -ne 0 ]; then
+              apt-get update
+              apt-get install -y ruby1.8 \
+                                 ruby1.8-dev \
+                                 libopenssl-ruby1.8 \
+                                 rubygems
+              gem install puppet --version "~> 2.7" --no-ri --no-rdoc
+            fi
+            ;;
+    *) Fatal "Unsupported Linux flavor: $LINUXFLAVOR"
+       ;;
+  esac
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000Z
+date: 2012-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &23035260 !ruby/object:Gem::Requirement
+  requirement: &27221180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23035260
+  version_requirements: *27221180
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &23034820 !ruby/object:Gem::Requirement
+  requirement: &27220740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23034820
+  version_requirements: *27220740
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &23034380 !ruby/object:Gem::Requirement
+  requirement: &27220300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23034380
+  version_requirements: *27220300
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -253001812742767215
+      hash: -4567911356011324298
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -253001812742767215
+      hash: -4567911356011324298
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10