vagrant-rackspace 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWFiODQ5NDFhYjkyYThhN2QzOGI3ZTFmMDA0ODQ0MzcxNGMwOTlmNg==
-  data.tar.gz: !binary |-
-    YjNhNTNmNGIyN2ViOTAwNjZiMDlmNTMxNTIyN2NmOTE1MzNmY2ZlNg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZWEzZDlmNGNjOTMzOGQ0ZDJkN2E0M2E0MzEzZWM1YmUyNjBkZjIwZGRmMGVj
-    NjQzYTQ5YWEzNmZjNjEwYTNiNWUyZWMzZmM3NmJlY2RkZmI1MmI4MDIxN2U0
-    ODgxZjlhNWFiZDEwMzcyYjdjYjYzZjYyYzdjNmUzOGQ2Y2E1YzE=
-  data.tar.gz: !binary |-
-    ZjdiYjcwYjQ0OGE0Mjg4YjYyYTk3M2JkNGY4MGY4NGIxMzNiY2JkNzE3MWVi
-    NGM5OTM2MzYzZDRmMzcyNzYzMWU3YTdhMjIyNmM4ZmI0ODA4ZDZjOTY4ZTUy
-    MzRjODhmMTE5YTVhNjhkMDM1MmE3ZjJlMDJiM2QzZDI3ZThlZjU=
+SHA1:
+  metadata.gz: 7fe21c6407d830b5385525127b4a603868d1633e
+  data.tar.gz: 844c3ce48da303288e07f98908f139d15883c98b
+SHA512:
+  metadata.gz: 01154897155ab913685c7521b06dd44019e35cb0437ab267089e611ef36376dab5fccb94c96bcc61b5c498e1c3d990228f51913fdaed13f7bba8c738122db9c3
+  data.tar.gz: 094f97a4d92ade0439411eb3d8e944f1401c2fee5925dc355066e9b71807cfda563e41df2b8ee10be058a126ffe453665d094019951260b03a12a29cc2f17620

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 0.1.7 (March 13, 2014)
+
+FEATURES:
+
+ - Adds commands to list available images and flavors [GH-73]
+ - Adds support for creating images from running VMs [GH-74]
+
+IMPROVEMENTS:
+
+ - Adds support for rsync --include directives [GH-56]
+ - Adds ability to add server metadata [GH-72]
+ - Cleans up chef node and client from chef server [GH-67]
+
 # 0.1.6 (January 8, 2014)
 
 BUG FIXES:

data/Gemfile

@@ -3,12 +3,13 @@ source 'https://rubygems.org'
 gemspec
 
 gem "appraisal", "1.0.0.beta2"
-gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
 
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem 'coveralls', require: false
+  gem 'pry'
 end
 

data/README.md

@@ -36,7 +36,7 @@ The default configuration of the RHEL family of Linux distributions requires a t
 > sudo: sorry, you must have a tty to run sudo
 
 The best way to take deal with this error is to upgrade to Vagrant 1.4 or later, and enable:
-```
+```ruby
 config.ssh.pty = true
 ```
 
@@ -55,15 +55,16 @@ $ vagrant box add dummy https://github.com/mitchellh/vagrant-rackspace/raw/maste
 And then make a Vagrantfile that looks like the following, filling in
 your information where necessary.
 
-```
+```ruby
 Vagrant.configure("2") do |config|
   config.vm.box = "dummy"
 
   config.vm.provider :rackspace do |rs|
     rs.username = "YOUR USERNAME"
     rs.api_key  = "YOUR API KEY"
-    rs.flavor   = /512MB/
+    rs.flavor   = /1 GB Performance/
     rs.image    = /Ubuntu/
+    rs.metadata = {"key" => "value"}       # optional
   end
 end
 ```
@@ -78,6 +79,27 @@ Note that normally a lot of this boilerplate is encoded within the box
 file, but the box file used for the quick start, the "dummy" box, has
 no preconfigured defaults.
 
