Merge branch 'master' into rubocop-offenses

Author: ashmaroli

.travis.yml

@@ -1,20 +1,25 @@
 language: ruby
+cache: bundler
+rvm:
+  - &latest_ruby 2.6
+  - 2.4
+  - 2.3
+
 script : script/cibuild
-sudo: false
-notifications:
-  email: false
+
 branches:
   only:
     - master
-rvm:
-  - 2.5
-  - 2.4
-  - 2.3
 env:
-  - ""
-  - JEKYLL_VERSION=3.7.4
+  matrix:
+  - JEKYLL_VERSION="~> 3.8"
 matrix:
   include:
     - # GitHub Pages
-      rvm: 2.5.1
-      env: GH_PAGES=true
+      rvm: 2.5.3
+      env: JEKYLL_VERSION="~> 3.7.4"
+    - rvm: *latest_ruby
+      env: JEKYLL_VERSION=">= 4.0.0.pre.alpha1"
+
+notifications:
+  email: false

Gemfile

@@ -3,8 +3,4 @@
 source "https://rubygems.org"
 gemspec
 
-if ENV["GH_PAGES"]
-  gem "github-pages"
-elsif ENV["JEKYLL_VERSION"]
-  gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
-end
+gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]

History.markdown

@@ -10,6 +10,10 @@
 
   * chore(deps): drop support for Liquid < 4.0 (#66)
 
+### Bug Fixes
+
+  * Re-introduce Ruby 2.3 support and test Jekyll 3.7+ (#72)
+
 ## 1.5.0 / 2017-12-03
 
 ### Documentation

jekyll-gist.gemspec

@@ -14,18 +14,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/jekyll/jekyll-gist"
   spec.license       = "MIT"
 
-  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) }
-  spec.test_files    = spec.files.grep(%r!^(test|spec|features)/!)
+  spec.test_files    = spec.files.grep(%r!^spec/!)
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "octokit", "~> 4.2"
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "jekyll", ">= 3.5"
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_runtime_dependency "jekyll", ">= 3.7", "< 5.0"
+  spec.add_runtime_dependency "octokit", "~> 4.2"
+
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop-jekyll", "~> 0.3"
+  spec.add_development_dependency "rubocop-jekyll", "~> 0.4"
   spec.add_development_dependency "webmock"
 end

lib/jekyll-gist/gist_tag.rb

@@ -26,12 +26,14 @@ def render(context)
         else
           raise ArgumentError, <<~ERROR
             Syntax error in tag 'gist' while parsing the following markup:
+
               #{@markup}
-              Valid syntax:
-                {% gist user/1234567 %}
-                {% gist user/1234567 foo.js %}
-                {% gist 28949e1d5ee2273f9fd3 %}
-                {% gist 28949e1d5ee2273f9fd3 best.md %}
+
+            Valid syntax:
+              {% gist user/1234567 %}
+              {% gist user/1234567 foo.js %}
+              {% gist 28949e1d5ee2273f9fd3 %}
+              {% gist 28949e1d5ee2273f9fd3 best.md %}
 
           ERROR
         end