From 9afff8fc3e40dbb485e411693a4f44f8c8d9b416 Mon Sep 17 00:00:00 2001 From: Olivier Lacan Date: Sat, 6 Aug 2016 01:35:29 -0400 Subject: [PATCH] Upgrade to Middleman 4.1.10 --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 164 ++++++++---------- config.rb | 2 +- ...{application.sass => application.css.sass} | 0 .../de/0.3.0/{index.haml => index.html.haml} | 4 +- .../{index.haml => en/0.3.0/index.html.haml} | 4 +- .../0.3.0/{index.haml => index.html.haml} | 4 +- .../{en/0.3.0/index.haml => index.html.haml} | 5 +- .../layouts/{layout.haml => layout.html.haml} | 6 +- .../0.3.0/{index.haml => index.html.haml} | 4 +- .../ru/0.3.0/{index.haml => index.html.haml} | 4 +- .../0.3.0/{index.haml => index.html.haml} | 4 +- .../0.3.0/{index.haml => index.html.haml} | 4 +- 14 files changed, 92 insertions(+), 117 deletions(-) rename source/assets/stylesheets/{application.sass => application.css.sass} (100%) rename source/de/0.3.0/{index.haml => index.html.haml} (98%) rename source/{index.haml => en/0.3.0/index.html.haml} (98%) rename source/es-ES/0.3.0/{index.haml => index.html.haml} (98%) rename source/{en/0.3.0/index.haml => index.html.haml} (98%) rename source/layouts/{layout.haml => layout.html.haml} (92%) rename source/pt-BR/0.3.0/{index.haml => index.html.haml} (98%) rename source/ru/0.3.0/{index.haml => index.html.haml} (99%) rename source/zh-CN/0.3.0/{index.haml => index.html.haml} (98%) rename source/zh-TW/0.3.0/{index.haml => index.html.haml} (98%) diff --git a/.ruby-version b/.ruby-version index 276cbf9..2bf1c1c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.0 +2.3.1 diff --git a/Gemfile b/Gemfile index f4e149a..ca87ecb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "addressable" -gem "middleman", "~> 3.4.0" +gem "middleman", "~> 4.1.0" gem "middleman-autoprefixer" gem "middleman-blog" gem "middleman-livereload" diff --git a/Gemfile.lock b/Gemfile.lock index 7b4ed17..97d167e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,120 +1,111 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.4) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) - autoprefixer-rails (6.0.3) + addressable (2.4.0) + autoprefixer-rails (6.4.0.1) execjs - json - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - chunky_png (1.3.4) + backports (3.6.8) coderay (1.1.1) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) + coffee-script-source (1.10.0) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) + concurrent-ruby (1.0.2) + contracts (0.13.0) + dotenv (2.1.1) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.8) - execjs (2.6.0) - ffi (1.9.10) + eventmachine (1.2.0.1) + execjs (2.7.0) + fast_blank (1.0.0) + fastimage (2.0.0) + addressable (~> 2) + ffi (1.9.14) haml (4.0.7) tilt - hike (1.2.3) - hooks (0.4.1) - uber (~> 0.0.14) + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.4.4) htmlcompressor (0.2.0) http_parser.rb (0.6.0) i18n (0.7.0) json (1.8.3) - kramdown (1.9.0) - listen (3.0.3) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + kramdown (1.11.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + memoist (0.14.0) method_source (0.8.2) - middleman (3.4.0) + middleman (4.1.10) coffee-script (~> 2.2) - compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) - execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.4.0) - middleman-sprockets (>= 3.1.2) + middleman-cli (= 4.1.10) + middleman-core (= 4.1.10) sass (>= 3.4.0, < 4.0) - uglifier (~> 2.5) - middleman-autoprefixer (2.6.1) - autoprefixer-rails (~> 6.0.1) + middleman-autoprefixer (2.7.0) + autoprefixer-rails (>= 6.3.1, < 7.0.0) middleman-core (>= 3.3.3) - middleman-blog (3.5.3) - addressable (~> 2.3.5) - middleman-core (~> 3.2) + middleman-blog (4.0.1) + addressable (~> 2.3) + middleman-core (>= 4.0.0) tzinfo (>= 0.3.0) - middleman-core (3.4.0) - activesupport (~> 4.1) + middleman-cli (4.1.10) + thor (>= 0.17.0, < 2.0) + middleman-core (4.1.10) + activesupport (~> 4.2) + addressable (~> 2.3) + backports (~> 3.6) bundler (~> 1.1) - capybara (~> 2.4.4) + contracts (~> 0.13.0) + dotenv erubis - hooks (~> 0.3) + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + hamster (~> 3.0) + hashie (~> 3.4) i18n (~> 0.7.0) - listen (~> 3.0.3) - padrino-helpers (~> 0.12.3) + listen (~> 3.0.0) + memoist (~> 0.14) + padrino-helpers (~> 0.13.0) + parallel rack (>= 1.4.5, < 2.0) - thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1, < 2.0) + sass (>= 3.4) + servolux + tilt (~> 1.4.1) + uglifier (~> 3.0) middleman-gh-pages (0.0.3) rake (> 0.9.3) - middleman-livereload (3.4.3) + middleman-livereload (3.4.6) em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) middleman-minify-html (3.4.1) htmlcompressor (~> 0.2.0) middleman-core (>= 3.2) - middleman-sprockets (3.4.2) - middleman-core (>= 3.3) - sprockets (~> 2.12.1) - sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.3.0) - middleman-syntax (2.0.0) - middleman-core (~> 3.2) - rouge (~> 1.0) - mime-types (2.6.2) - mini_portile (0.6.2) - minitest (5.8.1) - multi_json (1.11.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - padrino-helpers (0.12.5) + middleman-syntax (3.0.0) + middleman-core (>= 3.2) + rouge (~> 2.0) + minitest (5.9.0) + padrino-helpers (0.13.2) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.5) - tilt (~> 1.4.1) - padrino-support (0.12.5) + padrino-support (= 0.13.2) + tilt (>= 1.4.1, < 3) + padrino-support (0.13.2) activesupport (>= 3.1) + parallel (1.9.0) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -122,44 +113,29 @@ GEM rack (1.6.4) rack-livereload (0.3.16) rack - rack-test (0.6.3) - rack (>= 1.0) rake (10.4.2) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) redcarpet (3.3.3) - rouge (1.10.1) - sass (3.4.19) + rouge (2.0.5) + sass (3.4.22) + servolux (0.12.0) slop (3.6.0) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.1.0) - sprockets (~> 2.0) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) tzinfo (1.2.2) thread_safe (~> 0.1) - uber (0.0.15) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - xpath (2.0.0) - nokogiri (~> 1.3) + uglifier (3.0.1) + execjs (>= 0.3.0, < 3) PLATFORMS ruby DEPENDENCIES addressable - middleman (~> 3.4.0) + middleman (~> 4.1.0) middleman-autoprefixer middleman-blog middleman-gh-pages @@ -170,4 +146,4 @@ DEPENDENCIES redcarpet BUNDLED WITH - 1.12.0.rc + 1.12.0 diff --git a/config.rb b/config.rb index 2c8bd11..01d6293 100644 --- a/config.rb +++ b/config.rb @@ -57,7 +57,7 @@ set :markdown, { helpers do def path_to_url(path) - Addressable::URI.join(site_url, path).normalize.to_s + Addressable::URI.join(config.site_url, path).normalize.to_s end end diff --git a/source/assets/stylesheets/application.sass b/source/assets/stylesheets/application.css.sass similarity index 100% rename from source/assets/stylesheets/application.sass rename to source/assets/stylesheets/application.css.sass diff --git a/source/de/0.3.0/index.haml b/source/de/0.3.0/index.html.haml similarity index 98% rename from source/de/0.3.0/index.haml rename to source/de/0.3.0/index.html.haml index 4496b70..ed7e8e9 100644 --- a/source/de/0.3.0/index.haml +++ b/source/de/0.3.0/index.html.haml @@ -10,13 +10,13 @@ version: 0.3.0 ## Lass deine Freunde nicht CHANGELOGs mit git logs füllen™ - Version **#{current_page.metadata[:page]["version"]}** + Version **#{current_page.metadata[:page][:version]}** ### Was ist ein Changelog? Ein Changelog ist eine Datei, welche eine nachgeführte, chronologisch sortierte Liste aller relevanten Änderungen für jede Version eines Projektes enthält. -%pre.changelog= File.read(File.join(root_path, "CHANGELOG.md")) +%pre.changelog= File.read("CHANGELOG.md") :markdown ### Was ist der Zweck eines Changelogs? diff --git a/source/index.haml b/source/en/0.3.0/index.html.haml similarity index 98% rename from source/index.haml rename to source/en/0.3.0/index.html.haml index 1d3bbba..3bbd884 100644 --- a/source/index.haml +++ b/source/en/0.3.0/index.html.haml @@ -10,13 +10,13 @@ version: 0.3.0 ## Don’t let your friends dump git logs into CHANGELOGs™ - Version **#{current_page.metadata[:page]["version"]}** + Version **#{current_page.metadata[:page][:version]}** ### What’s a change log? A change log is a file which contains a curated, chronologically ordered list of notable changes for each version of a project. -%pre.changelog= File.read(File.join(root_path, "CHANGELOG.md")) +%pre.changelog= File.read("CHANGELOG.md") :markdown ### What’s the point of a change log? diff --git a/source/es-ES/0.3.0/index.haml b/source/es-ES/0.3.0/index.html.haml similarity index 98% rename from source/es-ES/0.3.0/index.haml rename to source/es-ES/0.3.0/index.html.haml index 9cc2cc4..b46f90e 100644 --- a/source/es-ES/0.3.0/index.haml +++ b/source/es-ES/0.3.0/index.html.haml @@ -10,13 +10,13 @@ version: 0.3.0 ## No dejes que tus amigos copien y peguen git logs en los CHANGELOGs™ - Version **#{current_page.metadata[:page]["version"]}** + Version **#{current_page.metadata[:page][:version]}** ### Qué es un registro de cambios (change log)? Un registro de cambios o “change log” de ahora en adelante, es un archivo que contiene una lista en orden cronológico sobre los cambios que vamos haciendo en cada reléase (o versión) de nuestro proyecto. -%pre.changelog= File.read(File.join(root_path, "CHANGELOG.md")) +%pre.changelog= File.read("CHANGELOG.md") :markdown ### Cuál es el propósito del change log? diff --git a/source/en/0.3.0/index.haml b/source/index.html.haml similarity index 98% rename from source/en/0.3.0/index.haml rename to source/index.html.haml index a263ab5..3bbd884 100644 --- a/source/en/0.3.0/index.haml +++ b/source/index.html.haml @@ -3,7 +3,6 @@ description: Keep a Changelog title: Keep a Changelog language: en version: 0.3.0 -redirect_path: /about/ --- :markdown @@ -11,13 +10,13 @@ redirect_path: /about/ ## Don’t let your friends dump git logs into CHANGELOGs™ - Version **#{current_page.metadata[:page]["version"]}** + Version **#{current_page.metadata[:page][:version]}** ### What’s a change log? A change log is a file which contains a curated, chronologically ordered list of notable changes for each version of a project. -%pre.changelog= File.read(File.join(root_path, "CHANGELOG.md")) +%pre.changelog= File.read("CHANGELOG.md") :markdown ### What’s the point of a change log? diff --git a/source/layouts/layout.haml b/source/layouts/layout.html.haml similarity index 92% rename from source/layouts/layout.haml rename to source/layouts/layout.html.haml index bddd972..5afea05 100644 --- a/source/layouts/layout.haml +++ b/source/layouts/layout.html.haml @@ -8,7 +8,7 @@ -# Open Graph - %meta{property: 'og:article:publisher', content: publisher_url} + %meta{property: 'og:article:publisher', content: config.publisher_url} %meta{property: 'og:title', content: current_page.data.title} %meta{property: 'og:type', content: 'article'} %meta{property: 'og:url', content: path_to_url(current_page.url)} @@ -47,7 +47,7 @@ #{link_to "Olivier Lacan", "http://olivierlacan.com/"} from #{link_to "Code School", "https://www.codeschool.com/"}. - - unless gauges_id.blank? + - unless config.gauges_id.blank? :javascript var _gauges = _gauges || []; (function() { @@ -55,7 +55,7 @@ t.type = 'text/javascript'; t.async = true; t.id = 'gauges-tracker'; - t.setAttribute('data-site-id', '#{gauges_id}'); + t.setAttribute('data-site-id', '#{config.gauges_id}'); t.src = '//secure.gaug.es/track.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(t, s); diff --git a/source/pt-BR/0.3.0/index.haml b/source/pt-BR/0.3.0/index.html.haml similarity index 98% rename from source/pt-BR/0.3.0/index.haml rename to source/pt-BR/0.3.0/index.html.haml index 6e06095..4d981a5 100644 --- a/source/pt-BR/0.3.0/index.haml +++ b/source/pt-BR/0.3.0/index.html.haml @@ -10,7 +10,7 @@ version: 0.3.0 ## Não deixe seus amigos despejar logs de commits em CHANGELOGs™ - Version **#{current_page.metadata[:page]["version"]}** + Version **#{current_page.metadata[:page][:version]}** ### O que é um change log? @@ -18,7 +18,7 @@ version: 0.3.0 cronologicamente de mudanças significativas para cada versão de um projeto open source. -%pre.changelog= File.read(File.join(root_path, "CHANGELOG.md")) +%pre.changelog= File.read("CHANGELOG.md") :markdown ### Para que serve um *change log*? diff --git a/source/ru/0.3.0/index.haml b/source/ru/0.3.0/index.html.haml similarity index 99% rename from source/ru/0.3.0/index.haml rename to source/ru/0.3.0/index.html.haml index c38e26d..23ffa88 100644 --- a/source/ru/0.3.0/index.haml +++ b/source/ru/0.3.0/index.html.haml @@ -10,7 +10,7 @@ version: 0.3.0 ## Не позволяйте друзьям сливать логи гита в CHANGELOG™ - Version **#{current_page.metadata[:page]["version"]}** + Version **#{current_page.metadata[:page][:version]}** ### Что такое лог изменений? @@ -18,7 +18,7 @@ version: 0.3.0 хронологическом порядке список значимых изменений для каждой версии проекта с открытым исходным кодом. -%pre.changelog= File.read(File.join(root_path, "CHANGELOG.md")) +%pre.changelog= File.read("CHANGELOG.md") :markdown ### Для чего нужен лог изменений? diff --git a/source/zh-CN/0.3.0/index.haml b/source/zh-CN/0.3.0/index.html.haml similarity index 98% rename from source/zh-CN/0.3.0/index.haml rename to source/zh-CN/0.3.0/index.html.haml index 8640f7e..1837edf 100644 --- a/source/zh-CN/0.3.0/index.haml +++ b/source/zh-CN/0.3.0/index.html.haml @@ -10,14 +10,14 @@ version: 0.3.0 ## 更新日志绝对不应该是git日志的堆砌物 - Version **#{current_page.metadata[:page]["version"]}** + Version **#{current_page.metadata[:page][:version]}** ### 更新日志是什么？ 更新日志（Change Log）是一个由人工编辑，以时间为倒叙的列表。 这个列表记录所有版本的重大变动。 -%pre.changelog= File.read(File.join(root_path, "CHANGELOG.md")) +%pre.changelog= File.read("CHANGELOG.md") :markdown ### 为何要提供更新日志？ diff --git a/source/zh-TW/0.3.0/index.haml b/source/zh-TW/0.3.0/index.html.haml similarity index 98% rename from source/zh-TW/0.3.0/index.haml rename to source/zh-TW/0.3.0/index.html.haml index fc1d9ce..564d883 100644 --- a/source/zh-TW/0.3.0/index.haml +++ b/source/zh-TW/0.3.0/index.html.haml @@ -10,14 +10,14 @@ version: 0.3.0 ## 更新日誌絕對不應該是git日誌的堆砌物 - Version **#{current_page.metadata[:page]["version"]}** + Version **#{current_page.metadata[:page][:version]}** ### 更新日誌是什麽？ 更新日誌（Change Log）是壹個由人工編輯，以時間為倒敘的列表。 這個列表記錄所有版本的重大變動。 -%pre.changelog= File.read(File.join(root_path, "CHANGELOG.md")) +%pre.changelog= File.read("CHANGELOG.md") :markdown ### 為何要提供更新日誌？