vagrant-pirate 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c46dc6ec2291217ca9f078dabcdb225d8ff54e3d
-  data.tar.gz: 1569a99613c7167e7c70911c29a37176f6f06f2c
+  metadata.gz: 34fae5c76d4b0a545453514b6b97748e5a6853da
+  data.tar.gz: 73d1e410e8dfea98add9d35ab7a364f2da6c8d0b
 SHA512:
-  metadata.gz: 63f6e2203dcf70a0e06b31359d1d92e2907c767c21f0033ec51bf350aa544b96a558c076e4ed051157631bf33e79d6b72c52e3f30e06976cd4c59dbe35e4a380
-  data.tar.gz: c3dd2754cb4a5338eac5e7f1290dadc959bd5db6a49247a2515df3f4fc9138e21b147164750776efd1fbc578055c809c464599dd56115498aa080a82aff142e4
+  metadata.gz: 0b81186308a7b48611a35c57f98885520d441ef9a4004d567b997bae4c8ba7160dba4a48d35af593f235cd509f5e0bad4ea57ceeb3c754919036844ff518e6ab
+  data.tar.gz: 16e1f49461211119bf20534de4e87fc14e17b05e027bff5eec2e69f159c4940452fea916f24c04fdbf014eb7de73cf474768b1cb2dfbb7abd6f2c63348deead6

data/features/fleet.feature

@@ -0,0 +1,34 @@
+Feature: 'vagrant pirate fleet' command
+
+  In order to start using a complex YAML-based Vagrant project
+  As a user using vagrant-pirate
+  I want to initialize a new full-featured project
+
+  Scenario: Running 'vagrant pirate fleet'
+    Given a directory named "test_fleet"
+    And I cd to "test_fleet"
+    When I successfully run `vagrant pirate fleet`
+    Then the following directories should exist:
+      | local.d |
+      | available.d |
+      | available.d/default |
+      | enabled.d |
+      | enabled.d/vm1 |
+      | enabled.d/vm2 |
+    And the following files should exist:
+      | Vagrantfile |
+      | available.d/default/Piratefile |
+      | local.d/vm1.yaml |
+      | local.d/vm2.yaml |
+    And the output should contain "A `Vagrantfile` has been placed in this directory. A default directory containing"
+
+  @up
+  Scenario: Running 'vagrant up' after initializing a full project
+    Given a Vagrant project directory named "test_fleet_up"
+    When I successfully run `vagrant pirate fleet`
+    And I successfully run `vagrant up`
+    And I successfully run `vagrant ssh vm1 -c "hostname -f"`
+    And I successfully run `vagrant ssh vm2 -c "hostname -f"`
+    Then the output should contain "vm1.example.com"
+    Then the output should contain "vm2.example.com"
+

data/features/help.feature

@@ -8,36 +8,34 @@ Feature: Command help text
     When I successfully run `vagrant help`
     Then the output should contain "pirate"
     And the output should contain "Manage YAML-based projects."
+    And the output should not contain "pirate-fleet"
     And the output should not contain "pirate-ship"
-    And the output should not contain "pirate-update"
 
   Scenario: Running 'vagrant list-commands'
     When I successfully run `vagrant list-commands`
     Then the output should contain "pirate"
     And the output should contain "Manage YAML-based projects."
+    And the output should contain "pirate-fleet"
+    And the output should contain "Initializes a new Vagrant environment by creating a Vagrantfile and YAML config files."
     And the output should contain "pirate-ship"
     And the output should contain "Initializes a new Vagrant environment by creating a Vagrantfile and YAML config files."
-    And the output should contain "pirate-update"
-    And the output should contain "Updates a YAML-based Vagrant environment."
 
   Scenario: Running 'vagrant pirate'
     When I successfully run `vagrant pirate`
     Then the output should contain "Usage: vagrant pirate <command> [<args>]"
     And the output should contain "Available subcommands:"
+    And the output should contain "fleet"
     And the output should contain "ship"
-    And the output should contain "update"
     And the output should contain "For help on any individual command run `vagrant pirate COMMAND -h`"
 
-  Scenario: Running 'vagrant pirate ship -h'
-    When I successfully run `vagrant pirate ship -h`
-    Then the output should contain "Usage: vagrant pirate ship [box-name] [box-url]"
+  Scenario: Running 'vagrant pirate fleet -h'
+    When I successfully run `vagrant pirate fleet -h`
+    Then the output should contain "Usage: vagrant pirate fleet [box-name] [box-url]"
     And the output should contain "-h, --help"
     And the output should contain "Print this help"
 
-  Scenario: Running 'vagrant pirate update -h'
-    When I successfully run `vagrant pirate update -h`
-    Then the output should contain "Usage: vagrant pirate update"
-    And the output should contain "-f, --force"
-    And the output should contain "Update without confirmation."
+  Scenario: Running 'vagrant pirate ship -h'
+    When I successfully run `vagrant pirate ship -h`
+    Then the output should contain "Usage: vagrant pirate ship [box-name] [box-url]"
     And the output should contain "-h, --help"
     And the output should contain "Print this help"

data/features/ship.feature

@@ -1,28 +1,23 @@
-Feature: Init command
+Feature: 'vagrant pirate ship' command
 
   In order to start using a YAML-based Vagrant project
   As a user using vagrant-pirate
-  I want to initialize a new project
+  I want to initialize a new basic project
 
   Scenario: Running 'vagrant pirate ship'
-    Given a directory named "test"
-    And I cd to "test"
+    Given a directory named "test_ship"
+    And I cd to "test_ship"
     When I successfully run `vagrant pirate ship`
-    Then the following directories should exist:
-      | local.d |
-      | available.d |
-      | enabled.d |
-    And the following files should exist:
+    Then the following files should exist:
       | Vagrantfile |
-      | available.d/default.yaml |
-      | enabled.d/vm1.yaml |
-      | enabled.d/vm2.yaml |
-      | local.d/vm1.yaml |
-      | local.d/vm2.yaml |
-    And the output should contain "A `Vagrantfile` has been placed in this directory, a default Yaml VM config file"
-    And the output should contain "has been placed in 'available.d', and a symlink to it, placed in 'enabled.d'."
-    And the output should contain "Finally, a file to contain local overrides was placed in 'local.d'. Unlike a"
-    And the output should contain "regular Vagrantfile, this one parses and applies the configuration in the Yaml"
-    And the output should contain "files it finds in 'enabled.d'. You are now ready to `vagrant up` your first"
-    And the output should contain "virtual environment! Please read the comments in the default Yaml VM config"
-    And the output should contain "file to see how it works."
+      | Piratefile |
+    And the output should contain "A `Vagrantfile` and `Piratefile` (YAML VM config file) have been placed in this"
+
+  @up
+  Scenario: Running 'vagrant up' after initializing a basic project
+    Given a Vagrant project directory named "test_ship_up"
+    When I successfully run `vagrant pirate ship`
+    And I successfully run `vagrant up`
+    And I successfully run `vagrant ssh vm1 -c "hostname -f"`
+    Then the output should contain "vm1.example.com"
+

data/features/step_definitions/vagrant_steps.rb

@@ -0,0 +1,30 @@
+Given(/^a Vagrant project directory named "(.*?)"$/) do |dir_name|
+  # Running 'vagrant up' (in a subsequent step) will take longer than the
+  # default 3 seconds that Aruba allows a process to run. So we set it to
+  # 2 minutes, unless it's already explicitely been set with:
+  # "Given The default aruba timeout is X seconds"
+  @aruba_timeout_seconds ||= 120
+
+  create_dir(dir_name)
+  cd(dir_name)
+
+  # We register the directory we'll be running 'vagrant up' in, so that we
+  # can 'vagrant destroy' it in our 'After' hook. Since the 'After' hook runs
+  # after each scenario, it's safe to re-use a single environment variable.
+  # If we ever want to support using this step multiple times in a single
+  # scenario, we'll need to re-work this.
+  ENV['vagrant_test_dir'] = Pathname.new(Dir.pwd).join(current_dir).to_s
+
+end
+
+After do |scenario|
+  if ENV.member?('vagrant_test_dir')
+    # chdir's persist within the process, so we'll need to get back where we
+    # started.
+    orig_dir = Dir.pwd
+    # @TODO Print the below calls and their output when @announce is set.
+    Dir.chdir(ENV.delete('vagrant_test_dir'))
+    `vagrant destroy -f`
+    Dir.chdir(orig_dir)
+  end
+end

