narou 3.5.1 → 3.6.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of narou might be problematic. Click here for more details.

Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +2 -2
  3. data/.rubocop.yml +1 -1
  4. data/ChangeLog.md +6 -0
  5. data/Gemfile.lock +68 -62
  6. data/README.md +2 -4
  7. data/lib/narou.rb +1 -1
  8. data/lib/version.rb +1 -1
  9. data/lib/web/appserver.rb +3 -1
  10. data/narou.gemspec +8 -9
  11. metadata +40 -28
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f37fc846838d47f62b093acfd19416b7eb81a992eaf50feb4f05a857624b3bbf
4
- data.tar.gz: 9765f2c1e9d88f266a922410f5f3ed89b70060c553c4f557bbac282fa7fc3a4b
3
+ metadata.gz: b9fcbe89c262fd6d8234351075c7bb9228498751df529c4f6def90d45cb6bca6
4
+ data.tar.gz: 1d3033f43c00d3dcfe3fcace49bc8e24915b91965716214ffe3e19a7b0a0f392
5
5
  SHA512:
6
- metadata.gz: 770d433baf61c01dc2d577e79fb8be0d6ca418c62fb6f6900c84b8401b1658b2c08beb65c5bcf58352bc70b62735b8cdb47caf4c25fe1bc15b2dad183eb6fc04
7
- data.tar.gz: 726d8579ab32be6ad94e9d2a84c764bea0c7c2f78b5ca7e9c7584f2b30340f472315e30781f16a44cf5d72043396271e6903d8a5002d4b5eaf8c51cf3ebb7e8e
6
+ metadata.gz: 11d21bbf7d64ce68a99e61988ca1c79f74b61832af90a52aea62d9a1e5e270164c7d364eca64188af5c390bdcb4beeefc633089f5fc6b27a084aa7d6d1848b5f
7
+ data.tar.gz: 39222977f49fc571f61d617503a4d14af9b8072f7f83265330b3244682e3fc38644ee644388a85ab65a6d4e5da9fee2b22e85134df502afc2deb1e48677fd59b
data/.circleci/config.yml CHANGED
@@ -12,8 +12,8 @@ jobs:
12
12
  - checkout
13
13
 
14
14
  - run:
15
- name: Which bundler?
16
- command: bundle -v
15
+ name: Install bundler 2.1.4
16
+ command: gem install bundler:2.1.4
17
17
 
18
18
  # Restore bundle cache
19
19
  - restore_cache:
data/.rubocop.yml CHANGED
@@ -176,7 +176,7 @@ Style/StringLiterals:
176
176
  Style/SymbolProc:
177
177
  Enabled: true
178
178
 
179
- Layout/Tab:
179
+ Layout/IndentationStyle:
180
180
  Enabled: true
181
181
 
182
182
  Layout/TrailingEmptyLines:
data/ChangeLog.md CHANGED
@@ -1,6 +1,12 @@
1
1
  更新履歴 - ChangeLog
2
2
  ====================
3
3
 
4
+ 3.6.0: 2021/01/02
5
+ -----------------
6
+ #### 修正内容
7
+ - Ruby 3.0 に対応
8
+
9
+
4
10
  3.5.1: 2020/03/21
5
11
  -----------------
6
12
  #### 修正内容
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- narou (3.5.0)
5
- activesupport (~> 5.2)
4
+ narou (3.5.1)
5
+ activesupport (>= 5.2, < 7.0)
6
6
  diff-lcs (~> 1.2, >= 1.2.5)
7
7
  erubis (~> 2.7)
8
8
  haml (>= 5.1.2, < 6)
@@ -11,69 +11,72 @@ PATH
11
11
  open_uri_redirections (~> 0.2, >= 0.2.1)
12
12
  pony (~> 1, >= 1.11)
13
13
  rubyzip (~> 2.0, >= 2.0.0)
