Merge branch 'feature/config-refactor' into develop

This commit is contained in:
Michael Rose 2016-02-21 22:19:14 -05:00
commit bf4872e453
3 changed files with 176 additions and 86 deletions

View file

@ -1,6 +1,3 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "jekyll", "~> 3.0" gem "github-pages"
gem "jekyll-sitemap"
gem "jekyll-gist"
gem "octopress"

View file

@ -1,12 +1,59 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
RedCloth (4.2.9)
activesupport (4.2.5.1)
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) addressable (2.3.8)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorator (0.1) colorator (0.1)
ethon (0.8.1)
ffi (>= 1.3.0)
execjs (2.6.0)
faraday (0.9.2) faraday (0.9.2)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.9.10) ffi (1.9.10)
jekyll (3.1.1) gemoji (2.1.0)
github-pages (51)
RedCloth (= 4.2.9)
github-pages-health-check (= 1.0.1)
jekyll (= 3.0.3)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.4.0)
jekyll-gist (= 1.4.0)
jekyll-mentions (= 1.0.1)
jekyll-paginate (= 1.1.0)
jekyll-redirect-from (= 0.9.1)
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 1.2.0)
jekyll-sitemap (= 0.10.0)
jekyll-textile-converter (= 0.1.0)
jemoji (= 0.5.1)
kramdown (= 1.9.0)
liquid (= 3.0.6)
mercenary (~> 0.3)
rdiscount (= 2.1.8)
redcarpet (= 3.3.3)
rouge (= 1.10.1)
terminal-table (~> 1.4)
github-pages-health-check (1.0.1)
addressable (~> 2.3)
net-dns (~> 0.8)
octokit (~> 4.0)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
html-pipeline (2.3.0)
activesupport (>= 2, < 5)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.0.3)
colorator (~> 0.1) colorator (~> 0.1)
jekyll-sass-converter (~> 1.0) jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1) jekyll-watch (~> 1.1)
@ -15,56 +62,69 @@ GEM
mercenary (~> 0.3.3) mercenary (~> 0.3.3)
rouge (~> 1.7) rouge (~> 1.7)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-feed (0.4.0)
jekyll-gist (1.4.0) jekyll-gist (1.4.0)
octokit (~> 4.2) octokit (~> 4.2)
jekyll-sass-converter (1.4.0) jekyll-mentions (1.0.1)
sass (~> 3.4) html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.9.1)
jekyll (>= 2.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-seo-tag (1.2.0)
jekyll (>= 2.0)
jekyll-sitemap (0.10.0) jekyll-sitemap (0.10.0)
jekyll-textile-converter (0.1.0)
RedCloth (~> 4.0)
jekyll-watch (1.3.1) jekyll-watch (1.3.1)
listen (~> 3.0) listen (~> 3.0)
jemoji (0.5.1)
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 2.0)
json (1.8.3)
kramdown (1.9.0) kramdown (1.9.0)
liquid (3.0.6) liquid (3.0.6)
listen (3.0.5) listen (3.0.6)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9.7)
mercenary (0.3.5) mercenary (0.3.5)
mini_portile2 (2.0.0)
minitest (5.8.4)
multipart-post (2.0.0) multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
octokit (4.2.0) octokit (4.2.0)
sawyer (~> 0.6.0, >= 0.5.3) sawyer (~> 0.6.0, >= 0.5.3)
octopress (3.0.11) public_suffix (1.5.3)
jekyll (>= 2.0)
mercenary (~> 0.3.2)
octopress-deploy
octopress-escape-code (~> 2.0)
octopress-hooks (~> 2.0)
redcarpet (~> 3.0)
titlecase
octopress-deploy (1.3.0)
colorator
octopress-escape-code (2.1.1)
jekyll (~> 3.0)
octopress-hooks (2.6.1)
jekyll (>= 2.0)
rb-fsevent (0.9.7) rb-fsevent (0.9.7)
rb-inotify (0.9.5) rb-inotify (0.9.7)
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (3.3.4) rdiscount (2.1.8)
redcarpet (3.3.3)
rouge (1.10.1) rouge (1.10.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.21) sass (3.4.21)
sawyer (0.6.0) sawyer (0.6.0)
addressable (~> 2.3.5) addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10) faraday (~> 0.8, < 0.10)
titlecase (0.1.1) terminal-table (1.5.2)
thread_safe (0.3.5)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
jekyll (~> 3.0) github-pages
jekyll-gist
jekyll-sitemap
octopress
BUNDLED WITH BUNDLED WITH
1.11.2 1.11.2

