github-pages 146 → 147
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/github-pages/configuration.rb +15 -6
- data/lib/github-pages/dependencies.rb +3 -3
- data/lib/github-pages/version.rb +1 -1
- metadata +8 -8
    
        checksums.yaml
    CHANGED
    
    | @@ -1,7 +1,7 @@ | |
| 1 1 | 
             
            ---
         | 
| 2 2 | 
             
            SHA1:
         | 
| 3 | 
            -
              metadata.gz:  | 
| 4 | 
            -
              data.tar.gz:  | 
| 3 | 
            +
              metadata.gz: 7370e4e90e7f60c603d6409e6e75a41ff0096f44
         | 
| 4 | 
            +
              data.tar.gz: 69daef8810f3ee14a749e978bee0784edc36f54a
         | 
| 5 5 | 
             
            SHA512:
         | 
| 6 | 
            -
              metadata.gz:  | 
| 7 | 
            -
              data.tar.gz:  | 
| 6 | 
            +
              metadata.gz: ec5dcdab7b6685c0fc19d5c71324f3709e0b7944befe4aaf9bd2544fad43fca667b69fa8dd3c7ad1ec5aba2299ed1070d3f5cfcbb1a9be3dcc744c3b0f49a9fb
         | 
| 7 | 
            +
              data.tar.gz: 3bebe5398b07acbc47340697e240090d54d90ff6006397f19a0488281adbf66394fb61cdabac735f93536db0d5c19c5a06104af1833417ddfea0572c51e31980
         | 
| @@ -14,7 +14,7 @@ module GitHubPages | |
| 14 14 | 
             
                # Default, user overwritable options
         | 
