blimpy 0.2.0 → 0.2.1

data/lib/blimpy/box.rb

@@ -12,16 +12,18 @@ module Blimpy
     DEFAULT_IMAGE_ID = 'ami-ec0b86dc'
 
     attr_reader :allowed_regions, :region
-    attr_accessor :image_id, :livery, :group
+    attr_accessor :image_id, :livery, :group, :server
     attr_accessor :name, :tags, :fleet_id, :username
 
-    def self.from_instance_id(an_id, data)
-      region = data['region'] || DEFAULT_REGION
+    def self.fog_server_for_instance(id, blimpdata)
+      region = blimpdata['region'] || DEFAULT_REGION
       fog = Fog::Compute.new(:provider => 'AWS', :region => region)
-      server = fog.servers.get(an_id)
-      if server.nil?
-        return nil
-      end
+      fog.servers.get(id)
+    end
+
+    def self.from_instance_id(an_id, data)
+      server = self.fog_server_for_instance(an_id, data)
+      return if server.nil?
       box = self.new(server)
       box.name = data['name']
       box

data/lib/blimpy/cli.rb

@@ -16,13 +16,33 @@ module Blimpy
         end
       end
 
+      def load_engine
+        engine = Blimpy::Engine.new
+        engine.load_file(File.open(BLIMPFILE).read)
+        engine
+      end
+
+
       def box_by_name(name)
-        fleet = Blimpy::Fleet.new
+        engine = load_engine
         box = nil
-        fleet.members.each do |instance_id, data|
-          box_name = data['name']
-          next unless box_name == name
-          box = Blimpy::Box.from_instance_id(instance_id, data)
+        id = nil
+        data = nil
+        engine.fleet.members.each do |instance_id, instance_data|
+          next unless instance_data['name'] == name
+          id = instance_id
+          data = instance_data
+          break
+        end
+
+        if id.nil?
+          return nil
+        end
+
+        engine.fleet.ships.each do |ship|
+          next unless ship.name == name
+          ship.server = Blimpy::Box.fog_server_for_instance(id, data)
+          box = ship
         end
         box
       end
@@ -32,8 +52,7 @@ module Blimpy
     method_options :"dry-run" => :boolean
     def start
       ensure_blimpfile
-      engine = Blimpy::Engine.new
-      engine.load_file(File.open(BLIMPFILE).read)
+      engine = load_engine
       puts 'Up, up and away!'
 
       if options[:'dry-run']
@@ -115,5 +134,16 @@ end
       box.wait_for_sshd
       box.scp_file(filename)
     end
+
+    desc 'provision BLIMP_NAME', 'Run the livery again'
+    def provision(name=nil)
+      ensure_blimpfile
+      box = box_by_name(name)
+      if box.nil?
+        puts "Could not find a blimp named \"#{name}\""
+        exit 1
+      end
+      box.bootstrap
+    end
   end
 end

data/lib/blimpy/fleet.rb

@@ -4,10 +4,10 @@ module Blimpy
   class Fleet
     include Blimpy::Helpers::State
 
-    attr_reader :hosts, :id
+    attr_reader :ships, :id
 
     def initialize
-      @hosts = []
+      @ships = []
       @id = Time.now.utc.to_i
     end
 
@@ -17,7 +17,7 @@ module Blimpy
       end
       box = Blimpy::Box.new
       box.fleet_id = @id
-      @hosts << box
+      @ships << box
       block.call(box)
     end
 
@@ -53,18 +53,18 @@ module Blimpy
         return resume(instances)
       end
 
-      # Make sure all our hosts are valid first!
-      @hosts.each do |host|
+      # Make sure all our ships are valid first!
+      @ships.each do |host|
         host.validate!
       end
 
       puts '>> Starting:'
-      @hosts.each do |host|
+      @ships.each do |host|
         puts "..#{host.name}"
         host.start
       end
 
-      @hosts.each do |host|
+      @ships.each do |host|
         print ">> #{host.name} "
         host.wait_for_state('running') { print '.' }
         print ".. online at: #{host.dns_name}"

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/blimpy/engine_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Blimpy::Engine do
-
   describe '#load_file' do
     context 'no contents' do
       let(:content) { '' }
@@ -32,12 +31,12 @@ describe Blimpy::Engine do
       let(:content) do
         """
           Blimpy.fleet do |fleet|
-            fleet.add do |host|
-              host.image_id = 'ami-349b495d'
-              host.livery = 'rails'
-              host.group = 'Simple'
-              host.region = 'us-west-1'
-              host.name = 'Rails App Server'
+            fleet.add do |ship|
+              ship.image_id = 'ami-349b495d'
+              ship.livery = 'rails'
+              ship.group = 'Simple'
+              ship.region = 'us-west-1'
+              ship.name = 'Rails App Server'
             end
           end
         """
@@ -46,12 +45,12 @@ describe Blimpy::Engine do
       it 'should create the appropriate Fleet object' do
         result = subject.load_file(content)
         result.should be_instance_of Blimpy::Fleet
-        result.hosts.should be_instance_of Array
-        result.hosts.size.should == 1
+        result.ships.should be_instance_of Array
+        result.ships.size.should == 1
 
-        host = result.hosts.first
-        host.group.should == 'Simple'
-        host.name.should == 'Rails App Server'
+        ship = result.ships.first
+        ship.group.should == 'Simple'
+        ship.name.should == 'Rails App Server'
       end
     end
   end

data/spec/blimpy/fleet_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Blimpy::Fleet do
-  describe '#hosts' do
+  describe '#ships' do
     it 'should be an Array' do
-      subject.hosts.should be_instance_of Array
-      subject.hosts.size.should == 0
+      subject.ships.should be_instance_of Array
+      subject.ships.size.should == 0
     end
   end
 
@@ -31,7 +31,7 @@ describe Blimpy::Fleet do
 
       it 'should add the box the fleet' do
         @box.should_not be nil
-        subject.hosts.should include(@box)
+        subject.ships.should include(@box)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &6248380 !ruby/object:Gem::Requirement
+  requirement: &5775980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6248380
+  version_requirements: *5775980
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &6247840 !ruby/object:Gem::Requirement
+  requirement: &5775440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6247840
+  version_requirements: *5775440
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &6247360 !ruby/object:Gem::Requirement
+  requirement: &5774900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6247360
+  version_requirements: *5774900
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org