Skip to content

Commit

Permalink
Gemfile and gemspec files cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
picandocodigo committed Feb 27, 2020
1 parent 34d3d39 commit 949990b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 29 deletions.
16 changes: 8 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in elasticsearch-dsl.gemspec
gemspec

if File.exist? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
gem 'elasticsearch', :path => File.expand_path("../../elasticsearch", __FILE__), :require => false
if File.exist? File.expand_path('../../elasticsearch/elasticsearch.gemspec', __FILE__)
gem 'elasticsearch', path: File.expand_path('../../elasticsearch', __FILE__), require: false
end

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

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

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

group :development do
Expand Down
39 changes: 18 additions & 21 deletions elasticsearch-dsl.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,38 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'elasticsearch/dsl/version'

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

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

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

s.required_ruby_version = '>= 1.9'
s.required_ruby_version = '>= 2.5'

s.add_development_dependency "bundler"
s.add_development_dependency "rake", "~> 11.1"
s.add_development_dependency 'bundler'
s.add_development_dependency 'rake', '~> 11.1'

s.add_development_dependency "elasticsearch"
s.add_development_dependency "elasticsearch-extensions"
s.add_development_dependency 'elasticsearch'
s.add_development_dependency 'elasticsearch-extensions'

s.add_development_dependency 'shoulda-context'
s.add_development_dependency 'mocha'
s.add_development_dependency 'cane'
s.add_development_dependency 'minitest', '~> 5'
s.add_development_dependency 'minitest-reporters', '~> 1'
s.add_development_dependency 'mocha'
s.add_development_dependency 'pry'
s.add_development_dependency 'shoulda-context'
s.add_development_dependency 'simplecov'
s.add_development_dependency 'test-unit', '~> 2'
s.add_development_dependency 'yard'
s.add_development_dependency 'cane'
s.add_development_dependency 'pry'

if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
s.add_development_dependency "test-unit", '~> 2'
end
end

0 comments on commit 949990b

Please sign in to comment.