Skip to content

Commit 8628e73

Browse files
picandocodigopicandocodigo
committed
Linting
1 parent e0d46a8 commit 8628e73

File tree

6 files changed

+91
-84
lines changed

6 files changed

+91
-84
lines changed

‎Rakefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
require 'pathname'
1919

20-
subprojects = [ 'elasticsearch-rails', 'elasticsearch-persistence' ]
20+
subprojects = ['elasticsearch-rails', 'elasticsearch-persistence']
2121
subprojects << 'elasticsearch-model' unless defined?(JRUBY_VERSION)
2222

23-
__current__ = Pathname( File.expand_path('..', __FILE__) )
23+
__current__ = Pathname(File.expand_path(__dir__))
2424

2525
def admin_client
2626
$admin_client ||= begin
@@ -50,7 +50,7 @@ def admin_client
5050
end
5151

5252
task :default do
53-
system "rake --tasks"
53+
system 'rake --tasks'
5454
end
5555

5656
task :subprojects do
@@ -62,11 +62,11 @@ task :subprojects do
6262
end
6363
end
6464

65-
desc "Alias for `bundle:install`"
66-
task :bundle => 'bundle:install'
65+
desc 'Alias for `bundle:install`'
66+
task bundle: 'bundle:install'
6767

6868
namespace :bundle do
69-
desc "Run `bundle install` in all subprojects"
69+
desc 'Run `bundle install` in all subprojects'
7070
task :install do
7171
subprojects.each do |project|
7272
puts '-'*80

‎elasticsearch-model/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ source 'https://rubygems.org'
2121
gemspec
2222

2323
group :development, :testing do
24-
gem 'rspec'
2524
gem 'pry-nav'
25+
gem 'rspec'
2626
end

‎elasticsearch-model/elasticsearch-model.gemspec

+37-39
Original file line numberDiff line numberDiff line change
@@ -16,56 +16,54 @@
1616
# under the License.
1717

1818
# coding: utf-8
19-
lib = File.expand_path('../lib', __FILE__)
19+
20+
lib = File.expand_path('lib', __dir__)
2021
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
2122
require 'elasticsearch/model/version'
2223

2324
Gem::Specification.new do |s|
24-
s.name = "elasticsearch-model"
25+
s.name = 'elasticsearch-model'
2526
s.version = Elasticsearch::Model::VERSION
26-
s.authors = ["Karel Minarik"]
27-
s.email = ["karel.minarik@elasticsearch.org"]
28-
s.description = "ActiveModel/Record integrations for Elasticsearch."
29-
s.summary = "ActiveModel/Record integrations for Elasticsearch."
30-
s.homepage = "https://github.com/elasticsearch/elasticsearch-rails/"
31-
s.license = "Apache 2"
27+
s.authors = ['Karel Minarik']
28+
s.email = ['karel.minarik@elasticsearch.org']
29+
s.description = 'ActiveModel/Record integrations for Elasticsearch.'
30+
s.summary = 'ActiveModel/Record integrations for Elasticsearch.'
31+
s.homepage = 'https://github.com/elasticsearch/elasticsearch-rails/'
32+
s.license = 'Apache 2'
3233

3334
s.files = `git ls-files`.split($/)
3435
s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
3536
s.test_files = s.files.grep(%r{^(test|spec|features)/})
36-
s.require_paths = ["lib"]
37-
38-
s.extra_rdoc_files = [ "README.md", "LICENSE.txt" ]
39-
s.rdoc_options = [ "--charset=UTF-8" ]
40-
41-
s.required_ruby_version = ">= 1.9.3"
42-
43-
s.add_dependency "elasticsearch", '> 1'
44-
s.add_dependency "activesupport", '> 3'
45-
s.add_dependency "hashie"
46-
47-
s.add_development_dependency "bundler"
48-
s.add_development_dependency "rake", "~> 12"
49-
50-
s.add_development_dependency "elasticsearch-extensions"
37+
s.require_paths = ['lib']
5138

52-
s.add_development_dependency "sqlite3" unless defined?(JRUBY_VERSION)
53-
s.add_development_dependency "activemodel", "> 3"
39+
s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
40+
s.rdoc_options = ['--charset=UTF-8']
5441

55-
s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
56-
s.add_development_dependency "kaminari"
57-
s.add_development_dependency "will_paginate"
42+
s.required_ruby_version = '>= 2.4'
5843

59-
s.add_development_dependency "minitest"
60-
s.add_development_dependency "test-unit"
61-
s.add_development_dependency "shoulda-context"
62-
s.add_development_dependency "mocha"
63-
s.add_development_dependency "turn"
64-
s.add_development_dependency "yard"
65-
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
66-
s.add_development_dependency "pry"
44+
s.add_dependency 'activesupport', '> 3'
45+
s.add_dependency 'elasticsearch', '> 1'
46+
s.add_dependency 'hashie'
6747

68-
s.add_development_dependency "simplecov"
69-
s.add_development_dependency "cane"
70-
s.add_development_dependency "require-prof"
48+
s.add_development_dependency 'activemodel', '> 3'
49+
s.add_development_dependency 'bundler'
50+
s.add_development_dependency 'cane'
51+
s.add_development_dependency 'elasticsearch-extensions'
52+
s.add_development_dependency 'kaminari'
53+
s.add_development_dependency 'minitest'
54+
s.add_development_dependency 'mocha'
55+
s.add_development_dependency 'pry'
56+
s.add_development_dependency 'rake', '~> 12'
57+
s.add_development_dependency 'require-prof'
58+
s.add_development_dependency 'shoulda-context'
59+
s.add_development_dependency 'simplecov'
60+
s.add_development_dependency 'test-unit'
61+
s.add_development_dependency 'turn'
62+
s.add_development_dependency 'will_paginate'
63+
s.add_development_dependency 'yard'
64+
unless defined?(JRUBY_VERSION)
65+
s.add_development_dependency 'oj'
66+
s.add_development_dependency 'ruby-prof'
67+
s.add_development_dependency 'sqlite3'
68+
end
7169
end