data/features/support/env.rb

@@ -1,9 +1,9 @@
-# Since simplecov need to run in the same process as the code being annalized,
-# we run initialize simplecov at the very beginning of our plugin. To only do
-# so during tests, we wrap it in a check for an environment variable.
+# Since simplecov needs to run in the same process as the code being analyzed,
+# we initialize simplecov at the very beginning of our plugin. To only do so
+# during tests, we wrap it in a check for an environment variable.
 ENV['COVERAGE'] = 'true'
 require 'coveralls'
-# Since simplecov is running under a separate process, we need to retrieve the
-# results afterwards.
+# Since simplecov is running under a separate process, we need to retrieve and
+# merge the results afterwards.
 Coveralls.wear_merged!
 require 'aruba/cucumber'

data/lib/vagrant-pirate.rb

@@ -11,7 +11,7 @@ end
 require 'vagrant'
 require 'vagrant-pirate/errors'
 require 'vagrant-pirate/plugin'
-require 'vagrant-pirate/vagrant-pirate'
+require 'vagrant-pirate/pirate'
 
 # Add our custom translations to the load path
 I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)

data/lib/vagrant-pirate/command/{pirate_ship.rb → fleet.rb}

@@ -2,18 +2,17 @@ require 'optparse'
 require 'vagrant/util/template_renderer'
 
 module VagrantPlugins
-  module VagrantPirate
+  module Pirate
     module Command
-      class PirateShip < Vagrant.plugin("2", :command)
+      class Fleet < Vagrant.plugin("2", :command)
 
         def self.synopsis
           "Initializes a new Vagrant environment by creating a Vagrantfile and YAML config files."
         end
         def execute
           options = {}
-
           opts = OptionParser.new do |opts|
-            opts.banner = "Usage: vagrant pirate ship [box-name] [box-url]"
+            opts.banner = "Usage: vagrant pirate fleet [box-name] [box-url]"
           end
 
           # Parse the options
@@ -22,12 +21,12 @@ module VagrantPlugins
 
           create_vagrantfile
           create_directories
