elasticsearch 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95a999b5b4ee7c8bbffdecc27a29364595466fdd
-  data.tar.gz: 7eaf1ab9853472d54c692a39bf0ad8612bd9d0a7
+SHA256:
+  metadata.gz: aa613bd4b8d40ffb91e1dd5ed3a4d74e1ba7af85beb524fb74dd806d86cbdd7a
+  data.tar.gz: ed9983dc06d3f066f42d179843c03c690a9b8dd3491d07b8c52011744d5ebca2
 SHA512:
-  metadata.gz: 52c7166a574c4e2ba5149a21e28a57d40a74bad666062beddb03ce293a973b56fe08f776e7329eda164ab63b0be8bcc07dfccbbc769716b69556bdd708f8894f
-  data.tar.gz: 7e84ed18dbc36a3065417f9082c9cae33450e6774904108174bf9b84734572cbbf61c9f58153b1ada6fd71401461aa23f84c42446655574900038716dc1c9a9f
+  metadata.gz: 024340fda6fc9086a191d1561c9504f4f70a47df1030a9c3182bc108c36b1d3e4572ec04a21b81b4c90e020b1a7f4cba7c875b69b9aebd74d5d55992d3f697d5
+  data.tar.gz: 1f867cf58d094edb836e9fc3aa74f8588c98f051ab9d94b7739d8522d0a42cb6597f6f9febe7cc950d93fef864126efacd691e0a8ab0ab43498653d243592761

data/Rakefile

@@ -7,6 +7,12 @@ task :test    => 'test:unit'
 
 require 'rake/testtask'
 namespace :test do
+
+  desc "Wait for Elasticsearch to be in a green state"
+  task :wait_for_green do
+    sh '../scripts/wait-cluster.sh'
+  end
+
   Rake::TestTask.new(:unit) do |test|
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/unit/**/*_test.rb"]
@@ -15,6 +21,7 @@ namespace :test do
   end
 
   Rake::TestTask.new(:integration) do |test|
+    test.deps = [ :wait_for_green ]
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/integration/**/*_test.rb"]
     test.verbose = false
@@ -22,8 +29,7 @@ namespace :test do
   end
 
   Rake::TestTask.new(:all) do |test|
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb"]
+    test.deps = [ :unit, :integration ]
   end
 
 end

data/elasticsearch.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email         = ["karel.minarik@elasticsearch.org"]
   s.summary       = "Ruby integrations for Elasticsearch"
   s.homepage      = "http://github.com/elasticsearch/elasticsearch-ruby"
-  s.license       = "Apache 2"
+  s.license       = "Apache-2.0"
 
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9'
 
-  s.add_dependency "elasticsearch-transport", '6.1.0'
-  s.add_dependency "elasticsearch-api",       '6.1.0'
+  s.add_dependency "elasticsearch-transport", '6.2.0'
+  s.add_dependency "elasticsearch-api",       '6.2.0'
 
-  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"

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module Elasticsearch
-  VERSION = "6.1.0"
+  VERSION = "6.2.0"
 end

data/test/integration/client_integration_test.rb

@@ -14,8 +14,7 @@ module Elasticsearch
 
       context "Elasticsearch client" do
         setup do
-          @port  = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
-          system "curl -X DELETE http://localhost:#{@port}/_all > /dev/null 2>&1"
+          system "curl -X DELETE http://#{TEST_HOST}:#{TEST_PORT}/_all > /dev/null 2>&1"
 
           @logger =  Logger.new(STDERR)
           @logger.formatter = proc do |severity, datetime, progname, msg|
@@ -28,7 +27,7 @@ module Elasticsearch
             ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
           end
 
-          @client = Elasticsearch::Client.new host: "localhost:#{@port}", logger: (ENV['QUIET'] ? nil : @logger)
+          @client = Elasticsearch::Client.new host: "#{TEST_HOST}:#{TEST_PORT}", logger: (ENV['QUIET'] ? nil : @logger)
         end
 
         should "perform the API methods" do

data/test/test_helper.rb

@@ -1,6 +1,15 @@
 RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
 JRUBY    = defined?(JRUBY_VERSION)
 
+
+ELASTICSEARCH_HOSTS = if hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOSTS']
+                        hosts.split(',').map do |host|
+                          /(http\:\/\/)?(\S+)/.match(host)[2]
+                        end
+                      end.freeze
+
+TEST_HOST, TEST_PORT = ELASTICSEARCH_HOSTS.first.split(':') if ELASTICSEARCH_HOSTS
+
 if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
   require 'rubygems'
   gem 'test-unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-transport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   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
@@ -287,7 +287,7 @@ files:
 - test/unit/wrapper_gem_test.rb
 homepage: http://github.com/elasticsearch/elasticsearch-ruby
 licenses:
-- Apache 2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -305,8 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch