blimpy 0.3.1 → 0.3.2

data/features/cli/start.feature

@@ -26,6 +26,20 @@ Feature: Start a VM or cluster of VMs in the cloud
       Up, up and away!
       """
 
+  Scenario: Start with an invalid Blimpfile
+    Given I have the Blimpfile:
+      """
+        Blimpy.fleet do |f|
+          f.bork
+        end
+      """
+    When I run `blimpy start`
+    Then the exit status should be 1
+    And the output should contain:
+      """
+      The Blimpfile is invalid!
+      """
+
   @slow @destroy
   Scenario: start with a functional Blimpfile
     Given I have the Blimpfile:

data/features/support/hooks.rb

@@ -1,7 +1,6 @@
 Before do
   @cwd = Dir.pwd
   @tempdir = TempDir.create(:basename => 'blimpy_test')
-  puts "Using tempdir: #{@tempdir}"
   Dir.chdir(@tempdir)
   @dirs = [@tempdir]
 end

data/lib/blimpy/box.rb

@@ -188,19 +188,14 @@ module Blimpy
       @exec_commands = use_exec
     end
 
+    def fog
+      raise NotImplementedError, '#fog should be implemented by cloud-specific subclasses'
+    end
+
     private
 
     def create_host
-      tags = @tags.merge({:Name => @name, :CreatedBy => 'Blimpy', :BlimpyFleetId => @fleet_id})
-      if @fog.nil?
-        @fog = Fog::Compute.new(:provider => 'AWS', :region => @region)
-      end
-
-      Blimpy::Keys.import_key(@fog)
-      @fog.servers.create(:image_id => @image_id,
-                          :key_name => Blimpy::Keys.key_name,
-                          :groups => [@group],
-                          :tags => tags)
+      raise NotImplementedError, '#create_host should be implemented by a cloud-specific subclass'
     end
   end
 end

data/lib/blimpy/boxes/aws.rb

@@ -23,9 +23,31 @@ module Blimpy::Boxes
     end
 
     def validate!
-      if Fog::Compute[:aws].security_groups.get(@group).nil?
-        raise Blimpy::BoxValidationError
+      if @region.nil?
+        raise Blimpy::BoxValidationError, "Cannot spin up machine without a set region"
       end
+
+      if fog.security_groups.get(@group).nil?
+        raise Blimpy::BoxValidationError, "The security group '#{@group}' does not exist in #{@region}"
+      end
+    end
+
+    def fog
+      @fog ||= begin
+        Fog::Compute.new(:provider => 'AWS', :region => @region)
+      end
+    end
+
+    private
+
+    def create_host
+      tags = @tags.merge({:Name => @name, :CreatedBy => 'Blimpy', :BlimpyFleetId => @fleet_id})
+
+      Blimpy::Keys.import_key(fog)
+      fog.servers.create(:image_id => @image_id,
+                          :key_name => Blimpy::Keys.key_name,
+                          :groups => [@group],
+                          :tags => tags)
     end
   end
 end

data/lib/blimpy/cli.rb

@@ -62,7 +62,13 @@ module Blimpy
     method_options :"dry-run" => :boolean
     def start
       ensure_blimpfile
-      engine = load_engine
+      begin
+        engine = load_engine
+      rescue Blimpy::InvalidBlimpFileError => e
+        puts "The Blimpfile is invalid!"
+        exit 1
+      end
+
       puts 'Up, up and away!'
 
       if options[:'dry-run']
@@ -111,7 +117,7 @@ module Blimpy
 # Blimpfile created on #{Time.now}
 
 Blimpy.fleet do |fleet|
-  fleet.add do |ship|
+  fleet.add(:aws) do |ship|
     ship.name = 'Excelsior'
     ship.group = 'default'
   end

data/lib/blimpy/version.rb

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

data/spec/blimpy/box_spec.rb

@@ -28,6 +28,23 @@ describe Blimpy::Box do
     end
   end
 
+  describe '#create_host' do
+    it 'should raise a NotImplementedError' do
+      # lol private
+      expect {
+        subject.send(:create_host)
+      }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#fog' do
+    it 'should raise NotImplementedError' do
+      expect {
+        subject.fog.should be_nil
+      }.to raise_error(NotImplementedError)
+    end
+  end
+
   context 'with a mocked server' do
     let(:server_id) { 'id-0xdeadbeef' }
     let(:server) do

data/spec/blimpy/boxes/aws_spec.rb

@@ -42,15 +42,23 @@ describe Blimpy::Boxes::AWS do
       group.stub(:name).and_return('MockedGroup')
       group
     end
-    let(:groups) { double('Fog::Compute::AWS::SecurityGroups') }
+    let (:fog) { mock('Fog::Compute::AWS') }
 
     before :each do
-      Fog::Compute.stub_chain(:[], :security_groups).and_return(groups)
+      subject.stub(:fog).and_return(fog)
+    end
+
+    it 'should raise if no region has been set' do
+      expect {
+        # This may be a silly test
+        subject.instance_variable_set(:@region, nil)
+        subject.validate!
+      }.to raise_error(Blimpy::BoxValidationError)
     end
 
     context 'with invalid settings' do
       it 'should raise with a bad security group' do
-        groups.should_receive(:get).and_return(nil)
+        fog.stub_chain(:security_groups, :get).and_return(nil)
         expect {
           subject.validate!
         }.to raise_error(Blimpy::BoxValidationError)
@@ -59,7 +67,7 @@ describe Blimpy::Boxes::AWS do
 
     context 'with valid settings' do
       it 'should validate with a good security group' do
-        groups.should_receive(:get).with('MockedGroup').and_return(security_group)
+        fog.stub_chain(:security_groups, :get).with('MockedGroup').and_return(security_group)
         expect {
           subject.group = 'MockedGroup'
           subject.validate!

metadata

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