elasticsearch 6.0.1 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb13a4a1902f0f411c3a7df148f13d24944632c7
-  data.tar.gz: eb6cb10dff0a5fc66c697e3244f98aca79f09c60
+SHA256:
+  metadata.gz: b417a4dbfc531d2dd4227b853b05b651da14f00a704a0f650d3d20b1e5270e64
+  data.tar.gz: 1aa815a971f914b27a6daf5fff877bdb95b2a860e99de82c53b5636eedadcacf
 SHA512:
-  metadata.gz: a042ed67b605bdeb60d751871cef2ffffcbf6f8bdb268cb65ba19e8e319e4535b84b346de1919884f13051b3a36944328c5b9dc432e827add0babec293b3a8fb
-  data.tar.gz: 4fb1309fdc02c0e6357f2c43704820f4b997b970fb65f8addf75c7501ca208fb3a505096a378ffe936a5cfb9db5a1cda99ca054b95f0d87465d0e9108c9ce658
+  metadata.gz: 2cbd7f185b75bbe6fb4dea4dfdcda8e2f75ea14855a73097165b7db11a3fe7fc9ae41ec9e097270355badaee83cd8d73a173b01a9703b88ec3915d95cda6e381
+  data.tar.gz: ef6459925c87dc42f57aca5e191afd2253f859a6d7f90fa6f7721e762ec72482d1cf9a15c9395972ab95e7231d87b5a8dbf4e6370aa0470206b606d420ceac64

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.0.1'
-  s.add_dependency "elasticsearch-api",       '6.0.1'
+  s.add_dependency "elasticsearch-transport", '6.8.0'
+  s.add_dependency "elasticsearch-api",       '6.8.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.0.1"
+  VERSION = "6.8.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.0.1
+  version: 6.8.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2019-05-22 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.0.1
+        version: 6.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.8.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.8.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
@@ -264,7 +264,7 @@ dependencies:
         version: '2'
 description: 'Ruby integrations for Elasticsearch (client, API, etc.)
 
-'
+  '
 email:
 - karel.minarik@elasticsearch.org
 executables: []
@@ -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.3
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch