Modernize tests & linting

.rubocop.yml

@@ -1,15 +1,10 @@
 inherit_gem:
   jekyll: .rubocop.yml
 
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - lib/jekyll-archives.rb
-
 Metrics/BlockLength:
   Exclude:
     - test/**/*.rb
+
 Metrics/LineLength:
   Exclude:
     - test/**/*.rb
-    - lib/jekyll-archives.rb
-    - lib/jekyll-archives/archive.rb

.travis.yml

@@ -6,14 +6,13 @@ sudo: false
 before_install: gem update --system
 
 rvm:
-  - 2.1
   - 2.2
   - 2.3
   - 2.4
 
 env:
   - ""
-  - JEKYLL_VERSION=3.4
+  - JEKYLL_VERSION=3.1
 
 matrix:
   include:

Rakefile

@@ -21,6 +21,7 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
   test.libs << "lib" << "test"
   test.pattern = "test/**/test_*.rb"
+  test.warning = false
 end
 
 task :default => "test"

jekyll-archives.gemspec

@@ -13,9 +13,11 @@ Gem::Specification.new do |s|
 
   s.homepage    = "https://github.com/jekyll/jekyll-archives"
   s.licenses    = ["MIT"]
-  s.files       = ["lib/jekyll-archives.rb", "lib/jekyll-archives/archive.rb"]
 
-  s.add_dependency "jekyll", ">= 2.4"
+  all_files       = `git ls-files -z`.split("\x0")
+  s.files         = all_files.grep(%r!^(lib)/!)
+
+  s.add_dependency "jekyll", ">= 3.1"
 
   s.add_development_dependency  "minitest"
   s.add_development_dependency  "rake"

lib/jekyll-archives.rb

@@ -24,11 +24,7 @@ class Archives < Jekyll::Generator
       }.freeze
 
       def initialize(config = nil)
-        @config = if config["jekyll-archives"].nil?
-                    DEFAULTS
-                  else
-                    Utils.deep_merge_hashes(DEFAULTS, config["jekyll-archives"])
-                  end
+        @config = Utils.deep_merge_hashes(DEFAULTS, config.fetch("jekyll-archives", {}))
       end
 
       def generate(site)