14
- sass (~> 3.4, >= 3.4.18)
15
- sinatra (~> 1.4, >= 1.4.5)
16
- sinatra-contrib (~> 1.4, >= 1.4.2)
14
+ sassc (~> 2.4)
15
+ sinatra (~> 2.0, >= 2.0.8.1)
16
+ sinatra-contrib (~> 2.0, >= 2.0.8.1)
17
17
  systemu (~> 2.6, >= 2.6.5)
18
18
  termcolorlight (~> 1.0, >= 1.1.1)
19
19
  tilt (~> 2.0, >= 2.0.10)
20
20
  unicode-display_width (~> 1.4)
21
+ webrick (~> 1.7)
21
22
 
22
23
  GEM
23
24
  remote: https://rubygems.org/
24
25
  specs:
25
- activesupport (5.2.4.1)
26
+ activesupport (6.1.0)
26
27
  concurrent-ruby (~> 1.0, >= 1.0.2)
27
- i18n (>= 0.7, < 2)
28
- minitest (~> 5.1)
29
- tzinfo (~> 1.1)
28
+ i18n (>= 1.6, < 2)
29
+ minitest (>= 5.1)
30
+ tzinfo (~> 2.0)
31
+ zeitwerk (~> 2.3)
30
32
  awesome_print (1.8.0)
31
- backports (3.15.0)
32
- byebug (11.1.1)
33
- coderay (1.1.2)
34
- concurrent-ruby (1.1.5)
35
- diff-lcs (1.3)
36
- docile (1.3.2)
33
+ byebug (11.1.3)
34
+ coderay (1.1.3)
35
+ concurrent-ruby (1.1.7)
36
+ diff-lcs (1.4.4)
37
+ docile (1.3.4)
37
38
  erubis (2.7.0)
38
- ffi (1.12.2)
39
- haml (5.1.2)
39
+ ffi (1.13.1)
40
+ ffi (1.13.1-java)
41
+ haml (5.2.1)
40
42
  temple (>= 0.8.0)
41
43
  tilt
42
- i18n (1.7.0)
44
+ i18n (1.8.6)
43
45
  concurrent-ruby (~> 1.0)
44
46
  mail (2.6.6)
45
47
  mime-types (>= 1.16, < 4)
46
48
  memoist (0.11.0)
47
- method_source (0.9.2)
49
+ method_source (1.0.0)
48
50
  mime-types (3.3.1)
49
51
  mime-types-data (~> 3.2015)
50
- mime-types-data (3.2019.1009)
51
- minitest (5.13.0)
52
- multi_json (1.14.1)
52
+ mime-types-data (3.2020.1104)
53
+ minitest (5.14.2)
54
+ multi_json (1.15.0)
55
+ mustermann (1.1.1)
56
+ ruby2_keywords (~> 0.0.1)
53
57
  open_uri_redirections (0.2.1)
54
58
  pony (1.13.1)
55
59
  mail (>= 2.0)
56
- pry (0.12.2)
57
- coderay (~> 1.1.0)
58
- method_source (~> 0.9.0)
59
- pry-byebug (3.8.0)
60
+ pry (0.13.1)
61
+ coderay (~> 1.1)
62
+ method_source (~> 1.0)
63
+ pry (0.13.1-java)
64
+ coderay (~> 1.1)
65
+ method_source (~> 1.0)
66
+ spoon (~> 0.0)
67
+ pry-byebug (3.9.0)
60
68
  byebug (~> 11.0)
61
- pry (~> 0.10)
62
- rack (1.6.12)
63
- rack-protection (1.5.5)
69
+ pry (~> 0.13.0)
70
+ rack (2.2.3)
71
+ rack-protection (2.1.0)
64
72
  rack
65
- rack-test (1.1.0)
66
- rack (>= 1.0, < 3)
67
- rb-fsevent (0.10.3)
68
- rb-inotify (0.10.1)
69
- ffi (~> 1.0)
70
73
  rspec (3.9.0)
71
74
  rspec-core (~> 3.9.0)
