Extract override version for use installing in devindirect/override-version-for-dev

3 files changed, 12 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index 7a11f223e7..93446375ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 script: rake spec:travis
 before_script:
   - travis_retry rake spec:travis:deps
-  - travis_retry rake spec:travis:sub_version
+  - 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 928fe9e38f..8142fbba3d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -235,18 +235,6 @@ begin
         raise "Spec run failed, please review the log for more information"
       end
     end
-
-    namespace :travis do
-      task :sub_version do
-        next unless version = ENV["BUNDLER_SPEC_SUB_VERSION"]
-        version_file = File.expand_path("../lib/bundler/version.rb", __FILE__)
-        contents = File.read(version_file)
-        unless contents.sub!(/(^\s+VERSION\s*=\s*)"#{Gem::Version::VERSION_PATTERN}"/, %(\\1"#{version}"))
-          abort("Failed to change bundler version")
-        end
-        File.open(version_file, "w") {|f| f << contents }
-      end
-    end
   end
 
 rescue LoadError
@@ -373,6 +361,16 @@ rescue LoadError
   end
 end
 
+task :override_version do
+  next unless version = ENV["BUNDLER_SPEC_SUB_VERSION"]
+  version_file = File.expand_path("../lib/bundler/version.rb", __FILE__)
+  contents = File.read(version_file)
+  unless contents.sub!(/(^\s+VERSION\s*=\s*)"#{Gem::Version::VERSION_PATTERN}"/, %(\\1"#{version}"))
+    abort("Failed to change bundler version")
+  end
+  File.open(version_file, "w") {|f| f << contents }
+end
+
 desc "Update vendored SSL certs to match the certs vendored by RubyGems"
 task :update_certs => "spec:rubygems:clone_rubygems_master" do
   require "bundler/ssl_certs/certificate_manager"
diff --git a/task/bundler_2.rake b/task/bundler_2.rake
index b76b63d85f..4b0be8d3a9 100644
--- a/task/bundler_2.rake
+++ b/task/bundler_2.rake
@@ -3,7 +3,7 @@
 namespace :bundler_2 do
   task :install do
     ENV["BUNDLER_SPEC_SUB_VERSION"] = "2.0.0.dev"
-    Rake::Task["spec:travis:sub_version"].invoke
+    Rake::Task["override_version"].invoke
     Rake::Task["install"].invoke
     sh("git", "checkout", "--", "lib/bundler/version.rb")
   end