Auto merge of #4386 - bundler:seg-fix-dash-pre, r=segiddins

[Git] Fix checking for equality when a version includes a -

Closes #4385.

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index 228ab61a67..f0594c6555 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -25,7 +25,7 @@ module Bundler
         @ref        = options["ref"] || options["branch"] || options["tag"] || "master"
         @submodules = options["submodules"]
         @name       = options["name"]
-        @version    = options["version"]
+        @version    = options["version"].to_s.strip.gsub("-", ".pre.")
 
         @copied     = false
         @local      = false
diff --git a/spec/commands/show_spec.rb b/spec/commands/show_spec.rb
index 7cfa02d418..43bbc3f945 100644
--- a/spec/commands/show_spec.rb
+++ b/spec/commands/show_spec.rb
@@ -110,6 +110,17 @@ describe "bundle show" do
       bundle :show
       expect(out).to include("foo (1.0 #{sha[0..6]})")
     end
+
+    it "handles when a version is a '-' prerelease", :rubygems => "2.1" do
+      @git = build_git("foo", "1.0.0-beta.1", :path => lib_path("foo"))
+      install_gemfile <<-G
+        gem "foo", "1.0.0-beta.1", :git => "#{lib_path("foo")}"
+      G
+      should_be_installed "foo 1.0.0.pre.beta.1"
+
+      bundle! :show
+      expect(out).to include("foo (1.0.0.pre.beta.1")
+    end
   end
 
   context "in a fresh gem in a blank git repo" do