blimpy 0.5.1 → 0.6.0

data/.gitignore

@@ -18,3 +18,5 @@ tmp
 .blimpy.d
 .rvmrc
 Blimpyfile
+features/report.html
+features/reports

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 group :development do
   gem 'rake'
-  gem 'rspec'
+  gem 'rspec', '~> 2.11.0'
   gem 'cucumber'
   gem 'ci_reporter'
   gem 'aruba'

data/README.md

@@ -50,8 +50,8 @@ Here's an example Blimpfile:
         fleet.add(:aws) do |ship|
             ship.name = 'rails-app'
             ship.ports = [22, 80, 8080] # [Optional] Create a security group with these ports open
-            ship.image_id = 'ami-349b495d' # [Optional] defaults to Ubuntu 10.04 64-bit
-            ship.livery = 'rails' # [Optional]
+            ship.image_id = 'ami-4438b474' # [Optional] defaults to Ubuntu 12.04 64-bit
+            ship.livery = Blimpy::Livery::CWD # [Optional]
             ship.group = 'Simple' # [Optional] The name of the desired Security Group
             ship.region = 'us-west-1' # [Optional] defaults to us-west-2
             ship.username = 'ubuntu' # [Optional] SSH username, defaults to "ubuntu" for AWS machines

data/Rakefile

@@ -9,28 +9,28 @@ RSpec::Core::RakeTask.new('spec') do |t|
 end
 
 
-namespace :cucumber do
-  cucumber_opts = '--color --format progress --tags ~@wip'
+Cucumber::Rake::Task.new('cucumber')
 
-  Cucumber::Rake::Task.new('basic') do |t|
-    t.cucumber_opts = cucumber_opts + ' --tags ~@slow'
+namespace :cucumber do
+  Cucumber::Rake::Task.new('aws') do |t|
+    t.cucumber_opts = '-p aws'
   end
 
-  Cucumber::Rake::Task.new('integration') do |t|
-    t.cucumber_opts = cucumber_opts + ' --tags @slow --tags ~@openstack'
+  Cucumber::Rake::Task.new('openstack') do |t|
+    t.cucumber_opts = '-p openstack'
   end
 
-  Cucumber::Rake::Task.new('openstack') do |t|
-    t.cucumber_opts = cucumber_opts + ' --tags @openstack'
+  Cucumber::Rake::Task.new('wip') do |t|
+    t.cucumber_opts = '-p wip'
   end
 end
 
 desc 'Run the basic test suite'
-task :test => [:spec, :"cucumber:basic"]
+task :test => ['spec', 'cucumber']
 
 namespace :test do
-  desc 'Run all the tests, including the slow integration tests'
-  task :all => [:spec, :'cucumber:basic', :'cucumber:integration']
+  desc 'Run all the tests, including the slow (AWS-based) integration tests'
+  task :all => ['spec', 'cucumber', 'cucumber:aws']
 end
 
 

data/cucumber.yml

@@ -0,0 +1,7 @@
+<%
+opts = "--color --format progress --format junit --out features/reports --format html --out features/report.html"
+%>
+default: <%= opts %> --tags ~@wip --tags ~@slow
+aws: <%= opts %> --tags ~@wip --tags @slow --tags ~@openstack
+openstack: <%= opts %> --tags ~@wip --tags @openstack
+wip: <%= opts %> --tags @wip

data/features/cli/version.feature

@@ -0,0 +1,8 @@
+Feature: Expose the current version to the user
+  As a user
+  I want to be able to check the blimpy version
+  So that I can tell if I should update or not
+
+  Scenario: Simple version check
+    When I run `blimpy version`
+    Then the output should contain the current Blimpy version

data/features/liveries.feature

@@ -4,6 +4,32 @@ Feature: Craft machines based on a livery
   When I specify a specific livery then that livery should provision
   the host the way I would expect it to.
 
+  Scenario: Using a configuration-less livery
+    Given the following Blimpfile contents:
+      """
+        Blimpy.fleet do |f|
+          f.add(:aws) do |ship|
+            ship.name = 'cucumber-livery'
+            ship.livery = Blimpy::Livery::CWD
+          end
+        end
+      """
+    When I evaluate the Blimpfile
+    Then the CWD livery should be set up
 
-  @slow @destroy @wip
-  Scenario: freebsd_puppet
+  Scenario: Configuration-less liveries
+    Given the following Blimpfile contents:
+      """
+        Blimpy.fleet do |f|
+          f.add(:aws) do |ship|
+            ship.name = 'cucumber-livery'
+            ship.livery = Blimpy::Livery::Puppet.configure do |p|
+              p.module_path = './modules'
+              p.manifest_path = './test/site.pp'
+              p.options = '--verbose'
+            end
+          end
+        end
+      """
+    When I evaluate the Blimpfile
+    Then the Puppet livery should be correctly configured

data/features/step_definitions/cli_steps.rb

@@ -52,3 +52,7 @@ Then /^the output should contain the right DNS info$/ do
   end
   step %{the output should contain "#{internal_name}"}
 end
+
+Then /^the output should contain the current Blimpy version$/ do
+  assert_partial_output(Blimpy::VERSION, all_output)
+end

data/features/step_definitions/liveries_steps.rb

@@ -0,0 +1,19 @@
+Given /^the following Blimpfile contents:$/ do |buffer|
+  @blimpfile = buffer
+end
+
+When /^I evaluate the Blimpfile$/ do
+  @blimpfile.should_not be_nil
+  @fleet = eval(@blimpfile)
+end
+
+Then /^the CWD livery should be set up$/ do
+  @fleet.should_not be_nil
+  @fleet.ships.first.livery.should == Blimpy::Livery::CWD
+end
+
+Then /^the Puppet livery should be correctly configured$/ do
+  @fleet.should_not be_nil
+  @fleet.ships.first.livery.should be_instance_of(Blimpy::Livery::Puppet)
+end
+

data/features/support/env.rb

@@ -1,19 +1,26 @@
+require 'rubygems'
 require 'aruba/cucumber'
 require 'fileutils'
+require 'ruby-debug'
 require 'temp_dir'
 
 
 # Pull in my gem working directory bin directory
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
+$:.unshift(File.expand_path(File.dirname(__FILE__) + "/../../lib"))
+require 'blimpy'
+require 'blimpy/livery'
 
-module BlimpyWorld
-  def create_blimpfile(string)
-    path = File.join(@tempdir, 'Blimpfile')
-    File.open(path, 'w') do |f|
-      f.write(string)
+module Blimpy
+  module Cucumber
+    def create_blimpfile(string)
+      path = File.join(@tempdir, 'Blimpfile')
+      File.open(path, 'w') do |f|
+        f.write(string)
+      end
     end
   end
 end
 
-World(BlimpyWorld)
+World(Blimpy::Cucumber)

data/lib/blimpy.rb

@@ -1,5 +1,8 @@
+require 'rubygems'
+require 'fog/core'
+require 'fog/compute'
+
 require 'blimpy/box'
-require 'blimpy/engine'
 require 'blimpy/fleet'
 require 'blimpy/version'
 
@@ -13,6 +16,22 @@ module Blimpy
     fleet
   end
 
+    def self.load_file(file_content)
+      if file_content.nil? || file_content.empty?
+        raise InvalidBlimpFileError, 'File appears empty'
+      end
+
+      begin
+        fleet = eval(file_content)
+        if fleet and !(fleet.instance_of? Blimpy::Fleet)
+          raise Exception, 'File does not create a Fleet'
+        end
+      rescue Exception => e
+        raise InvalidBlimpFileError, e.to_s
+      end
+      fleet
+    end
+
   class UnknownError < Exception
   end
   class InvalidBlimpFileError < Exception
@@ -27,4 +46,5 @@ module Blimpy
   end
   class UnsupportedFeatureException < Exception
   end
+  class InvalidLiveryException < Exception; end;
 end

data/lib/blimpy/box.rb

@@ -75,10 +75,16 @@ module Blimpy
 
     def bootstrap
       @exec_commands = false
-      unless livery.nil?
-        wait_for_sshd
-        bootstrap_livery
+      if @livery.nil?
+        return
+      end
+
+      if @livery.respond_to? :new
+        @livery = @livery.new
       end
+
+      wait_for_sshd
+      bootstrap_livery
     end
 
     def stop
@@ -204,46 +210,14 @@ module Blimpy
     end
 
     def bootstrap_livery
-      script = File.expand_path(File.dirname(__FILE__) + "/../../scripts/#{livery}.sh")
-
-      if livery == :cwd
-        script = File.join(Dir.pwd, '/bootstrap.sh')
-      end
-
-      unless File.exists?(script)
-        puts "Could not find `#{script}` which is needed to kick-start the machine"
-        return
-      end
-
-      unpack_command = 'true'
-      dir_name = File.basename(Dir.pwd)
-
-      if can_rsync?
-        unpack_command = "cd #{dir_name}"
-        run_command('rsync', '-avL',
-                    '-e',
-                    'ssh -o StrictHostKeyChecking=no',
-                    '--exclude=.git',
-                    '--exclude=.svn',
-                    '--exclude=.blimpy.d',
-                    '.',
-                    "#{username}@#{dns}:#{dir_name}/")
-      else
-        puts "Remote host has no rsync(1), falling back to copying a full tarball over"
-        tarball = Blimpy::Livery.tarball_directory(Dir.pwd)
-        scp_file(tarball)
-        # HAXX
-        basename = File.basename(tarball)
-        ssh_into("tar -zxf #{basename} && cd #{dir_name}")
+      if @livery.kind_of? Symbol
+        raise Blimpy::InvalidLiveryException, 'Symbol liveries are unsupported!'
       end
 
-      puts 'Bootstrapping the livery'
-      run_sudo = 'sudo'
-      if username == 'root'
-        run_sudo = ''
-      end
-      scp_file(script, dir_name)
-      ssh_into("cd #{dir_name} && #{run_sudo} ./#{File.basename(script)}")
+      @livery.setup_on(self)
+      @livery.preflight(self)
+      @livery.flight(self)
+      @livery.postflight(self)
     end
 
     def wait_for_sshd
@@ -273,10 +247,6 @@ module Blimpy
       raise NotImplementedError, '#fog should be implemented by cloud-specific subclasses'
     end
 
-    def can_rsync?
-      @can_rsync ||= ssh_into('-q', 'which rsync > /dev/null')
-    end
-
 
     private
 

data/lib/blimpy/boxes/aws.rb

@@ -5,8 +5,8 @@ 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'
+    # Default to 12.04 64-bit
+    DEFAULT_IMAGE_ID = 'ami-4438b474'
 
     def self.fog_server_for_instance(id, blimpdata)
       region = blimpdata[:region] || DEFAULT_REGION

data/lib/blimpy/cli.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'thor'
 
 require 'blimpy'
-require 'blimpy/engine'
 
 module Blimpy
   class CLI < Thor
@@ -16,18 +15,16 @@ module Blimpy
         end
       end
 
-      def load_engine
-        engine = Blimpy::Engine.new
-        engine.load_file(File.open(BLIMPFILE).read)
-        engine
+      def load_blimpfile
+        Blimpy.load_file(File.open(BLIMPFILE).read)
       end
 
       def box_by_name(name)
-        engine = load_engine
+        fleet = load_blimpfile
         box = nil
         ship_id = nil
         data = nil
-        engine.fleet.members.each do |instance_id, instance_data|
+        fleet.members.each do |instance_id, instance_data|
           next unless instance_data[:name] == name
           ship_id = instance_id
           data = instance_data
@@ -38,7 +35,7 @@ module Blimpy
           return nil
         end
 
-        engine.fleet.ships.each do |ship|
+        fleet.ships.each do |ship|
           next unless ship.name == name
           ship.with_data(ship_id, data)
           return ship
@@ -62,7 +59,7 @@ module Blimpy
     def start
       ensure_blimpfile
       begin
-        engine = load_engine
+        fleet = load_blimpfile
       rescue Blimpy::InvalidBlimpFileError => e
         puts "The Blimpfile is invalid!"
         exit 1
@@ -73,7 +70,7 @@ module Blimpy
         exit 0
       end
 
-      engine.fleet.start
+      fleet.start
     end
 
     desc 'status', 'Show running blimps'
@@ -185,5 +182,10 @@ end
         end
       end
     end
+
+    desc 'version', 'Print the current Blimpy gem version'
+    def version
+      puts Blimpy::VERSION
+    end
   end
 end

data/lib/blimpy/livery.rb

@@ -2,8 +2,11 @@ require 'rubygems'
 require 'zlib'
 require 'archive/tar/minitar'
 
+require 'blimpy/livery/cwd'
+require 'blimpy/livery/puppet'
+
 module Blimpy
-  class Livery
+  module Livery
     def self.tarball_directory(directory)
       if directory.nil? || !(File.directory? directory)
         raise ArgumentError, "The argument '#{directory}' doesn't appear to be a directory"

data/lib/blimpy/livery/base.rb

@@ -0,0 +1,59 @@
+
+module Blimpy
+  module Livery
+    class Base
+      def preflight(*args)
+      end
+
+      def flight(*args)
+        raise NotImplementedError
+      end
+
+      def postflight(*args)
+      end
+
+      def rsync_excludes
+        ['.git', '.svn', '.blimpy.d']
+      end
+
+      def rsync_command
+        excludes = rsync_excludes.map { |x| "--exclude=#{x}" }
+        ['rsync',
+         '-avL',
+         '-e',
+         'ssh -o StrictHostKeyChecking=no'] + excludes
+      end
+
+      def can_rsync?(box)
+        @can_rsync ||= box.ssh_into('-q', 'which rsync > /dev/null')
+      end
+
+      def sync_to(box)
+        if can_rsync? box
+          command = rsync_command + ['.', "#{box.username}@#{box.dns}:#{dir_name}/"]
+          box.run_command(*command)
+        else
+          puts "Remote host has no rsync(1), falling back to copying a full tarball over"
+          tarball = Blimpy::Livery.tarball_directory(livery_root)
+          box.scp_file(tarball)
+          # HAXX
+          basename = File.basename(tarball)
+          box.ssh_into("tar -zxf #{basename} && cd #{dir_name}")
+        end
+
+      end
+
+      def livery_root
+        Dir.pwd
+      end
+
+      def dir_name
+        File.basename(livery_root)
+      end
+
+      def setup_on(box)
+        sync_to(box)
+      end
+    end
+  end
+end

data/lib/blimpy/livery/cwd.rb

@@ -0,0 +1,33 @@
+require 'blimpy/livery/base'
+
+module Blimpy
+  module Livery
+    class CWD < Base
+      def script
+        'bootstrap.sh'
+      end
+
+      def preflight(box)
+        box.scp_file(bootstrap_script, dir_name)
+      end
+
+      def use_sudo?(box)
+        box.username != 'root'
+      end
+
+      def flight(box)
+        run_sudo = 'sudo'
+
+        unless use_sudo?(box)
+          run_sudo = ''
+        end
+
+        box.ssh_into("cd #{dir_name} && #{run_sudo} ./#{script}")
+      end
+
+      def bootstrap_script
+        File.join(livery_root, script)
+      end
+    end
+  end
+end

data/lib/blimpy/livery/puppet.rb

@@ -0,0 +1,64 @@
+require 'blimpy/livery/base'
+require 'blimpy/livery/cwd'
+
+module Blimpy
+  module Livery
+    class Puppet < CWD
+      attr_accessor :module_path, :manifest_path, :options
+
+      def initialize(*args)
+        super
+        @module_path = './modules'
+        @manifest_path = 'manifests/site.pp'
+        @options = '--verbose'
+        @puppet_exists = false
+      end
+
+      def script
+        'puppet.sh'
+      end
+
+      def preflight(box)
+        # If we find Puppet in our default path, we don't really need to send
+        # the bootstrap script again
+        @puppet_exists = box.ssh_into('which puppet > /dev/null')
+        unless @puppet_exists
+          super(box)
+        end
+      end
+
+      def flight(box)
+        unless @puppet_exists
+          # This should get our puppet.sh bootstrap script run
+          super(box)
+        end
+
+        # At this point we should be safe to actually invoke Puppet
+        command = "puppet apply --modulepath=#{module_path} #{options} #{manifest_path}"
+
+        run_sudo = ''
+        run_sudo = 'sudo' if use_sudo?(box)
+
+        box.ssh_into("cd #{dir_name} && #{run_sudo} #{command}")
+      end
+
+      def postflight(box)
+      end
+
+      def bootstrap_script
+        File.expand_path(File.dirname(__FILE__) + "/../../../scripts/#{script}")
+      end
+
+      def self.configure(&block)
+        if block.nil?
+          raise Blimpy::InvalidLiveryException, "Puppet livery must be given a block in order to configure itself"
+        end
+        instance = self.new
+        yield instance
+        instance
+      end
+
+
+    end
+  end
+end

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/scripts/puppet.sh

@@ -40,5 +40,3 @@ else
   fi
 
 fi
-
-puppet apply --modulepath=./modules --verbose manifests/site.pp

data/spec/blimpy/box_spec.rb

@@ -144,5 +144,55 @@ describe Blimpy::Box do
         end
       end
     end
