blimpy 0.3.2 → 0.3.3

data/README.md

@@ -5,6 +5,35 @@
 
 
 ### About
+
+Blimpy is a tool to help developers spin up and utilize machines "in the
+cloud."
+
+Once a developer has a Blimpfile, they can execute a few simple commands to
+manage the newly created "fleet" in the specified cloud provider:
+
+```
+   % blimpy start
+   [snip]
+   >> excelsior ..... online at: ec2-50-112-3-57.us-west-2.compute.amazonaws.com..
+   >> goodyear ..... online at: ec2-50-112-27-89.us-west-2.compute.amazonaws.com
+   %
+```
+
+Once machines are online, they're easy to access by name with:
+
+```
+  % blimpy scp goodyear secrets.tar.gz
+  % blimpy ssh goodyear
+```
+
+Then once you're finished working with the machines a simple `blimpy destroy`
+will terminate the machines.
+
+---
+
+(Inspired by [Vagrant](http://vagrantup.com))
+
 Notes and other bits are being stored in [this public Evernote
 notebook](https://www.evernote.com/pub/agentdero/blimpy).
 
@@ -19,11 +48,11 @@ Here's an example Blimpfile:
 ```ruby
     Blimpy.fleet do |fleet|
         fleet.add(:aws) do |ship|
-            ship.image_id = 'ami-349b495d'
-            ship.livery = 'rails'
+            ship.name = 'rails-app'
+            ship.image_id = 'ami-349b495d' # optional, defaults to Ubuntu 10.04 64-bit
+            ship.livery = 'rails' # optional
             ship.group = 'Simple' # [Required] The name of the desired Security Group
-            ship.region = 'us-west-1'
-            ship.name = 'Rails App Server'
+            ship.region = 'us-west-1' # optional, defaults to us-west-2
         end
     end
 ```

data/features/cli/start.feature

@@ -23,7 +23,7 @@ Feature: Start a VM or cluster of VMs in the cloud
     Then the exit status should be 0
     And the output should contain:
       """
-      Up, up and away!
+      skipping actually starting the fleet
       """
 
   Scenario: Start with an invalid Blimpfile
@@ -55,12 +55,22 @@ Feature: Start a VM or cluster of VMs in the cloud
     Then the exit status should be 0
     And the output should contain:
       """
-      Up, up and away!
+      online at:
       """
-    And the output should contain:
+
+  @slow @destroy
+  Scenario: Start a bigger instance
+    Given I have the Blimpfile:
       """
-      online at:
+      Blimpy.fleet do |f|
+        f.add(:aws) do |host|
+          host.name = 'Cucumber Host'
+          host.flavor = 'm1.large'
+        end
+      end
       """
+    When I run `blimpy start`
+    Then the exit status should be 0
 
   @slow @destroy @openstack @wip
   Scenario: start with an OpenStack Blimpfile

data/lib/blimpy/box.rb

@@ -8,8 +8,8 @@ module Blimpy
     include Blimpy::Helpers::State
 
     attr_reader :allowed_regions, :region
-    attr_accessor :image_id, :livery, :group, :server
-    attr_accessor :name, :tags, :fleet_id, :username
+    attr_accessor :image_id, :flavor, :group
+    attr_accessor :name, :tags, :fleet_id, :username, :livery
 
 
     def self.from_instance_id(an_id, data)
@@ -151,7 +151,6 @@ module Blimpy
     end
 
     def bootstrap_livery
-      tarball = nil
       if livery == :cwd
         dir_name = File.basename(Dir.pwd)
         run_command('rsync', '-av',

data/lib/blimpy/boxes/aws.rb

@@ -20,6 +20,8 @@ module Blimpy::Boxes
       @region = DEFAULT_REGION
       @image_id = DEFAULT_IMAGE_ID
       @username = 'ubuntu'
+      @flavor = 't1.micro'
+      @group = 'default'
     end
 
     def validate!
@@ -45,9 +47,10 @@ module Blimpy::Boxes
 
       Blimpy::Keys.import_key(fog)
       fog.servers.create(:image_id => @image_id,
-                          :key_name => Blimpy::Keys.key_name,
-                          :groups => [@group],
-                          :tags => tags)
+                         :flavor_id => @flavor,
+                         :key_name => Blimpy::Keys.key_name,
+                         :groups => [@group],
+                         :tags => tags)
     end
   end
 end

data/lib/blimpy/cli.rb

@@ -69,8 +69,6 @@ module Blimpy
         exit 1
       end
 
-      puts 'Up, up and away!'
-
       if options[:'dry-run']
         puts 'skipping actually starting the fleet'
         exit 0

data/lib/blimpy/fleet.rb

@@ -10,6 +10,7 @@ module Blimpy
     def initialize
       @ships = []
       @id = Time.now.utc.to_i
+      @airborn = false
     end
 
     def valid_types
@@ -60,6 +61,37 @@ module Blimpy
       puts
     end
 
+    def animate
+      buffer ="""
+            _..--=--..._
+          .-'            '-.  .-.
+        /.'              '.\\/  /
+        |=-  B L I M P Y   -=| (
+        \\'.              .'/\\  \\
+          '-.,_____ _____.-'  '-'
+              [_____]=+ ~ ~"""
+      frames = [
+        'x~   ',
+        'x ~  ',
+        '+~ ~ ',
+        '+ ~ ~',
+        '+  ~ ',
+        'x   ~',
+      ]
+
+      print buffer
+      $stdout.flush
+      until @airborn do
+        frames.each do |frame|
+          # Reset every frame
+          5.times { print "\b" }
+          print frame
+          $stdout.flush
+          sleep 0.2
+        end
+      end
+    end
+
     def start
       instances = members
       unless instances.empty?
@@ -71,16 +103,19 @@ module Blimpy
         host.validate!
       end
 
-      puts '>> Starting:'
+      Thread.new do
+        animate
+      end
+
       @ships.each do |host|
-        puts "..#{host.name}"
         host.start
       end
 
       @ships.each do |host|
-        print ">> #{host.name} "
-        host.wait_for_state('running') { print '.' }
-        print ".. online at: #{host.dns_name}"
+        host.wait_for_state('running') {  }
+        @airborn = true
+        print "\n"
+        puts ">> #{host.name} online at: #{host.dns_name}"
         host.online!
         host.bootstrap
         puts

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-19 00:00:00.000000000Z
+date: 2012-05-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &13915520 !ruby/object:Gem::Requirement
+  requirement: &10172400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13915520
+  version_requirements: *10172400
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &13914980 !ruby/object:Gem::Requirement
+  requirement: &10171980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13914980
+  version_requirements: *10171980
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &13914440 !ruby/object:Gem::Requirement
+  requirement: &10171560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13914440
+  version_requirements: *10171560
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org