72
75
  rspec-expectations (~> 3.9.0)
73
76
  rspec-mocks (~> 3.9.0)
74
- rspec-core (3.9.1)
75
- rspec-support (~> 3.9.1)
76
- rspec-expectations (3.9.0)
77
+ rspec-core (3.9.2)
78
+ rspec-support (~> 3.9.3)
79
+ rspec-expectations (3.9.2)
77
80
  diff-lcs (>= 1.2.0, < 2.0)
78
81
  rspec-support (~> 3.9.0)
79
82
  rspec-mocks (3.9.1)
@@ -81,39 +84,42 @@ GEM
81
84
  rspec-support (~> 3.9.0)
82
85
  rspec-retry (0.6.2)
83
86
  rspec-core (> 3.3)
84
- rspec-support (3.9.2)
87
+ rspec-support (3.9.3)
85
88
  rspec_junit_formatter (0.4.1)
86
89
  rspec-core (>= 2, < 4, != 2.12.0)
87
- rubyzip (2.0.0)
88
- sass (3.7.4)
89
- sass-listen (~> 4.0.0)
90
- sass-listen (4.0.0)
91
- rb-fsevent (~> 0.9, >= 0.9.4)
92
- rb-inotify (~> 0.9, >= 0.9.7)
93
- simplecov (0.18.2)
90
+ ruby2_keywords (0.0.2)
91
+ rubyzip (2.3.0)
92
+ sassc (2.4.0)
93
+ ffi (~> 1.9)
94
+ simplecov (0.20.0)
94
95
  docile (~> 1.1)
95
96
  simplecov-html (~> 0.11)
96
- simplecov-html (0.12.0)
97
- sinatra (1.4.8)
98
- rack (~> 1.5)
99
- rack-protection (~> 1.4)
100
- tilt (>= 1.3, < 3)
101
- sinatra-contrib (1.4.7)
102
- backports (>= 2.0)
97
+ simplecov_json_formatter (~> 0.1)
98
+ simplecov-html (0.12.3)
99
+ simplecov_json_formatter (0.1.2)
100
+ sinatra (2.1.0)
101
+ mustermann (~> 1.0)
102
+ rack (~> 2.2)
103
+ rack-protection (= 2.1.0)
104
+ tilt (~> 2.0)
105
+ sinatra-contrib (2.1.0)
103
106
  multi_json
104
- rack-protection
105
- rack-test
106
- sinatra (~> 1.4.0)
107
- tilt (>= 1.3, < 3)
107
+ mustermann (~> 1.0)
108
+ rack-protection (= 2.1.0)
109
+ sinatra (= 2.1.0)
110
+ tilt (~> 2.0)
111
+ spoon (0.0.6)
112
+ ffi
108
113
  systemu (2.6.5)
109
114
  temple (0.8.2)
110
115
  termcolorlight (1.1.1)
111
- thread_safe (0.3.6)
112
116
  tilt (2.0.10)
113
117
  timecop (0.9.1)
114
- tzinfo (1.2.6)
115
- thread_safe (~> 0.1)
116
- unicode-display_width (1.6.0)
118
+ tzinfo (2.0.4)
119
+ concurrent-ruby (~> 1.0)
120
+ unicode-display_width (1.7.0)
121
+ webrick (1.7.0)
122
+ zeitwerk (2.4.2)
117
123
 
118
124
  PLATFORMS
119
125
  java
@@ -127,8 +133,8 @@ DEPENDENCIES
127
133
  rspec (~> 3.9)
128
134
  rspec-retry (~> 0.6)
129
135
  rspec_junit_formatter (~> 0.4)
130
- simplecov (~> 0.18)
136
+ simplecov (~> 0.20)
131
137
  timecop (~> 0.9)
132
138
 
133
139
  BUNDLED WITH
134
- 1.17.3
140
+ 2.2.3
data/README.md CHANGED
@@ -34,12 +34,10 @@ Narou.rb - 小説家になろうのダウンローダ＆縦書き整形＆管理
34
34
  更新履歴 - ChangeLog
