diff --git a/Gemfile b/Gemfile index bd770f0aa..162f00dc0 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,10 @@ source "http://rubygems.org" gem "vagrant", :path => '.' -# Use the version of virtualbox off of github +# Use the following gems straight from git, since Vagrant dev +# typically coincides with it gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git" +gem "radar", :git => "git://github.com/mitchellh/radar.git" # Gems required for testing only. To install run # gem bundle test diff --git a/Gemfile.lock b/Gemfile.lock index 7ea5154da..d57059edf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: git://github.com/mitchellh/radar.git + revision: cec6c4b + specs: + radar (0.4.0.dev) + builder (~> 2.0) + json (>= 1.4.6) + GIT remote: git://github.com/mitchellh/virtualbox.git revision: 69db76b @@ -10,11 +18,12 @@ PATH specs: vagrant (0.6.0.dev) archive-tar-minitar (= 0.5.2) - erubis (>= 2.6.6) - json (>= 1.4.3) + erubis (~> 2.6.6) + json (~> 1.4.6) mario (~> 0.0.6) - net-scp (>= 1.0.2) - net-ssh (>= 2.0.19) + net-scp (~> 1.0.3) + net-ssh (~> 2.0.23) + radar virtualbox (~> 0.7.3) GEM @@ -22,6 +31,7 @@ GEM specs: abstract (1.0.0) archive-tar-minitar (0.5.2) + builder (2.1.2) contest (0.1.2) erubis (2.6.6) abstract (>= 1.0.0) @@ -43,6 +53,7 @@ PLATFORMS DEPENDENCIES contest (>= 0.1.2) mocha + radar! rake vagrant! virtualbox! diff --git a/vagrant.gemspec b/vagrant.gemspec index 8aaa72557..adf92c26b 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -13,19 +13,20 @@ Gem::Specification.new do |s| s.required_rubygems_version = ">= 1.3.6" s.rubyforge_project = "vagrant" - s.add_dependency("virtualbox", "~> 0.7.3") - s.add_dependency("net-ssh", ">= 2.0.19") - s.add_dependency("net-scp", ">= 1.0.2") - s.add_dependency("json", ">= 1.4.3") - s.add_dependency("archive-tar-minitar", "= 0.5.2") - s.add_dependency("mario", "~> 0.0.6") - s.add_dependency("erubis", ">= 2.6.6") + s.add_dependency "archive-tar-minitar", "= 0.5.2" + s.add_dependency "erubis", "~> 2.6.6" + s.add_dependency "json", "~> 1.4.6" + s.add_dependency "mario", "~> 0.0.6" + s.add_dependency "net-ssh", "~> 2.0.23" + s.add_dependency "net-scp", "~> 1.0.3" + s.add_dependency "radar" + s.add_dependency "virtualbox", "~> 0.7.3" - s.add_development_dependency("rake") - s.add_development_dependency("contest", ">= 0.1.2") - s.add_development_dependency("mocha") - s.add_development_dependency("ruby-debug") - s.add_development_dependency("bundler", ">= 1.0.0.rc.5") + s.add_development_dependency "rake" + s.add_development_dependency "contest", ">= 0.1.2" + s.add_development_dependency "mocha" + s.add_development_dependency "ruby-debug" + s.add_development_dependency "bundler", ">= 1.0.0.rc.6" s.files = `git ls-files`.split("\n") s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact