Skip to content

Commit 6167d99

Browse files
picandocodigopicandocodigo
committed
Some Gemfile cleanup
1 parent 184b8d6 commit 6167d99

File tree

4 files changed

+38
-88
lines changed

4 files changed

+38
-88
lines changed

Diff for: ‎elasticsearch-api/elasticsearch-api.gemspec

+12-32
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,12 @@ Gem::Specification.new do |s|
2929
s.add_dependency "multi_json"
3030

3131
s.add_development_dependency "bundler"
32-
33-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
34-
s.add_development_dependency "rake", "~> 11.1"
35-
else
36-
s.add_development_dependency "rake", "< 11.0"
37-
end
38-
32+
s.add_development_dependency "rake"
3933
s.add_development_dependency "elasticsearch"
4034
s.add_development_dependency "elasticsearch-transport"
41-
42-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
43-
s.add_development_dependency "minitest"
44-
s.add_development_dependency "minitest-reporters"
45-
s.add_development_dependency "elasticsearch-extensions"
46-
end
47-
35+
s.add_development_dependency "minitest"
36+
s.add_development_dependency "minitest-reporters"
37+
s.add_development_dependency "elasticsearch-extensions"
4838
s.add_development_dependency "ansi"
4939
s.add_development_dependency "shoulda-context"
5040
s.add_development_dependency "mocha"
@@ -55,25 +45,15 @@ Gem::Specification.new do |s|
5545
s.add_development_dependency "jsonify"
5646
s.add_development_dependency "hashie"
5747

58-
# Prevent unit test failures on Ruby 1.8
59-
if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
60-
s.add_development_dependency "test-unit", '~> 2'
61-
s.add_development_dependency "json", '~> 1.8'
62-
end
63-
64-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
65-
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
66-
s.add_development_dependency "jbuilder"
67-
s.add_development_dependency "escape_utils" unless defined? JRUBY_VERSION
68-
s.add_development_dependency "simplecov"
69-
s.add_development_dependency "simplecov-rcov"
70-
s.add_development_dependency "cane"
71-
s.add_development_dependency "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
72-
end
48+
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
49+
s.add_development_dependency "jbuilder"
50+
s.add_development_dependency "escape_utils" unless defined? JRUBY_VERSION
51+
s.add_development_dependency "simplecov"
52+
s.add_development_dependency "simplecov-rcov"
53+
s.add_development_dependency "cane"
54+
s.add_development_dependency "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
7355

74-
if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
75-
s.add_development_dependency "test-unit", '~> 2'
76-
end
56+
s.add_development_dependency "test-unit", '~> 2'
7757

7858
s.description = <<-DESC.gsub(/^ /, '')
7959
Ruby API for Elasticsearch. See the `elasticsearch` gem for full integration.

Diff for: ‎elasticsearch-transport/elasticsearch-transport.gemspec

+11-24
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ Gem::Specification.new do |s|
3535

3636
s.add_development_dependency "bundler"
3737

38-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
39-
s.add_development_dependency "rake", "~> 11.1"
40-
else
41-
s.add_development_dependency "rake", "< 11.0"
42-
end
38+
s.add_development_dependency "rake"
39+
4340

4441
s.add_development_dependency "ansi"
4542
s.add_development_dependency "shoulda-context"
@@ -56,26 +53,16 @@ Gem::Specification.new do |s|
5653
s.add_development_dependency "manticore", '~> 0.6' if defined? JRUBY_VERSION
5754
s.add_development_dependency "hashie"
5855

59-
# Prevent unit test failures on Ruby 1.8
60-
if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
61-
s.add_development_dependency "test-unit", '~> 2'
62-
s.add_development_dependency "json", '~> 1.8'
63-
end
56+
s.add_development_dependency "minitest"
57+
s.add_development_dependency "minitest-reporters"
58+
s.add_development_dependency "elasticsearch-extensions"
59+
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
60+
s.add_development_dependency "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
61+
s.add_development_dependency "simplecov"
62+
s.add_development_dependency "simplecov-rcov"
63+
s.add_development_dependency "cane"
6464

65-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
66-
s.add_development_dependency "minitest"
67-
s.add_development_dependency "minitest-reporters"
68-
s.add_development_dependency "elasticsearch-extensions"
69-
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
70-
s.add_development_dependency "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
71-
s.add_development_dependency "simplecov"
72-
s.add_development_dependency "simplecov-rcov"
73-
s.add_development_dependency "cane"
74-
end
75-
76-
if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
77-
s.add_development_dependency "test-unit", '~> 2'
78-
end
65+
s.add_development_dependency "test-unit", '~> 2'
7966

8067
s.description = <<-DESC.gsub(/^ /, '')
8168
Ruby client for Elasticsearch. See the `elasticsearch` gem for full integration.

Diff for: ‎elasticsearch/Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ source 'https://rubygems.org'
88
gemspec
99

1010
if File.exist? File.expand_path("../../elasticsearch-api/elasticsearch-api.gemspec", __FILE__)
11-
gem 'elasticsearch-api', :path => File.expand_path("../../elasticsearch-api", __FILE__), :require => false
11+
gem 'elasticsearch-api', path: File.expand_path("../../elasticsearch-api", __FILE__), require: false
1212
end
1313

1414
if File.exist? File.expand_path("../../elasticsearch-transport/elasticsearch-transport.gemspec", __FILE__)
15-
gem 'elasticsearch-transport', :path => File.expand_path("../../elasticsearch-transport", __FILE__), :require => false
15+
gem 'elasticsearch-transport', path: File.expand_path("../../elasticsearch-transport", __FILE__), require: false
1616
end
1717

1818
if File.exist? File.expand_path("../../elasticsearch-extensions", __FILE__)
19-
gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => true
19+
gem 'elasticsearch-extensions', path: File.expand_path("../../elasticsearch-extensions", __FILE__), require: true
2020
end

Diff for: ‎elasticsearch/elasticsearch.gemspec

+12-29
Original file line numberDiff line numberDiff line change
@@ -30,43 +30,26 @@ Gem::Specification.new do |s|
3030
s.add_dependency "elasticsearch-transport", '7.0.0'
3131
s.add_dependency "elasticsearch-api", '7.0.0'
3232

33+
s.add_development_dependency "minitest"
3334
s.add_development_dependency "bundler"
35+
s.add_development_dependency "rake"
3436

35-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
36-
s.add_development_dependency "rake", "~> 11.1"
37-
else
38-
s.add_development_dependency "rake", "< 11.0"
39-
end
40-
41-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
42-
s.add_development_dependency "elasticsearch-extensions"
43-
end
37+
s.add_development_dependency "elasticsearch-extensions"
4438

4539
s.add_development_dependency "ansi"
4640
s.add_development_dependency "shoulda-context"
4741
s.add_development_dependency "mocha"
4842
s.add_development_dependency "yard"
4943
s.add_development_dependency "pry"
50-
51-
# Prevent unit test failures on Ruby 1.8
52-
if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
53-
s.add_development_dependency "test-unit", '~> 2'
54-
s.add_development_dependency "json", '~> 1.8'
55-
end
56-
57-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
58-
s.add_development_dependency "minitest"
59-
s.add_development_dependency "minitest-reporters"
60-
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
61-
s.add_development_dependency "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
62-
s.add_development_dependency "simplecov"
63-
s.add_development_dependency "simplecov-rcov"
64-
s.add_development_dependency "cane"
65-
end
66-
67-
if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
68-
s.add_development_dependency "test-unit", '~> 2'
69-
end
44+
s.add_development_dependency "rspec"
45+
s.add_development_dependency "minitest-reporters"
46+
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
47+
s.add_development_dependency "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
48+
s.add_development_dependency "simplecov"
49+
s.add_development_dependency "simplecov-rcov"
50+
s.add_development_dependency "cane"
51+
52+
s.add_development_dependency "test-unit", '~> 2'
7053

7154
s.description = <<-DESC.gsub(/^ /, '')
7255
Ruby integrations for Elasticsearch (client, API, etc.)

0 commit comments

Comments
 (0)