blimpy 0.6.6 → 0.6.7

data/Gemfile

@@ -11,9 +11,5 @@ group :development do
   gem 'aruba'
   gem 'tempdir'
   gem 'pry'
-  if RUBY_VERSION > '1.9'
-    gem 'ruby-debug19', :require => 'ruby-debug'
-  else
-    gem 'ruby-debug'
-  end
+  gem 'debugger' unless RUBY_VERSION =~ /1.8.+/
 end

data/README.md

@@ -47,6 +47,9 @@ Here's an example Blimpfile:
             ship.group = 'Simple' # [Optional] The name of the desired Security Group
             ship.region = 'us-west-1' # [Optional] defaults to us-west-2
             ship.username = 'ubuntu' # [Optional] SSH username, defaults to "ubuntu" for AWS machines
+            ship.flavor = 'm1.small' # [Optional] defaults to t1.micro
+            ship.tags = {:mytag => 'somevalue'} # [Optional]
+            ship.provision_on_start = false # [Optional] defaults to true
         end
     end
 ```

data/bin/blimpy

@@ -10,12 +10,12 @@ rescue NameError
   # I don't think we have YAML::ENGINE until Ruby 1.9
 end
 
-begin
-  require 'blimpy/cli'
-rescue LoadError
-  $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib/')
-  require 'blimpy/cli'
-end
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib/')
+require 'blimpy/cli'
+
+# allow monkey-patching of Blimpy by the project (mainly to add more commands)
+blimprc = File.join(Dir.pwd,"Blimprc")
+Blimpy.load_file File.open(blimprc).read if File.exists? blimprc
 
 Blimpy::CLI.start
 exit 0

data/features/support/env.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'aruba/cucumber'
 require 'fileutils'
-require 'ruby-debug'
+require 'ruby-debug' unless RUBY_VERSION =~ /1.8.+/
 require 'temp_dir'
 
 

data/lib/blimpy/box.rb

@@ -13,8 +13,8 @@ module Blimpy
     attr_reader :allowed_regions, :region
     attr_accessor :image_id, :flavor, :group, :ports
     attr_accessor :dns, :internal_dns
-    attr_accessor :name, :tags, :fleet_id, :username, :livery
-
+    attr_accessor :name, :tags, :fleet_id, :username, :ssh_port, :livery
+    attr_accessor :provision_on_start
 
     def self.from_instance_id(an_id, data)
       return if data[:type].nil?
@@ -33,6 +33,7 @@ module Blimpy
     end
 
     def initialize(server=nil)
+      @provision_on_start = true
       @livery = nil
       @group = nil
       @name = 'Unnamed Box'
@@ -126,7 +127,7 @@ module Blimpy
     end
 
     def serializable_attributes
-      [:type, :name, :region, :dns, :internal_dns]
+      [:type, :name, :region, :dns, :internal_dns, :flavor, :tags]
     end
 
     def immutable_attributes
@@ -161,7 +162,6 @@ module Blimpy
       end
     end
 
-
     def with_data(ship_id, data)
       data.each do |key, value|
         next if immutable_attributes.include? key.to_sym
@@ -197,15 +197,15 @@ module Blimpy
       end
     end
 
+    def ssh_commands(*args)
+      ['ssh', '-o', 'PasswordAuthentication=no',
+          '-o', 'StrictHostKeyChecking=no',
+          '-p', (ssh_port||22).to_s,
+          '-l', username, dns, *args]
+    end
+
     def ssh_into(*args)
-      # Support using #ssh_into within our own code as well to pass arguments
-      # to the ssh(1) binary
-      if args.empty?
-        args = ARGV[2 .. -1]
-      end
-      run_command('ssh', '-o', 'PasswordAuthentication=no',
-                  '-o', 'StrictHostKeyChecking=no',
-                  '-l', username, dns, *args)
+      run_command(*ssh_commands(*args))
     end
 
     def scp_file(filename, directory='', *args)
@@ -214,6 +214,11 @@ module Blimpy
                   filename, "#{username}@#{dns}:#{directory}", *args)
     end
 
+    def scp_files(directory, files)
+      filename = File.expand_path(filename)
+      run_command(*['scp', '-o', 'StrictHostKeyChecking=no']+files+["#{username}@#{dns}:#{directory}"])
+    end
+
     def bootstrap_livery
       if @livery.kind_of? Symbol
         raise Blimpy::InvalidLiveryException, 'Symbol liveries are unsupported!'
@@ -233,18 +238,34 @@ module Blimpy
       # after sshd(8) comes online
       @exec_commands = false
 
+      $stdout.sync = true
+      need_nl = false
+
       until @ssh_connected
         # Run the `true` command and exit
         @ssh_connected = ssh_into('-q', 'true')
+        # if SSH is killed, don't repeat
+        if $?.signaled?
+          if $?.termsig==2
+            # if Ctrl+C, report what we were doing
+            puts "Failed to connect. To try it yourself:\n#{ssh_commands('-v','true').join(' ')}"
+          end
+          raise Exception, "ssh was killed: #{$?}"
+        end
 
         unless @ssh_connected
+          if !need_nl
+            p = ssh_port.nil? ? "" : ":#{ssh_port}"
+            print ">> Connecting #{username}@#{name}#{p}"
+          end
           if (Time.now.to_i - start) < 60
             print '.'
+            need_nl = true
             sleep 1
           end
         end
       end
-      puts
+      puts if need_nl
       @exec_commands = use_exec
     end
 

data/lib/blimpy/boxes/aws.rb

@@ -1,5 +1,6 @@
 require 'blimpy/box'
 require 'blimpy/boxes'
+require 'fog/aws'
 
 module Blimpy::Boxes
   class AWS < Blimpy::Box

data/lib/blimpy/boxes/openstack.rb

@@ -1,5 +1,6 @@
 require 'blimpy/box'
 require 'blimpy/boxes'
+require 'fog/openstack'
 
 module Blimpy::Boxes
   class OpenStack < Blimpy::Box

data/lib/blimpy/cli.rb

@@ -62,6 +62,7 @@ module Blimpy
         fleet = load_blimpfile
       rescue Blimpy::InvalidBlimpFileError => e
         puts "The Blimpfile is invalid!"
+        puts e.to_s
         exit 1
       end
 
@@ -73,6 +74,32 @@ module Blimpy
       fleet.start
     end
 
+    desc 'show', 'Show blimp details for running blimps'
+    method_options :tags => :boolean
+    def show
+      ensure_blimpfile
+      blimps = current_blimps
+      unless blimps
+        puts 'No currently running VMs'
+        exit 0
+      end
+
+      tags_option = options[:tags]
+      blimps.each do |blimp, data|
+        if tags_option
+          tags = nil
+          data[:tags].each do |k,v|
+            if tags.nil?
+              tags = "#{k}=#{v}"
+            elsif
+              tags = "#{tags},#{k}=#{v}"
+            end
+          end
+          puts "#{data[:name]} #{data[:internal_dns]} #{tags}"
+        end
+      end
+    end
+
     desc 'status', 'Show running blimps'
     def status
       ensure_blimpfile
@@ -85,7 +112,7 @@ module Blimpy
       blimps.each do |blimp, data|
         instance_id = File.basename(blimp)
         instance_id = instance_id.split('.blimp').first
-        puts "#{data[:name]} (#{instance_id}) is: online at #{data[:dns]}"
+        puts "#{data[:name]} (#{instance_id}) is: online at #{data[:dns]} (#{data[:internal_dns]} internally)"
       end
     end
 
@@ -143,7 +170,7 @@ end
       end
 
       box.wait_for_sshd
-      box.ssh_into
+      box.ssh_into *args
     end
 
     desc 'scp BLIMP_NAME FILE_NAME', 'Securely copy FILE_NAME into the blimp'

data/lib/blimpy/fleet.rb

@@ -124,8 +124,10 @@ module Blimpy
         print "\n"
         puts ">> #{host.name} online at: #{host.dns}"
         host.online!
-        host.bootstrap
-        puts
+        if host.provision_on_start
+          host.bootstrap
+          puts
+        end
       end
 
       save!

data/lib/blimpy/livery/cwd.rb

@@ -22,7 +22,7 @@ module Blimpy
           run_sudo = ''
         end
 
-        box.ssh_into("cd #{dir_name} && #{run_sudo} ./#{script}")
+        box.ssh_into("cd #{dir_name} && #{run_sudo} BLIMPY_SHIPNAME=#{box.name} ./#{script}")
       end
 
       def bootstrap_script

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/scripts/puppet.sh

@@ -51,12 +51,14 @@ else
     Ubuntu) export PATH=/var/lib/gems/1.8/bin:/usr/local/bin:$PATH
             which puppet > /dev/null 2>&1
             if [ $? -ne 0 ]; then
+              # CODENAME is 'precise', 'oneiric', etc.
+              CODENAME=`lsb_release -c | awk '{print $2}'`
+              REPO_DEB="puppetlabs-release-${CODENAME}.deb"
+              wget --quiet http://apt.puppetlabs.com/${REPO_DEB} || Fatal "Could not retrieve http://apt.puppetlabs.com/${REPO_DEB}"
+              dpkg -i ${REPO_DEB} || Fatal "Could not install Puppet repo source '${REPO_DEB}'"
+              rm -f ${REPO_DEB}
               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
+              apt-get -qqy install puppet-common=2.7.* puppet=2.7.* hiera=1.1.* hiera-puppet=1.0* || Fatal "Could not install Puppet"
             fi
             ;;
     *) Fatal "Unsupported Linux flavor: $LINUXFLAVOR"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &23419180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23419180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &23418760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23418760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &23418300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23418300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -117,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 728683722124113180
+      hash: 4596383241046326596
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,10 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 728683722124113180
+      hash: 4596383241046326596
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby + CLOUD = Blimpy