From eb5450900a31e8c5283180eca2f50fdf6ef6d5b0 Mon Sep 17 00:00:00 2001 From: Yasuaki Uechi Date: Thu, 14 Mar 2019 22:32:24 +0900 Subject: [PATCH] update --- .gitignore | 2 +- .travis.yml | 2 +- Dockerfile | 15 -------------- Gemfile.lock | 44 +++++++++++++++++++-------------------- _config.yml | 50 ++++++++++++++++++++++----------------------- _includes/head.html | 2 ++ css/index.scss | 3 ++- docker-compose.yml | 9 -------- package.json | 12 ++++++----- 9 files changed, 60 insertions(+), 79 deletions(-) delete mode 100644 Dockerfile delete mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index 2727d53..13b4ee2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ /.jekyll-metadata /images/crushed /.bundle -/vendor/bundle/ \ No newline at end of file +/vendor/bundle/ diff --git a/.travis.yml b/.travis.yml index fc2ccaa..46a7603 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,4 @@ node_js: stable notifications: email: on_success: never - on_failure: change \ No newline at end of file + on_failure: change diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d387ffa..0000000 --- a/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM ruby:2.5 - -# see http://stackoverflow.com/questions/38453963/gitlab-ci-setup-error-could-not-find-a-javascript-runtime -RUN apt-get update && apt-get install nodejs -y - -# throw errors if Gemfile has been modified since Gemfile.lock -RUN bundle config --global frozen 1 - -ENV LANG C.UTF-8 - -WORKDIR /usr/src/app -COPY Gemfile Gemfile.lock /usr/src/app/ -RUN bundle install - -COPY . /usr/src/app diff --git a/Gemfile.lock b/Gemfile.lock index 8da90ef..e7af33b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,24 +15,24 @@ GEM colorator (1.1.0) commonmarker (0.17.13) ruby-enum (~> 0.5) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) dnsruby (1.61.2) addressable (~> 2.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - ethon (0.11.0) + ethon (0.12.0) ffi (>= 1.3.0) eventmachine (1.2.7) execjs (2.7.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.9.25) + ffi (1.10.0) forwardable-extended (2.6.0) gemoji (3.0.0) - github-pages (193) + github-pages (197) activesupport (= 4.2.10) - github-pages-health-check (= 1.8.1) + github-pages-health-check (= 1.16.1) jekyll (= 3.7.4) jekyll-avatar (= 0.6.0) jekyll-coffeescript (= 1.1.1) @@ -40,13 +40,13 @@ GEM jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.11.0) jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.9.4) + jekyll-github-metadata (= 2.12.1) jekyll-mentions (= 1.4.1) jekyll-optional-front-matter (= 0.3.0) jekyll-paginate (= 1.1.0) jekyll-readme-index (= 0.2.0) jekyll-redirect-from (= 0.14.0) - jekyll-relative-links (= 0.5.3) + jekyll-relative-links (= 0.6.0) jekyll-remote-theme (= 0.3.1) jekyll-sass-converter (= 1.5.2) jekyll-seo-tag (= 2.5.0) @@ -66,22 +66,22 @@ GEM jekyll-theme-tactile (= 0.1.1) jekyll-theme-time-machine (= 0.1.1) jekyll-titles-from-headings (= 0.5.1) - jemoji (= 0.10.1) + jemoji (= 0.10.2) kramdown (= 1.17.0) liquid (= 4.0.0) listen (= 3.1.5) mercenary (~> 0.3) minima (= 2.5.0) - nokogiri (>= 1.8.2, < 2.0) + nokogiri (>= 1.8.5, < 2.0) rouge (= 2.2.1) terminal-table (~> 1.4) - github-pages-health-check (1.8.1) + github-pages-health-check (1.16.1) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (~> 2.0) + public_suffix (~> 3.0) typhoeus (~> 1.3) - html-pipeline (2.9.1) + html-pipeline (2.10.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -118,8 +118,8 @@ GEM jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-github-metadata (2.9.4) - jekyll (~> 3.1) + jekyll-github-metadata (2.12.1) + jekyll (~> 3.4) octokit (~> 4.0, != 4.4.0) jekyll-mentions (1.4.1) html-pipeline (~> 2.3) @@ -131,7 +131,7 @@ GEM jekyll (~> 3.0) jekyll-redirect-from (0.14.0) jekyll (~> 3.3) - jekyll-relative-links (0.5.3) + jekyll-relative-links (0.6.0) jekyll (~> 3.3) jekyll-remote-theme (0.3.1) jekyll (~> 3.5) @@ -187,7 +187,7 @@ GEM jekyll (~> 3.3) jekyll-watch (2.1.2) listen (~> 3.0) - jemoji (0.10.1) + jemoji (0.10.2) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) @@ -205,13 +205,13 @@ GEM jekyll-seo-tag (~> 2.1) minitest (5.11.3) multipart-post (2.0.0) - nokogiri (1.9.1) + nokogiri (1.10.1) mini_portile2 (~> 2.4.0) octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (2.0.5) + public_suffix (3.0.3) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) @@ -220,8 +220,8 @@ GEM i18n ruby_dep (1.5.0) rubyzip (1.2.2) - safe_yaml (1.0.4) - sass (3.7.2) + safe_yaml (1.0.5) + sass (3.7.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -236,7 +236,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.4.1) + unicode-display_width (1.5.0) PLATFORMS ruby @@ -245,4 +245,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 1.17.3 + 2.0.1 diff --git a/_config.yml b/_config.yml index 1d69fdc..f5e9dd9 100644 --- a/_config.yml +++ b/_config.yml @@ -9,12 +9,12 @@ collections: title: Uploads output: true defaults: -- scope: - path: '' - type: posts - values: - layout: post - permalink: "/blog/:title" + - scope: + path: '' + type: posts + values: + layout: post + permalink: '/blog/:title' description: Random posts from @uetchy. url: https://uechi.io email: y@uechi.io @@ -22,26 +22,26 @@ twitter: username: uetschy github: username: uetchy -logo: "/images/icon.png" -excerpt_separator: "#" +logo: '/images/icon.png' +excerpt_separator: '#' google_analytics: UA-28919359-12 plugins: -- jekyll-redirect-from -- jekyll-sitemap -- jekyll-seo-tag -- jekyll-feed -- jemoji + - jekyll-redirect-from + - jekyll-sitemap + - jekyll-seo-tag + - jekyll-feed + - jemoji include: -- _pages + - _pages exclude: -- README.md -- LICENSE -- CNAME -- Gemfile -- Gemfile.lock -- package.json -- node_modules -- script -- vendor -- docker-compose.yml -- Dockerfile + - README.md + - LICENSE + - CNAME + - Gemfile + - Gemfile.lock + - package.json + - node_modules + - script + - vendor + - docker-compose.yml + - Dockerfile diff --git a/_includes/head.html b/_includes/head.html index cbe65f0..19f29cf 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -9,8 +9,10 @@ + {% seo %} {% feed_meta %} + diff --git a/css/index.scss b/css/index.scss index 956da19..f2739ff 100644 --- a/css/index.scss +++ b/css/index.scss @@ -123,4 +123,5 @@ hr { } } } -@import 'post'; + +@import './post'; diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index c62a611..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '3' -services: - web: - build: . - command: jekyll serve --host 0.0.0.0 --port 4000 --baseurl '' --force_polling --drafts --unpublished --incremental - ports: - - 4000:4000 - volumes: - - .:/usr/src/app diff --git a/package.json b/package.json index 3190770..186535e 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,10 @@ { - "private": true, + "name": "uechi.io", "scripts": { - "start": "script/server", - "test": "textlint _posts/*.md _pages/*.md -f pretty-error", - "fix-typo": "textlint _posts/*.md _pages/*.md --fix --dry-run -f diff" + "fix-typo": "textlint _posts/*.md _pages/*.md --fix --dry-run -f diff", + "build": "bundle exec jekyll build", + "start": "bundle exec jekyll serve --host 0.0.0.0 --port 4000 --baseurl '' --force_polling --drafts --unpublished --incremental", + "test": "textlint _posts/*.md _pages/*.md -f pretty-error" }, "devDependencies": { "textlint": "^11.0.2", @@ -13,5 +14,6 @@ "textlint-rule-no-dropping-the-ra": "^1.1.2", "textlint-rule-no-start-duplicated-conjunction": "^2.0.2", "textlint-rule-preset-japanese": "^4.0.0" - } + }, + "private": true }