‎elasticsearch-persistence/Gemfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ source 'https://rubygems.org'
2020
# Specify your gem's dependencies in elasticsearch-persistence.gemspec
2121
gemspec
2222

23-
gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => false
23+
gem 'elasticsearch-model',
24+
path: File.expand_path('../elasticsearch-model', __dir__),
25+
require: false
2426

2527
gem 'virtus'
2628

2729
group :development, :testing do
28-
gem 'rspec'
2930
gem 'pry-nav'
31+
gem 'rspec'
3032
end

‎elasticsearch-rails/Gemfile

+7-3
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@ source 'https://rubygems.org'
2020
# Specify your gem's dependencies in elasticsearch-rails.gemspec
2121
gemspec
2222

23-
gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => false
24-
gem 'elasticsearch-persistence', :path => File.expand_path("../../elasticsearch-persistence", __FILE__), :require => false
23+
gem 'elasticsearch-model',
24+
path: File.expand_path('../elasticsearch-model', __dir__),
25+
require: false
2526

27+
gem 'elasticsearch-persistence',
28+
path: File.expand_path('../elasticsearch-persistence', __dir__),
29+
require: false
2630

2731
group :development, :testing do
28-
gem 'rspec'
2932
gem 'pry-nav'
33+
gem 'rspec'
3034
gem 'sqlite3' unless defined?(JRUBY_VERSION)
3135
end

‎elasticsearch-rails/elasticsearch-rails.gemspec

+36-33
Original file line numberDiff line numberDiff line change
@@ -21,45 +21,48 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
2121
require 'elasticsearch/rails/version'
2222

2323
Gem::Specification.new do |s|
24-
s.name = "elasticsearch-rails"
24+
s.name = 'elasticsearch-rails'
2525
s.version = Elasticsearch::Rails::VERSION
26-
s.authors = ["Karel Minarik"]
27-
s.email = ["karel.minarik@elasticsearch.org"]
28-
s.description = "Ruby on Rails integrations for Elasticsearch."
29-
s.summary = "Ruby on Rails integrations for Elasticsearch."
30-
s.homepage = "https://github.com/elasticsearch/elasticsearch-rails/"
31-
s.license = "Apache 2"
26+
s.authors = ['Karel Minarik']
27+
s.email = ['karel.minarik@elasticsearch.org']
28+
s.description = 'Ruby on Rails integrations for Elasticsearch.'
29+
s.summary = 'Ruby on Rails integrations for Elasticsearch.'
30+
s.homepage = 'https://github.com/elasticsearch/elasticsearch-rails/'
31+
s.license = 'Apache 2'
32+
s.metadata = {
33+
'homepage_uri' => 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/ruby_on_rails.html',
34+
'changelog_uri' => 'https://github.com/elastic/elasticsearch-rails/blob/master/CHANGELOG.md',
35+
'source_code_uri' => 'https://github.com/elastic/elasticsearch-rails/',
36+
'bug_tracker_uri' => 'https://github.com/elastic/elasticsearch-rails/issues'
37+
}
3238

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

38-
s.extra_rdoc_files = [ "README.md", "LICENSE.txt" ]
39-
s.rdoc_options = [ "--charset=UTF-8" ]
44+
s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
45+
s.rdoc_options = ['--charset=UTF-8']
4046

41-
s.required_ruby_version = ">= 1.9.3"
47+
s.required_ruby_version = '>= 2.4'
4248

43-
s.add_development_dependency "bundler"
44-
s.add_development_dependency "rake", "~> 12"
45-
46-
s.add_development_dependency "elasticsearch-extensions"
47-
48-
s.add_development_dependency "rails", ">= 3.1"
49-
50-
s.add_development_dependency "lograge"
51-
52-
s.add_development_dependency "minitest"
53-
s.add_development_dependency "test-unit"
54-
s.add_development_dependency "shoulda-context"
55-
s.add_development_dependency "mocha"
56-
s.add_development_dependency "turn"
57-
s.add_development_dependency "yard"
58-
s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
59-
s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
60-
s.add_development_dependency "pry"
61-
62-
s.add_development_dependency "simplecov"
63-
s.add_development_dependency "cane"
64-
s.add_development_dependency "require-prof"
49+
s.add_development_dependency 'bundler'
50+
s.add_development_dependency 'cane'
51+
s.add_development_dependency 'elasticsearch-extensions'
52+
s.add_development_dependency 'lograge'
53+
s.add_development_dependency 'minitest'
54+
s.add_development_dependency 'mocha'
55+
s.add_development_dependency 'pry'
56+
s.add_development_dependency 'rails', '> 3.1'
57+
s.add_development_dependency 'rake', '~> 12'
58+
s.add_development_dependency 'require-prof'
59+
s.add_development_dependency 'shoulda-context'
60+
s.add_development_dependency 'simplecov'
61+
s.add_development_dependency 'test-unit'
62+
s.add_development_dependency 'turn'
63+
s.add_development_dependency 'yard'
64+
unless defined?(JRUBY_VERSION)
65+
s.add_development_dependency 'oj'
66+
s.add_development_dependency 'ruby-prof'
67+
end
6568
end

0 commit comments

Comments
 (0)