Skip to content

Commit 695667d

Browse files
picandocodigopicandocodigo
committed
Clean up gemspec files
1 parent 02de34b commit 695667d

File tree

7 files changed

+180
-277
lines changed

7 files changed

+180
-277
lines changed

‎Gemfile

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
source 'https://rubygems.org'
22

3-
gem 'elasticsearch-api', :path => File.expand_path("../elasticsearch-api", __FILE__), :require => false
4-
gem 'elasticsearch-transport', :path => File.expand_path("../elasticsearch-transport", __FILE__), :require => false
5-
gem 'elasticsearch-extensions', :path => File.expand_path("../elasticsearch-extensions", __FILE__), :require => false
6-
gem 'elasticsearch', :path => File.expand_path("../elasticsearch", __FILE__), :require => false
3+
gem 'elasticsearch-api', path: File.expand_path('../elasticsearch-api', __FILE__), require: false
4+
gem 'elasticsearch-transport', path: File.expand_path('../elasticsearch-transport', __FILE__), require: false
5+
gem 'elasticsearch-extensions', path: File.expand_path('../elasticsearch-extensions', __FILE__), require: false
6+
gem 'elasticsearch', path: File.expand_path('../elasticsearch', __FILE__), require: false
77

8-
gem "rake"
9-
gem "pry"
10-
gem "ansi"
11-
gem "shoulda-context"
12-
gem "mocha"
13-
gem "turn"
14-
gem "yard"
15-
16-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
17-
gem "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
18-
gem "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
19-
gem "simplecov", '~> 0.17', '< 0.18'
20-
gem "simplecov-rcov"
21-
gem "cane"
22-
end
23-
24-
if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
25-
gem "test-unit", '~> 2'
8+
gem 'ansi'
9+
gem 'cane'
10+
gem 'mocha'
11+
gem 'pry'
12+
gem 'rake'
13+
gem 'shoulda-context'
14+
gem 'simplecov', '~> 0.17', '< 0.18'
15+
gem 'simplecov-rcov'
16+
gem 'test-unit', '~> 2'
17+
gem 'turn'
18+
gem 'yard'
19+
unless defined?(JRUBY_VERSION) || defined?(Rubinius)
20+
gem 'ruby-prof'
21+
gem 'require-prof'
2622
end

‎elasticsearch-api/elasticsearch-api.gemspec

Lines changed: 37 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,71 +4,49 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
44
require 'elasticsearch/api/version'
55

66
Gem::Specification.new do |s|
7-
s.name = "elasticsearch-api"
7+
s.name = 'elasticsearch-api'
88
s.version = Elasticsearch::API::VERSION
9-
s.authors = ["Karel Minarik"]
10-
s.email = ["[email protected]"]
11-
s.summary = "Ruby API for Elasticsearch."
12-
s.homepage = "https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-api"
13-
s.license = "Apache-2.0"
9+
s.authors = ['Karel Minarik']
10+
s.email = ['[email protected]']
11+
s.summary = 'Ruby API for Elasticsearch.'
12+
s.homepage = 'https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-api'
13+
s.license = 'Apache-2.0'
1414