35
35
  --------------------
36
36
 
37
- 3.5.1: 2020/03/21
37
+ 3.6.0: 2021/01/02
38
38
  -----------------
39
39
  #### 修正内容
40
- - 小説家になろう系列の挿絵をダウンロード時に、サムネイル画像を取得するように
41
- なってしまっていたのを修正
42
- - Ruby 2.7 で narou setting -l を実行時に警告が大量に出ていたのを修正
40
+ - Ruby 3.0 に対応
43
41
 
44
42
  ----
45
43
 
data/lib/narou.rb CHANGED
@@ -44,7 +44,7 @@ module Narou
44
44
  @@is_web = false
45
45
 
46
46
  def last_commit_year
47
- 2020
47
+ 2021
48
48
  end
49
49
 
50
50
  def root_dir
data/lib/version.rb CHANGED
@@ -5,5 +5,5 @@
5
5
  #
6
6
 
7
7
  module Narou
8
- VERSION = "3.5.1"
8
+ VERSION = "3.6.0"
9
9
  end
data/lib/web/appserver.rb CHANGED
@@ -835,8 +835,10 @@ class Narou::AppServer < Sinatra::Base
835
835
 
836
836
  # ダウンロード登録すると同時にグレーのボタン画像を返す
837
837
  get "/api/download4ssl" do
838
+ target = params["target"] or error("need a parameter: `target'")
839
+ opt_mail = "--mail" if query_to_boolean(params["mail"])
838
840
  Narou::WebWorker.push do
839
- CommandLine.run!("download", params["target"])
841
+ CommandLine.run!("download", target, opt_mail)
840
842
  @@push_server.send_all(:"table.reload")
841
843
  end
842
844
  redirect "/resources/images/dl_button1.gif"
data/narou.gemspec CHANGED
@@ -32,12 +32,10 @@ Gem::Specification.new do |gem|
32
32
  install_message = <<-EOS
33
33
  #{"*" * 60}
34
34
 
35
- 3.5.1: 2020/03/21
35
+ 3.6.0: 2021/01/02
36
36
  -----------------
37
37
  #### 修正内容
38
- - 小説家になろう系列の挿絵をダウンロード時に、サムネイル画像を取得するように
39
- なってしまっていたのを修正
40
- - Ruby 2.7 で narou setting -l を実行時に警告が大量に出ていたのを修正
38
+ - Ruby 3.0 に対応
41
39
 
42
40
  #{"*" * 60}
43
41
  EOS
@@ -53,17 +51,18 @@ Gem::Specification.new do |gem|
53
51
  gem.add_runtime_dependency 'mail', '~> 2.6.0', '>= 2.6.6'
54
52
  gem.add_runtime_dependency 'pony', '~> 1', '>= 1.11'
55
53
  gem.add_runtime_dependency 'diff-lcs', '~> 1.2', '>= 1.2.5'
56
- gem.add_runtime_dependency 'sinatra', '~> 1.4', '>= 1.4.5'
57
- gem.add_runtime_dependency 'sinatra-contrib', '~> 1.4', '>= 1.4.2'
54
+ gem.add_runtime_dependency 'sinatra', '~> 2.0', '>= 2.0.8.1'
55
+ gem.add_runtime_dependency 'sinatra-contrib', '~> 2.0', '>= 2.0.8.1'
58
56
  gem.add_runtime_dependency 'tilt', '~> 2.0', '>= 2.0.10'
59
- gem.add_runtime_dependency 'sass', '~> 3.4', '>= 3.4.18'
57
+ gem.add_runtime_dependency 'sassc', '~> 2.4'
60
58
  gem.add_runtime_dependency 'haml', '>= 5.1.2', '< 6'
61
59
  gem.add_runtime_dependency 'memoist', '~> 0.11.0'
62
60
  gem.add_runtime_dependency 'systemu', '~> 2.6', '>= 2.6.5'
