blimpy 0.2.1 → 0.3.0

data/README.md

@@ -1,4 +1,5 @@
 # Blimpy
+[![Build Status](https://buildhive.cloudbees.com/job/rtyler/job/blimpy/badge/icon)](https://buildhive.cloudbees.com/job/rtyler/job/blimpy/)
 
 ![Excelsior!](http://strongspace.com/rtyler/public/excelsior.png)
 
@@ -17,7 +18,7 @@ Here's an example Blimpfile:
 
 ```ruby
     Blimpy.fleet do |fleet|
-        fleet.add do |ship|
+        fleet.add(:aws) do |ship|
             ship.image_id = 'ami-349b495d'
             ship.livery = 'rails'
             ship.group = 'Simple' # [Required] The name of the desired Security Group

data/Rakefile

@@ -28,3 +28,5 @@ namespace :test do
   task :all => [:spec, :'cucumber:basic', :'cucumber:integration']
 end
 
+
+task :default => :test

data/features/cli/scp.feature

@@ -7,7 +7,7 @@ Feature: SCP a file into a named VM
     Given I have the Blimpfile:
       """
       Blimpy.fleet do |f|
-        f.add do |host|
+        f.add(:aws) do |host|
           host.name = 'Cucumber Host'
         end
       end
@@ -27,7 +27,7 @@ Feature: SCP a file into a named VM
     Given I have the Blimpfile:
       """
       Blimpy.fleet do |f|
-        f.add do |host|
+        f.add(:aws) do |host|
           host.name = 'Cucumber Host'
         end
       end

data/features/cli/ssh.feature

@@ -7,7 +7,7 @@ Feature: SSH into a named VM
     Given I have the Blimpfile:
       """
       Blimpy.fleet do |f|
-        f.add do |host|
+        f.add(:aws) do |host|
           host.name = 'Cucumber Host'
         end
       end
@@ -27,7 +27,7 @@ Feature: SSH into a named VM
     Given I have the Blimpfile:
       """
       Blimpy.fleet do |f|
-        f.add do |host|
+        f.add(:aws) do |host|
           host.group = 'Simple'
           host.name = 'Cucumber Host'
         end

data/features/cli/start.feature

@@ -13,7 +13,7 @@ Feature: Start a VM or cluster of VMs in the cloud
     Given I have the Blimpfile:
       """
       Blimpy.fleet do |f|
-        f.add do |host|
+        f.add(:aws) do |host|
           host.group = 'Simple'
           host.name = 'Cucumber Host'
         end
@@ -31,7 +31,7 @@ Feature: Start a VM or cluster of VMs in the cloud
     Given I have the Blimpfile:
       """
       Blimpy.fleet do |f|
-        f.add do |host|
+        f.add(:aws) do |host|
           host.group = 'Simple'
           host.name = 'Cucumber Host'
         end
@@ -47,3 +47,24 @@ Feature: Start a VM or cluster of VMs in the cloud
       """
       online at:
       """
+
+  @slow @destroy @openstack @wip
+  Scenario: start with an OpenStack Blimpfile
+    Given I have the Blimpfile:
+      """
+      Blimpy.fleet do |f|
+        f.add(:openstack) do |host|
+          host.name = 'Cucumber Host'
+        end
+      end
+      """
+    When I run `blimpy start`
+    Then the exit status should be 0
+    And the output should contain:
+      """
+      Up, up and away!
+      """
+    And the output should contain:
+      """
+      online at:
+      """

data/lib/blimpy.rb

@@ -21,4 +21,6 @@ module Blimpy
   end
   class SSHKeyNotFoundError < Exception
   end
+  class InvalidShipException < Exception
+  end
 end

data/lib/blimpy/box.rb

@@ -1,42 +1,37 @@
 require 'blimpy/helpers/state'
 require 'blimpy/livery'
 require 'blimpy/keys'
+require 'blimpy/boxes'
 
 module Blimpy
   class Box
     include Blimpy::Helpers::State
 
-    # Default to US West (Oregon)
-    DEFAULT_REGION = 'us-west-2'
-    # Default to 10.04 64-bit
-    DEFAULT_IMAGE_ID = 'ami-ec0b86dc'
-
     attr_reader :allowed_regions, :region
     attr_accessor :image_id, :livery, :group, :server
     attr_accessor :name, :tags, :fleet_id, :username
 
-    def self.fog_server_for_instance(id, blimpdata)
-      region = blimpdata['region'] || DEFAULT_REGION
-      fog = Fog::Compute.new(:provider => 'AWS', :region => region)
-      fog.servers.get(id)
-    end
 
     def self.from_instance_id(an_id, data)
-      server = self.fog_server_for_instance(an_id, data)
+      return if data['type'].nil?
+
+      name = data['type'].upcase.to_sym
+      return unless Blimpy::Boxes.const_defined? name
+
+      klass = Blimpy::Boxes.const_get(name)
+
+      server = klass.fog_server_for_instance(an_id, data)
       return if server.nil?
-      box = self.new(server)
+
+      box = klass.new(server)
       box.name = data['name']
       box
     end
 
     def initialize(server=nil)
-      @allowed_regions = ['us-west-1', 'us-west-2', 'us-east-1']
-      @region = DEFAULT_REGION
-      @image_id = DEFAULT_IMAGE_ID
       @livery = nil
       @group = nil
       @name = 'Unnamed Box'
-      @username = 'ubuntu'
       @tags = {}
       @server = server
       @fleet_id = 0
@@ -45,18 +40,12 @@ module Blimpy
     end
 
     def region=(newRegion)
-      unless @allowed_regions.include? newRegion
+      unless (@allowed_regions.nil?) || (@allowed_regions.include?(newRegion))
         raise InvalidRegionError
       end
       @region = newRegion
     end
 
-    def validate!
-      if Fog::Compute[:aws].security_groups.get(@group).nil?
-        raise BoxValidationError
-      end
-    end
-
     def online!
       File.open(state_file, 'a') do |f|
         f.write("dns: #{@server.dns_name}\n")
@@ -64,6 +53,10 @@ module Blimpy
       end
     end
 
+    def validate!
+      raise NotImplementedError, '#validate! should be defined in a subclass of Blimpy::Box'
+    end
+
     def start
       ensure_state_folder
       @server = create_host
@@ -99,6 +92,9 @@ module Blimpy
 
     def write_state_file
       File.open(state_file, 'w') do |f|
+        # We only really care about the class name as part of the Blimpy::Boxes
+        # module
+        f.write("type: #{self.class.to_s.split('::').last}\n")
         f.write("name: #{@name}\n")
         f.write("region: #{@region}\n")
       end

data/lib/blimpy/boxes.rb

@@ -0,0 +1,5 @@
+
+module Blimpy
+  module Boxes
+  end
+end

data/lib/blimpy/boxes/aws.rb

@@ -0,0 +1,31 @@
+require 'blimpy/box'
+require 'blimpy/boxes'
+
+module Blimpy::Boxes
+  class AWS < Blimpy::Box
+    # Default to US West (Oregon)
+    DEFAULT_REGION = 'us-west-2'
+    # Default to 10.04 64-bit
+    DEFAULT_IMAGE_ID = 'ami-ec0b86dc'
+
+    def self.fog_server_for_instance(id, blimpdata)
+      region = blimpdata['region'] || DEFAULT_REGION
+      fog = Fog::Compute.new(:provider => 'AWS', :region => region)
+      fog.servers.get(id)
+    end
+
+    def initialize(server=nil)
+      super(server)
+      @allowed_regions = ['us-west-1', 'us-west-2', 'us-east-1']
+      @region = DEFAULT_REGION
+      @image_id = DEFAULT_IMAGE_ID
+      @username = 'ubuntu'
+    end
+
+    def validate!
+      if Fog::Compute[:aws].security_groups.get(@group).nil?
+        raise Blimpy::BoxValidationError
+      end
+    end
+  end
+end

data/lib/blimpy/boxes/openstack.rb

@@ -0,0 +1,12 @@
+require 'blimpy/box'
+require 'blimpy/boxes'
+
+module Blimpy::Boxes
+  class OpenStack < Blimpy::Box
+    def self.fog_server_for_instance(id, blimpdata)
+      region = blimpdata['region']
+      fog = Fog::Compute.new(:provider => 'OpenStack', :region => region)
+      fog.servers.get(id)
+    end
+  end
+end

data/lib/blimpy/fleet.rb

@@ -1,4 +1,5 @@
 require 'blimpy/helpers/state'
+require 'blimpy/boxes/aws'
 
 module Blimpy
   class Fleet
@@ -11,11 +12,23 @@ module Blimpy
       @id = Time.now.utc.to_i
     end
 
-    def add(&block)
+    def valid_types
+      [:aws]
+    end
+
+    def add(box_type, &block)
+      unless valid_types.include? box_type
+        raise Blimpy::InvalidShipException
+      end
       if block.nil?
         return false
       end
-      box = Blimpy::Box.new
+
+      box = Blimpy::Boxes::AWS.new
+
+      if box.nil?
+        return false
+      end
       box.fleet_id = @id
       @ships << box
       block.call(box)

data/lib/blimpy/version.rb

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

data/spec/blimpy/box_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe Blimpy::Box do
-  describe '#image_id' do
-    it 'should be the Ubuntu 10.04 AMI ID by default' do
-      subject.image_id.should == Blimpy::Box::DEFAULT_IMAGE_ID
-    end
-  end
 
   describe '#livery' do
     it 'should be unset by default' do
@@ -25,65 +20,11 @@ describe Blimpy::Box do
     end
   end
 
-  describe '#allowed_regions' do
-    it 'should be an Array' do
-      subject.allowed_regions.should be_instance_of Array
-    end
-    it 'should not be empty' do
-      subject.allowed_regions.should_not be_empty
-    end
-  end
-
-  describe '#region' do
-    it 'should return the default region' do
-      subject.region.should == 'us-west-2'
-    end
-  end
-
-  describe '#region=' do
-    it 'should raise an InvalidRegionError if the region is not allowed' do
-      expect {
-        subject.region = :elbonia
-      }.to raise_error(Blimpy::InvalidRegionError)
-    end
-
-    it 'should change the value of @region' do
-      subject.region = 'us-east-1'
-      subject.region.should == 'us-east-1'
-    end
-  end
-
   describe '#validate!' do
-    let(:security_group) do
-      group = double('Fog::Compute::AWS::SecurityGroup')
-      group.stub(:name).and_return('MockedGroup')
-      group
-    end
-    let(:groups) { double('Fog::Compute::AWS::SecurityGroups') }
-
-    before :each do
-      # Fog::Compute[:aws] will return a *new* instance of
-      # Fog::Compute::Aws::Real every time (apparently) it is invoked
-      Fog::Compute::AWS::Real.any_instance.should_receive(:security_groups).and_return(groups)
-    end
-
-    context 'with invalid settings' do
-      it 'should raise with a bad security group' do
-        groups.should_receive(:get).and_return(nil)
-        expect {
-          subject.validate!
-        }.to raise_error(Blimpy::BoxValidationError)
-      end
-    end
-
-    context 'with valid settings' do
-      it 'should validate with a good security group' do
-        groups.should_receive(:get).with('MockedGroup').and_return(security_group)
-        expect {
-          subject.group = 'MockedGroup'
-          subject.validate!
-        }.not_to raise_error(Blimpy::BoxValidationError)
-      end
+    it 'should raise a NotImplementedError, since this should be defined by subclasses' do
+      expect {
+        subject.validate!
+      }.to raise_error(NotImplementedError)
     end
   end
 
@@ -136,14 +77,27 @@ describe Blimpy::Box do
 
     describe '#from_instance_id' do
       let(:fog) { double('Fog::Compute') }
-      before :each do
-        fog.stub_chain(:servers, :get).and_return(server)
-        Fog::Compute.should_receive(:new).and_return(fog)
-      end
 
-      it 'should create a new Box instance' do
+      it 'should fail if no "type" exists' do
         result = Blimpy::Box.from_instance_id('someid', {})
-        result.should be_instance_of Blimpy::Box
+        result.should be_nil
+      end
+
+      it 'should fail if the "type" is not a defined Box class' do
+        result = Blimpy::Box.from_instance_id('someid', {'type' => 'MAGIC'})
+        result.should be_nil
+      end
+
+      context 'with an AWS box type' do
+        before :each do
+          fog.stub_chain(:servers, :get).and_return(server)
+          Fog::Compute.should_receive(:new).and_return(fog)
+        end
+
+        it 'should create a new AWS Box instance' do
+          result = Blimpy::Box.from_instance_id('someid', {'type' => 'AWS'})
+          result.should be_instance_of Blimpy::Boxes::AWS
+        end
       end
 
     end

data/spec/blimpy/boxes/aws_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require 'blimpy/boxes/aws'
+
+describe Blimpy::Boxes::AWS do
+  describe '#image_id' do
+    it 'should be the Ubuntu 10.04 AMI ID by default' do
+      subject.image_id.should == Blimpy::Boxes::AWS::DEFAULT_IMAGE_ID
+    end
+  end
+
+  describe '#allowed_regions' do
+    it 'should be an Array' do
+      subject.allowed_regions.should be_instance_of Array
+    end
+    it 'should not be empty' do
+      subject.allowed_regions.should_not be_empty
+    end
+  end
+
+  describe '#region' do
+    it 'should return the default region' do
+      subject.region.should == 'us-west-2'
+    end
+  end
+
+  describe '#region=' do
+    it 'should raise an InvalidRegionError if the region is not allowed' do
+      expect {
+        subject.region = :elbonia
+      }.to raise_error(Blimpy::InvalidRegionError)
+    end
+
+    it 'should change the value of @region' do
+      subject.region = 'us-east-1'
+      subject.region.should == 'us-east-1'
+    end
+  end
+
+  describe '#validate!' do
+    let(:security_group) do
+      group = double('Fog::Compute::AWS::SecurityGroup')
+      group.stub(:name).and_return('MockedGroup')
+      group
+    end
+    let(:groups) { double('Fog::Compute::AWS::SecurityGroups') }
+
+    before :each do
+      Fog::Compute.stub_chain(:[], :security_groups).and_return(groups)
+    end
+
+    context 'with invalid settings' do
+      it 'should raise with a bad security group' do
+        groups.should_receive(:get).and_return(nil)
+        expect {
+          subject.validate!
+        }.to raise_error(Blimpy::BoxValidationError)
+      end
+    end
+
+    context 'with valid settings' do
+      it 'should validate with a good security group' do
+        groups.should_receive(:get).with('MockedGroup').and_return(security_group)
+        expect {
+          subject.group = 'MockedGroup'
+          subject.validate!
+        }.not_to raise_error(Blimpy::BoxValidationError)
+      end
+    end
+  end
+end

data/spec/blimpy/boxes/openstack_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'blimpy/boxes/openstack'
+
+describe Blimpy::Boxes::OpenStack do
+  describe '#image_id' do
+    it 'should be nil by default' do
+      subject.image_id.should be_nil
+    end
+  end
+
+  describe '#allowed_regions' do
+    it 'should be nil by default' do
+      subject.allowed_regions.should be_nil
+    end
+  end
+
+  describe '#region=' do
+    it 'should not raise an InvalidRegionError if no allowed_regions exist' do
+      subject.stub(:allowed_regions).and_return(nil)
+      subject.region = :elbonia
+      subject.region.should == :elbonia
+    end
+  end
+end

data/spec/blimpy/engine_spec.rb

@@ -31,7 +31,7 @@ describe Blimpy::Engine do
       let(:content) do
         """
           Blimpy.fleet do |fleet|
-            fleet.add do |ship|
+            fleet.add(:aws) do |ship|
               ship.image_id = 'ami-349b495d'
               ship.livery = 'rails'
               ship.group = 'Simple'

data/spec/blimpy/fleet_spec.rb

@@ -9,29 +9,39 @@ describe Blimpy::Fleet do
   end
 
   describe '#add' do
-    it 'should return false if no Box was properly added' do
-      subject.add.should == false
+    context 'with invalid parameters' do
+      it 'should raise an InvalidShipException' do
+        expect {
+          subject.add(:submarine)
+        }.to raise_error(Blimpy::InvalidShipException)
+      end
     end
 
-    it 'should pass a Box instance to the block' do
-      invoked_block = false
-      subject.add do |box|
-        invoked_block = true
-        box.should be_instance_of Blimpy::Box
+    context 'with valid parameters' do
+      it 'should return false if no Box was properly added' do
+        subject.add(:aws).should == false
       end
-      invoked_block.should be true
-    end
 
-    context 'with a block' do
-      before :each do
-        subject.add do |b|
-          @box = b
+      it 'should pass a Box instance to the block' do
+        invoked_block = false
+        subject.add(:aws) do |box|
+          invoked_block = true
+          box.should be_a Blimpy::Box
         end
+        invoked_block.should be true
       end
 
-      it 'should add the box the fleet' do
-        @box.should_not be nil
-        subject.ships.should include(@box)
+      context 'with a block' do
+        before :each do
+          subject.add(:aws) do |b|
+            @box = b
+          end
+        end
+
+        it 'should add the box the fleet' do
+          @box.should_not be nil
+          subject.ships.should include(@box)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000Z
+date: 2012-05-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &5775980 !ruby/object:Gem::Requirement
+  requirement: &20178020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5775980
+  version_requirements: *20178020
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &5775440 !ruby/object:Gem::Requirement
+  requirement: &20177600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5775440
+  version_requirements: *20177600
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &5774900 !ruby/object:Gem::Requirement
+  requirement: &20177180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5774900
+  version_requirements: *20177180
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -69,6 +69,9 @@ files:
 - features/support/hooks.rb
 - lib/blimpy.rb
 - lib/blimpy/box.rb
+- lib/blimpy/boxes.rb
+- lib/blimpy/boxes/aws.rb
+- lib/blimpy/boxes/openstack.rb
 - lib/blimpy/cli.rb
 - lib/blimpy/engine.rb
 - lib/blimpy/fleet.rb
@@ -77,6 +80,8 @@ files:
 - lib/blimpy/livery.rb
 - lib/blimpy/version.rb
 - spec/blimpy/box_spec.rb
+- spec/blimpy/boxes/aws_spec.rb
+- spec/blimpy/boxes/openstack_spec.rb
 - spec/blimpy/engine_spec.rb
 - spec/blimpy/fleet_spec.rb
 - spec/blimpy/helpers/state_spec.rb
@@ -118,6 +123,8 @@ test_files:
 - features/support/env.rb
 - features/support/hooks.rb
 - spec/blimpy/box_spec.rb
+- spec/blimpy/boxes/aws_spec.rb
+- spec/blimpy/boxes/openstack_spec.rb
 - spec/blimpy/engine_spec.rb
 - spec/blimpy/fleet_spec.rb
 - spec/blimpy/helpers/state_spec.rb