From cc2155919f052bff29ec223d5c4c8213ef1cecc4 Mon Sep 17 00:00:00 2001
From: Colin Surprenant <colin.surprenant@gmail.com>
Date: Mon, 14 Jul 2014 17:41:06 -0400
Subject: [PATCH] use bundler compatible ruby version string

---
 gembag.rb                   | 2 +-
 lib/logstash/environment.rb | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gembag.rb b/gembag.rb
index 86218f6c3..8fad3b437 100644
--- a/gembag.rb
+++ b/gembag.rb
@@ -43,7 +43,7 @@ require "bundler/cli"
 module Bundler
   module SharedHelpers
     def default_lockfile
-      ruby = "#{LogStash::Environment.ruby_engine}-#{LogStash::Environment.ruby_abi_version}"
+      ruby = "#{LogStash::Environment.ruby_engine}-#{LogStash::Environment.gem_ruby_version}"
       return Pathname.new("#{default_gemfile}.#{ruby}.lock")
     end
   end
diff --git a/lib/logstash/environment.rb b/lib/logstash/environment.rb
index 0d44126ca..03399379c 100644
--- a/lib/logstash/environment.rb
+++ b/lib/logstash/environment.rb
@@ -29,7 +29,7 @@ module LogStash
     end
 
     def set_gem_paths!
-      gemdir = "#{gem_target}/#{ruby_engine}/#{ruby_abi_version}/"
+      gemdir = "#{gem_target}/#{ruby_engine}/#{gem_ruby_version}/"
       ENV["GEM_HOME"] = gemdir
       ENV["GEM_PATH"] = gemdir
     end
@@ -39,6 +39,11 @@ module LogStash
       RUBY_VERSION[/(\d+\.\d+)(\.\d+)*/, 1]
     end
 
+    # @return [String] the ruby version string bundler uses to craft its gem path
+    def gem_ruby_version
+      RbConfig::CONFIG["ruby_version"]
+    end
+
     # @return [String] jruby, ruby, rbx, ...
     def ruby_engine
       RUBY_ENGINE