63
61
  gem.add_runtime_dependency 'erubis', '~> 2.7'
64
62
  gem.add_runtime_dependency 'open_uri_redirections', '~> 0.2', '>= 0.2.1'
65
- gem.add_runtime_dependency 'activesupport', '~> 5.2'
63
+ gem.add_runtime_dependency 'activesupport', '>= 5.2', '< 7.0'
66
64
  gem.add_runtime_dependency 'unicode-display_width', '~> 1.4'
65
+ gem.add_runtime_dependency 'webrick', '~> 1.7'
67
66
 
68
67
  gem.add_development_dependency 'rspec', '~> 3.9'
69
68
  gem.add_development_dependency 'rspec-retry', '~> 0.6'
@@ -72,6 +71,6 @@ Gem::Specification.new do |gem|
72
71
  gem.add_development_dependency 'pry', '~> 0.12'
73
72
  gem.add_development_dependency 'pry-byebug', '~> 3.8'
74
73
  gem.add_development_dependency 'awesome_print', '~> 1.8'
75
- gem.add_development_dependency 'simplecov', '~> 0.18'
74
+ gem.add_development_dependency 'simplecov', '~> 0.20'
76
75
  end
77
76
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: narou
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.1
4
+ version: 3.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - whiteleaf7
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-03-21 00:00:00.000000000 Z
11
+ date: 2021-01-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: termcolorlight
@@ -116,40 +116,40 @@ dependencies:
116
116
  requirements:
117
117
  - - "~>"
118
118
  - !ruby/object:Gem::Version
119
- version: '1.4'
119
+ version: '2.0'
120
120
  - - ">="
121
121
  - !ruby/object:Gem::Version
122
- version: 1.4.5
122
+ version: 2.0.8.1
123
123
  type: :runtime
124
124
  prerelease: false
125
125
  version_requirements: !ruby/object:Gem::Requirement
126
126
  requirements:
127
127
  - - "~>"
128
128
  - !ruby/object:Gem::Version
129
- version: '1.4'
129
+ version: '2.0'
130
130
  - - ">="
131
131
  - !ruby/object:Gem::Version
132
- version: 1.4.5
132
+ version: 2.0.8.1
133
133
  - !ruby/object:Gem::Dependency
134
134
  name: sinatra-contrib
135
135
  requirement: !ruby/object:Gem::Requirement
136
136
  requirements:
137
137
  - - "~>"
138
138
  - !ruby/object:Gem::Version
139
- version: '1.4'
139
+ version: '2.0'
140
140
  - - ">="
141
141
  - !ruby/object:Gem::Version
142
- version: 1.4.2
142
+ version: 2.0.8.1
143
143
  type: :runtime
144
144
  prerelease: false
145
145
  version_requirements: !ruby/object:Gem::Requirement
146
146
  requirements:
147
147
  - - "~>"
148
148
  - !ruby/object:Gem::Version
149
- version: '1.4'
149
+ version: '2.0'
150
150
  - - ">="
151
151
  - !ruby/object:Gem::Version
152
- version: 1.4.2
152
+ version: 2.0.8.1
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: tilt
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -171,25 +171,19 @@ dependencies:
171
171
  - !ruby/object:Gem::Version
172
172
  version: 2.0.10
173
173
  - !ruby/object:Gem::Dependency
174
- name: sass
174
+ name: sassc
175
175
  requirement: !ruby/object:Gem::Requirement
176
176
  requirements:
177
177
  - - "~>"
178
178
  - !ruby/object:Gem::Version
179
- version: '3.4'
180
- - - ">="
181
- - !ruby/object:Gem::Version
182
- version: 3.4.18
179
+ version: '2.4'
183
180
  type: :runtime
184
181
  prerelease: false
185
182
  version_requirements: !ruby/object:Gem::Requirement
186
183
  requirements:
187
184
  - - "~>"
188
185
  - !ruby/object:Gem::Version
