Skip to content

Commit 949990b

Browse files
committed
Gemfile and gemspec files cleanup
1 parent 34d3d39 commit 949990b

File tree

2 files changed

+26
-29
lines changed

2 files changed

+26
-29
lines changed

Gemfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ source 'https://rubygems.org'
77
# Specify your gem's dependencies in elasticsearch-dsl.gemspec
88
gemspec
99

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

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

18-
if File.exist? File.expand_path("../../elasticsearch-api", __FILE__)
19-
gem 'elasticsearch-api', :path => File.expand_path("../../elasticsearch-api", __FILE__), :require => false
18+
if File.exist? File.expand_path('../../elasticsearch-api', __FILE__)
19+
gem 'elasticsearch-api', path: File.expand_path('../../elasticsearch-api', __FILE__), require: false
2020
end
2121

22-
if File.exist? File.expand_path("../../elasticsearch-extensions", __FILE__)
23-
gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => false
22+
if File.exist? File.expand_path('../../elasticsearch-extensions', __FILE__)
23+
gem 'elasticsearch-extensions', path: File.expand_path('../../elasticsearch-extensions', __FILE__), require: false
2424
end
2525

2626
group :development do

elasticsearch-dsl.gemspec

+18-21
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,38 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
88
require 'elasticsearch/dsl/version'
99

1010
Gem::Specification.new do |s|
11-
s.name = "elasticsearch-dsl"
11+
s.name = 'elasticsearch-dsl'
1212
s.version = Elasticsearch::DSL::VERSION
13-
s.authors = ["Karel Minarik"]
14-
s.email = ["karel.minarik@elasticsearch.com"]
13+
s.authors = ['Karel Minarik']
14+
s.email = ['karel.minarik@elasticsearch.com']
1515
s.description = %q{A Ruby DSL builder for Elasticsearch}
1616
s.summary = s.description
17-
s.homepage = "https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-dsl"
18-
s.license = "Apache-2.0"
17+
s.homepage = 'https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-dsl'
18+
s.license = 'Apache-2.0'
1919

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

25-
s.extra_rdoc_files = [ "README.md", "LICENSE.txt" ]
26-
s.rdoc_options = [ "--charset=UTF-8" ]
25+
s.extra_rdoc_files = [ 'README.md', 'LICENSE.txt' ]
26+
s.rdoc_options = [ '--charset=UTF-8' ]
2727

28-
s.required_ruby_version = '>= 1.9'
28+
s.required_ruby_version = '>= 2.5'
2929

30-
s.add_development_dependency "bundler"
31-
s.add_development_dependency "rake", "~> 11.1"
30+
s.add_development_dependency 'bundler'
31+
s.add_development_dependency 'rake', '~> 11.1'
3232

33-
s.add_development_dependency "elasticsearch"
34-
s.add_development_dependency "elasticsearch-extensions"
33+
s.add_development_dependency 'elasticsearch'
34+
s.add_development_dependency 'elasticsearch-extensions'
3535

36-
s.add_development_dependency 'shoulda-context'
37-
s.add_development_dependency 'mocha'
36+
s.add_development_dependency 'cane'
3837
s.add_development_dependency 'minitest', '~> 5'
3938
s.add_development_dependency 'minitest-reporters', '~> 1'
39+
s.add_development_dependency 'mocha'
40+
s.add_development_dependency 'pry'
41+
s.add_development_dependency 'shoulda-context'
4042
s.add_development_dependency 'simplecov'
43+
s.add_development_dependency 'test-unit', '~> 2'
4144
s.add_development_dependency 'yard'
42-
s.add_development_dependency 'cane'
43-
s.add_development_dependency 'pry'
44-
45-
if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
46-
s.add_development_dependency "test-unit", '~> 2'
47-
end
4845
end

0 commit comments

Comments
 (0)