+
+    describe '#bootstrap_livery' do
+      let(:livery) { double('Mock-livery') }
+
+      it 'should raise an error if the livery is a symbol (old style)' do
+        subject.livery = :deprecated
+        expect {
+          subject.bootstrap_livery
+        }.to raise_error(Blimpy::InvalidLiveryException)
+      end
+
+      it 'should invoke the correct livery methods' do
+        subject.livery = livery
+        livery.should_receive(:setup_on).with(subject)
+        livery.should_receive(:preflight).with(subject)
+        livery.should_receive(:flight).with(subject)
+        livery.should_receive(:postflight).with(subject)
+
+        subject.bootstrap_livery
+      end
+    end
+
+    describe '#bootstrap' do
+      context 'when livery is not defined' do
+        before :each do
+          subject.livery = nil
+        end
+
+        it 'should not call any of the bootstrap methods' do
+          subject.should_receive(:wait_for_sshd).never
+          subject.should_receive(:bootstrap_livery).never
+          subject.bootstrap
+        end
+      end
+
+      context 'when a livery is defined' do
+        before :each do
+          subject.should_receive(:wait_for_sshd)
+          subject.should_receive(:bootstrap_livery)
+        end
+
+        context 'as a class object' do
+          it 'should instantiate the livery' do
+            subject.livery = Blimpy::Livery::CWD
+            subject.livery.should_receive(:new)
+            subject.bootstrap
+          end
+        end
+      end
+    end
   end
 end

data/spec/blimpy/livery/base_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'blimpy/livery/base'
+
+
+describe Blimpy::Livery::Base do
+  describe '#rsync_excludes' do
+    it { subject.rsync_excludes.should be_instance_of Array }
+  end
+
+  describe '#rsync_command' do
+    subject { described_class.new.rsync_command }
+
+    it { expect(subject.first).to eql('rsync') }
+    it { should include('--exclude=.git') }
+  end
+
+  describe '#livery_root' do
+    it { expect(subject.livery_root).to eql(Dir.pwd) }
+  end
+
+end

data/spec/blimpy/livery/cwd_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+require 'blimpy/livery/cwd'
+
+describe Blimpy::Livery::CWD do
+
+end

data/spec/blimpy/livery/puppet_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+require 'blimpy/livery/puppet'
+
+describe Blimpy::Livery::Puppet do
+  context 'class methods' do
+    subject { described_class }
+
+    it { should respond_to :configure }
+    describe '#configure' do
+      it 'should return an instance of the Puppet livery' do
+        result = subject.configure { |p| }
+        expect(result).to be_instance_of described_class
+      end
+
+      it 'should raise a nice error if no configuration specified' do
+        expect {
+          subject.configure
+        }.to raise_error(Blimpy::InvalidLiveryException)
+      end
+
+      it 'should yield an instance of the Puppet livery' do
+        yielded = nil
+        subject.configure { |p| yielded = p }
+        expect(yielded).to be_instance_of described_class
+      end
+    end
+  end
+
+  it { should respond_to :module_path= }
+  it { should respond_to :manifest_path= }
+  it { should respond_to :options= }
+end

data/spec/blimpy_spec.rb

@@ -25,4 +25,58 @@ describe Blimpy do
       end
     end
   end
+
+  describe '#load_file' do
+    context 'no contents' do
+      let(:content) { '' }
+
+      it 'should raise InvalidBlimpFileError' do
+        expect {
+          subject.load_file(content)
+        }.to raise_error(Blimpy::InvalidBlimpFileError)
+      end
+
+    end
+
+    context 'invalid content' do
+      let(:content) do
+        """
+          this is totally invalid Ruby
+        """
+      end
+
+      it 'should raise InvalidBlimpFileError' do
+        expect {
+          subject.load_file(content)
+        }.to raise_error(Blimpy::InvalidBlimpFileError)
+      end
+    end
+
+    context 'valid content' do
+      let(:content) do
+        """
+          Blimpy.fleet do |fleet|
+            fleet.add(:aws) 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
+        """
+      end
+
+      it 'should create the appropriate Fleet object' do
+        result = subject.load_file(content)
+        result.should be_instance_of Blimpy::Fleet
+        result.ships.should be_instance_of Array
+        result.ships.size.should == 1
+
+        ship = result.ships.first
+        ship.group.should == 'Simple'
+        ship.name.should == 'Rails App Server'
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'ruby-debug'
+
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'blimpy'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000Z
+date: 2012-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &7880740 !ruby/object:Gem::Requirement
+  requirement: &6595860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7880740
+  version_requirements: *6595860
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &7879300 !ruby/object:Gem::Requirement
+  requirement: &6592700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7879300
+  version_requirements: *6592700
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &7878680 !ruby/object:Gem::Requirement
+  requirement: &6573460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7878680
+  version_requirements: *6573460
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -59,15 +59,18 @@ files:
 - Rakefile
 - bin/blimpy
 - blimpy.gemspec
