blimpy 0.4.4 → 0.5.0

data/lib/blimpy/cli.rb

@@ -124,13 +124,27 @@ end
     end
 
     desc 'ssh BLIMP_NAME', 'Log into a running blimp'
-    def ssh(name, *args)
+    def ssh(name=nil, *args)
       ensure_blimpfile
-      box = box_by_name(name)
-      if box.nil?
-        puts "Could not find a blimp named \"#{name}\""
-        exit 1
+      unless name.nil?
+        box = box_by_name(name)
+        if box.nil?
+          puts "Could not find a blimp named \"#{name}\""
+          exit 1
+        end
+      else
+        blimps = current_blimps
+        unless blimps
+          puts "No Blimps running!"
+          exit 1
+        end
+
+        blimps.each do |blimp, data|
+          next unless data[:name]
+          box = box_by_name(data[:name])
+        end
       end
+
       box.wait_for_sshd
       box.ssh_into
     end

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/scripts/puppet.sh

@@ -0,0 +1,44 @@
+#!/bin/sh -x
+
+OSNAME=`uname`
+
+if [ "${OSNAME}" = "FreeBSD" ]; then
+
+  which pkg > /dev/null
+
+  if [ $? -ne 0 ]; then
+    echo "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
+    # Install rsync(1) so we don't have to fall back to tar(1)+scp(1) ever again
+    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:$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 --no-ri --no-rdoc
+  fi
+
+fi
+
+puppet apply --modulepath=./modules --verbose manifests/site.pp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000Z
+date: 2012-08-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &20821560 !ruby/object:Gem::Requirement
+  requirement: &19966060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20821560
+  version_requirements: *19966060
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &20821040 !ruby/object:Gem::Requirement
+  requirement: &19965580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20821040
+  version_requirements: *19965580
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &20820460 !ruby/object:Gem::Requirement
+  requirement: &19965040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20820460
+  version_requirements: *19965040
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -83,8 +83,7 @@ files:
 - lib/blimpy/livery.rb
 - lib/blimpy/securitygroups.rb
 - lib/blimpy/version.rb
-- scripts/freebsd_puppet.sh
-- scripts/linux_puppet.sh
+- scripts/puppet.sh
 - spec/blimpy/box_spec.rb
 - spec/blimpy/boxes/aws_spec.rb
 - spec/blimpy/boxes/openstack_spec.rb
@@ -108,18 +107,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -980627700140636570
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -980627700140636570
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/scripts/freebsd_puppet.sh

@@ -1,21 +0,0 @@
-#!/bin/sh -x
-
-which pkg > /dev/null
-
-if [ $? -ne 0 ]; then
-  echo "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
-  # Install rsync(1) so we don't have to fall back to tar(1)+scp(1) ever again
-  pkg install -y rsync
-  # Install puppet so we can get that up and running
-  pkg install -y puppet
-fi
-
-puppet apply --modulepath=./modules --verbose manifests/site.pp

data/scripts/linux_puppet.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -x
-
-export PATH=/var/lib/gems/1.8/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 --no-ri --no-rdoc
-fi
-
-
-puppet apply --verbose --modulepath=./modules manifests/site.pp