Skip to content
This repository was archived by the owner on Nov 10, 2020. It is now read-only.

Commit ce28a59

Browse files
committed
Upgrade to Jekyll 3.0.
1 parent ca74932 commit ce28a59

File tree

7 files changed

+44
-72
lines changed

7 files changed

+44
-72
lines changed

Gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
source 'https://rubygems.org'
22

3-
gem 'jekyll'
3+
gem 'jekyll', '>= 3.1'
44
gem 'node'
55
gem 'therubyracer'
66
gem 'less'
7-
gem 'japr'
7+
gem 'japr', :github => 'natecook1000/japr', :branch => 'nc-jekyll-3'
8+
gem 'jekyll-paginate'
89

910
group :development do
1011
gem 'foreman'

Gemfile.lock

+35-63
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,66 @@
1+
GIT
2+
remote: git://github.com/natecook1000/japr.git
3+
revision: 9db17d8bd2769899f8fd28b90ae1c917863802c6
4+
branch: nc-jekyll-3
5+
specs:
6+
japr (0.4)
7+
jekyll (~> 3.0)
8+
liquid (~> 3.0)
9+
110
GEM
211
remote: https://rubygems.org/
312
specs:
4-
blankslate (2.1.2.4)
5-
celluloid (0.16.0)
6-
timers (~> 4.0.0)
7-
classifier-reborn (2.0.3)
8-
fast-stemmer (~> 1.0)
9-
coffee-script (2.3.0)
10-
coffee-script-source
11-
execjs
12-
coffee-script-source (1.8.0)
1313
colorator (0.1)
1414
commonjs (0.2.7)
15-
dotenv (0.7.0)
16-
eventmachine (1.0.7)
17-
execjs (2.2.2)
18-
fast-stemmer (1.0.2)
19-
ffi (1.9.3)
20-
foreman (0.67.0)
21-
dotenv (~> 0.7.0)
22-
thor (~> 0.17.0)
23-
hitimes (1.2.2)
24-
japr (0.3.1)
25-
jekyll (~> 2.0)
26-
liquid (~> 2.4)
27-
jekyll (2.5.3)
28-
classifier-reborn (~> 2.0)
15+
eventmachine (1.0.9.1)
16+
ffi (1.9.10)
17+
foreman (0.78.0)
18+
thor (~> 0.19.1)
19+
jekyll (3.1.2)
2920
colorator (~> 0.1)
30-
jekyll-coffeescript (~> 1.0)
31-
jekyll-gist (~> 1.0)
32-
jekyll-paginate (~> 1.0)
3321
jekyll-sass-converter (~> 1.0)
3422
jekyll-watch (~> 1.1)
3523
kramdown (~> 1.3)
36-
liquid (~> 2.6.1)
24+
liquid (~> 3.0)
3725
mercenary (~> 0.3.3)
38-
pygments.rb (~> 0.6.0)
39-
redcarpet (~> 3.1)
26+
rouge (~> 1.7)
4027
safe_yaml (~> 1.0)
41-
toml (~> 0.1.0)
42-
jekyll-coffeescript (1.0.1)
43-
coffee-script (~> 2.2)
44-
jekyll-gist (1.1.0)
4528
jekyll-paginate (1.1.0)
46-
jekyll-sass-converter (1.3.0)
47-
sass (~> 3.2)
48-
jekyll-watch (1.2.1)
49-
listen (~> 2.7)
50-
kramdown (1.5.0)
29+
jekyll-sass-converter (1.4.0)
30+
sass (~> 3.4)
31+
jekyll-watch (1.3.1)
32+
listen (~> 3.0)
33+
kramdown (1.10.0)
5134
less (2.6.0)
5235
commonjs (~> 0.2.7)
53-
libv8 (3.16.14.7)
54-
liquid (2.6.2)
55-
listen (2.8.5)
56-
celluloid (>= 0.15.2)
36+
libv8 (3.16.14.13)
37+
liquid (3.0.6)
38+
listen (3.0.6)
5739
rb-fsevent (>= 0.9.3)
58-
rb-inotify (>= 0.9)
40+
rb-inotify (>= 0.9.7)
5941
mercenary (0.3.5)
6042
node (0.0.2)
6143
eventmachine
62-
parslet (1.5.0)
63-
blankslate (~> 2.0)
64-
posix-spawn (0.3.9)
65-
pygments.rb (0.6.2)
66-
posix-spawn (~> 0.3.6)
67-
yajl-ruby (~> 1.2.0)
68-
rb-fsevent (0.9.4)
69-
rb-inotify (0.9.4)
44+
rb-fsevent (0.9.7)
45+
rb-inotify (0.9.7)
7046
ffi (>= 0.5.0)
71-
redcarpet (3.2.2)
72-
ref (1.0.5)
47+
ref (2.0.0)
48+
rouge (1.10.1)
7349
safe_yaml (1.0.4)
74-
sass (3.3.7)
75-
therubyracer (0.12.1)
50+
sass (3.4.21)
51+
therubyracer (0.12.2)
7652
libv8 (~> 3.16.14.0)
7753
ref
78-
thor (0.17.0)
79-
timers (4.0.1)
80-
hitimes
81-
toml (0.1.2)
82-
parslet (~> 1.5.0)
83-
yajl-ruby (1.2.1)
54+
thor (0.19.1)
8455

8556
PLATFORMS
8657
ruby
8758

8859
DEPENDENCIES
8960
foreman
90-
japr
91-
jekyll
61+
japr!
62+
jekyll (>= 3.1)
63+
jekyll-paginate
9264
less
9365
node
9466
therubyracer

_config.yml

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ include: [ "_[A-Z]*", "__[A-Z]*" ]
1414
exclude: [ "README.md", "LICENSE", "CC-BY-NC-LICENSE.md", "Gemfile", "Gemfile.lock", "Procfile" ]
1515
keep_files: [ ".nojekyll", ".git", "CNAME", "README.md" ]
1616

17+
gems: [ jekyll-paginate ]
18+
1719
# Build settings
1820
markdown: kramdown
1921
paginate: 10

_plugins/_site/pageless_redirects.rb

-3
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ def generate_aliases(destination_path, aliases)
116116
fs_path_to_dir = File.join(@site.dest, alias_dir)
117117
alias_index_path = File.join(alias_dir, alias_file)
118118

119-
print fs_path_to_dir
120-
print "\n"
121-
122119
FileUtils.mkdir_p(fs_path_to_dir)
123120

124121
File.open(File.join(fs_path_to_dir, alias_file), 'w') do |file|

_plugins/_site/tag_gen.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def write_tag_index(site, dir, tag)
4141
end
4242

4343
def posts_with_tag(site, tag)
44-
site.posts.select { |post| post.tags.include?(tag) }
44+
site.posts.select { |post| post.data.tags.include?(tag) }
4545
end
4646

4747
end

_plugins/archive_gen.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ def generate(site)
5454
end
5555

5656
def posts_group_by_year_and_month(site)
57-
site.posts.each.group_by { |post| [post.date.year, post.date.month] }
57+
site.posts.docs.each.group_by { |post| [post.date.year, post.date.month] }
5858
end
5959

6060
def posts_group_by_year(site)
61-
site.posts.each.group_by { |post| post.date.year }
61+
site.posts.docs.each.group_by { |post| post.date.year }
6262
end
6363

6464
def archive_base(site)

_plugins/tag_gen.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def write_tag_index(site, dir, tag)
4141
end
4242

4343
def posts_with_tag(site, tag)
44-
site.posts.select { |post| post.tags.include?(tag) }
44+
site.posts.docs.select { |post| post.data['tags'].include?(tag) }
4545
end
4646

4747
end

0 commit comments

Comments
 (0)