[EXT] Bugfix: parses Elasticsearch version correctly

Changes regexp for `\d` so it parses the version correctly when a major, minor
or patch have more than 1 digit (e.g. 7.10.0)

Fixes #1110

Author: picandocodigo

elasticsearch-extensions/README.md

@@ -1,7 +1,6 @@
 # Elasticsearch::Extensions
 
-This library provides a set of extensions to the
-[`elasticsearch`](https://github.com/elasticsearch/elasticsearch-ruby) Rubygem.
+This library provides a set of extensions to the [`elasticsearch`](https://github.com/elasticsearch/elasticsearch-ruby) Rubygem.
 
 ## Installation
 

elasticsearch-extensions/lib/elasticsearch/extensions/test/cluster.rb

@@ -530,7 +530,7 @@ def __determine_version
                 raise RuntimeError, "Cannot determine Elasticsearch version from [#{arguments[:command]} --version] or [#{arguments[:command]} -v]"
               end
 
-              if m = output.match(/Version: (\d\.\d.\d).*,/)
+              if(m = output.match(/Version: (\d+\.\d+.\d+).*,/))
                 m[1]
               else
                 raise RuntimeError, "Cannot determine Elasticsearch version from elasticsearch --version output [#{output}]"

elasticsearch-extensions/test/test/cluster/unit/cluster_test.rb

@@ -291,6 +291,24 @@ class Elasticsearch::Extensions::TestClusterTest < Elasticsearch::Test::UnitTest
           assert_equal '2.0', @subject.__determine_version
         end
 
+        should "return version from `elasticsearch --version` when version reaches double digits" do
+          File.expects(:exist?).with('/foo/bar/bin/../lib/').returns(false)
+          File.expects(:exist?).with('/foo/bar/bin/elasticsearch').returns(true)
+
+          io = mock('IO')
+          io.expects(:pid).returns(123)
+          io.expects(:read).returns('Version: 7.11.0-SNAPSHOT, Build: d1c86b0/2016-03-30T10:43:20Z, JVM: 1.8.0_60')
+          io.expects(:closed?).returns(false)
+          io.expects(:close)
+          IO.expects(:popen).returns(io)
+
+          Process.stubs(:wait)
+          Process.expects(:kill).with('INT', 123)
+
+          assert_equal '7.0', @subject.__determine_version
+        end
+
+
         should "return version from arguments" do
           cluster = Elasticsearch::Extensions::Test::Cluster::Cluster.new command: '/foo/bar/bin/elasticsearch', version: '5.2'
           assert_equal '5.0', cluster.__determine_version

elasticsearch-extensions/test/test_helper.rb

@@ -25,7 +25,7 @@
 
 JRUBY = defined?(JRUBY_VERSION)
 
-if ENV['COVERAGE'] && ENV['CI'].nil? && !RUBY_1_8
+if ENV['COVERAGE'] && ENV['CI'].nil?
   require 'simplecov'
   SimpleCov.start { add_filter "/test|test_" }
 end