189
- version: '3.4'
190
- - - ">="
191
- - !ruby/object:Gem::Version
192
- version: 3.4.18
186
+ version: '2.4'
193
187
  - !ruby/object:Gem::Dependency
194
188
  name: haml
195
189
  requirement: !ruby/object:Gem::Requirement
@@ -282,16 +276,22 @@ dependencies:
282
276
  name: activesupport
283
277
  requirement: !ruby/object:Gem::Requirement
284
278
  requirements:
285
- - - "~>"
279
+ - - ">="
286
280
  - !ruby/object:Gem::Version
287
281
  version: '5.2'
282
+ - - "<"
283
+ - !ruby/object:Gem::Version
284
+ version: '7.0'
288
285
  type: :runtime
289
286
  prerelease: false
290
287
  version_requirements: !ruby/object:Gem::Requirement
291
288
  requirements:
292
- - - "~>"
289
+ - - ">="
293
290
  - !ruby/object:Gem::Version
294
291
  version: '5.2'
292
+ - - "<"
293
+ - !ruby/object:Gem::Version
294
+ version: '7.0'
295
295
  - !ruby/object:Gem::Dependency
296
296
  name: unicode-display_width
297
297
  requirement: !ruby/object:Gem::Requirement
@@ -306,6 +306,20 @@ dependencies:
306
306
  - - "~>"
307
307
  - !ruby/object:Gem::Version
308
308
  version: '1.4'
309
+ - !ruby/object:Gem::Dependency
310
+ name: webrick
311
+ requirement: !ruby/object:Gem::Requirement
312
+ requirements:
313
+ - - "~>"
314
+ - !ruby/object:Gem::Version
315
+ version: '1.7'
316
+ type: :runtime
317
+ prerelease: false
318
+ version_requirements: !ruby/object:Gem::Requirement
319
+ requirements:
320
+ - - "~>"
321
+ - !ruby/object:Gem::Version
322
+ version: '1.7'
309
323
  - !ruby/object:Gem::Dependency
310
324
  name: rspec
311
325
  requirement: !ruby/object:Gem::Requirement
@@ -410,14 +424,14 @@ dependencies:
410
424
  requirements:
411
425
  - - "~>"
412
426
  - !ruby/object:Gem::Version
413
- version: '0.18'
427
+ version: '0.20'
414
428
  type: :development
415
429
  prerelease: false
416
430
  version_requirements: !ruby/object:Gem::Requirement
417
431
  requirements:
418
432
  - - "~>"
419
433
  - !ruby/object:Gem::Version
420
- version: '0.18'
434
+ version: '0.20'
421
435
  description: 小説家になろうで公開されている小説の管理、及び電子書籍データへの変換を支援します。縦書用に特化されており、横書き用に特化されたWEB小説を違和感なく縦書で読むことが出来るようになります。
422
436
  email:
423
437
  - 2nd.leaf@gmail.com
@@ -661,12 +675,10 @@ metadata: {}
661
675
  post_install_message: |
662
676
  ************************************************************
663
677
 
664
- 3.5.1: 2020/03/21
678
+ 3.6.0: 2021/01/02
665
679
  -----------------
666
680
  #### 修正内容
667
- - 小説家になろう系列の挿絵をダウンロード時に、サムネイル画像を取得するように
668
- なってしまっていたのを修正
669
- - Ruby 2.7 で narou setting -l を実行時に警告が大量に出ていたのを修正
681
+ - Ruby 3.0 に対応
670
682
 
671
683
  ************************************************************
672
684
  rdoc_options: []
@@ -683,7 +695,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
683
695
  - !ruby/object:Gem::Version
684
696
  version: '0'
685
697
  requirements: []
686
- rubygems_version: 3.1.2
698
+ rubygems_version: 3.2.3
687
699
  signing_key:
688
700
  specification_version: 4
689
701
  summary: Narou.rb ― 小説家になろうダウンローダ＆縦書用整形スクリプト