From 02421f4e3f301275037a72b5e7d70a79d7b47fe5 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Tue, 1 May 2018 16:20:11 +0200 Subject: [PATCH 1/6] Require Ruby 2.3 --- .rubocop.yml | 2 +- .travis.yml | 3 +-- jekyll-gist.gemspec | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index e86cc3d..144cc61 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ inherit_gem: jekyll: .rubocop.yml AllCops: - TargetRubyVersion: 2.1 + TargetRubyVersion: 2.3 Exclude: - vendor/**/* - spec/*.rb diff --git a/.travis.yml b/.travis.yml index cdf5bc6..6b50f0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,9 @@ rvm: - 2.5 - 2.4 - 2.3 - - 2.2 env: - "" - - JEKYLL_VERSION=3.7.0 + - JEKYLL_VERSION=3.8.0 matrix: include: - # GitHub Pages diff --git a/jekyll-gist.gemspec b/jekyll-gist.gemspec index b9e7448..8f4dc7f 100644 --- a/jekyll-gist.gemspec +++ b/jekyll-gist.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/jekyll/jekyll-gist" spec.license = "MIT" - spec.required_ruby_version = ">= 2.1" + spec.required_ruby_version = ">= 2.3.0" spec.files = `git ls-files -z`.split("\x0") spec.executables = spec.files.grep(%r!^bin/!) { |f| File.basename(f) } From 261f0041d34f87e14bfe1cc29c122718aaa03343 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Tue, 1 May 2018 16:20:24 +0200 Subject: [PATCH 2/6] Appease Rubocop --- jekyll-gist.gemspec | 2 +- lib/jekyll-gist/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jekyll-gist.gemspec b/jekyll-gist.gemspec index 8f4dc7f..5354ff7 100644 --- a/jekyll-gist.gemspec +++ b/jekyll-gist.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "jekyll", ">= 3.0" spec.add_development_dependency "rake" spec.add_development_dependency "rspec" - spec.add_development_dependency "rubocop", "0.51" + spec.add_development_dependency "rubocop", "0.55" spec.add_development_dependency "webmock" end diff --git a/lib/jekyll-gist/version.rb b/lib/jekyll-gist/version.rb index 0de8671..2bef474 100644 --- a/lib/jekyll-gist/version.rb +++ b/lib/jekyll-gist/version.rb @@ -2,6 +2,6 @@ module Jekyll module Gist - VERSION = "1.5.0".freeze + VERSION = "1.5.0" end end From f9fed3a7111adbd283f8dc4d71e978ea7cb2ee22 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 5 Jul 2018 19:39:30 +0200 Subject: [PATCH 3/6] Stick to GitHub Pages version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b50f0d..d09341d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ rvm: - 2.3 env: - "" - - JEKYLL_VERSION=3.8.0 + - JEKYLL_VERSION=3.7.3 matrix: include: - # GitHub Pages From abeb0d15b641e15b42da9fd98fd04191bbf668f6 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 5 Jul 2018 19:39:50 +0200 Subject: [PATCH 4/6] Appease Rubocop 57.2 --- lib/jekyll-gist/gist_tag.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb index c265063..33cbe9f 100644 --- a/lib/jekyll-gist/gist_tag.rb +++ b/lib/jekyll-gist/gist_tag.rb @@ -36,7 +36,7 @@ def render(context) {% gist user/1234567 foo.js %} {% gist 28949e1d5ee2273f9fd3 %} {% gist 28949e1d5ee2273f9fd3 best.md %} - EOS + EOS end end From 5b9692b7aaada94bf8bc1f00fb32076915739f1c Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 5 Jul 2018 19:40:23 +0200 Subject: [PATCH 5/6] Use latest Rubocop --- jekyll-gist.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll-gist.gemspec b/jekyll-gist.gemspec index 5354ff7..579b858 100644 --- a/jekyll-gist.gemspec +++ b/jekyll-gist.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "jekyll", ">= 3.0" spec.add_development_dependency "rake" spec.add_development_dependency "rspec" - spec.add_development_dependency "rubocop", "0.55" + spec.add_development_dependency "rubocop", "~> 0.57" spec.add_development_dependency "webmock" end From 1b71c6b8dc67d5d718e1ea651577f211d5f4e731 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 5 Jul 2018 20:02:35 +0200 Subject: [PATCH 6/6] Appease Rubocop --- lib/jekyll-gist/gist_tag.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb index 33cbe9f..fb562a4 100644 --- a/lib/jekyll-gist/gist_tag.rb +++ b/lib/jekyll-gist/gist_tag.rb @@ -26,17 +26,18 @@ def render(context) script_tag = gist_script_tag(gist_id, filename) "#{noscript_tag}#{script_tag}" else - raise ArgumentError, <<-EOS - Syntax error in tag 'gist' while parsing the following markup: + raise ArgumentError, <<~ERROR + Syntax error in tag 'gist' while parsing the following markup: - #{@markup} + #{@markup} - Valid syntax: - {% gist user/1234567 %} - {% gist user/1234567 foo.js %} - {% gist 28949e1d5ee2273f9fd3 %} - {% gist 28949e1d5ee2273f9fd3 best.md %} - EOS + Valid syntax: + {% gist user/1234567 %} + {% gist user/1234567 foo.js %} + {% gist 28949e1d5ee2273f9fd3 %} + {% gist 28949e1d5ee2273f9fd3 best.md %} + + ERROR end end