From: Antonio Terceiro Date: Sun, 16 Aug 2015 10:45:47 +0200 Subject: Relax dependency resolution --- Gemfile | 6 ------ vagrant.gemspec | 34 +++++++++++----------------------- 2 files changed, 11 insertions(+), 29 deletions(-) --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,3 @@ source "https://rubygems.org" gemspec - -if File.exist?(File.expand_path("../../vagrant-spec", __FILE__)) - gem 'vagrant-spec', path: "../vagrant-spec" -else - gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git" -end --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -15,29 +15,17 @@ Gem::Specification.new do |s| s.required_rubygems_version = ">= 1.3.6" s.rubyforge_project = "vagrant" - s.add_dependency "bundler", ">= 1.5.2", "<= 1.10.6" - s.add_dependency "childprocess", "~> 0.5.0" - s.add_dependency "erubis", "~> 2.7.0" - s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0" - s.add_dependency "listen", "~> 3.0.2" - s.add_dependency "hashicorp-checkpoint", "~> 0.1.1" - s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" - s.add_dependency "net-ssh", "~> 3.0.1" - s.add_dependency "net-sftp", "~> 2.1" - s.add_dependency "net-scp", "~> 1.1.0" - s.add_dependency "rb-kqueue", "~> 0.2.0" + s.add_dependency "bundler" + s.add_dependency "childprocess" + s.add_dependency "erubis" + s.add_dependency "i18n" + s.add_dependency "listen" + s.add_dependency "log4r" + s.add_dependency "net-ssh" + s.add_dependency "net-sftp" + s.add_dependency "net-scp" s.add_dependency "rest-client", ">= 1.6.0", "< 2.0" - s.add_dependency "wdm", "~> 0.1.0" - s.add_dependency "winrm", "~> 1.3" - s.add_dependency "winrm-fs", "~> 0.2.2" - - # We lock this down to avoid compilation issues. - s.add_dependency "nokogiri", "= 1.6.3.1" - - s.add_development_dependency "rake" - s.add_development_dependency "rspec", "~> 2.14.0" - s.add_development_dependency "webmock", "~> 1.20" - s.add_development_dependency "fake_ftp", "~> 0.1" + s.add_dependency "nokogiri" # The following block of code determines the files that should be included # in the gem. It does this by reading all the files in the directory where