1515
s.files = `git ls-files`.split($/)
1616
s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
1717
s.test_files = s.files.grep(%r{^(test|spec|features)/})
18-
s.require_paths = ["lib"]
19-
20-
s.extra_rdoc_files = [ "README.md", "LICENSE.txt" ]
21-
s.rdoc_options = [ "--charset=UTF-8" ]
22-
23-
s.required_ruby_version = '>= 1.9'
24-
25-
s.add_dependency "multi_json"
26-
27-
s.add_development_dependency "bundler"
28-
29-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
30-
s.add_development_dependency "rake", "~> 11.1"
31-
else
32-
s.add_development_dependency "rake", "< 11.0"
33-
end
34-
35-
s.add_development_dependency "elasticsearch"
36-
s.add_development_dependency "elasticsearch-transport"
37-
38-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
39-
s.add_development_dependency "minitest", "~> 4.0"
40-
s.add_development_dependency "elasticsearch-extensions"
41-
end
42-
43-
s.add_development_dependency "ansi"
44-
s.add_development_dependency "shoulda-context"
45-
s.add_development_dependency "mocha"
46-
s.add_development_dependency "turn"
47-
s.add_development_dependency "yard"
48-
s.add_development_dependency "pry"
49-
18+
s.require_paths = ['lib']
19+
20+
s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
21+
s.rdoc_options = ['--charset=UTF-8']
22+
23+
s.required_ruby_version = '>= 2.4'
24+
25+
s.add_dependency 'multi_json'
26+
s.add_development_dependency 'ansi'
27+
s.add_development_dependency 'bundler'
28+
s.add_development_dependency 'elasticsearch'
29+
s.add_development_dependency 'elasticsearch-extensions'
30+
s.add_development_dependency 'elasticsearch-transport'
31+
s.add_development_dependency 'minitest', '~> 4.0'
32+
s.add_development_dependency 'mocha'
33+
s.add_development_dependency 'pry'
34+
s.add_development_dependency 'rake', '~> 11.1'
35+
s.add_development_dependency 'shoulda-context'
36+
s.add_development_dependency 'turn'
37+
s.add_development_dependency 'yard'
5038
# Gems for testing integrations
51-
s.add_development_dependency "jsonify"
52-
s.add_development_dependency "hashie"
53-
54-
# Prevent unit test failures on Ruby 1.8
55-
if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
56-
s.add_development_dependency "test-unit", '~> 2'
57-
s.add_development_dependency "json", '~> 1.8'
58-
end
59-
60-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
61-
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius) || RUBY_VERSION < '2.4'
62-
s.add_development_dependency "jbuilder"
63-
s.add_development_dependency "escape_utils" unless defined? JRUBY_VERSION
64-
s.add_development_dependency "simplecov", '~> 0.17', '< 0.18'
65-
s.add_development_dependency "simplecov-rcov"
66-
s.add_development_dependency "cane"
67-
s.add_development_dependency "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
68-
end
69-
70-
if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
71-
s.add_development_dependency "test-unit", '~> 2'
39+
s.add_development_dependency 'cane'
40+
s.add_development_dependency 'escape_utils' unless defined? JRUBY_VERSION
41+
s.add_development_dependency 'hashie'
42+
s.add_development_dependency 'jbuilder'
43+
s.add_development_dependency 'jsonify'
44+
s.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
45+
s.add_development_dependency 'simplecov-rcov'
46+
s.add_development_dependency 'test-unit', '~> 2'
47+
unless defined?(JRUBY_VERSION) || defined?(Rubinius)
48+
s.add_development_dependency 'require-prof'
49+
s.add_development_dependency 'ruby-prof'
7250
end
7351

7452
s.description = <<-DESC.gsub(/^ /, '')

‎elasticsearch-dsl/elasticsearch-dsl.gemspec

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,36 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
44
require 'elasticsearch/dsl/version'
55

66
Gem::Specification.new do |s|
7-
s.name = "elasticsearch-dsl"
7+
s.name = 'elasticsearch-dsl'
88
s.version = Elasticsearch::DSL::VERSION
9-
s.authors = ["Karel Minarik"]
10-
s.email = ["[email protected]"]
9+
s.authors = ['Karel Minarik']
10+
s.email = ['[email protected]']
1111
s.description = %q{A Ruby DSL builder for Elasticsearch}
1212
s.summary = s.description
13-
s.homepage = "https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-dsl"
14-
s.license = "Apache-2.0"
13+
s.homepage = 'https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-dsl'
14+
s.license = 'Apache-2.0'
1515

1616
s.files = `git ls-files`.split($/)
1717
s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
1818
s.test_files = s.files.grep(%r{^(test|spec|features)/})
19-
s.require_paths = ["lib"]
19+
s.require_paths = ['lib']
2020

21-
s.extra_rdoc_files = [ "README.md", "LICENSE.txt" ]
22-
s.rdoc_options = [ "--charset=UTF-8" ]
21+
s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
22+
s.rdoc_options = ['--charset=UTF-8']
2323

2424
s.required_ruby_version = '>= 1.9'
2525

