jekyll-test 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f1b22958852090e21598daea53b41509b37cb4cf1e2f747c8e49292c784a3d
-  data.tar.gz: 73335d98cc5b9b264b31d13a3a882b6aa97945b03ea19a5578642c21f406b56c
+  metadata.gz: 419340df0145f20ca9bdb709f48bdf523560b92cce2de3d57b4cfbe6b7be5ed9
+  data.tar.gz: 27ab0614a7c46ef2392bf2875b7c71df97f493d4192924c1f6077526edb6f9da
 SHA512:
-  metadata.gz: 2cdb10753c28cc98f1b4e931cda12e0195635878b83f5baf3f07ac842b42c75d6b44abafeb84679b937b45110cf4a81a190d57dcda57c2d335eff010a3004ca7
-  data.tar.gz: 2644d982b8e6680a2258354d51573100f65327f2720d46b3e0a3a2adfc51b564fe7652413a842f984616476ce0c3e378297e8168e7cd1f7539d838d58d0d50f3
+  metadata.gz: 931b7daa79e328e875d285f5dba77eb0483ae70bdcc742d10c1d624c242bc1c97a5b6762ac4999afb0f70b68bea56a5e38afaffd8e82ad9a13cd4c93b00f102a
+  data.tar.gz: 8e81cea5c5ebd18fedeb31a0be63defe70a92a63143640376ab4acb9f31da00fe8ac5ff00291d9f1bc73cd956a1b7e339fb81138011f6cde0a9f033f7ff48dd7

data/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.5
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.rubocop_todo.yml

@@ -0,0 +1,18 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-10-30 21:18:33 +0100 using RuboCop version 0.60.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 28
+
+# Offense count: 1
+Style/Documentation:
+  Exclude:
+    - 'lib/jekyll/test.rb'

data/.ruby-version

@@ -0,0 +1 @@
+2.5.3

data/.travis.yml

@@ -2,13 +2,12 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-- 2.2.9
-- 2.3.6
-- 2.4.3
-- 2.5.0
-before_install: 
+- 2.3.8
+- 2.4.5
+- 2.5.3
+before_install:
 - gem update --system
-- gem install bundler -v 1.16.1
+- gem install bundler -v 1.17.1
 deploy:
   provider: rubygems
   api_key:

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.2.0
+
+* Check SRI tags by default
+* Automatically handle sites with non-empty baseurl
+* Run travis builds on 2.5.3
+
+Rerun `rake jekyll:configure:travis` to get the new configuration.
+
 ## 1.1.1
 
 * Support Ruby 2.5.0

data/Gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in jekyll-test.gemspec
 gemspec

data/README.md

@@ -10,7 +10,7 @@ It provides two rake tasks:
 
 ## Requirements
 
-* Ruby 2.2 or higher (`ruby -v` to check version)
+* Ruby 2.3 or higher (`ruby -v` to check version)
 * Bundler (`gem install bundler` if it's not there)
 
 ## Usage

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "jekyll/test"

data/jekyll-test.gemspec

@@ -1,17 +1,18 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jekyll/test/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "jekyll-test"
-  spec.version       = Jekyll::Test::VERSION
-  spec.licenses      = ['MIT']
-  spec.authors       = ["James Smith"]
-  spec.email         = ["james@floppy.org.uk"]
+  spec.name     = "jekyll-test"
+  spec.version  = Jekyll::Test::VERSION
+  spec.licenses = ["MIT"]
+  spec.authors  = ["James Smith"]
+  spec.email    = ["james@floppy.org.uk"]
 
-  spec.summary       = %q{An highly opinionated test configuration for Jekyll sites.}
-  spec.homepage      = "https://github.com/Floppy/jekyll-test"
+  spec.summary  = "A highly opinionated test configuration for Jekyll sites."
+  spec.homepage = "https://github.com/Floppy/jekyll-test"
 
   if spec.respond_to?(:metadata)
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
@@ -20,7 +21,7 @@ Gem::Specification.new do |spec|
       "public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = "exe"
@@ -29,13 +30,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ["~> 2.2", "< 2.6"]
 
+  spec.add_dependency "html-proofer", "~> 3.7"
   spec.add_dependency "jekyll", "~> 3.0"
-  spec.add_dependency "rspec", "~> 3.0"
   spec.add_dependency "rake", "~> 12.0"
-  spec.add_dependency 'html-proofer', "~> 3.7"
-  spec.add_dependency 'travis', "~> 1.8"
-  spec.add_dependency 'rspec-html-matchers', "~> 0.9"
+  spec.add_dependency "rspec", "~> 3.0"
+  spec.add_dependency "rspec-html-matchers", "~> 0.9"
+  spec.add_dependency "travis", "~> 1.8"
 
   spec.add_development_dependency "bundler", "~> 1.15"
-
+  spec.add_development_dependency "rubocop", "~> 0.60"
 end

data/lib/jekyll/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "jekyll/test/version"
 
 module Jekyll

data/lib/jekyll/test/jekyll.rake

@@ -1,49 +1,61 @@
-require 'html-proofer'
+# frozen_string_literal: true
 
-def check_site(options = {})
-  defaults = {
+require "html-proofer"
+
+def default_options
+  {
     assume_extension: ".html",
     typhoeus: {
-      ssl_verifypeer: false, 
+      ssl_verifypeer: false,
       ssl_verifyhost: 0,
-      timeout: 3,
-    }, 
+      timeout: 3
+    }
   }
-  HTMLProofer.check_directory(jekyll_site_directory, defaults.merge(options)).run
+end
+
+def check_site(options = {})
+  HTMLProofer.check_directory(
+    jekyll_site_directory,
+    default_options.merge(options)
+  ).run
+end
+
+def jekyll_config
+  File.exist?("_config.yml") ? YAML.load_file("_config.yml") : {}
 end
 
 def jekyll_site_directory
-  dir = "./_site"
-  if File.exist?('_config.yml')
-    config = YAML.load_file("_config.yml")
-    dir = config["destination"] || dir
-  end
-  dir
+  jekyll_config["destination"] || "./_site"
 end
 
-namespace :jekyll do
+def baseurl
+  jekyll_config["baseurl"] || ""
+end
 
+namespace :jekyll do
   task :rebuild do
     sh "rm -rf #{jekyll_site_directory}"
     sh "bundle exec jekyll build"
   end
 
-  task :check => :rebuild do
+  task check: :rebuild do
     check_site(
-      check_html: true, 
+      check_html: true,
       check_favicon: true,
-      #check_sri: true, #soon!
+      check_sri: true,
       check_img_http: true,
       check_opengraph: true,
       disable_external: true,
+      url_swap: {
+        /^#{baseurl}/ => ""
+      }
     )
   end
 
-  task :check_external_links => :rebuild do
+  task check_external_links: :rebuild do
     check_site(
       url_ignore: [],
-      check_external_hash: true,
+      check_external_hash: true
     )
   end
-
-end
+end

data/lib/jekyll/test/tasks.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 $VERBOSE = nil
-Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
+Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }

data/lib/jekyll/test/travis.rake

@@ -1,17 +1,14 @@
-namespace :jekyll do
+# frozen_string_literal: true
 
+namespace :jekyll do
   namespace :configure do
-  
     task :travis do
       # Initialise travis
-      unless File.exist?(".travis.yml")
-        sh "bundle exec travis init"
-      end
+      sh "bundle exec travis init" unless File.exist?(".travis.yml")
       # Load existing configuration
-      travis = {}
-      travis = YAML.load_file(".travis.yml") 
+      travis = YAML.load_file(".travis.yml")
       # Update configuration
-      travis["rvm"] = ["2.4.3"]
+      travis["rvm"] = ["2.5.3"]
       travis["sudo"] = false
       travis["cache"] = "bundler"
       travis["addons"] = {
@@ -22,20 +19,18 @@ namespace :jekyll do
         }
       }
       travis["env"] = [
-        %Q{TASK='jekyll:check'},
-        %Q{TASK='jekyll:check_external_links'},
+        %(TASK='jekyll:check'),
+        %(TASK='jekyll:check_external_links')
       ]
       travis["matrix"] = {
         "fast_finish" => true,
         "allow_failures" => [{
-          "env" => %Q{TASK='jekyll:check_external_links'}
+          "env" => %(TASK='jekyll:check_external_links')
         }]
       }
       travis["script"] = "bundle exec rake $TASK"
       # Output
       File.write(".travis.yml", travis.to_yaml)
     end
-  
   end
-  
 end

data/lib/jekyll/test/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Test
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-test
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jekyll
+  name: html-proofer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: html-proofer
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rspec-html-matchers
+  name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.60'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.60'
 description: 
 email:
 - james@floppy.org.uk
@@ -117,6 +131,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -156,8 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: An highly opinionated test configuration for Jekyll sites.
+summary: A highly opinionated test configuration for Jekyll sites.
 test_files: []