View file

@ -1,76 +1,109 @@
# Site wide configuration # Welcome to Jekyll!
#
# This config file is meant for settings that affect your whole blog, values
# which you are expected to set up once and rarely need to edit after that.
# For technical reasons, this file is *NOT* reloaded automatically when you use
# 'jekyll serve'. If you change this file, please restart the server process.
title: Site Title # Site settings
locale: en_US locale : en_US
url: title : Your awesome title
description : "Write an awesome description for your new site here."
url : "" # the base hostname & protocol for your site
baseurl : "" # the subpath of your site, e.g. /blog
email : your-email@domain.com
# Handling Reading
safe : false
include :
- .htaccess
- _pages
exclude :
- "*.sublime-project"
- "*.sublime-workspace"
- .asset-cache
- .bundle
- .jekyll-assets-cache
- .sass-cache
- Capfile
- config
- Gemfile
- Gruntfile.js
- LICENSE
- log
- node_modules
- package.json
- Rakefile
- README
- tmp
keep_files:
- .git
- .svn
encoding: "utf-8"
markdown_ext: "markdown,mkdown,mkdn,mkd,md"
# Jekyll configuration # Conversion
markdown: kramdown
permalink: /:categories/:title/
markdown: kramdown
highlighter: rouge highlighter: rouge
sass: sass:
sass_dir: _sass sass_dir: _sass
style: compressed style: compressed
lsi: false
excerpt_separator: "\n\n"
incremental: false
# Plugins
gems: gems:
- jekyll-paginate
- jekyll-sitemap - jekyll-sitemap
- jekyll-gist - jekyll-gist
# Outputting
permalink: /:categories/:title/
paginate_path: /page:num
timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# Markdown Processors
kramdown: kramdown:
auto_ids: true input: GFM
hard_wrap: false
auto_ids: rue
footnote_nr: 1 footnote_nr: 1
entity_output: as_char entity_output: as_char
toc_levels: 1..6 toc_levels: 1..6
smart_quotes: lsquo,rsquo,ldquo,rdquo
enable_coderay: false enable_coderay: false
# Octopress
# Default extensions
post_ext: md
page_ext: md
# Found in _templates/
post_layout: post
page_layout: page
# Format titles with titlecase?
titlecase: true
# Site owner # Site owner
owner: owner:
name: Your Name name : Your Name
avatar: bio-photo.jpg avatar : bio-photo.jpg
bio: "Describe your self." bio : "Describe your self."
email: email :
disqus-shortname: disqus-shortname : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
twitter: #username bing-verify :
facebook: #username codepen :
google: dribbble :
plus: #username flickr :
analytics: facebook :
verify: foursquare :
ad-client: github :
ad-slot: google :
bing-verify: plus :
github: #username analytics :
stackoverflow: #123456/username from a "http://stackoverflow.com/users/123456/username" link verify :
linkedin: #username ad-client :
xing: #username ad-slot :
instagram: #username instagram :
lastfm: #username lastfm :
tumblr: #username linkedin :
pinterest: #username pinterest :
foursquare: #username soundcloud :
steam: #username stackoverflow : # http://stackoverflow.com/users/123456/username
dribbble: #username steam :
youtube: #username tumblr :
soundcloud: #username twitter :
weibo: #username weibo :
flickr: #username xing :
codepen: #username youtube :
include: [".htaccess"]
exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "LICENSE", "README.md"]