26-
s.add_development_dependency "bundler"
27-
s.add_development_dependency "rake", "~> 11.1"
28-
29-
s.add_development_dependency "elasticsearch"
30-
s.add_development_dependency "elasticsearch-extensions"
31-
32-
s.add_development_dependency 'shoulda-context'
33-
s.add_development_dependency 'mocha'
26+
s.add_development_dependency 'bundler'
27+
s.add_development_dependency 'cane'
28+
s.add_development_dependency 'elasticsearch'
29+
s.add_development_dependency 'elasticsearch-extensions'
3430
s.add_development_dependency 'minitest'
3531
s.add_development_dependency 'minitest-reporters'
32+
s.add_development_dependency 'mocha'
33+
s.add_development_dependency 'pry'
34+
s.add_development_dependency 'rake', '~> 11.1'
35+
s.add_development_dependency 'shoulda-context'
3636
s.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
37+
s.add_development_dependency 'test-unit', '~> 2'
3738
s.add_development_dependency 'yard'
38-
s.add_development_dependency 'cane'
39-
s.add_development_dependency 'pry'
40-
41-
if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
42-
s.add_development_dependency "test-unit", '~> 2'
43-
end
4439
end

‎elasticsearch-extensions/elasticsearch-extensions.gemspec

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,36 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
44
require 'elasticsearch/extensions/version'
55

66
Gem::Specification.new do |s|
7-
s.name = "elasticsearch-extensions"
7+
s.name = 'elasticsearch-extensions'
88
s.version = Elasticsearch::Extensions::VERSION
9-
s.authors = ["Karel Minarik"]
10-
s.email = ["[email protected]"]
9+
s.authors = ['Karel Minarik']
10+
s.email = ['[email protected]']
1111
s.description = %q{Extensions for the Elasticsearch Rubygem}
1212
s.summary = %q{Extensions for the Elasticsearch Rubygem}
13-
s.homepage = "https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-extensions"
14-
s.license = "Apache-2.0"
13+
s.homepage = 'https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-extensions'
14+
s.license = 'Apache-2.0'
1515

1616
s.files = `git ls-files`.split($/)
1717
s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
1818
s.test_files = s.files.grep(%r{^(test|spec|features)/})
19-
s.require_paths = ["lib"]
19+
s.require_paths = ['lib']
2020

21-
s.add_dependency "ansi"
22-
s.add_dependency "elasticsearch"
23-
24-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
25-
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
26-
end
27-
28-
s.add_development_dependency "bundler"
29-
30-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
31-
s.add_development_dependency "rake", "~> 11.1"
32-
else
33-
s.add_development_dependency "rake", "< 11.0"
34-
end
35-
36-
s.add_development_dependency "awesome_print"
37-
38-
s.add_development_dependency 'shoulda-context'
39-
s.add_development_dependency 'mocha'
21+
s.add_dependency 'ansi'
22+
s.add_dependency 'elasticsearch'
23+
s.add_development_dependency 'awesome_print'
24+
s.add_development_dependency 'bundler'
25+
s.add_development_dependency 'cane'
4026
s.add_development_dependency 'minitest'
4127
s.add_development_dependency 'minitest-reporters'
28+
s.add_development_dependency 'mocha'
29+
s.add_development_dependency 'pry'
30+
s.add_development_dependency 'rake', '~> 11.1'
31+
s.add_development_dependency 'ruby-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
32+
s.add_development_dependency 'shoulda-context'
4233
s.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
4334
s.add_development_dependency 'yard'
44-
s.add_development_dependency 'cane'
45-
s.add_development_dependency 'pry'
46-
4735
unless defined?(JRUBY_VERSION)
4836
s.add_development_dependency 'oj'
4937
s.add_development_dependency 'patron'
5038
end
51-
52-
if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
53-
s.add_development_dependency "json", '~> 1.8'
54-
end
5539
end

‎elasticsearch-transport/elasticsearch-transport.gemspec

Lines changed: 38 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -4,75 +4,50 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
44
require 'elasticsearch/transport/version'
55

66
Gem::Specification.new do |s|
7-
s.name = "elasticsearch-transport"
7+
s.name = 'elasticsearch-transport'
88
s.version = Elasticsearch::Transport::VERSION
9-
s.authors = ["Karel Minarik"]
10-
s.email = ["[email protected]"]
11-
s.summary = "Ruby client for Elasticsearch."
12-
s.homepage = "https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-transport"
13-
s.license = "Apache-2.0"
9+
s.authors = ['Karel Minarik']
10+
s.email = ['[email protected]']
11+
s.summary = 'Ruby client for Elasticsearch.'
12+
s.homepage = 'https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-transport'
13+
s.license = 'Apache-2.0'
1414

