Re-enable development dependencies.

It seems they are loaded in runtime just by accident, so this should be
fixed probably in Bundler.

1 files changed, 30 insertions, 14 deletions

diff --git a/vagrant-1.6.5-fix-dependencies.patch b/vagrant-1.6.5-fix-dependencies.patch
index 43ac4b5..fac45e6 100644
--- a/vagrant-1.6.5-fix-dependencies.patch
+++ b/vagrant-1.6.5-fix-dependencies.patch
@@ -13,6 +13,27 @@ index 21630e1..ac28e04 100755
    puts "Vagrant #{Vagrant::VERSION}"
    exit 0
  end
+diff --git a/lib/vagrant.rb b/lib/vagrant.rb
+index 26ed018..fd0da8c 100644
+--- a/lib/vagrant.rb
++++ b/lib/vagrant.rb
+@@ -72,10 +72,12 @@ global_logger.info("RubyGems version: #{Gem::VERSION}")
+ ENV.each do |k, v|
+   global_logger.info("#{k}=#{v.inspect}") if k =~ /^VAGRANT_/
+ end
+-global_logger.info("Plugins:")
+-Bundler.definition.specs_for([:plugins]).each do |spec|
+-  global_logger.info("  - #{spec.name} = #{spec.version}")
+-end
++# This forces Bundler to load development dependencies. Seem to be Bundler
++# issue: https://github.com/bundler/bundler/issues/3231
++#global_logger.info("Plugins:")
++#Bundler.definition.specs_for([:plugins]).each do |spec|
++#  global_logger.info("  - #{spec.name} = #{spec.version}")
++#end
+ 
+ 
+ # We need these components always so instead of an autoload we
 diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
 index 05867da..ea8c056 100644
 --- a/lib/vagrant/bundler.rb
@@ -43,10 +64,10 @@ index 8756fc3..7fb2be8 100644
  
          return [options, subprocess_options]
 diff --git a/vagrant.gemspec b/vagrant.gemspec
-index c4131b2..d06558a 100644
+index c4131b2..d053f22 100644
 --- a/vagrant.gemspec
 +++ b/vagrant.gemspec
-@@ -15,27 +15,32 @@ Gem::Specification.new do |s|
+@@ -15,25 +15,30 @@ Gem::Specification.new do |s|
    s.required_rubygems_version = ">= 1.3.6"
    s.rubyforge_project         = "vagrant"
  
@@ -74,20 +95,15 @@ index c4131b2..d06558a 100644
 -  # We lock this down to avoid compilation issues.
 -  s.add_dependency "nokogiri", "= 1.6.3.1"
 +  s.add_dependency "nokogiri"
++
++  # This dependency is typically provided by listen, but was removed in Fedora.
++  s.add_dependency "rb-inotify"
  
--  s.add_development_dependency "rake"
+   s.add_development_dependency "rake"
 -  s.add_development_dependency "contest", ">= 0.1.2"
 -  s.add_development_dependency "minitest", "~> 2.5.1"
--  s.add_development_dependency "mocha"
--  s.add_development_dependency "rspec", "~> 2.14.0"
-+  # This dependency is typically provided by listen, but was removed in Fedora.
-+  s.add_dependency "rb-inotify"
-+
-+  #s.add_development_dependency "rake"
 +  #s.add_development_dependency "contest", ">= 0.1.2"
-+  #s.add_development_dependency "minitest"
-+  #s.add_development_dependency "mocha"
-+  #s.add_development_dependency "rspec", "~> 2.14.0"
++  s.add_development_dependency "minitest"
+   s.add_development_dependency "mocha"
+   s.add_development_dependency "rspec", "~> 2.14.0"
  
-   # 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