elasticsearch-extensions 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4760fbeff3a693cc08f02710afebaaf1dbca1a0d0771c36fc3b5072932f0268
-  data.tar.gz: 6f3da46e288f0ca3d98be99e6e1455dd18d2af0b69d2a3b3841a3fbbf70c660a
+  metadata.gz: f5f6b6c31f37e1278f22a8b9ab0c21a369f29c02c24d761c12c25126d068cbd5
+  data.tar.gz: 932658f2b66a2501955eb4316cf6ac430296501fe1b7bc48c8837f1ed5a92d5b
 SHA512:
-  metadata.gz: 5e6ad27fa0c9588b9f58da4f7cecabba3a96b5b69a51fd469bac7fad0a4fe348fbd9acc8aac8a0b8205fac22fe0e5f62703da639f2bbadccda66ff7541ace0f7
-  data.tar.gz: a092b5a179bf08df5b13675b0a9f59565bcc0ebfc1e2720f29125f6319d8d47c22ac5e8414976d678b528559c8d0aca5bb8f068f56950c04ba36d29190b24622
+  metadata.gz: d865de3f16d4405b49605bf264be22a9995cfb9d4eab8c94dc9ea2eb695ee59e0582541689ccefa6f6fceb38c16566391ab60583329aeb42f861ece224c3c12a
+  data.tar.gz: 0b8cffb3648be6894d19286cf708842a5353a54c5c05954eabc0187f6da24cf7dd6e67a0f48da9a41386491e838d08785496f4f6a9dd33e1198d95c1123fbebb

data/elasticsearch-extensions.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
   end
 
-  s.add_development_dependency "bundler", "> 1"
+  s.add_development_dependency "bundler"
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_development_dependency "rake", "~> 11.1"
@@ -37,8 +37,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'shoulda-context'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'minitest', '~> 5'
-  s.add_development_dependency 'minitest-reporters', '~> 1'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'cane'

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

@@ -453,10 +453,10 @@ module Elasticsearch
             path_to_lib = File.dirname(arguments[:command]) + '/../lib/'
             version = if arguments[:version]
               arguments[:version]
-            elsif File.exist?(path_to_lib) && !(jar = Dir.entries(path_to_lib).select { |f| f.start_with? 'elasticsearch' }.first).nil?
+            elsif File.exist?(path_to_lib) && !(jar = Dir.entries(path_to_lib).select { |f| f =~ /^elasticsearch\-\d/ }.first).nil?
               __log "Determining version from [#{jar}]" if ENV['DEBUG']
-              if m = jar.match(/elasticsearch\-(\d+\.\d+\.\d+).*/)
-                m[1]
+              if m = jar.match(/elasticsearch\-(\S+-)?(?<version>\d+\.\d+\.\d+).*/)
+                m[:version]
               else
                 raise RuntimeError, "Cannot determine Elasticsearch version from jar [#{jar}]"
               end
@@ -483,15 +483,14 @@ module Elasticsearch
               begin
                 # First, try the new `--version` syntax...
                 __log "Running [#{arguments[:command]} --version] to determine version" if ENV['DEBUG']
-                rout, wout = IO.pipe
-                pid = Process.spawn("#{arguments[:command]} --version", out: wout)
+                io = IO.popen("#{arguments[:command]} --version")
+                pid = io.pid
 
                 Timeout::timeout(arguments[:timeout_version]) do
                   Process.wait(pid)
-                  wout.close unless wout.closed?
-                  output = rout.read unless rout.closed?
-                  rout.close unless rout.closed?
+                  output = io.read
                 end
+
               rescue Timeout::Error
                 # ...else, the old `-v` syntax
                 __log "Running [#{arguments[:command]} -v] to determine version" if ENV['DEBUG']
@@ -500,8 +499,7 @@ module Elasticsearch
                 if pid
                   Process.kill('INT', pid) rescue Errno::ESRCH # Most likely the process has terminated already
                 end
-                wout.close unless wout.closed?
-                rout.close unless rout.closed?
+                io.close unless io.closed?
               end
 
               STDERR.puts "> #{output}" if ENV['DEBUG']

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.30"
+    VERSION = "0.0.31"
   end
 end

data/test/test/cluster/unit/cluster_test.rb

@@ -252,7 +252,7 @@ class Elasticsearch::Extensions::TestClusterTest < Elasticsearch::Test::UnitTest
 
         should "return version from lib/elasticsearch.X.Y.Z.jar" do
           File.expects(:exist?).with('/foo/bar/bin/../lib/').returns(true)
-          Dir.expects(:entries).with('/foo/bar/bin/../lib/').returns(['foo.jar', 'elasticsearch-2.3.0.jar'])
+          Dir.expects(:entries).with('/foo/bar/bin/../lib/').returns(['foo.jar', 'elasticsearch-foo-1.0.0.jar', 'elasticsearch-2.3.0.jar', 'elasticsearch-bar-9.9.9.jar'])
 
           assert_equal '2.0', @subject.__determine_version
         end
@@ -261,13 +261,16 @@ class Elasticsearch::Extensions::TestClusterTest < Elasticsearch::Test::UnitTest
           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: 2.3.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(:spawn).returns(123)
           Process.expects(:kill).with('INT', 123)
 
-          IO.any_instance.expects(:read)
-            .returns('Version: 2.3.0-SNAPSHOT, Build: d1c86b0/2016-03-30T10:43:20Z, JVM: 1.8.0_60')
-
           assert_equal '2.0', @subject.__determine_version
         end
 
@@ -288,12 +291,16 @@ class Elasticsearch::Extensions::TestClusterTest < Elasticsearch::Test::UnitTest
           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: FOOBAR')
+          io.expects(:closed?).returns(false)
+          io.expects(:close)
+          IO.expects(:popen).returns(io)
+
           Process.stubs(:wait)
-          Process.expects(:spawn).returns(123)
           Process.expects(:kill).with('INT', 123)
 
-          IO.any_instance.expects(:read).returns('Version: FOOBAR')
-
           assert_raise(RuntimeError) { @subject.__determine_version }
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,30 +126,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement