Merge branch 'master' into improve-collection-and-category-management

Author: DirtyF

.gitignore

@@ -18,3 +18,4 @@ Gemfile.lock
 spec/dest
 .bundle
 spec/fixtures/.jekyll-metadata
+spec/fixtures/.jekyll-cache

.travis.yml

@@ -1,13 +1,20 @@
 language: ruby
 cache: bundler
-sudo: false
 rvm:
-- 2.5
-- 2.4
-- 2.3
+  - &latest_ruby 2.6
+  - 2.4
+  - 2.3
 env:
   global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  matrix:
+    - JEKYLL_VERSION="~> 3.8"
+matrix:
+  include:
+    - rvm: *latest_ruby
+      env: JEKYLL_VERSION="~> 3.7.4"
+    - rvm: *latest_ruby
+      env: JEKYLL_VERSION=">= 4.0.0.pre.alpha1"
 before_install:
 - gem update --system
 - gem install bundler

Gemfile

@@ -3,6 +3,9 @@
 source "https://rubygems.org"
 gemspec
 
-if ENV["JEKYLL_VERSION"]
-  gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
+gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]
+
+install_if -> { Gem.win_platform? } do
+  gem "tzinfo", "~> 1.2"
+  gem "tzinfo-data"
 end

History.markdown

@@ -1,10 +1,20 @@
-## HEAD
+## 0.12.1 / 2019-03-23
 
-  * Release 💎 0.11 (#241)
+  * Release: v0.12.0 (#271)
+
+### Bug Fixes
+
+  * Re-introduce Ruby 2.3 support and test Jekyll 3.7+ (#272)
+
+## 0.12.0 / 2019-03-21
+
+  * Allow Jekyll v4 (still alpha)
 
 ### Development Fixes
 
   * style: fix offenses in specs (#248)
+  * dev: update CI and style settings (#258)
+  * Enable testing for Windows platform (#265)
 
 ## 0.11.0 / 2018-09-09
 

README.md

@@ -31,7 +31,7 @@ The plugin will automatically use any of the following configuration variables,
 
 * `title` or `name` - The title of the site, e.g., "My awesome site"
 * `description` - A longer description of what your site is about, e.g., "Where I blog about Jekyll and other awesome things"
-* `url` - The URL to your site, e.g., `http://example.com`. If none is provided, the plugin will try to use `site.github.url`.
+* `url` - The URL to your site, e.g., `https://example.com`. If none is provided, the plugin will try to use `site.github.url`.
 * `author` - Global author information (see below)
 
 ### Already have a feed path?

appveyor.yml

@@ -0,0 +1,29 @@
+version: "{build}"
+clone_depth: 5
+build: off
+
+environment:
+  NOKOGIRI_USE_SYSTEM_LIBRARIES: true
+  JEKYLL_VERSION: "~> 3.8"
+  matrix:
+    - RUBY_FOLDER_VER: "26"
+      JEKYLL_VERSION : "~> 3.7.4"
+    - RUBY_FOLDER_VER: "26"
+      JEKYLL_VERSION : ">= 4.0.0.pre.alpha1"
+    - RUBY_FOLDER_VER: "26"
+    - RUBY_FOLDER_VER: "24"
+    - RUBY_FOLDER_VER: "23"
+
+install:
+  - SET PATH=C:\Ruby%RUBY_FOLDER_VER%-x64\bin;%PATH%
+  - bundle install --retry 5 --jobs=%NUMBER_OF_PROCESSORS% --clean --path vendor\bundle
+
+test_script:
+  - ruby --version
+  - gem --version
+  - bundler --version
+  - bash ./script/test
+
+cache:
+  # If one of the files after the right arrow changes, cache will be invalidated
+  - 'vendor\bundle -> appveyor.yml, Gemfile, jekyll-feed.gemspec'

jekyll-feed.gemspec

@@ -14,17 +14,17 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   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.required_ruby_version = ">= 2.3.0"
 
-  spec.add_dependency "jekyll", "~> 3.3"
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_dependency "jekyll", ">= 3.7", "< 5.0"
+
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "nokogiri", "~> 1.6"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop-jekyll", "~> 0.3"
+  spec.add_development_dependency "rubocop-jekyll", "~> 0.5"
   spec.add_development_dependency "typhoeus", ">= 0.7", "< 2.0"
 end

lib/jekyll-feed/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Feed
-    VERSION = "0.11.0"
+    VERSION = "0.12.1"
   end
 end

spec/jekyll-feed_spec.rb

@@ -205,6 +205,7 @@
 
   context "validation" do
     it "validates" do
+      skip "Typhoeus couldn't find the 'libcurl' module on Windows" if Gem.win_platform?
       # See https://validator.w3.org/docs/api.html
       url = "https://validator.w3.org/feed/check.cgi?output=soap12"
       response = Typhoeus.post(url, :body => { :rawdata => contents }, :accept_encoding => "gzip")

spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "jekyll"
-require "typhoeus"
+require "typhoeus" unless Gem.win_platform?
 require "nokogiri"
 require "rss"
 require File.expand_path("../lib/jekyll-feed", __dir__)