+## Custom Commands
+
+The plugin includes several Rackspace-specific vagrant commands.  You can get the
+list of available commands with `vagrant rackspace -h`.
+
+If you want to know what images or flavors are available for a machine, you can use:
+
+```
+$ vagrant rackspace images
+$ vagrant rackspace flavors
+```
+
+In a multi-machine Vagrantfile you can also query for a single machine:
+```
+$ vagrant rackspace images <name>
+$ vagrant rackspace flavors <name>
+```
+
+These command will connect to Rackspace using the settings associated with the machine,
+and query the region to get the list of available images or flavors.
+
 ## Box Format
 
 Every provider in Vagrant must introduce a custom box format. This
@@ -96,7 +118,7 @@ This provider exposes quite a few provider-specific configuration options:
 * `api_key` - The API key for accessing Rackspace.
 * `flavor` - The server flavor to boot. This can be a string matching
   the exact ID or name of the server, or this can be a regular expression
-  to partially match some server flavor.
+  to partially match some server flavor. Flavors are listed [here](#flavors).
 * `image` - The server image to boot. This can be a string matching the
   exact ID or name of the image, or this can be a regular expression to
   partially match some image.
@@ -116,6 +138,8 @@ vagrant will authenticate against the UK authentication endpoint.
   can be overridden with this.
 * `username` - The username with which to access Rackspace.
 * `disk_config` - Disk Configuration  'AUTO' or 'MANUAL'
+* `metadata` - A set of key pair values that will be passed to the instance
+  for configuration.
 
 These can be set like typical provider-specific configuration:
 
@@ -130,6 +154,29 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+### Flavors
+
+As of February 2, 2014, the available flavor names are:
+
+* 512MB Standard Instance
+* 1GB Standard Instance
+* 2GB Standard Instance
+* 4GB Standard Instance
+* 8GB Standard Instance
+* 15GB Standard Instance
+* 30GB Standard Instance
+* 1 GB Performance
+* 2 GB Performance
+* 4 GB Performance
+* 8 GB Performance
+* 120 GB Performance
+* 15 GB Performance
+* 30 GB Performance
+* 60 GB Performance
+* 90 GB Performance
+
+Please note that the standard instances are deprecated in favor of our performance flavors.
+
 ## Networks
 
 Networking features in the form of `config.vm.network` are not

data/RELEASE.md

@@ -0,0 +1,18 @@
+# Release process
+
+This is vagrant-rackspace's current release process, documented so people know what is
+currently done.
+
+## Prepare the release
+
+* Update the version in "lib/vagrant-rackspace/version.rb"
+* Update the version in CHANGELOG.md
+* Use "rake release". This will make sure to tag that commit and push it RubyGems.
+* Create new [github release](https://github.com/mitchellh/vagrant-rackspace/releases)
+* Update the version again in both files to a dev version for working again.
+
+The CHANGELOG.md should be maintained in a similar format to Vagrant:
+
+https://github.com/mitchellh/vagrant/blob/master/CHANGELOG.md
+
+

data/Vagrantfile

@@ -15,6 +15,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider :rackspace do |rs|
     rs.username = ENV['RAX_USERNAME']
     rs.api_key  = ENV['RAX_API_KEY']
+    rs.flavor   = /1 GB Performance/
+    rs.image    = /Ubuntu/
+    rs.rackspace_region = :iad
+
+    # rs.rsync_include 'PATTERN'  # per man page for rsync
   end
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.

data/Vagrantfile.multi

@@ -0,0 +1,19 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+REGIONS = [:dfw, :ord, :syd]
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  Vagrant.require_plugin "vagrant-rackspace"
+
+  REGIONS.each do |region|
+    config.vm.define region do |machine|
+      machine.vm.provider :rackspace do |rs|
+        rs.username = ENV['RAX_USERNAME']
+        rs.api_key  = ENV['RAX_API_KEY']
+      end
+    end
+  end
+end

data/features/vagrant-rackspace.feature

@@ -57,7 +57,7 @@ Scenario: Create a single server (rackspace_compute_url)
         rs.server_name = 'vagrant-single-server'
         rs.username = ENV['RAX_USERNAME']
         rs.api_key  = ENV['RAX_API_KEY']
-        rs.rackspace_compute_url = "https://#{ENV['RAX_REGION'].downcase}.servers.api.rackspacecloud.com/v2"
+        rs.rackspace_compute_url = "https://#{ENV['RAX_REGION'].downcase}.servers.api.rackspacecloud.com/v2/#{ENV['RAX_TENANT_ID']}"
         rs.flavor   = /1 GB Performance/
         rs.image    = /Ubuntu/
         rs.public_key_path = "~/.ssh/id_rsa.pub" unless Fog.mock?

data/lib/vagrant-rackspace/action/create_image.rb

@@ -0,0 +1,53 @@
+require "fog/rackspace"
+require "log4r"
+
+require 'vagrant/util/retryable'
+
+module VagrantPlugins
+  module Rackspace
+    module Action
+      # Creates an Image 
+      class CreateImage
+        include Vagrant::Util::Retryable
+        
+        attr_reader :env
+
+        def initialize(app, env)
+          @app, @env = app, env
+        end
+        
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_rackspace.creating_image"))
+
+          server = env[:rackspace_compute].servers.get(env[:machine].id)
+
+          config     = env[:machine].provider_config          
+          image_name = config.server_name || env[:machine].name
+
+          image = server.create_image(image_name)
+
+          retryable(:on => Fog::Errors::TimeoutError, :tries => 200) do
+            # If we're interrupted don't worry about waiting
+            next if env[:interrupted]
+
+            env[:ui].clear_line
+            env[:ui].report_progress(image.progress, 100, false)
+            
+            begin
+              image.wait_for(5) { ready? }
+            rescue RuntimeError => e
+              # If we don't have an error about a state transition, then
+              # we just move on.
+              raise if e.message !~ /should have transitioned/
+              raise Errors::CreateBadState, :state => server.state
+            end            
+          end
+
+          env[:ui].info(I18n.t("vagrant_rackspace.image_ready"))
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/action/create_server.rb

@@ -55,7 +55,8 @@ module VagrantPlugins
           options = {
             :flavor_id   => flavor.id,
             :image_id    => image.id,
-            :name        => server_name
+            :name        => server_name,
+            :metadata    => config.metadata
           }
 
           if config.key_name

data/lib/vagrant-rackspace/action/list_flavors.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Rackspace
+    module Action
+      class ListFlavors
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          compute_service = env[:rackspace_compute]
+          env[:ui].info ('%-36s %s' % ['Flavor ID', 'Flavor Name'])
+          compute_service.flavors.sort_by(&:id).each do |flavor|
+            env[:ui].info ('%-36s %s' % [flavor.id, flavor.name])
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/action/list_images.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Rackspace
+    module Action
+      class ListImages
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          compute_service = env[:rackspace_compute]
+          env[:ui].info ('%-36s %s' % ['Image ID', 'Image Name'])
+          compute_service.images.sort_by(&:name).each do |image|
+            env[:ui].info ('%-36s %s' % [image.id.to_s, image.name])
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/action/sync_folders.rb

@@ -19,6 +19,9 @@ module VagrantPlugins
 
           ssh_info = env[:machine].ssh_info
 
+          config          = env[:machine].provider_config
+          rsync_includes  = config.rsync_includes.to_a
+
           env[:machine].config.vm.synced_folders.each do |id, data|
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
@@ -41,6 +44,12 @@ module VagrantPlugins
             env[:machine].communicate.sudo(
               "chown -R #{ssh_info[:username]} '#{guestpath}'")
 
+            # Generate rsync include commands
+            includes = rsync_includes.each_with_object([]) { |incl, incls| 
+              incls << "--include" 
+              incls << incl
+            }
+
             # Rsync over to the guest path using the SSH info. add
             # .hg/ to exclude list as that isn't covered in
             # --cvs-exclude
@@ -48,9 +57,11 @@ module VagrantPlugins
               "rsync", "--verbose", "--archive", "-z",
               "--cvs-exclude", 
               "--exclude", ".hg/",
+              *includes,
               "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options(ssh_info)}",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+            command.compact!
 
             # during rsync, ignore files specified in .hgignore and
             # .gitignore traditional .gitignore or .hgignore files

data/lib/vagrant-rackspace/action.rb

@@ -20,6 +20,7 @@ module VagrantPlugins
 
             b2.use ConnectRackspace
             b2.use DeleteServer
+            b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
           end
         end
       end
@@ -107,6 +108,40 @@ module VagrantPlugins
         end
       end
 
+      def self.action_create_image
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            created = env[:result]
+            
+            if !created
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use ConnectRackspace
+            b2.use CreateImage
+          end
+        end
+      end
+
+      # Extended actions
+      def self.action_list_images
+        Vagrant::Action::Builder.new.tap do |b|
+          # b.use ConfigValidate # is this per machine?
+          b.use ConnectRackspace
+          b.use ListImages
+        end
+      end
+
+      def self.action_list_flavors
+        Vagrant::Action::Builder.new.tap do |b|
+          # b.use ConfigValidate # is this per machine?
+          b.use ConnectRackspace
+          b.use ListFlavors
+        end
+      end
+
       # The autoload farm
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectRackspace, action_root.join("connect_rackspace")
@@ -118,6 +153,9 @@ module VagrantPlugins
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :ReadState, action_root.join("read_state")
       autoload :SyncFolders, action_root.join("sync_folders")
+      autoload :CreateImage, action_root.join("create_image")
+      autoload :ListImages, action_root.join("list_images")
+      autoload :ListFlavors, action_root.join("list_flavors")
     end
   end
 end

data/lib/vagrant-rackspace/command/create_image.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Rackspace
+    module Command
+      class CreateImage < Vagrant.plugin("2", :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant rackspace images create [options]"
+          end
+
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :provider => :rackspace) do |machine|
+            machine.action('create_image')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/command/flavors.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Rackspace
+    module Command
+      class Flavors < Vagrant.plugin("2", :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant rackspace flavors [options]"
+          end
+
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :provider => :rackspace) do |machine|
+            machine.action('list_flavors')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/command/images.rb

@@ -0,0 +1,59 @@
+module VagrantPlugins
+  module Rackspace
+    module Command
+      class Images < Vagrant.plugin("2", :command)
+        def initialize(argv, env)
+          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+          @subcommands = Vagrant::Registry.new
+          @subcommands.register(:list) do
+            require File.expand_path("../list_images", __FILE__)
+            ListImages
+          end
+          @subcommands.register(:create) do
+            require File.expand_path("../create_image", __FILE__)
+            CreateImage
+          end
+
+          super(argv, env)
+        end
+
+        def execute
+          if @main_args.include?("-h") || @main_args.include?("--help")
+            # Print the help for all the rackspace commands.
+            return help
+          end
+
+          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+          return help if !command_class || !@sub_command
+          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+          # Initialize and execute the command class
+          command_class.new(@sub_args, @env).execute
+        end
+
+        def help
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant rackspace images <subcommand> [<args>]"
+            opts.separator ""
+            opts.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              opts.separator "     #{key}"
+            end
+
+            opts.separator ""
+            opts.separator "For help on any individual subcommand run `vagrant rackspace images <subcommand> -h`"
+          end
+
+          @env.ui.info(opts.help, :prefix => false)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/command/list_images.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Rackspace
+    module Command
+      class ListImages < Vagrant.plugin("2", :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant rackspace images list [options]"
+          end
+
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :provider => :rackspace) do |machine|
+            machine.action('list_images')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/command/root.rb

@@ -0,0 +1,65 @@
+require 'vagrant-rackspace/action'
+
+module VagrantPlugins
+  module Rackspace
+    module Command
+      class Root < Vagrant.plugin("2", :command)
+        def self.synopsis
+          "query Rackspace for available images or flavors"
+        end
+
+        def initialize(argv, env)
+          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+          @subcommands = Vagrant::Registry.new
+          @subcommands.register(:images) do
+            require File.expand_path("../images", __FILE__)
+            Images
+          end
+          @subcommands.register(:flavors) do
+            require File.expand_path("../flavors", __FILE__)
+            Flavors
+          end
+
+          super(argv, env)
+        end
+
+        def execute
+          if @main_args.include?("-h") || @main_args.include?("--help")
+            # Print the help for all the rackspace commands.
+            return help
+          end
+
+          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+          return help if !command_class || !@sub_command
+          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+          # Initialize and execute the command class
+          command_class.new(@sub_args, @env).execute
+        end
+
+        def help
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant rackspace <subcommand> [<args>]"
+            opts.separator ""
+            opts.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              opts.separator "     #{key}"
+            end
+
+            opts.separator ""
+            opts.separator "For help on any individual subcommand run `vagrant rackspace <subcommand> -h`"
+          end
+
+          @env.ui.info(opts.help, :prefix => false)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/config.rb

@@ -60,6 +60,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :key_name
 
+      # A Hash of metadata that will be sent to the instance for configuration
+      #
+      # @return [Hash]
+      attr_accessor :metadata
+
       # The option that indicates RackConnect usage or not.
       #
       # @return [Boolean]
@@ -92,6 +97,11 @@ module VagrantPlugins
       # @return [Array]
       attr_accessor :networks
 
+      # Opt files/directories in to the rsync operation performed by this provider
+      #
+      # @return [Array]
+      attr_accessor :rsync_includes
+
       # Default Rackspace Cloud Network IDs
       SERVICE_NET_ID = '11111111-1111-1111-1111-111111111111'
       PUBLIC_NET_ID = '00000000-0000-0000-0000-000000000000'
@@ -109,6 +119,7 @@ module VagrantPlugins
         @username = UNSET_VALUE
         @disk_config = UNSET_VALUE
         @networks = []
+        @rsync_includes = []
       end
 
       def finalize!
@@ -120,9 +131,11 @@ module VagrantPlugins
         @image    = /Ubuntu/ if @image == UNSET_VALUE
         @rackconnect = nil if @rackconnect == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
+        @metadata = nil if @metadata == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @disk_config = nil if @disk_config == UNSET_VALUE
         @networks = nil if @networks.empty?
+        @rsync_includes = nil if @rsync_includes.empty?
 
         if @public_key_path == UNSET_VALUE
           @public_key_path = Vagrant.source_root.join("keys/vagrant.pub")
@@ -159,6 +172,10 @@ module VagrantPlugins
         end
       end
 
+      def rsync_include(inc)
+        @rsync_includes << inc
+      end
+
       def validate(machine)
         errors = _detected_errors
 

data/lib/vagrant-rackspace/plugin.rb

@@ -32,6 +32,11 @@ module VagrantPlugins
         require_relative "provider"
         Provider
       end
+
+      command('rackspace') do
+        require_relative "command/root"
+        Command::Root
+      end
     end
   end
 end

data/lib/vagrant-rackspace/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rackspace
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/locales/en.yml

@@ -2,12 +2,16 @@ en:
   vagrant_rackspace:
     already_created: |-
       The server is already created.
+    creating_image: |-
+      Creating image...
     deleting_server: |-
       Deleting server...
     finding_flavor: |-
       Finding flavor for server...
     finding_image: |-
       Finding image for server...
+    image_ready: |-
+      Image created
     launching_server: |-
       Launching a server with the following settings...
     not_created: |-
@@ -43,6 +47,8 @@ en:
         A username is required.
       invalid_uri: |-
         The value for %{key} is not a valid URI: %{uri}
+      metadata_must_be_hash: |-
+        Metadata must be a hash.
 
     errors:
       create_bad_state: |-

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+if ENV['COVERAGE'] != 'false'
+  require 'simplecov'
+  require 'coveralls'
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+  SimpleCov.start
+
+  # Normally classes are lazily loaded, so any class without a test
+  # is missing from the report.  This ensures they show up so we can
+  # see uncovered methods.
+  require 'vagrant'
+  Dir["lib/**/*.rb"].each do|file|
+    require_string = file.match(/lib\/(.*)\.rb/)[1]
+    require require_string
+  end
+end
+
+require 'fog'

data/spec/vagrant-rackspace/actions/list_flavors_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require "vagrant-rackspace/action/list_flavors"
+
+describe VagrantPlugins::Rackspace::Action::ListFlavors do
+  let(:app) { lambda { |env| } }
+  let(:ui) { Vagrant::UI::Silent.new }
+  let(:flavors) {
+    Fog.mock!
+    Fog::Compute.new({
+      :provider => :rackspace,
+      :rackspace_region => :dfw,
+      :rackspace_api_key => 'anything',
+      :rackspace_username => 'anything',
+    }).flavors
+  }
+  let(:compute_connection) { double('fog connection') }
+  let(:env) do
+    {
+      :rackspace_compute => compute_connection,
+      :ui => ui
+    }
+  end
+
+  subject(:action) { described_class.new(app, env) }
+
+  before do
+    allow(compute_connection).to receive(:flavors).and_return flavors
+  end
+
+  it 'get flavors from Fog' do
+    expect(compute_connection).to receive(:flavors).and_return flavors
+    action.call(env)
+  end
+
+  it 'writes a sorted, formatted flavor table to Vagrant::UI' do
+    header_line = '%-36s %s' % ['Flavor ID', 'Flavor Name']
+    expect(ui).to receive(:info).with(header_line)
+    flavors.sort_by(&:id).each do |flavor|
+      formatted_line = '%-36s %s' % [flavor.id, flavor.name]
+      expect(ui).to receive(:info).with formatted_line
+    end
+    action.call(env)
+  end
+
+  it 'continues the middleware chain' do
+    expect(app).to receive(:call).with(env)
+    action.call(env)
+  end
+end

data/spec/vagrant-rackspace/actions/list_images_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require "vagrant-rackspace/action/list_images"
+
+describe VagrantPlugins::Rackspace::Action::ListImages do
+  let(:app) { lambda { |env| } }
+  let(:ui) { Vagrant::UI::Silent.new }
+  let(:images) {
+    Fog.mock!
+    Fog::Compute.new({
+      :provider => :rackspace,
+      :rackspace_region => :dfw,
+      :rackspace_api_key => 'anything',
+      :rackspace_username => 'anything',
+    }).images
+  }
+  let(:compute_connection) { double('fog connection') }
+  let(:env) do
+    {
+      :rackspace_compute => compute_connection,
+      :ui => ui
+    }
+  end
+
+  subject(:action) { described_class.new(app, env) }
+
+  before do
+    allow(compute_connection).to receive(:images).and_return images
+  end
+
+  it 'get images from Fog' do
+    expect(compute_connection).to receive(:images).and_return images
+    action.call(env)
+  end
+
+  it 'writes a sorted, formatted image table to Vagrant::UI' do
+    header_line = '%-36s %s' % ['Image ID', 'Image Name']
+    expect(ui).to receive(:info).with(header_line)
+    images.sort_by(&:name).each do |image|
+      formatted_line = '%-36s %s' % [image.id.to_s, image.name]
+      expect(ui).to receive(:info).with formatted_line
+    end
+    action.call(env)
+  end
+
+  it 'continues the middleware chain' do
+    expect(app).to receive(:call).with(env)
+    action.call(env)
+  end
+end

data/spec/vagrant-rackspace/config_spec.rb

@@ -1,15 +1,5 @@
-if ENV['COVERAGE'] != 'false'
-  require 'simplecov'
-  require 'coveralls'
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-  SimpleCov.start
-end
-
+require 'spec_helper'
 require "vagrant-rackspace/config"
-require 'fog'
 
 describe VagrantPlugins::Rackspace::Config do
   describe "defaults" do
@@ -33,6 +23,7 @@ describe VagrantPlugins::Rackspace::Config do
     its(:username) { should be_nil }
     its(:disk_config) { should be_nil }
     its(:networks) { should be_nil }
+    its(:rsync_includes) { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -62,6 +53,13 @@ describe VagrantPlugins::Rackspace::Config do
       subject.send(:networks).should include(VagrantPlugins::Rackspace::Config::PUBLIC_NET_ID)
       subject.send(:networks).should include(VagrantPlugins::Rackspace::Config::SERVICE_NET_ID)
     end
+
+    it "should not default rsync_includes if overridden" do 
+      inc = "core"
+      subject.send(:rsync_include, inc)
+      subject.finalize!
+      subject.send(:rsync_includes).should include(inc)
+    end
   end
 
   describe "validation" do

data/vagrant-rackspace.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "fog", "~> 1.18"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.13.0"
-  gem.add_development_dependency "aruba"
+  gem.add_development_dependency "rspec", "~> 2.14.0"
+  gem.add_development_dependency "aruba", "~> 0.5.4"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 description: Enables Vagrant to manage machines in RackSpace Cloud.
 email:
 - mitchell@hashicorp.com
@@ -73,15 +73,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASE.md
 - Rakefile
 - Vagrantfile
+- Vagrantfile.multi
 - dummy.box
 - example_box/README.md
 - example_box/metadata.json
@@ -97,20 +99,31 @@ files:
 - lib/vagrant-rackspace.rb
 - lib/vagrant-rackspace/action.rb
 - lib/vagrant-rackspace/action/connect_rackspace.rb
+- lib/vagrant-rackspace/action/create_image.rb
 - lib/vagrant-rackspace/action/create_server.rb
 - lib/vagrant-rackspace/action/delete_server.rb
 - lib/vagrant-rackspace/action/is_created.rb
+- lib/vagrant-rackspace/action/list_flavors.rb
+- lib/vagrant-rackspace/action/list_images.rb
 - lib/vagrant-rackspace/action/message_already_created.rb
 - lib/vagrant-rackspace/action/message_not_created.rb
 - lib/vagrant-rackspace/action/read_ssh_info.rb
 - lib/vagrant-rackspace/action/read_state.rb
 - lib/vagrant-rackspace/action/sync_folders.rb
+- lib/vagrant-rackspace/command/create_image.rb
+- lib/vagrant-rackspace/command/flavors.rb
+- lib/vagrant-rackspace/command/images.rb
+- lib/vagrant-rackspace/command/list_images.rb
+- lib/vagrant-rackspace/command/root.rb
 - lib/vagrant-rackspace/config.rb
 - lib/vagrant-rackspace/errors.rb
 - lib/vagrant-rackspace/plugin.rb
 - lib/vagrant-rackspace/provider.rb
 - lib/vagrant-rackspace/version.rb
 - locales/en.yml
+- spec/spec_helper.rb
+- spec/vagrant-rackspace/actions/list_flavors_spec.rb
+- spec/vagrant-rackspace/actions/list_images_spec.rb
 - spec/vagrant-rackspace/config_spec.rb
 - vagrant-rackspace.gemspec
 homepage: http://www.vagrantup.com
@@ -122,17 +135,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in RackSpace Cloud.
@@ -143,4 +156,7 @@ test_files:
 - features/support/env.rb
 - features/support/fog_mock.rb
 - features/vagrant-rackspace.feature
+- spec/spec_helper.rb
+- spec/vagrant-rackspace/actions/list_flavors_spec.rb
+- spec/vagrant-rackspace/actions/list_images_spec.rb
 - spec/vagrant-rackspace/config_spec.rb