Skip to content

Commit 5f1b599

Browse files
balloobballoob
committed
Upgrade ruby/jekyll/style
1 parent ad565e8 commit 5f1b599

33 files changed

+330
-951
lines changed

‎.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.3
1+
2.3.1

‎Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ group :development do
55
gem 'jekyll', '~> 3.0'
66
gem 'pygments.rb', '~> 0.6.3'
77
gem 'rdiscount', '~> 2.0'
8-
gem 'RedCloth', '~> 4.2.9'
8+
gem 'RedCloth', '~> 4.2'
99
gem 'haml', '~> 4.0'
10-
gem 'compass', '~> 0.12.2'
11-
gem 'sass-globbing', '~> 1.0.0'
12-
gem 'rubypants', '~> 0.2.0'
10+
gem 'compass', '~> 0.12'
11+
gem 'sass-globbing', '~> 1.0'
12+
gem 'rubypants', '~> 0.2'
1313
gem 'rb-fsevent', '~> 0.9'
14-
gem 'stringex', '~> 1.4.0'
14+
gem 'stringex', '~> 1.4'
1515
gem 'execjs'
1616
gem 'therubyracer', :platforms => :ruby
1717
gem 'coderay'

‎Gemfile.lock

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,47 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
5-
chunky_png (1.3.5)
6-
coderay (1.1.0)
7-
colorator (0.1)
4+
RedCloth (4.3.2)
5+
addressable (2.4.0)
6+
chunky_png (1.3.6)
7+
coderay (1.1.1)
8+
colorator (1.1.0)
89
compass (0.12.7)
910
chunky_png (~> 1.2)
1011
fssm (>= 0.2.7)
1112
sass (~> 3.2.19)
12-
execjs (2.6.0)
13-
ffi (1.9.10)
13+
execjs (2.7.0)
14+
ffi (1.9.14)
15+
forwardable-extended (2.6.0)
1416
fssm (0.2.10)
1517
haml (4.0.7)
1618
tilt
17-
jekyll (3.0.0)
18-
colorator (~> 0.1)
19+
jekyll (3.2.1)
20+
colorator (~> 1.0)
1921
jekyll-sass-converter (~> 1.0)
2022
jekyll-watch (~> 1.1)
2123
kramdown (~> 1.3)
2224
liquid (~> 3.0)
2325
mercenary (~> 0.3.3)
26+
pathutil (~> 0.9)
2427
rouge (~> 1.7)
2528
safe_yaml (~> 1.0)
2629
jekyll-paginate (1.1.0)
2730
jekyll-sass-converter (1.3.0)
2831
sass (~> 3.2)
29-
jekyll-sitemap (0.9.0)
30-
jekyll-time-to-read (0.1.1)
32+
jekyll-sitemap (0.11.0)
33+
addressable (~> 2.4.0)
34+
jekyll-time-to-read (0.1.2)
3135
jekyll
32-
jekyll-watch (1.3.0)
33-
listen (~> 3.0)
34-
kramdown (1.9.0)
35-
libv8 (3.16.14.13)
36+
jekyll-watch (1.5.0)
37+
listen (~> 3.0, < 3.1)
38+
kramdown (1.12.0)
39+
libv8 (3.16.14.15)
3640
liquid (3.0.6)
37-
listen (3.0.3)
38-
rb-fsevent (>= 0.9.3)
39-
rb-inotify (>= 0.9)
40-
mercenary (0.3.5)
41+
listen (3.0.8)
42+
rb-fsevent (~> 0.9, >= 0.9.4)
43+
rb-inotify (~> 0.9, >= 0.9.7)
44+
mercenary (0.3.6)
4145
method_source (0.8.2)
4246
octopress (3.0.11)
4347
jekyll (>= 2.0)
@@ -49,8 +53,8 @@ GEM
4953
titlecase
5054
octopress-deploy (1.3.0)
5155
colorator
52-
octopress-escape-code (2.0.6)
53-
octopress-hooks (~> 2.0)
56+
octopress-escape-code (2.1.1)
57+
jekyll (~> 3.0)
5458
octopress-filters (1.4.0)
5559
jekyll
5660
octopress-hooks (~> 2.0)
@@ -63,8 +67,10 @@ GEM
6367
octopress-tag-helpers (~> 1.0)
6468
octopress-tag-helpers (1.0.8)
6569
jekyll (>= 2.0)
70+
pathutil (0.14.0)
71+
forwardable-extended (~> 2.6)
6672
posix-spawn (0.3.11)
67-
pry (0.10.3)
73+
pry (0.10.4)
6874
coderay (~> 1.1.0)
6975
method_source (~> 0.8.1)
7076
slop (~> 3.4)
@@ -74,40 +80,40 @@ GEM
7480
rack (1.6.4)
7581
rack-protection (1.5.3)
7682
rack
77-
rake (10.4.2)
78-
rb-fsevent (0.9.6)
79-
rb-inotify (0.9.5)
83+
rake (10.5.0)
84+
rb-fsevent (0.9.7)
85+
rb-inotify (0.9.7)
8086
ffi (>= 0.5.0)
81-
rdiscount (2.1.8)
82-
redcarpet (3.3.3)
87+
rdiscount (2.2.0.1)
88+
redcarpet (3.3.4)
8389
ref (2.0.0)
84-
rouge (1.10.1)
85-
rubypants (0.2.0)
90+
rouge (1.11.1)
91+
rubypants (0.5.0)
8692
rubypants-unicode (0.2.5)
8793
safe_yaml (1.0.4)
8894
sass (3.2.19)
89-
sass-globbing (1.0.0)
95+
sass-globbing (1.1.5)
9096
sass (>= 3.1)
91-
sinatra (1.4.6)
92-
rack (~> 1.4)
97+
sinatra (1.4.7)
98+
rack (~> 1.5)
9399
rack-protection (~> 1.4)
94100
tilt (>= 1.3, < 3)
95101
slop (3.6.0)
96-
stringex (1.4.0)
102+
stringex (1.5.1)
97103
therubyracer (0.12.2)
98104
libv8 (~> 3.16.14.0)
99105
ref
100-
tilt (2.0.1)
106+
tilt (2.0.5)
101107
titlecase (0.1.1)
102108
yajl-ruby (1.2.1)
103109

