Skip to content

Commit 5735da2

Browse files
author
Jakob Vad Nielsen
committed
Merged #39 and fixed deps
1 parent fbf4ffa commit 5735da2

File tree

8 files changed

+76
-66
lines changed

8 files changed

+76
-66
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ build-iPhoneSimulator/
5050

5151
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
5252
.rvmrc
53+
./vendor

.rubocop.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ Metrics/ClassLength:
1919
Metrics/PerceivedComplexity:
2020
Enabled: false
2121

22-
Naming/MethodParameterName:
23-
MinNameLength: 1
24-
2522
Style/Documentation:
2623
Enabled: false
2724

Gemfile.lock

Lines changed: 63 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,124 @@
11
PATH
22
remote: .
33
specs:
4-
premonition (4.0.1)
4+
premonition (4.0.2)
55
jekyll (>= 3.7, < 5.0)
66

77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
addressable (2.7.0)
10+
activesupport (6.1.4.6)
11+
concurrent-ruby (~> 1.0, >= 1.0.2)
12+
i18n (>= 1.6, < 2)
13+
minitest (>= 5.1)
14+
tzinfo (~> 2.0)
15+
zeitwerk (~> 2.3)
16+
addressable (2.8.0)
1117
public_suffix (>= 2.0.2, < 5.0)
12-
ansi (1.5.0)
13-
ast (2.4.0)
18+
ast (2.4.2)
1419
colorator (1.1.0)
15-
concurrent-ruby (1.1.7)
16-
em-websocket (0.5.2)
20+
concurrent-ruby (1.1.9)
21+
em-websocket (0.5.3)
1722
eventmachine (>= 0.12.9)
18-
http_parser.rb (~> 0.6.0)
23+
http_parser.rb (~> 0)
1924
eventmachine (1.2.7)
20-
ffi (1.13.1)
25+
ffi (1.15.5)
2126
forwardable-extended (2.6.0)
22-
http_parser.rb (0.6.0)
23-
i18n (1.8.5)
27+
http_parser.rb (0.8.0)
28+
i18n (1.10.0)
2429
concurrent-ruby (~> 1.0)
25-
jaro_winkler (1.5.4)
26-
jekyll (4.1.1)
30+
jekyll (4.2.1)
2731
addressable (~> 2.4)
2832
colorator (~> 1.0)
2933
em-websocket (~> 0.5)
3034
i18n (~> 1.0)
3135
jekyll-sass-converter (~> 2.0)
3236
jekyll-watch (~> 2.0)
33-
kramdown (~> 2.1)
37+
kramdown (~> 2.3)
3438
kramdown-parser-gfm (~> 1.0)
3539
liquid (~> 4.0)
3640
mercenary (~> 0.4.0)
3741
pathutil (~> 0.9)
3842
rouge (~> 3.0)
3943
safe_yaml (~> 1.0)
40-
terminal-table (~> 1.8)
41-
jekyll-sass-converter (2.1.0)
44+
terminal-table (~> 2.0)
45+
jekyll-sass-converter (2.2.0)
4246
sassc (> 2.0.1, < 3.0)
4347
jekyll-watch (2.2.1)
4448
listen (~> 3.0)
45-
kramdown (2.3.0)
49+
kramdown (2.3.1)
4650
rexml
4751
kramdown-parser-gfm (1.1.0)
4852
kramdown (~> 2.0)
4953
liquid (4.0.3)
50-
listen (3.2.1)
54+
listen (3.7.1)
5155
rb-fsevent (~> 0.10, >= 0.10.3)
5256
rb-inotify (~> 0.9, >= 0.9.10)
5357
mercenary (0.4.0)
54-
minitest (4.7.5)
58+
minitest (5.15.0)
5559
mocha (1.11.2)
56-
parallel (1.19.1)
57-
parser (2.7.0.5)
58-
ast (~> 2.4.0)
60+
parallel (1.21.0)
61+
parser (3.1.1.0)
62+
ast (~> 2.4.1)
5963
pathutil (0.16.2)
6064
forwardable-extended (~> 2.6)
61-
power_assert (1.1.7)
65+
power_assert (2.0.1)
6266
public_suffix (4.0.6)
63-
rainbow (3.0.0)
64-
rake (13.0.1)
65-
rb-fsevent (0.10.4)
67+
rack (2.2.3)
68+
rainbow (3.1.1)
69+
rake (13.0.6)
70+
rb-fsevent (0.11.1)
6671
rb-inotify (0.10.1)
6772
ffi (~> 1.0)
68-
rexml (3.2.4)
69-
rouge (3.23.0)
70-
rubocop (0.71.0)
71-
jaro_winkler (~> 1.5.1)
73+
regexp_parser (2.2.1)
74+
rexml (3.2.5)
75+
rouge (3.28.0)
76+
rubocop (1.18.4)
7277
parallel (~> 1.10)
73-
parser (>= 2.6)
78+
parser (>= 3.0.0.0)
7479
rainbow (>= 2.2.2, < 4.0)
80+
regexp_parser (>= 1.8, < 3.0)
81+
rexml
82+
rubocop-ast (>= 1.8.0, < 2.0)
7583
ruby-progressbar (~> 1.7)
76-
unicode-display_width (>= 1.4.0, < 1.7)
77-
rubocop-jekyll (0.10.0)
78-
rubocop (>= 0.68.0, < 0.72.0)
84+
unicode-display_width (>= 1.4.0, < 3.0)
85+
rubocop-ast (1.16.0)
86+
parser (>= 3.1.1.0)
87+
rubocop-jekyll (0.12.0)
88+
rubocop (~> 1.18.0)
7989
rubocop-performance (~> 1.2)
80-
rubocop-performance (1.5.2)
81-
rubocop (>= 0.71.0)
82-
ruby-progressbar (1.10.1)
90+
rubocop-performance (1.13.2)
91+
rubocop (>= 1.7.0, < 2.0)
92+
rubocop-ast (>= 0.4.0)
93+
rubocop-rails (2.13.2)
94+
activesupport (>= 4.2.0)
95+
rack (>= 1.1)
96+
rubocop (>= 1.7.0, < 2.0)
97+
ruby-progressbar (1.11.0)
8398
safe_yaml (1.0.5)
8499
sassc (2.4.0)
85100
ffi (~> 1.9)
86-
terminal-table (1.8.0)
101+
terminal-table (2.0.0)
87102
unicode-display_width (~> 1.1, >= 1.1.1)
88-
test-unit (3.3.5)
103+
test-unit (3.3.9)
89104
power_assert
90-
turn (0.9.7)
91-
ansi
92-
minitest (~> 4)
93-
unicode-display_width (1.6.1)
105+
tzinfo (2.0.4)
106+
concurrent-ruby (~> 1.0)
107+
unicode-display_width (1.8.0)
108+
zeitwerk (2.5.4)
94109

95110
PLATFORMS
96-
ruby
111+
universal-darwin-21
97112

98113
DEPENDENCIES
99-
bundler (~> 2.1.4)
114+
bundler (> 2.1.4, <= 2.3.8)
100115
mocha (~> 1.11.2)
101116
premonition!
102117
rake (~> 13.0.1)
103-
rubocop (>= 0.68.0, < 0.72.0)
104-
rubocop-jekyll (~> 0.10.0)
118+
rubocop (>= 0.68.0, <= 1.25.1)
119+
rubocop-jekyll (~> 0.12.0)
120+
rubocop-rails (~> 2.13.2)
105121
test-unit (~> 3.3.5)
106-
turn (~> 0.9.7)
107122

108123
BUNDLED WITH
109-
2.1.4
124+
2.3.8

HISTORY.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 4.0.2
2+
3+
- Added collection support: https://github.com/lazee/premonition/pull/39 [Feature]
4+
- Upgraded packages and removed turn in order to work for newer package versions.
15

26
## 4.0.1
37

lib/premonition/processor.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ def load_references(content)
5757
content.each_line do |l|
5858
# refs << l if l.strip!.match(/^\[.*\]:.*\".*\"$/i)
5959

60-
refs << l if l.strip.length>0 && l.strip.match(/^\[.*\]:.*\".*\"$/i)
60+
refs << l if l.strip.length.positive? && l.strip.match(/^\[.*\]:.*\".*\"$/i)
6161
end
6262
refs
6363
end
6464

6565
def code_block_line?(line)
66-
line.strip.start_with?('~~~')
66+
line.strip.start_with?('~~~') || line.strip.start_with?('```')
6767
end
6868

6969
def blockquote?(line)

lib/premonition/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
module Jekyll
44
module Premonition
55
# Make sure to change this manually before a release.
6-
VERSION = '4.0.1'
6+
VERSION = '4.0.2'
77
end
88
end

premonition.gemspec

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ Gem::Specification.new do |s|
1414
s.extra_rdoc_files = ['README.md']
1515

1616
s.add_dependency 'jekyll', '>= 3.7', '< 5.0'
17-
s.add_development_dependency 'bundler', '~> 2.1.4'
17+
s.add_development_dependency 'bundler', '> 2.1.4', '<= 2.3.8'
1818
s.add_development_dependency 'mocha', '~> 1.11.2'
1919
s.add_development_dependency 'rake', '~> 13.0.1'
20-
s.add_development_dependency 'rubocop', '>= 0.68.0', '< 0.72.0'
21-
s.add_development_dependency 'rubocop-jekyll', '~> 0.10.0'
20+
s.add_development_dependency 'rubocop', '>= 0.68.0', '<= 1.25.1'
21+
s.add_development_dependency 'rubocop-jekyll', '~> 0.12.0'
22+
s.add_development_dependency 'rubocop-rails', '~> 2.13.2'
2223
s.add_development_dependency 'test-unit', '~> 3.3.5'
23-
s.add_development_dependency 'turn', '~> 0.9.7'
24+
#s.add_development_dependency 'turn', '~> 0.9.7'
2425

2526
end

test/test_helper.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44
require 'mocha/test_unit'
55
require 'premonition'
66

7-
begin
8-
require 'turn'
9-
rescue LoadError
10-
puts '**********************************************'
11-
puts 'Install the Turn gem for prettier test output.'
12-
puts '> gem install turn'
13-
puts '**********************************************'
14-
end
157

168
class Test::Unit::TestCase
179
end

0 commit comments

Comments
 (0)