-          create_default_yaml(argv[0], argv[1])
+          create_piratefile(argv[0], argv[1])
           create_vm_yaml('vm1')
           create_vm_yaml('vm2')
 
           @env.ui.info(I18n.t(
-            "vagrant.plugins.pirate.commands.ship.success",
+            "vagrant.plugins.pirate.commands.fleet.success",
               avail_dir: 'available.d',
               enabled_dir: 'enabled.d',
               local_dir: 'local.d'
@@ -38,9 +37,11 @@ module VagrantPlugins
 
         def create_vagrantfile
           save_path = @env.cwd.join("Vagrantfile")
-          raise Errors::VagrantfileExistsError if save_path.exist?
+          if save_path.exist?
+            raise ::Pirate::Errors::VagrantfileExistsError, :command => 'fleet'
+          end
 
-          template_path = ::VagrantPirate.source_root.join("templates/Vagrantfile")
+          template_path = ::Pirate.gangway.join("templates/Vagrantfile_fleet")
           contents = Vagrant::Util::TemplateRenderer.render(template_path)
           save_path.open("w+") do |f|
             f.write(contents)
@@ -48,16 +49,21 @@ module VagrantPlugins
         end
 
         def create_directories
-          Dir.mkdir('available.d')
-          Dir.mkdir('enabled.d')
-          Dir.mkdir('local.d')
+          ['available.d', 'enabled.d', 'local.d', 'available.d/default'].each do |dir|
+            if ::Pirate.haven.join(dir).exist?
+              raise ::Pirate::Errors::ConfigDirExistsError, :this_dir => dir, :command => 'fleet'
+            end
+            Dir.mkdir(dir)
+          end
         end
 
-        def create_default_yaml(box_name=nil, box_url=nil)
-          save_path = @env.cwd.join("available.d/default.yaml")
-          raise Errors::VagrantfileExistsError if save_path.exist?
+        def create_piratefile(box_name=nil, box_url=nil)
+          save_path = ::Pirate.haven.join("available.d/default/Piratefile")
+          if save_path.exist?
+            raise ::Pirate::Errors::PiratefileExistsError, :this_dir => save_path.dirname, :command => 'fleet'
+          end
 
-          template_path = ::VagrantPirate.source_root.join("templates/default.yaml")
+          template_path = ::Pirate.gangway.join("templates/Piratefile")
           contents = Vagrant::Util::TemplateRenderer.render(template_path,
                                                             :box_name => box_name,
                                                             :box_url => box_url)
@@ -67,10 +73,17 @@ module VagrantPlugins
         end
 
         def create_vm_yaml(vm_name)
-          File.symlink("../available.d/default.yaml", "enabled.d/" + vm_name + ".yaml")
-          save_path = @env.cwd.join("local.d/" + vm_name + ".yaml")
-          raise Errors::VagrantfileExistsError if save_path.exist?
-          template_path = ::VagrantPirate.source_root.join("templates/local.yaml")
+          source = "enabled.d/" + vm_name
+          target = "../available.d/default/"
+          if ::Pirate.haven.join(source).exist?
+            raise ::Pirate::Errors::SymlinkExistsError, :source => source, :command => 'fleet'
+          end
+          File.symlink(target, source)
+          save_path = ::Pirate.haven.join("local.d/" + vm_name + ".yaml")
+          if save_path.exist?
+            raise ::Pirate::Errors::LocalFileExistsError, :save_path => save_path, :command => 'fleet'
+          end
+          template_path = ::Pirate.gangway.join("templates/local.yaml")
           contents = Vagrant::Util::TemplateRenderer.render(template_path,
                                                             :hostname => vm_name + ".example.com")
           save_path.open("w+") do |f|

data/lib/vagrant-pirate/command/pirate.rb

@@ -1,7 +1,7 @@
 require 'optparse'
 
 module VagrantPlugins
-  module VagrantPirate
+  module Pirate
     module Command
       class Pirate < Vagrant.plugin("2", :command)
         def self.synopsis
@@ -14,15 +14,17 @@ module VagrantPlugins
           @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
 
           @subcommands = Vagrant::Registry.new
+
           @subcommands.register(:ship) do
-            require File.expand_path("../pirate_ship", __FILE__)
-            PirateShip
+            require File.expand_path("../ship", __FILE__)
+            Ship
           end
 
-          @subcommands.register(:update) do
-            require File.expand_path("../pirate_update", __FILE__)
-            PirateUpdate
+          @subcommands.register(:fleet) do
+            require File.expand_path("../fleet", __FILE__)
+            Fleet
           end
+
         end
 
         def execute

data/lib/vagrant-pirate/command/ship.rb

@@ -0,0 +1,73 @@
+require 'optparse'
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module Pirate
+    module Command
+      class Ship < Vagrant.plugin("2", :command)
+
+        def self.synopsis
+          "Initializes a new Vagrant environment by creating a Vagrantfile and YAML config files."
+        end
+        def execute
+          options = {}
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant pirate ship [box-name] [box-url]"
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          create_vagrantfile
+          create_piratefile(argv[0], argv[1])
+          create_vm_yaml('vm1')
+
+          @env.ui.info(I18n.t("vagrant.plugins.pirate.commands.ship.success"), :prefix => false)
+
+          # Success, exit status 0
+          0
+        end
+
+        def create_vagrantfile
+          save_path = @env.cwd.join("Vagrantfile")
+          if save_path.exist?
+            raise ::Pirate::Errors::VagrantfileExistsError, :command => 'ship'
+          end
+
+          template_path = ::Pirate.gangway.join("templates/Vagrantfile_ship")
+          contents = Vagrant::Util::TemplateRenderer.render(template_path)
+          save_path.open("w+") do |f|
+            f.write(contents)
+          end
+        end
+
+        def create_piratefile(box_name=nil, box_url=nil)
+          save_path = ::Pirate.haven.join("Piratefile")
+          if save_path.exist?
+            raise ::Pirate::Errors::PiratefileExistsError, :this_dir => save_path.dirname, :command => 'ship'
+          end
+
+          template_path = ::Pirate.gangway.join("templates/Piratefile")
+          contents = Vagrant::Util::TemplateRenderer.render(template_path,
+                                                            :box_name => box_name,
+                                                            :box_url => box_url)
+          save_path.open("w+") do |f|
+            f.write(contents)
+          end
+        end
+
+        def create_vm_yaml(vm_name)
+          source = ::Pirate.haven.join(vm_name)
+          # TODO: target need to be relative
+          target = ::Pirate.haven.join(".")
+          if source.exist?
+            raise ::Pirate::Errors::SymlinkExistsError, :source => source, :command => 'ship'
+          end
+          File.symlink('.', source)
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-pirate/config/pirate.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module VagrantPirate
+  module Pirate
     module Config
       class Pirate < Vagrant.plugin("2", :config)
         attr_accessor :map
@@ -10,22 +10,10 @@ module VagrantPlugins
 
         def finalize!
           if @map == UNSET_VALUE
-            @map = { "local" => "local.d", "enabled" => "vms-enabled" }
+            @map = { "local" => "local.d", "enabled" => "enabled.d" }
           end
         end
 
-        def validate(machine)
-          errors = _detected_errors
-          @map.each() do |name, conf_dir|
-            current_dir = Dir.pwd + '/' + conf_dir
-            if !File.directory?(current_dir)
-              errors << "Configuration directories must exist: #{current_dir}"
-            end
-          end
-
-          { "pirate" => errors }
-        end
-
       end
     end
   end

data/lib/vagrant-pirate/errors.rb

@@ -1,4 +1,4 @@
-module VagrantPirate
+module Pirate
   module Errors
 
     class PirateError < Vagrant::Errors::VagrantError
@@ -9,9 +9,27 @@ module VagrantPirate
       error_key :vagrantfile_exists
     end
 
-    class EnabledDirMissing < PirateError
-      error_key :enabled_dir_missing
+    class PiratefileExistsError < PirateError
+      error_key :piratefile_exists
     end
 
+    class ConfigDirExistsError < PirateError
+      error_key :config_dir_exists
+    end
+
+    class ConfigDirMissingError < PirateError
+      error_key :config_dir_missing
+    end
+
+    class LocalFileExistsError < PirateError
+      error_key :local_file_exists
+    end
+
+    class SymlinkExistsError < PirateError
+      error_key :symlink_exists
+    end
+
+
+
   end
 end

data/lib/vagrant-pirate/{vagrant-pirate.rb → pirate.rb}

@@ -1,7 +1,13 @@
-module VagrantPirate
+module Pirate
   # The source root is the path to the root directory of the this gem.
-  def self.source_root
-    @source_root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+  def self.gangway
+    @gangway ||= Pathname.new(File.expand_path('../../../', __FILE__))
+  end
+
+  # The project root directory.
+  # TODO: can we retrive this from Vagrant::Environment?
+  def self.haven
+    @haven ||= Pathname.new(Dir.pwd)
   end
 
   # Apply settings loaded from YAML to a vm.
@@ -22,49 +28,56 @@ module VagrantPirate
   def self.sail_ho!(first, second)
     second.each_pair do |k,v|
       if first[k].is_a?(Hash) and second[k].is_a?(Hash)
-        deep_merge!(first[k], second[k])
+        sail_ho!(first[k], second[k])
       else
         first[k] = second[k]
       end
     end
   end
 
-  
-  def self.Arrr!(plunder)
-    require "yaml"
-
+  # Define our config directories
+  def self.get_map(plunder)
+    dirs = {}
     # Set defaults
-    local_dir = "local.d"
-    enabled_dir = "enabled.d"
+    dirs['local'] = ::Pirate.haven.join('local.d')
+    dirs['enabled'] = ::Pirate.haven.join('enabled.d')
     # Override defaults with config, if it's set, since config finalizing
     # occurs too late for our purposes.
     if plunder.pirate.map.is_a?(Hash)
       if plunder.pirate.map.has_key?('local')
-        local_dir = plunder.pirate.map['local']
+        dirs['local'] = ::Pirate.haven.join(plunder.pirate.map['local'])
       end
       if plunder.pirate.map.has_key?('enabled')
-        enabled_dir = plunder.pirate.map['enabled']
+        dirs['enabled'] = ::Pirate.haven.join(plunder.pirate.map['enabled'])
       end
     end
 
-    # All paths are relative to the project root
-    # todo: Can we access this from Vagrant::Environment?
-    current_dir = Dir.pwd
-    local_dir = "#{current_dir}/#{local_dir}"
-    enabled_dir = "#{current_dir}/#{enabled_dir}"
-
-    # Scan our vms-enabled/ directory for YAML config files
-    if File.directory?(enabled_dir)
-      config_files = Dir.glob("#{enabled_dir}/*.yaml")
-    else
-      raise Errors::EnabledDirMissing,
-        :enabled_dir => enabled_dir
+    # We only check that the 'enabled' directory exists, since the 'local' one
+    # is optional and the existence of the files therein are checked indivi-
+    # dually.
+    if not dirs['enabled'].directory?
+      raise Errors::ConfigDirMissingError, :label => 'enabled',:missing_dir => dirs['enabled']
     end
 
+    dirs
+  end
+
+  def self.Arrr!(plunder)
+    require "yaml"
+
+    # Get our config directories
+    map = ::Pirate.get_map(plunder)
+
+    # Scan our enabled directory for Piratefiles (YAML config files)
+    config_dirs = Dir.glob(map['enabled'] + '*/')
+
     # Build up a list of the VMs we'll provision, and their config_files
     vms = {}
-    config_files.each do |config_file|
-      vms.update({ File.basename(config_file, ".yaml") => config_file})
+    config_dirs.each do |config_dir|
+      piratefile = Pathname.new(config_dir).join('Piratefile')
+      if piratefile.file?
+        vms.update({ File.basename(config_dir) => piratefile})
+      end
     end
 
     # VM-specific configuration loaded from YAML config files
@@ -74,7 +87,7 @@ module VagrantPirate
       yml = {} if !yml.is_a?(Hash)
 
       # Allow local overrides
-      local_file = "#{local_dir}/#{vm}.yaml"
+      local_file = map['local'] + "#{vm}.yaml"
       if File.exists?(local_file)
         local = YAML.load_file local_file
         sail_ho!(yml, local) if local.is_a?(Hash)

data/lib/vagrant-pirate/plugin.rb

@@ -1,9 +1,9 @@
-require 'vagrant-pirate/vagrant-pirate'
+require 'vagrant-pirate/pirate'
 
 module VagrantPlugins
-  module VagrantPirate
+  module Pirate
     class Plugin < Vagrant.plugin("2")
-      name "Yagrant YAML"
+      name "Yagrant Pirate"
       description <<-DESC
       This plugin enables Vagrant to use YAML files to configure VMs.
       DESC
@@ -19,14 +19,15 @@ module VagrantPlugins
       end
 
       command("pirate-ship", primary: false) do
-        require_relative "command/pirate_ship"
-        Command::PirateShip
+        require_relative "command/ship"
+        Command::Ship
       end
 
-      command("pirate-update", primary: false) do
-        require_relative "command/pirate_update"
-        Command::PirateUpdate
+      command("pirate-fleet", primary: false) do
+        require_relative "command/fleet"
+        Command::Fleet
       end
+
     end
   end
 end

data/lib/vagrant-pirate/version.rb

@@ -1,3 +1,3 @@
-module VagrantPirate
-  VERSION = "0.2.0"
+module Pirate
+  VERSION = "0.3.0"
 end

data/locales/en.yml

@@ -3,15 +3,22 @@ en:
     plugins:
       pirate:
         commands:
+          fleet:
+            success: |-
+              A `Vagrantfile` has been placed in this directory. A default directory containing
+              a Piratefile (Yaml VM config file) has been placed in '%{avail_dir}', and symlinks
+              to it, placed in '%{enabled_dir}'. Finally, files to contain local overrides were
+              placed in '%{local_dir}'. Unlike a regular Vagrantfile, this one parses and applies
+              the configuration in the Piratefiles it finds under '%{enabled_dir}'. You are now
+              ready to `vagrant up` your first virtual environment! Please read the comments in
+              the default Yaml VM config file to see how it works.
           ship:
             success: |-
-              A `Vagrantfile` has been placed in this directory, a default Yaml VM config file
-              has been placed in '%{avail_dir}', and a symlink to it, placed in '%{enabled_dir}'.
-              Finally, a file to contain local overrides was placed in '%{local_dir}'. Unlike a
-              regular Vagrantfile, this one parses and applies the configuration in the Yaml
-              files it finds in '%{enabled_dir}'. You are now ready to `vagrant up` your first
-              virtual environment! Please read the comments in the default Yaml VM config
-              file to see how it works.
+              A `Vagrantfile` and `Piratefile` (YAML VM config file) have been placed in this
+              directory, along with a symlink to it (that defines the VM name). Unlike a regular
+              Vagrantfile, this one parses and applies the configuration in the Piratefile. You
+              are now ready to `vagrant up` your first virtual environment! Please read the
+              comments in the Piratefile to see how it works.
           update:
             success: |-
               Vagrantfile updated using the latest one from vagrant-pirate.
@@ -24,9 +31,20 @@ en:
         errors:
           vagrantfile_exists: |-
             `Vagrantfile` already exists in this directory. Remove it before running `vagrant
-            pirate init`, or run `vagrant pirate update` to update to the latest version.
-          enabled_dir_missing: |-
+            pirate %{command}`.
+          piratefile_exists: |-
+            `Piratefile` already exists in '%{this_dir}'.
+            Remove it before running `vagrant pirate %{command}`.
+          config_dir_exists: |-
+            Config directory already exists at '%{this_dir}'.
+            Remove it before running `vagrant pirate %{command}`.
+          config_dir_missing: |-
             A valid directory must be specified where YAML configs for the VMs can be found.
-            Current config points to a non-existent directory:
-            >>> %{enabled_dir}
-
+            Current `%{label}` config points to a non-existent directory:
+            >>> %{missing_dir}
+          local_file_exists: |-
+            Local override file already exists at `%{save_path}`.
+            Remove it before running `vagrant pirate %{command}`.
+          symlink_exists: |-
+            Symlink to available config directory already exists at %{source}.
+            Remove it before running `vagrant pirate %{command}`.

data/tasks/cucumber.rake

@@ -7,5 +7,5 @@ desc 'Default task which runs all cucumber tests'
 Coveralls::RakeTask.new
 task :default => [:features, 'coveralls:push']
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --no-source --format pretty"
+  t.cucumber_opts = "features --no-source --format pretty --tags ~@up"
 end

data/templates/Vagrantfile_ship.erb

@@ -0,0 +1,16 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version.
+# Don't be touching this, Matey, lest ye send us all down to Dany Jones' locker!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |plunder|
+
+  # Specify the directories in which to look for YAML VM config files.
+  plunder.pirate.map = { 'enabled' => '.' }
+
+  # Load, parse and apply YAML VM configs.
+  Pirate::Arrr!(plunder)
+
+end

data/vagrant-pirate.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/vagrant-pirate/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "vagrant-pirate"
-  s.version     = VagrantPirate::VERSION
+  s.version     = Pirate::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Christopher Gervais"]
   s.email       = ["chris@ergonlogic.com"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pirate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Christopher Gervais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -94,22 +94,25 @@ files:
 - LICENSE
 - Rakefile
 - Readme.md
+- features/fleet.feature
 - features/help.feature
 - features/ship.feature
+- features/step_definitions/vagrant_steps.rb
 - features/support/env.rb
 - lib/vagrant-pirate.rb
+- lib/vagrant-pirate/command/fleet.rb
 - lib/vagrant-pirate/command/pirate.rb
-- lib/vagrant-pirate/command/pirate_ship.rb
-- lib/vagrant-pirate/command/pirate_update.rb
+- lib/vagrant-pirate/command/ship.rb
 - lib/vagrant-pirate/config/pirate.rb
 - lib/vagrant-pirate/errors.rb
+- lib/vagrant-pirate/pirate.rb
 - lib/vagrant-pirate/plugin.rb
-- lib/vagrant-pirate/vagrant-pirate.rb
 - lib/vagrant-pirate/version.rb
 - locales/en.yml
 - tasks/cucumber.rake
-- templates/Vagrantfile.erb
-- templates/default.yaml.erb
+- templates/Piratefile.erb
+- templates/Vagrantfile_fleet.erb
+- templates/Vagrantfile_ship.erb
 - templates/local.yaml.erb
 - vagrant-pirate.gemspec
 homepage: https://github.com/PraxisLabs/vagrant-pirate

data/lib/vagrant-pirate/command/pirate_update.rb

@@ -1,77 +0,0 @@
-require 'optparse'
-require 'vagrant/util/template_renderer'
-
-module VagrantPlugins
-  module VagrantPirate
-    module Command
-      class PirateUpdate < Vagrant.plugin("2", :command)
-        def self.synopsis
-          "Updates a YAML-based Vagrant environment."
-        end
-
-        def execute
-          options = {}
-
-          # Boolean whether we should actually go through with the update
-          # or not. This is true only if the "--force" flag is set or if the
-          # user confirms it.
-          do_update = false
-
-          opts = OptionParser.new do |opts|
-            opts.banner = "Usage: vagrant pirate update"
-
-            opts.on("-f", "--force", "Update without confirmation.") do |f|
-              options[:force] = f
-            end
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          if options[:force]
-            do_update = true
-          else
-            choice = nil
-            begin
-              choice = @env.ui.ask(I18n.t("vagrant.plugins.pirate.commands.update.confirmation"))
-
-            rescue Errors::UIExpectsTTY
-              # We raise a more specific error but one which basically
-              # means the same thing.
-              raise Errors::UpdateRequiresForce
-            end
-            do_update = choice.upcase == "Y"
-          end
-
-          if do_update
-            @logger.info("Updating project with latest Vagrantfile from vagrant-pirate.")
-            update
-          else
-            @logger.info("Not updating project since confirmation was declined.")
-            @env.ui.success(I18n.t("vagrant.plugins.pirate.commands.update.will_not_update"),
-                              :prefix => false)
-          end
-        end
-
-        def update
-          save_path = @env.cwd.join("Vagrantfile")
-
-          template_path = ::VagrantPirate.source_root.join("templates/Vagrantfile")
-          contents = Vagrant::Util::TemplateRenderer.render(template_path)
-
-          # Write out the contents
-          save_path.open("w+") do |f|
-            f.write(contents)
-          end
-
-          @env.ui.info(I18n.t("vagrant.plugins.pirate.commands.update.success"),
-                       :prefix => false)
-
-          # Success, exit status 0
-          0
-        end
-      end
-    end
-  end
-end