blimpy 0.3.3 → 0.3.4

data/lib/blimpy/box.rb

@@ -118,9 +118,20 @@ module Blimpy
       end
     end
 
+
+    def with_data(ship_id, data)
+      @dns = data['dns']
+      @region = data['region']
+    end
+
     def dns_name
-      return @server.dns_name unless @server.nil?
-      'no name'
+      @dns ||= begin
+          if @server.nil?
+            'no name'
+          else
+            @server.dns_name
+          end
+        end
     end
 
     def internal_dns_name
@@ -177,7 +188,7 @@ module Blimpy
         @ssh_connected = ssh_into('-q', 'true')
 
         unless @ssh_connected
-          if (Time.now.to_i - start) < 30
+          if (Time.now.to_i - start) < 60
             print '.'
             sleep 1
           end

data/lib/blimpy/cli.rb

@@ -25,25 +25,24 @@ module Blimpy
       def box_by_name(name)
         engine = load_engine
         box = nil
-        id = nil
+        ship_id = nil
         data = nil
         engine.fleet.members.each do |instance_id, instance_data|
           next unless instance_data['name'] == name
-          id = instance_id
+          ship_id = instance_id
           data = instance_data
           break
         end
 
-        if id.nil?
+        if ship_id.nil?
           return nil
         end
 
         engine.fleet.ships.each do |ship|
           next unless ship.name == name
-          ship.server = ship.class.fog_server_for_instance(id, data)
-          box = ship
+          ship.with_data(ship_id, data)
+          return ship
         end
-        box
       end
 
       def current_blimps

data/lib/blimpy/version.rb

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

data/spec/blimpy/box_spec.rb

@@ -45,6 +45,31 @@ describe Blimpy::Box do
     end
   end
 
+  describe '#with_data' do
+    context 'with valid data' do
+      let(:data) do
+        {'type' => 'AWS',
+         'name' => 'Fakey',
+         'region' => 'us-west-2',
+         'dns' => 'ec2-50-112-24-134.us-west-2.compute.amazonaws.com',
+         'internal_dns' => 'ip-10-252-73-124.us-west-2.compute.internal'}
+      end
+      let(:ship_id) { 'i-deadbeef' }
+
+      before :each do
+        subject.with_data(ship_id, data)
+      end
+
+      it 'should set the dns_name' do
+        subject.dns_name.should == data['dns']
+      end
+
+      it 'should set the region' do
+        subject.region.should == data['region']
+      end
+    end
+  end
+
   context 'with a mocked server' do
     let(:server_id) { 'id-0xdeadbeef' }
     let(:server) do

metadata

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