+- cucumber.yml
 - features/cli/init.feature
 - features/cli/provision.feature
 - features/cli/scp.feature
 - features/cli/ssh.feature
 - features/cli/start.feature
 - features/cli/status.feature
+- features/cli/version.feature
 - features/liveries.feature
 - features/openstack.feature
 - features/step_definitions/cli_steps.rb
+- features/step_definitions/liveries_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
 - lib/blimpy.rb
@@ -76,21 +79,25 @@ files:
 - lib/blimpy/boxes/aws.rb
 - lib/blimpy/boxes/openstack.rb
 - lib/blimpy/cli.rb
-- lib/blimpy/engine.rb
 - lib/blimpy/fleet.rb
 - lib/blimpy/helpers/state.rb
 - lib/blimpy/keys.rb
 - lib/blimpy/livery.rb
+- lib/blimpy/livery/base.rb
+- lib/blimpy/livery/cwd.rb
+- lib/blimpy/livery/puppet.rb
 - lib/blimpy/securitygroups.rb
 - lib/blimpy/version.rb
 - scripts/puppet.sh
 - 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
 - spec/blimpy/keys_spec.rb
+- spec/blimpy/livery/base_spec.rb
+- spec/blimpy/livery/cwd_spec.rb
+- spec/blimpy/livery/puppet_spec.rb
 - spec/blimpy/livery_spec.rb
 - spec/blimpy/securitygroups_spec.rb
 - spec/blimpy_spec.rb
@@ -109,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1569587934174396261
+      hash: 932416498555668498
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1569587934174396261
+      hash: 932416498555668498
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -132,18 +139,22 @@ test_files:
 - features/cli/ssh.feature
 - features/cli/start.feature
 - features/cli/status.feature
+- features/cli/version.feature
 - features/liveries.feature
 - features/openstack.feature
 - features/step_definitions/cli_steps.rb
+- features/step_definitions/liveries_steps.rb
 - 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
 - spec/blimpy/keys_spec.rb
+- spec/blimpy/livery/base_spec.rb
+- spec/blimpy/livery/cwd_spec.rb
+- spec/blimpy/livery/puppet_spec.rb
 - spec/blimpy/livery_spec.rb
 - spec/blimpy/securitygroups_spec.rb
 - spec/blimpy_spec.rb

data/lib/blimpy/engine.rb

@@ -1,30 +0,0 @@
-
-require 'rubygems'
-require 'fog/core'
-require 'fog/compute'
-
-module Blimpy
-  class Engine
-    attr_reader :fleet
-
-    def initialize
-      @fleet = nil
-    end
-
-    def load_file(file_content)
-      if file_content.nil? || file_content.empty?
-        raise InvalidBlimpFileError, 'File appears empty'
-      end
-
-      begin
-        @fleet = eval(file_content)
-        if @fleet and !(@fleet.instance_of? Blimpy::Fleet)
-          raise Exception, 'File does not create a Fleet'
-        end
-      rescue Exception => e
-        raise InvalidBlimpFileError, e.to_s
-      end
-      @fleet
-    end
-  end
-end

data/spec/blimpy/engine_spec.rb

@@ -1,57 +0,0 @@
-require 'spec_helper'
-
-describe Blimpy::Engine do
-  describe '#load_file' do
-    context 'no contents' do
-      let(:content) { '' }
-
-      it 'should raise InvalidBlimpFileError' do
-        expect {
-          subject.load_file(content)
-        }.to raise_error(Blimpy::InvalidBlimpFileError)
-      end
-
-    end
-
-    context 'invalid content' do
-      let(:content) do
-        """
-          this is totally invalid Ruby
-        """
-      end
-
-      it 'should raise InvalidBlimpFileError' do
-        expect {
-          subject.load_file(content)
-        }.to raise_error(Blimpy::InvalidBlimpFileError)
-      end
-    end
-
-    context 'valid content' do
-      let(:content) do
-        """
-          Blimpy.fleet do |fleet|
-            fleet.add(:aws) 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
-        """
-      end
-
-      it 'should create the appropriate Fleet object' do
-        result = subject.load_file(content)
-        result.should be_instance_of Blimpy::Fleet
-        result.ships.should be_instance_of Array
-        result.ships.size.should == 1
-
-        ship = result.ships.first
-        ship.group.should == 'Simple'
-        ship.name.should == 'Rails App Server'
-      end
-    end
-  end
-end