1515
s.files = `git ls-files`.split($/)
1616
s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
1717
s.test_files = s.files.grep(%r{^(test|spec|features)/})
18-
s.require_paths = ["lib"]
19-
20-
s.extra_rdoc_files = [ "README.md", "LICENSE.txt" ]
21-
s.rdoc_options = [ "--charset=UTF-8" ]
22-
23-
s.required_ruby_version = '>= 1.9'
24-
25-
s.add_dependency "multi_json"
26-
s.add_dependency "faraday", '>= 0.14', "< 1"
27-
28-
if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
29-
s.add_dependency "system_timer"
30-
end
31-
32-
s.add_development_dependency "bundler"
33-
34-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
35-
s.add_development_dependency "rake", "~> 11.1"
36-
else
37-
s.add_development_dependency "rake", "< 11.0"
38-
end
39-
40-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
41-
s.add_development_dependency "elasticsearch-extensions"
42-
end
43-
44-
s.add_development_dependency "ansi"
45-
s.add_development_dependency "shoulda-context"
46-
s.add_development_dependency "mocha"
47-
s.add_development_dependency "turn"
48-
s.add_development_dependency "yard"
49-
s.add_development_dependency "pry"
50-
18+
s.require_paths = ['lib']
19+
20+
s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
21+
s.rdoc_options = ['--charset=UTF-8']
22+
23+
s.required_ruby_version = '>= 2.4'
24+
25+
s.add_dependency 'multi_json'
26+
s.add_dependency 'faraday', '>= 0.14', '< 1'
27+
s.add_development_dependency 'ansi'
28+
s.add_development_dependency 'bundler'
29+
s.add_development_dependency 'elasticsearch-extensions'
30+
s.add_development_dependency 'mocha'
31+
s.add_development_dependency 'pry'
32+
s.add_development_dependency 'rake', '< 11.0'
33+
s.add_development_dependency 'shoulda-context'
34+
s.add_development_dependency 'turn'
35+
s.add_development_dependency 'yard'
5136
# Gems for testing integrations
52-
s.add_development_dependency "curb" unless defined? JRUBY_VERSION
53-
s.add_development_dependency "patron" unless defined? JRUBY_VERSION
54-
s.add_development_dependency "typhoeus", '~> 0.6'
55-
s.add_development_dependency "net-http-persistent"
56-
s.add_development_dependency "manticore", '~> 0.5.2' if defined? JRUBY_VERSION
57-
s.add_development_dependency "hashie"
58-
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
64-
65-
if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
66-
s.add_development_dependency "minitest", "~> 4.0"
67-
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
68-
s.add_development_dependency "require-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)
69-
s.add_development_dependency "simplecov", '~> 0.17', '< 0.18'
70-
s.add_development_dependency "simplecov-rcov"
71-
s.add_development_dependency "cane"
72-
end
73-
74-
if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
75-
s.add_development_dependency "test-unit", '~> 2'
37+
s.add_development_dependency 'cane'
38+
s.add_development_dependency 'hashie'
39+
s.add_development_dependency 'manticore', '~> 0.5.2' if defined? JRUBY_VERSION
40+
s.add_development_dependency 'minitest', '~> 4.0'
41+
s.add_development_dependency 'net-http-persistent'
42+
s.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
43+
s.add_development_dependency 'simplecov-rcov'
44+
s.add_development_dependency 'test-unit', '~> 2'
45+
s.add_development_dependency 'typhoeus', '~> 0.6'
46+
unless defined?(JRUBY_VERSION) || defined?(Rubinius)
47+
s.add_development_dependency 'curb'
48+
s.add_development_dependency 'patron'
49+
s.add_development_dependency 'require-prof'
50+
s.add_development_dependency 'ruby-prof'
7651
end
7752

7853
s.description = <<-DESC.gsub(/^ /, '')

0 commit comments

Comments
 (0)