elasticsearch 0.4.7 → 0.4.8
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +4 -0
- data/README.md +11 -0
- data/elasticsearch.gemspec +4 -3
- data/lib/elasticsearch/version.rb +1 -1
- data/test/test_helper.rb +16 -5
- metadata +22 -6
data/Gemfile
CHANGED
@@ -2,3 +2,7 @@ source 'https://rubygems.org'
|
|
2
2
|
|
3
3
|
# Specify your gem's dependencies in elasticsearch.gemspec
|
4
4
|
gemspec
|
5
|
+
|
6
|
+
if File.exists? File.expand_path("../../elasticsearch-extensions", __FILE__)
|
7
|
+
gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => true
|
8
|
+
end
|
data/README.md
CHANGED
@@ -14,6 +14,17 @@ Features overview:
|
|
14
14
|
* Extensive documentation and examples
|
15
15
|
* Emphasis on modularity and extendability of both the client and API libraries
|
16
16
|
|
17
|
+
## Compatibility
|
18
|
+
|
19
|
+
The library is compatible with Ruby 1.8.7 and higher.
|
20
|
+
|
21
|
+
The library is compatible with Elasticsearch 0.90 and 1.0 -- you have to install and use a matching version, though.
|
22
|
+
|
23
|
+
The 1.0 pre-release version and the master branch are compatible with **Elasticsearch 1.0** API.
|
24
|
+
|
25
|
+
To use the **Elasticsearch 0.90** API, install the **0.4.x** gem version or use the corresponding
|
26
|
+
[`0.4`](https://github.com/elasticsearch/elasticsearch-ruby/tree/0.4) branch.
|
27
|
+
|
17
28
|
## Installation
|
18
29
|
|
19
30
|
Install the package from [Rubygems](https://rubygems.org):
|
data/elasticsearch.gemspec
CHANGED
@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
|
|
20
20
|
s.extra_rdoc_files = [ "README.md", "LICENSE.txt" ]
|
21
21
|
s.rdoc_options = [ "--charset=UTF-8" ]
|
22
22
|
|
23
|
-
s.add_dependency "elasticsearch-transport", '0.4.
|
24
|
-
s.add_dependency "elasticsearch-api", '0.4.
|
23
|
+
s.add_dependency "elasticsearch-transport", '0.4.8'
|
24
|
+
s.add_dependency "elasticsearch-api", '0.4.8'
|
25
25
|
|
26
26
|
s.add_development_dependency "bundler", "> 1"
|
27
27
|
s.add_development_dependency "rake"
|
@@ -45,8 +45,9 @@ Gem::Specification.new do |s|
|
|
45
45
|
end
|
46
46
|
|
47
47
|
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
|
48
|
-
s.add_development_dependency "ruby-prof"
|
48
|
+
s.add_development_dependency "ruby-prof" unless defined? JRUBY_VERSION
|
49
49
|
s.add_development_dependency "simplecov"
|
50
|
+
s.add_development_dependency "simplecov-rcov"
|
50
51
|
s.add_development_dependency "cane"
|
51
52
|
s.add_development_dependency "require-prof"
|
52
53
|
s.add_development_dependency "coveralls"
|
data/test/test_helper.rb
CHANGED
@@ -1,11 +1,22 @@
|
|
1
1
|
RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
|
2
|
+
JRUBY = defined?(JRUBY_VERSION)
|
2
3
|
|
3
4
|
if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
|
4
5
|
require 'rubygems'
|
5
6
|
gem 'test-unit'
|
6
7
|
end
|
7
8
|
|
8
|
-
|
9
|
+
if ENV['COVERAGE'] && ENV['CI'].nil? && !RUBY_1_8
|
10
|
+
require 'simplecov'
|
11
|
+
SimpleCov.start { add_filter "/test|test_/" }
|
12
|
+
end
|
13
|
+
|
14
|
+
if ENV['CI'] && !RUBY_1_8
|
15
|
+
require 'simplecov'
|
16
|
+
require 'simplecov-rcov'
|
17
|
+
SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
|
18
|
+
SimpleCov.start { add_filter "/test|test_" }
|
19
|
+
end
|
9
20
|
|
10
21
|
# Register `at_exit` handler for integration tests shutdown.
|
11
22
|
# MUST be called before requiring `test/unit`.
|
@@ -25,7 +36,7 @@ RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
|
|
25
36
|
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
|
26
37
|
require 'elasticsearch/extensions/test/cluster'
|
27
38
|
require 'elasticsearch/extensions/test/startup_shutdown'
|
28
|
-
require 'elasticsearch/extensions/test/profiling'
|
39
|
+
require 'elasticsearch/extensions/test/profiling' unless JRUBY
|
29
40
|
end
|
30
41
|
|
31
42
|
module Elasticsearch
|
@@ -33,7 +44,7 @@ module Elasticsearch
|
|
33
44
|
class IntegrationTestCase < ::Test::Unit::TestCase
|
34
45
|
extend Elasticsearch::Extensions::Test::StartupShutdown
|
35
46
|
|
36
|
-
shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? }
|
47
|
+
shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
|
37
48
|
context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
|
38
49
|
end if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
|
39
50
|
end
|
@@ -43,8 +54,8 @@ module Elasticsearch
|
|
43
54
|
extend Elasticsearch::Extensions::Test::StartupShutdown
|
44
55
|
extend Elasticsearch::Extensions::Test::Profiling
|
45
56
|
|
46
|
-
shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? }
|
57
|
+
shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
|
47
58
|
context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
|
48
|
-
end
|
59
|
+
end unless RUBY_1_8 || JRUBY
|
49
60
|
end
|
50
61
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: elasticsearch
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.8
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-
|
12
|
+
date: 2014-02-09 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: elasticsearch-transport
|
@@ -18,7 +18,7 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - '='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.4.
|
21
|
+
version: 0.4.8
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - '='
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 0.4.
|
29
|
+
version: 0.4.8
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: elasticsearch-api
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
@@ -34,7 +34,7 @@ dependencies:
|
|
34
34
|
requirements:
|
35
35
|
- - '='
|
36
36
|
- !ruby/object:Gem::Version
|
37
|
-
version: 0.4.
|
37
|
+
version: 0.4.8
|
38
38
|
type: :runtime
|
39
39
|
prerelease: false
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -42,7 +42,7 @@ dependencies:
|
|
42
42
|
requirements:
|
43
43
|
- - '='
|
44
44
|
- !ruby/object:Gem::Version
|
45
|
-
version: 0.4.
|
45
|
+
version: 0.4.8
|
46
46
|
- !ruby/object:Gem::Dependency
|
47
47
|
name: bundler
|
48
48
|
requirement: !ruby/object:Gem::Requirement
|
@@ -235,6 +235,22 @@ dependencies:
|
|
235
235
|
- - ! '>='
|
236
236
|
- !ruby/object:Gem::Version
|
237
237
|
version: '0'
|
238
|
+
- !ruby/object:Gem::Dependency
|
239
|
+
name: simplecov-rcov
|
240
|
+
requirement: !ruby/object:Gem::Requirement
|
241
|
+
none: false
|
242
|
+
requirements:
|
243
|
+
- - ! '>='
|
244
|
+
- !ruby/object:Gem::Version
|
245
|
+
version: '0'
|
246
|
+
type: :development
|
247
|
+
prerelease: false
|
248
|
+
version_requirements: !ruby/object:Gem::Requirement
|
249
|
+
none: false
|
250
|
+
requirements:
|
251
|
+
- - ! '>='
|
252
|
+
- !ruby/object:Gem::Version
|
253
|
+
version: '0'
|
238
254
|
- !ruby/object:Gem::Dependency
|
239
255
|
name: cane
|
240
256
|
requirement: !ruby/object:Gem::Requirement
|