From 3a0a5438595278def1fc9cfd300e7c8ec1d1b3c4 Mon Sep 17 00:00:00 2001 From: 0xfff <0xfff@protonmail.com> Date: Fri, 9 Sep 2016 18:41:03 +0200 Subject: [PATCH] (Update) Dependencies: Add bundler and Gemfile (#5) * (Update) Dependencies: Add bundler and Gemfile to handle ruby dependencies * (Update) Dependencies: Move jekyll-multiple-languages-plugin into Gemfile instead of using a git submodule * (Doc) README: Adjust note about jekyll-multiple-language-plugin --- .gitmodules | 3 -- Gemfile | 7 +++ Gemfile.lock | 65 +++++++++++++++++++++++ README.md | 13 ++--- _config.yml | 1 + _plugins/jekyll-multiple-languages-plugin | 1 - 6 files changed, 78 insertions(+), 12 deletions(-) delete mode 100644 .gitmodules create mode 100644 Gemfile create mode 100644 Gemfile.lock delete mode 160000 _plugins/jekyll-multiple-languages-plugin diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b7ebf35..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "_plugins/jekyll-multiple-languages-plugin"] - path = _plugins/jekyll-multiple-languages-plugin - url = git://github.com/perrywoodin/jekyll-multiple-languages-plugin.git diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..14a56de --- /dev/null +++ b/Gemfile @@ -0,0 +1,7 @@ +source 'https://rubygems.org' +gem 'jekyll' +gem 'jekyll-paginate' +gem 'jekyll-autoprefixer' +gem 'jekyll-serve' +gem 'classifier-reborn' +gem 'jekyll-multiple-languages-plugin', :git => 'https://github.com/perrywoodin/jekyll-multiple-languages-plugin.git' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..38d2098 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,65 @@ +GIT + remote: https://github.com/perrywoodin/jekyll-multiple-languages-plugin.git + revision: d72bf07e773eb17e5b85f8aa9b97d2a160f0238b + specs: + jekyll-multiple-languages-plugin (1.4.2) + jekyll (>= 2.0, < 4.0) + +GEM + remote: https://rubygems.org/ + specs: + autoprefixer-rails (6.3.7) + execjs + classifier-reborn (2.0.4) + fast-stemmer (~> 1.0) + colorator (1.1.0) + execjs (2.7.0) + fast-stemmer (1.0.2) + ffi (1.9.14) + forwardable-extended (2.6.0) + jekyll (3.2.1) + colorator (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (~> 1.7) + safe_yaml (~> 1.0) + jekyll-autoprefixer (1.0.0) + autoprefixer-rails (~> 6.3.6) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.4.0) + sass (~> 3.4) + jekyll-serve (1.0.0.rc1) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + kramdown (1.12.0) + liquid (3.0.6) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) + pathutil (0.14.0) + forwardable-extended (~> 2.6) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rouge (1.11.1) + safe_yaml (1.0.4) + sass (3.4.22) + +PLATFORMS + ruby + +DEPENDENCIES + classifier-reborn + jekyll + jekyll-autoprefixer + jekyll-multiple-languages-plugin! + jekyll-paginate + jekyll-serve + +BUNDLED WITH + 1.12.5 diff --git a/README.md b/README.md index 1d41ca5..afce7e4 100644 --- a/README.md +++ b/README.md @@ -7,19 +7,16 @@ https://jekyllrb.com ### Requirements (mac) * Ruby: `brew install ruby` * Ruby Gems: https://rubygems.org/pages/download -* NoddeJS: https://nodejs.org/en/ +* NodeJS: https://nodejs.org/en/ * Python: `brew install python` -* `gem install jekyll` +* Bundler: `gem install bundler` ### Supporting Gems -These Gems must also be installed on the CI server. - -* `gem install jekyll-paginate` -* `gem install classifier-reborn` -* `gem install jekyll-autoprefixer` +Simply run `bundle install` and [bundler](http://bundler.io/) will install all ruby gems/dependencies. +Note: The Gems must also be installed on the CI server. ### Plugins -* `jekyll-multiple-languages-plugin` installed as a git submodule in `_plugins/`. Documentation at https://github.com/perrywoodin/jekyll-multiple-languages-plugin. This is a modified fork that adds two new tags for outputting markdown `{% tmd key %}` or `{% translatemd key %}` +* `jekyll-multiple-languages-plugin` installed as a gem. Documentation at https://github.com/perrywoodin/jekyll-multiple-languages-plugin. This is a modified fork that adds two new tags for outputting markdown `{% tmd key %}` or `{% translatemd key %}` ## Development `jekyll serve` Will build to the _site directory whenever a file is changed and serve via 127.0.0.1 diff --git a/_config.yml b/_config.yml index 651a7ce..d4c50f7 100644 --- a/_config.yml +++ b/_config.yml @@ -25,6 +25,7 @@ autoprefixer: gems: - jekyll-paginate - jekyll-autoprefixer + - jekyll-multiple-languages-plugin collections: components: # style guide diff --git a/_plugins/jekyll-multiple-languages-plugin b/_plugins/jekyll-multiple-languages-plugin deleted file mode 160000 index d72bf07..0000000 --- a/_plugins/jekyll-multiple-languages-plugin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d72bf07e773eb17e5b85f8aa9b97d2a160f0238b