From 536109ddd85add2bf79961f2aad3cae959355283 Mon Sep 17 00:00:00 2001 From: Kohei Suzuki Date: Mon, 23 Apr 2018 23:45:03 +0900 Subject: [PATCH] Fix for rubocop --- .rubocop.yml | 6 ++++-- gemfiles/rails_3.2.gemfile | 12 ++++++------ gemfiles/rails_4.0.gemfile | 12 ++++++------ gemfiles/rails_4.1.gemfile | 12 ++++++------ gemfiles/rails_4.2.gemfile | 12 ++++++------ gemfiles/rails_5.0.gemfile | 12 ++++++------ gemfiles/rails_5.1.gemfile | 12 ++++++------ gemfiles/rails_edge.gemfile | 14 +++++++------- switch_point.gemspec | 2 +- 9 files changed, 48 insertions(+), 46 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 66e3572..3232515 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -36,9 +36,11 @@ Style/RaiseArgs: EnforcedStyle: compact Style/SignalException: Enabled: false -Style/TrailingCommaInLiteral: - Enabled: false Style/TrailingCommaInArguments: Enabled: false +Style/TrailingCommaInArrayLiteral: + Enabled: false +Style/TrailingCommaInHashLiteral: + Enabled: false Metrics: Enabled: false diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile index c525804..9498fdf 100644 --- a/gemfiles/rails_3.2.gemfile +++ b/gemfiles/rails_3.2.gemfile @@ -1,16 +1,16 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source 'https://rubygems.org' -gem "activerecord", "~> 3.2" +gem 'activerecord', '~> 3.2' platforms :ruby do - gem "sqlite3" + gem 'sqlite3' end platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "json" + gem 'activerecord-jdbcsqlite3-adapter' + gem 'json' end -gemspec path: "../" +gemspec path: '../' diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile index 943c34d..bd6c3f7 100644 --- a/gemfiles/rails_4.0.gemfile +++ b/gemfiles/rails_4.0.gemfile @@ -1,16 +1,16 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source 'https://rubygems.org' -gem "activerecord", "~> 4.0" +gem 'activerecord', '~> 4.0' platforms :ruby do - gem "sqlite3" + gem 'sqlite3' end platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "json" + gem 'activerecord-jdbcsqlite3-adapter' + gem 'json' end -gemspec path: "../" +gemspec path: '../' diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile index 3817cdf..5c8e48b 100644 --- a/gemfiles/rails_4.1.gemfile +++ b/gemfiles/rails_4.1.gemfile @@ -1,16 +1,16 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source 'https://rubygems.org' -gem "activerecord", "~> 4.1" +gem 'activerecord', '~> 4.1' platforms :ruby do - gem "sqlite3" + gem 'sqlite3' end platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "json" + gem 'activerecord-jdbcsqlite3-adapter' + gem 'json' end -gemspec path: "../" +gemspec path: '../' diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index bafc0a6..ba00e7c 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -1,16 +1,16 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source 'https://rubygems.org' -gem "activerecord", "~> 4.2" +gem 'activerecord', '~> 4.2' platforms :ruby do - gem "sqlite3" + gem 'sqlite3' end platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "json" + gem 'activerecord-jdbcsqlite3-adapter' + gem 'json' end -gemspec path: "../" +gemspec path: '../' diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index 7fc5b18..bba9014 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -1,16 +1,16 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source 'https://rubygems.org' -gem "activerecord", "~> 5.0" +gem 'activerecord', '~> 5.0' platforms :ruby do - gem "sqlite3" + gem 'sqlite3' end platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "json" + gem 'activerecord-jdbcsqlite3-adapter' + gem 'json' end -gemspec path: "../" +gemspec path: '../' diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 8ff3f04..4c03642 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -1,16 +1,16 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source 'https://rubygems.org' -gem "activerecord", "~> 5.1" +gem 'activerecord', '~> 5.1' platforms :ruby do - gem "sqlite3" + gem 'sqlite3' end platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "json" + gem 'activerecord-jdbcsqlite3-adapter' + gem 'json' end -gemspec path: "../" +gemspec path: '../' diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index 346e9e8..1f32707 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -1,17 +1,17 @@ # This file was generated by Appraisal -source "https://rubygems.org" +source 'https://rubygems.org' -gem "activerecord", git: "https://github.com/rails/rails" -gem "arel", git: "https://github.com/rails/arel" +gem 'activerecord', git: 'https://github.com/rails/rails' +gem 'arel', git: 'https://github.com/rails/arel' platforms :ruby do - gem "sqlite3" + gem 'sqlite3' end platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "master" - gem "json" + gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master' + gem 'json' end -gemspec path: "../" +gemspec path: '../' diff --git a/switch_point.gemspec b/switch_point.gemspec index 4a77a1a..7a14545 100644 --- a/switch_point.gemspec +++ b/switch_point.gemspec @@ -1,6 +1,6 @@ # frozen_string_literal: true -lib = File.expand_path('../lib', __FILE__) +lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'switch_point/version'