[Travis] Override version before installing depsseg-bundler-2

4 files changed, 11 insertions, 9 deletions

diff --git a/.travis.yml b/.travis.yml
index 74086969fd..f52d5cd8a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: ruby
 script: rake spec:travis
 before_script:
+  - travis_retry rake -E 'module ::Bundler; VERSION = "0.0.0"; end' override_version
   - travis_retry rake spec:travis:deps
-  - travis_retry rake override_version
   - travis_retry rake man:build
   - travis_retry rake spec:rubygems:clone_rubygems_$RGV
 
diff --git a/Rakefile b/Rakefile
index d61e3684a8..a6dd6dbdba 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,7 +11,9 @@ else
   File.expand_path("tmp/rubygems")
 end
 
-BUNDLER_SPEC = Gem::Specification.load("bundler.gemspec")
+def bundler_spec
+  @bundler_spec ||= Gem::Specification.load("bundler.gemspec")
+end
 
 def safe_task(&block)
   yield
@@ -37,7 +39,7 @@ end
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
-    deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
+    deps = Hash[bundler_spec.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
     deps["rubocop"] ||= "= 0.49.1" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
@@ -91,7 +93,7 @@ namespace :spec do
 end
 
 begin
-  rspec = BUNDLER_SPEC.development_dependencies.find {|d| d.name == "rspec" }
+  rspec = bundler_spec.development_dependencies.find {|d| d.name == "rspec" }
   gem "rspec", rspec.requirement.to_s
   require "rspec/core/rake_task"
 
diff --git a/task/build_metadata.rake b/task/build_metadata.rake
index e06a795259..f899562b46 100644
--- a/task/build_metadata.rake
+++ b/task/build_metadata.rake
@@ -4,7 +4,7 @@ def write_build_metadata(build_metadata)
   build_metadata_file = "lib/bundler/build_metadata.rb"
 
   ivars = build_metadata.sort.map do |k, v|
-    "    @#{k} = #{BUNDLER_SPEC.send(:ruby_code, v)}"
+    "    @#{k} = #{bundler_spec.send(:ruby_code, v)}"
   end.join("\n")
 
   contents = File.read(build_metadata_file)
@@ -14,7 +14,7 @@ end
 
 task :build_metadata do
   build_metadata = {
-    :built_at => BUNDLER_SPEC.date.utc.strftime("%Y-%m-%d"),
+    :built_at => bundler_spec.date.utc.strftime("%Y-%m-%d"),
     :git_commit_sha => `git rev-parse --short HEAD`.strip,
     :release => Rake::Task["release"].instance_variable_get(:@already_invoked),
   }
diff --git a/task/release.rake b/task/release.rake
index de543b84d7..edd6e9a7d5 100644
--- a/task/release.rake
+++ b/task/release.rake
@@ -123,7 +123,7 @@ namespace :release do
     version = args.version
 
     version ||= begin
-      version = BUNDLER_SPEC.version
+      version = bundler_spec.version
       segments = version.segments
       if segments.last.is_a?(String)
         segments << "1"
@@ -133,7 +133,7 @@ namespace :release do
       segments.join(".")
     end
 
-    confirm "You are about to release #{version}, currently #{BUNDLER_SPEC.version}"
+    confirm "You are about to release #{version}, currently #{bundler_spec.version}"
 
     milestones = gh_api_request(:path => "repos/bundler/bundler/milestones?state=open")
     unless patch_milestone = milestones.find {|m| m["title"] == version }
@@ -147,7 +147,7 @@ namespace :release do
     end
     prs.compact!
 
-    BUNDLER_SPEC.version = version
+    bundler_spec.version = version
 
     branch = version.split(".", 3)[0, 2].push("stable").join("-")
     sh("git", "checkout", branch)