From ef8fe3106cc8d7752ddec2bd32af716f07517c1a Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 31 Mar 2017 21:31:06 +0200 Subject: [PATCH 1/2] bump and appease Rubocop --- Gemfile | 16 ++++++++-------- Rakefile | 6 +++--- jekyll-seo-tag.gemspec | 39 ++++++++++++++++++++------------------- lib/jekyll-seo-tag.rb | 2 +- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index 0919f4a..c626203 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,15 @@ -source 'https://rubygems.org' -require 'json' -require 'open-uri' +source "https://rubygems.org" +require "json" +require "open-uri" gemspec group :development, :test do - versions = JSON.parse(open('https://pages.github.com/versions.json').read) - versions.delete('ruby') - versions.delete('jekyll-seo-tag') - versions.delete('github-pages') - versions.delete('jekyll') # Remove this line when GitHub Pages supports 3.3.0 + versions = JSON.parse(open("https://pages.github.com/versions.json").read) + versions.delete("ruby") + versions.delete("jekyll-seo-tag") + versions.delete("github-pages") + versions.delete("jekyll") # Remove this line when GitHub Pages supports 3.3.0 versions.each do |dep, version| gem dep, version diff --git a/Rakefile b/Rakefile index 4c774a2..b7e9ed5 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ -require 'bundler/gem_tasks' -require 'rspec/core/rake_task' +require "bundler/gem_tasks" +require "rspec/core/rake_task" RSpec::Core::RakeTask.new(:spec) -task default: :spec +task :default => :spec diff --git a/jekyll-seo-tag.gemspec b/jekyll-seo-tag.gemspec index 872c582..75abd13 100644 --- a/jekyll-seo-tag.gemspec +++ b/jekyll-seo-tag.gemspec @@ -1,34 +1,35 @@ # coding: utf-8 -lib = File.expand_path('../lib', __FILE__) + +lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'jekyll-seo-tag/version' +require "jekyll-seo-tag/version" Gem::Specification.new do |spec| - spec.name = 'jekyll-seo-tag' + spec.name = "jekyll-seo-tag" spec.version = Jekyll::SeoTag::VERSION - spec.authors = ['Ben Balter'] - spec.email = ['ben.balter@github.com'] + spec.authors = ["Ben Balter"] + spec.email = ["ben.balter@github.com"] spec.summary = "A Jekyll plugin to add metadata tags for search engines and social networks to better index and display your site's content." - spec.homepage = 'https://github.com/benbalter/jekyll-seo-tag' - spec.license = 'MIT' + spec.homepage = "https://github.com/benbalter/jekyll-seo-tag" + spec.license = "MIT" # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or # delete this section to allow pushing this gem to any host. if spec.respond_to?(:metadata) - spec.metadata['allowed_push_host'] = 'https://rubygems.org' + spec.metadata["allowed_push_host"] = "https://rubygems.org" else - raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' + raise "RubyGems 2.0 or newer is required to protect against public gem pushes." end - spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } - spec.bindir = 'exe' - spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } - spec.require_paths = ['lib'] + spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|spec|features)/!) } + spec.bindir = "exe" + spec.executables = spec.files.grep(%r!^exe/!) { |f| File.basename(f) } + spec.require_paths = ["lib"] - spec.add_dependency 'jekyll', '~> 3.3' - spec.add_development_dependency 'bundler', '~> 1.10' - spec.add_development_dependency 'rake', '~> 10.0' - spec.add_development_dependency 'rspec', '~> 3.3' - spec.add_development_dependency 'html-proofer', '~> 2.5' - spec.add_development_dependency 'rubocop', '~> 0.37' + spec.add_dependency "jekyll", "~> 3.3" + spec.add_development_dependency "bundler", "~> 1.10" + spec.add_development_dependency "rake", "~> 10.0" + spec.add_development_dependency "rspec", "~> 3.3" + spec.add_development_dependency "html-proofer", "~> 2.5" + spec.add_development_dependency "rubocop", "~> 0.48" end diff --git a/lib/jekyll-seo-tag.rb b/lib/jekyll-seo-tag.rb index 696daa6..7d3a736 100644 --- a/lib/jekyll-seo-tag.rb +++ b/lib/jekyll-seo-tag.rb @@ -44,7 +44,7 @@ module Jekyll end def title? - !(@text =~ %r!title=false!i) + @text !~ %r!title=false!i end def info From 4be96131915313478655c7c15c859c7b887099b2 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 31 Mar 2017 23:55:49 +0200 Subject: [PATCH 2/2] Disable Style/IndentHeredoc on specs --- .rubocop.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index c796613..d60d44a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -16,6 +16,10 @@ Style/Documentation: Style/FileName: Enabled: false +Style/IndentHeredoc: + Exclude: + - spec/**/* + AllCops: Exclude: - vendor/**/*