| 15 15 | 
             
                DEFAULTS = {
         | 
| 16 16 | 
             
                  "jailed"   => false,
         | 
| 17 | 
            -
                  " | 
| 17 | 
            +
                  "plugins"  => GitHubPages::Plugins::DEFAULT_PLUGINS,
         | 
| 18 18 | 
             
                  "future"   => true,
         | 
| 19 19 | 
             
                  "theme"    => "jekyll-theme-primer",
         | 
| 20 20 | 
             
                  "kramdown" => {
         | 
| @@ -44,7 +44,6 @@ module GitHubPages | |
| 44 44 | 
             
                OVERRIDES = {
         | 
| 45 45 | 
             
                  "lsi"         => false,
         | 
| 46 46 | 
             
                  "safe"        => true,
         | 
| 47 | 
            -
                  "plugins"     => SecureRandom.hex,
         | 
| 48 47 | 
             
                  "plugins_dir" => SecureRandom.hex,
         | 
| 49 48 | 
             
                  "whitelist"   => GitHubPages::Plugins::PLUGIN_WHITELIST,
         | 
| 50 49 | 
             
                  "highlighter" => "rouge",
         | 
| @@ -63,7 +62,7 @@ module GitHubPages | |
| 63 62 | 
             
                # Jekyll::Site and need to be set properly when the config is updated.
         | 
| 64 63 | 
             
                CONFIGS_WITH_METHODS = %w(
         | 
| 65 64 | 
             
                  safe lsi highlighter baseurl exclude include future unpublished
         | 
| 66 | 
            -
                  show_drafts limit_posts keep_files | 
| 65 | 
            +
                  show_drafts limit_posts keep_files
         | 
| 67 66 | 
             
                ).freeze
         | 
| 68 67 |  | 
| 69 68 | 
             
                class << self
         | 
| @@ -105,9 +104,15 @@ module GitHubPages | |
| 105 104 | 
             
                    config = Jekyll::Utils.deep_merge_hashes config, OVERRIDES
         | 
| 106 105 |  | 
| 107 106 | 
             
                    # Ensure we have those gems we want.
         | 
| 108 | 
            -
                    config[" | 
| 109 | 
            -
             | 
| 110 | 
            -
                     | 
| 107 | 
            +
                    config["plugins"] = Array(config["plugins"]) | DEFAULT_PLUGINS
         | 
| 108 | 
            +
             | 
| 109 | 
            +
                    if disable_whitelist?
         | 
| 110 | 
            +
                      config["whitelist"] = config["whitelist"] | config["plugins"]
         | 
| 111 | 
            +
                    end
         | 
| 112 | 
            +
             | 
| 113 | 
            +
                    if development?
         | 
| 114 | 
            +
                      config["whitelist"] = config["whitelist"] | DEVELOPMENT_PLUGINS
         | 
| 115 | 
            +
                    end
         | 
| 111 116 |  | 
| 112 117 | 
             
                    config
         | 
| 113 118 | 
             
                  end
         | 
| @@ -141,6 +146,10 @@ module GitHubPages | |
| 141 146 | 
             
                    CONFIGS_WITH_METHODS.each do |opt|
         | 
| 142 147 | 
             
                      site.public_send("#{opt}=", site.config[opt])
         | 
| 143 148 | 
             
                    end
         | 
| 149 | 
            +
             | 
| 150 | 
            +
                    # While Configuration renamed the gems key to plugins, Site retained
         | 
| 151 | 
            +
                    # backwards compatability and must be set manually
         | 
| 152 | 
            +
                    site.gems = site.config["plugins"]
         | 
| 144 153 | 
             
                  end
         | 
| 145 154 | 
             
                end
         | 
| 146 155 | 
             
              end
         | 
| @@ -7,14 +7,14 @@ module GitHubPages | |
| 7 7 | 
             
              class Dependencies
         | 
| 8 8 | 
             
                VERSIONS = {
         | 
| 9 9 | 
             
                  # Jekyll
         | 
| 10 | 
            -
                  "jekyll"                    => "3. | 
| 10 | 
            +
                  "jekyll"                    => "3.5.1",
         | 
| 11 11 | 
             
                  "jekyll-sass-converter"     => "1.5.0",
         | 
| 12 12 |  | 
| 13 13 | 
             
                  # Converters
         | 
| 14 14 | 
             
                  "kramdown"                  => "1.13.2",
         | 
| 15 15 |  | 
| 16 16 | 
             
                  # Misc
         | 
| 17 | 
            -
                  "liquid"                    => " | 
| 17 | 
            +
                  "liquid"                    => "4.0.0",
         | 
| 18 18 | 
             
                  "rouge"                     => "1.11.1",
         | 
| 19 19 | 
             
                  "github-pages-health-check" => "1.3.5",
         | 
| 20 20 |  | 
| @@ -22,7 +22,7 @@ module GitHubPages | |
| 22 22 | 
             
                  "jekyll-redirect-from"   => "0.12.1",
         | 
| 23 23 | 
             
                  "jekyll-sitemap"         => "1.0.0",
         | 
| 24 24 | 
             
                  "jekyll-feed"            => "0.9.2",
         | 
| 25 | 
            -
                  "jekyll-gist"            => "1.4. | 
| 25 | 
            +
                  "jekyll-gist"            => "1.4.1",
         | 
| 26 26 | 
             
                  "jekyll-paginate"        => "1.1.0",
         | 
| 27 27 | 
             
                  "jekyll-coffeescript"    => "1.0.1",
         | 
| 28 28 | 
             
                  "jekyll-seo-tag"         => "2.2.3",
         | 
    
        data/lib/github-pages/version.rb
    CHANGED
    
    
    
        metadata
    CHANGED
    
    | @@ -1,14 +1,14 @@ | |
| 1 1 | 
             
            --- !ruby/object:Gem::Specification
         | 
| 2 2 | 
             
            name: github-pages
         | 
| 3 3 | 
             
            version: !ruby/object:Gem::Version
         | 
| 4 | 
            -
              version: ' | 
| 4 | 
            +
              version: '147'
         | 
| 5 5 | 
             
            platform: ruby
         | 
| 6 6 | 
             
            authors:
         | 
| 7 7 | 
             
            - GitHub, Inc.
         | 
| 8 8 | 
             
            autorequire: 
         | 
| 9 9 | 
             
            bindir: bin
         | 
| 10 10 | 
             
            cert_chain: []
         | 
| 11 | 
            -
            date: 2017- | 
| 11 | 
            +
            date: 2017-08-08 00:00:00.000000000 Z
         | 
| 12 12 | 
             
            dependencies:
         | 
| 13 13 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 14 14 | 
             
              name: jekyll
         | 
| @@ -16,14 +16,14 @@ dependencies: | |
| 16 16 | 
             
                requirements:
         | 
| 17 17 | 
             
                - - '='
         | 
| 18 18 | 
             
                  - !ruby/object:Gem::Version
         | 
| 19 | 
            -
                    version: 3. | 
| 19 | 
            +
                    version: 3.5.1
         | 
| 20 20 | 
             
              type: :runtime
         | 
| 21 21 | 
             
              prerelease: false
         | 
| 22 22 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 23 23 | 
             
                requirements:
         | 
| 24 24 | 
             
                - - '='
         | 
| 25 25 | 
             
                  - !ruby/object:Gem::Version
         | 
| 26 | 
            -
                    version: 3. | 
| 26 | 
            +
                    version: 3.5.1
         | 
| 27 27 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 28 28 | 
             
              name: jekyll-sass-converter
         | 
| 29 29 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| @@ -58,14 +58,14 @@ dependencies: | |
| 58 58 | 
             
                requirements:
         | 
| 59 59 | 
             
                - - '='
         | 
| 60 60 | 
             
                  - !ruby/object:Gem::Version
         | 
| 61 | 
            -
                    version:  | 
| 61 | 
            +
                    version: 4.0.0
         | 
| 62 62 | 
             
              type: :runtime
         | 
| 63 63 | 
             
              prerelease: false
         | 
| 64 64 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 65 65 | 
             
                requirements:
         | 
| 66 66 | 
             
                - - '='
         | 
| 67 67 | 
             
                  - !ruby/object:Gem::Version
         | 
| 68 | 
            -
                    version:  | 
| 68 | 
            +
                    version: 4.0.0
         | 
| 69 69 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 70 70 | 
             
              name: rouge
         | 
| 71 71 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| @@ -142,14 +142,14 @@ dependencies: | |
| 142 142 | 
             
                requirements:
         | 
| 143 143 | 
             
                - - '='
         | 
| 144 144 | 
             
                  - !ruby/object:Gem::Version
         | 
| 145 | 
            -
                    version: 1.4. | 
| 145 | 
            +
                    version: 1.4.1
         | 
| 146 146 | 
             
              type: :runtime
         | 
| 147 147 | 
             
              prerelease: false
         | 
| 148 148 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 149 149 | 
             
                requirements:
         | 
| 150 150 | 
             
                - - '='
         | 
| 151 151 | 
             
                  - !ruby/object:Gem::Version
         | 
| 152 | 
            -
                    version: 1.4. | 
| 152 | 
            +
                    version: 1.4.1
         | 
| 153 153 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 154 154 | 
             
              name: jekyll-paginate
         | 
| 155 155 | 
             
              requirement: !ruby/object:Gem::Requirement
         |