Merge branch 'master' of https://github.com/github/pages-gem

# Conflicts: # lib/github-pages/version.rb
siteleaf · Jun 29, 2017 · 3da9082 · 3da9082
2 parents ea18621 + 5801a7c
commit 3da9082
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 41 deletions.
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Hi there! We're glad you're interested in contributing to the GitHub Pages Gem.
 
 ### Bugs
 
-* If your think you may have found a bug in a particular plugin, please open an issue against that plugin's repository directly.
+* If your think you may have found a bug in a particular theme or plugin, please open an issue against that project's repository directly.
 
 * If your think you may have found a bug in Jekyll itself, please [open an issue in the Jekyll repository](https://github.com/jekyll/jekyll/issues/new).
 
@@ -22,7 +22,7 @@ If you have a general question about Jekyll or GitHub Pages (e.g., a configurati
 
 ### Feature requests
 
-General GitHub Pages feature requests, including requests to add additional plugins should be made via [GitHub Support](https://github.com/contact?form%5Bsubject%5D=GitHub%20Pages%20Feature%20Request).
+General GitHub Pages feature requests, including requests to add additional plugins or themes should be made via [GitHub Support](https://github.com/contact?form%5Bsubject%5D=GitHub%20Pages%20Feature%20Request).
 
 ## Contributing
 

diff --git a/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md
@@ -1,13 +1,15 @@
 ### Before submitting an issue, please be sure to
 
 - [ ] Read [the contributing instructions](https://github.com/github/pages-gem/blob/master/CONTRIBUTING.md#contributing-to-the-github-pages-gem)
-- [ ] Update to the latest Gem version (either `gem update github-pages` or `bundle update github-pages`)
+- [ ] Update to the latest Gem version (run `bundle update github-pages`)
 
 ### This issue affects
 
 - [ ] The site generated by GitHub Pages
 - [ ] Building sites locally
 
+*The GitHub Pages Gem is intended to help users replicate the GitHub Pages build environment locally. If your issue affects both the hosted version and the version previewed locally, you may be better suited reporting [seeking support in other forums](https://github.com/github/pages-gem/blob/master/CONTRIBUTING.md#where-to-get-help-or-report-an-issue).*
+
 ### What did you do (e.g., steps to reproduce)
 
 ### What did you expect to happen?

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -47,10 +47,10 @@ Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Severity: error
 
-Style/AlignHash:
+Layout/AlignHash:
   SupportedLastArgumentHashStyles: always_ignore
 
-Style/AlignParameters:
+Layout/AlignParameters:
   Enabled: false # This is usually true, but we often want to roll back to
                  # the start of a line.
 
@@ -94,7 +94,7 @@ Style/MultilineTernaryOperator:
 Style/AndOr:
   Severity: error
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Severity: error
 
 Metrics/MethodLength:
@@ -121,14 +121,14 @@ Metrics/PerceivedComplexity: { Max: 8 }
 Metrics/ParameterLists: { Max: 4 }
 Metrics/AbcSize: { Max: 20 }
 
-Style/IndentHash: { EnforcedStyle: consistent }
+Layout/IndentHash: { EnforcedStyle: consistent }
 Style/SignalException: { EnforcedStyle: only_raise }
-Style/MultilineMethodCallIndentation: { EnforcedStyle: indented }
-Style/MultilineOperationIndentation: { EnforcedStyle: indented }
-Style/FirstParameterIndentation: { EnforcedStyle: consistent }
+Layout/MultilineMethodCallIndentation: { EnforcedStyle: indented }
+Layout/MultilineOperationIndentation: { EnforcedStyle: indented }
+Layout/FirstParameterIndentation: { EnforcedStyle: consistent }
 Style/StringLiterals: { EnforcedStyle: double_quotes }
-Style/IndentArray: { EnforcedStyle: consistent }
-Style/ExtraSpacing: { AllowForAlignment: true }
+Layout/IndentArray: { EnforcedStyle: consistent }
+Layout/ExtraSpacing: { AllowForAlignment: true }
 Style/TrailingCommaInLiteral: { EnforcedStyleForMultiline: consistent_comma }
 
 Style/PercentLiteralDelimiters:

diff --git a/README.md b/README.md
@@ -30,12 +30,9 @@ $ bundle exec github-pages versions
 +---------------------------+---------+
 | Gem                       | Version |
 +---------------------------+---------+
-| jekyll                    | 3.3.1   |
-| jekyll-sass-converter     | 1.3.0   |
-| kramdown                  | 1.13.2  |
-| liquid                    | 3.0.6   |
-| rouge                     | 1.11.1  |
-| github-pages-health-check | 1.3.0   |
+| jekyll                    | x.x.x   |
+| kramdown                  | x.x.x   |
+| liquid                    | x.x.x   |
 | ....                      | ....    |
 +---------------------------+---------+
 ```

diff --git a/lib/github-pages/configuration.rb b/lib/github-pages/configuration.rb
@@ -47,6 +47,7 @@ class Configuration
       "plugins_dir" => SecureRandom.hex,
       "whitelist"   => GitHubPages::Plugins::PLUGIN_WHITELIST,
       "highlighter" => "rouge",
+      "markdown"    => "kramdown",
       "kramdown"    => {
         "template"           => "",
         "math_engine"        => "mathjax",

diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb
@@ -17,7 +17,7 @@ class Dependencies
       # Misc
       "liquid"                    => "3.0.6",
       "rouge"                     => "1.11.1",
-      "github-pages-health-check" => "1.3.3",
+      "github-pages-health-check" => "1.3.4",
 
       # Plugins
       "jekyll-redirect-from"   => "0.12.1",
@@ -26,25 +26,25 @@ class Dependencies
       "jekyll-gist"            => "1.4.0",
       "jekyll-paginate"        => "1.1.0",
       "jekyll-coffeescript"    => "1.0.1",
-      "jekyll-seo-tag"         => "2.1.0",
-      "jekyll-github-metadata" => "2.3.1",
+      "jekyll-seo-tag"         => "2.2.3",
+      "jekyll-github-metadata" => "2.4.0",
       "jekyll-avatar"          => "0.4.2",
 
       # Plugins to match GitHub.com Markdown
       "jemoji"                       => "0.8.0",
       "jekyll-mentions"              => "1.2.0",
-      "jekyll-relative-links"        => "0.4.0",
+      "jekyll-relative-links"        => "0.4.1",
       "jekyll-optional-front-matter" => "0.1.2",
       "jekyll-readme-index"          => "0.1.0",
       "jekyll-default-layout"        => "0.1.4",
-      "jekyll-titles-from-headings"  => "0.1.5",
+      "jekyll-titles-from-headings"  => "0.2.0",
 
       # Pin listen because it's broken on 2.1 & that's what we recommend.
       # https://github.com/guard/listen/pull/371
       "listen"                    => "3.0.6",
 
       # Pin activesupport because 5.0 is broken on 2.1
-      "activesupport"             => "4.2.7",
+      "activesupport"             => "4.2.8",
     }.freeze
 
     # Jekyll and related dependency versions as used by GitHub Pages.

diff --git a/lib/github-pages/plugins.rb b/lib/github-pages/plugins.rb
@@ -44,21 +44,21 @@ class Plugins
 
     # Themes
     THEMES = {
-      "minima"                     => "2.0.0",
+      "minima"                     => "2.1.1",
       "jekyll-swiss"               => "0.4.0",
-      "jekyll-theme-primer"        => "0.1.7",
-      "jekyll-theme-architect"     => "0.0.3",
-      "jekyll-theme-cayman"        => "0.0.3",
-      "jekyll-theme-dinky"         => "0.0.3",
-      "jekyll-theme-hacker"        => "0.0.3",
-      "jekyll-theme-leap-day"      => "0.0.3",
-      "jekyll-theme-merlot"        => "0.0.3",
-      "jekyll-theme-midnight"      => "0.0.3",
-      "jekyll-theme-minimal"       => "0.0.3",
-      "jekyll-theme-modernist"     => "0.0.3",
-      "jekyll-theme-slate"         => "0.0.3",
-      "jekyll-theme-tactile"       => "0.0.3",
-      "jekyll-theme-time-machine"  => "0.0.3",
+      "jekyll-theme-primer"        => "0.2.1",
+      "jekyll-theme-architect"     => "0.0.4",
+      "jekyll-theme-cayman"        => "0.0.4",
+      "jekyll-theme-dinky"         => "0.0.4",
+      "jekyll-theme-hacker"        => "0.0.4",
+      "jekyll-theme-leap-day"      => "0.0.4",
+      "jekyll-theme-merlot"        => "0.0.4",
+      "jekyll-theme-midnight"      => "0.0.4",
+      "jekyll-theme-minimal"       => "0.0.4",
+      "jekyll-theme-modernist"     => "0.0.4",
+      "jekyll-theme-slate"         => "0.0.4",
+      "jekyll-theme-tactile"       => "0.0.4",
+      "jekyll-theme-time-machine"  => "0.0.4",
     }.freeze
   end
 end
diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GitHubPages
-  VERSION = 132
+  VERSION = 141
     .to_s + '-siteleaf'.freeze
 end
diff --git a/spec/github-pages/configuration_spec.rb b/spec/github-pages/configuration_spec.rb
@@ -14,8 +14,11 @@
   let(:configuration) { Jekyll.configuration(test_config) }
   let(:site)          { Jekyll::Site.new(configuration) }
   let(:effective_config) { described_class.effective_config(site.config) }
-  before(:each) { ENV.delete("DISABLE_WHITELIST") }
-  before(:each) { ENV["JEKYLL_ENV"] = "test" }
+  before(:each) do
+    ENV.delete("DISABLE_WHITELIST")
+    ENV["JEKYLL_ENV"] = "test"
+    ENV["PAGES_REPO_NWO"] = "github/pages-gem"
+  end
 
   context "#effective_config" do
     it "sets configuration defaults" do