Merge pull request ggiamarchi#211 from ggiamarchi/fix_matrix_ci_build

Fix matrix ci build
Sharpie · Feb 8, 2015 · b256b80 · b256b80
2 parents a010fb6 + 9918065
commit b256b80
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 30 deletions.
diff --git a/gemfiles/latest_stable.gemfile b/gemfiles/latest_stable.gemfile
diff --git a/gemfiles/minimal_release.gemfile b/gemfiles/minimal_release.gemfile
diff --git a/gemfiles/previous_release.gemfile b/gemfiles/previous_release.gemfile
diff --git a/lib/vagrant-openstack-provider/errors.rb b/lib/vagrant-openstack-provider/errors.rb
@@ -4,6 +4,17 @@ module VagrantPlugins
   module Openstack
     module Errors
       class VagrantOpenstackError < Vagrant::Errors::VagrantError
+        #
+        # Added for vagrant 1.4.x compatibility This attribute had been
+        # added in Vagrant::Errors::VagrantError form the version 1.5.0
+        #
+        attr_accessor :extra_data
+
+        def initialize(args = nil)
+          @extra_data = args
+          super(args)
+        end
+
         error_namespace('vagrant_openstack.errors')
         error_key(:default)
       end

diff --git a/vagrant-openstack-provider.gemspec b/vagrant-openstack-provider.gemspec
@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.1.0'
   gem.add_development_dependency 'rspec-its', '~> 1.0.1'
+  gem.add_development_dependency 'rspec-expectations', '~> 3.1.2'
   gem.add_development_dependency 'webmock', '~> 1.18.0'
   gem.add_development_dependency 'fakefs', '~> 0.5.2'