104110
PLATFORMS
105111
ruby
106112

107113
DEPENDENCIES
108-
RedCloth (~> 4.2.9)
114+
RedCloth (~> 4.2)
109115
coderay
110-
compass (~> 0.12.2)
116+
compass (~> 0.12)
111117
execjs
112118
haml (~> 4.0)
113119
jekyll (~> 3.0)
@@ -122,10 +128,10 @@ DEPENDENCIES
122128
rake (~> 10.0)
123129
rb-fsevent (~> 0.9)
124130
rdiscount (~> 2.0)
125-
rubypants (~> 0.2.0)
126-
sass-globbing (~> 1.0.0)
131+
rubypants (~> 0.2)
132+
sass-globbing (~> 1.0)
127133
sinatra (~> 1.4.2)
128-
stringex (~> 1.4.0)
134+
stringex (~> 1.4)
129135
therubyracer
130136

131137
BUNDLED WITH

‎_config.yml

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ category_dir: blog/categories
3535
markdown: kramdown
3636
timezone: UTC
3737

38+
# highlighter: coderay
39+
3840
kramdown:
3941
input: GFM
4042
auto_ids: false
@@ -43,15 +45,32 @@ kramdown:
4345
toc_levels: 1..6
4446
smart_quotes: lsquo,rsquo,ldquo,rdquo
4547
parse_block_html: true
46-
enable_coderay: true
47-
48-
coderay:
49-
coderay_wrap: div
50-
coderay_line_numbers: nil
51-
coderay_line_number_start: 1
52-
coderay_tab_width: 4
53-
coderay_bold_every: 10
54-
coderay_css: class
48+
49+
# enable_coderay: true
50+
51+
# coderay:
52+
# coderay_wrap: div
53+
# coderay_line_numbers: nil
54+
# coderay_line_number_start: 1
55+
# coderay_tab_width: 4
56+
# coderay_bold_every: 10
57+
# coderay_css: class
58+
59+
# syntax_highlighter_opts:
60+
# wrap: div
61+
# line_numbers: nil
62+
# line_number_start: 1
63+
# tab_width: 4
64+
# bold_every: 10
65+
# css: class
66+
67+
# block:
68+
# wrap: div
69+
# line_numbers: nil
70+
# line_number_start: 1
71+
# tab_width: 4
72+
# bold_every: 10
73+
# css: class
5574

5675
highlighter: rouge
5776

‎generate-redirect.py

Lines changed: 0 additions & 163 deletions
This file was deleted.

0 commit comments

Comments
 (0)