narou 3.4.8 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd69fb85561bf578df4ef0979bf50746c662a7c9f7f9267387c6f301e626b318
-  data.tar.gz: 4e8f8841a8e2fcbbd62f5e1e681d1e37c4fc4d9b48a840a1eaa3ae687640db70
+  metadata.gz: 9e7602ba2d969aaf94fd33d0a1ba7f706149861cb90b6d7924cc2c8f66081416
+  data.tar.gz: 5d0dc68095c855a69a3af7837949a2902bd2509cf6febae7d8c9589ea1fef301
 SHA512:
-  metadata.gz: ca73de016293a5745831afdc14f4e76071c60283b493774cbc0d5fe2d5b0fb864ac2837e6746c0dd12e9a804ab0202d6b1306262816fd064cae9abcf30df76b2
-  data.tar.gz: 4aaf2337f272602260b0b82494eee829164cde6c1f58246a8ba072fe4f3441b29ac7e34ebc792eebceba32e358570575c4a8aafde18d19591ff4ddbd594ee3fb
+  metadata.gz: f9f48b127ae554760619b1cfdbd61041b3284ee675a9c6a00fb91adfe54968d8c0f5f776eee036bdf8fadb59308169a2732ac0413c3da3223e18c0fbe0bc83fa
+  data.tar.gz: c368440c723fec9af88932da94755d787720bddf393413467ddbcb86c39b41cdb629e980b79f76db6acc8b7715cd55b41a4e20f998a975caf75259434dd8d46a

data/.circleci/config.yml

@@ -12,8 +12,8 @@ jobs:
       - checkout
 
       - run:
-          name: Which bundler?
-          command: bundle -v
+          name: Install bundler 2.1.4
+          command: gem install bundler:2.1.4
 
       # Restore bundle cache
       - restore_cache:

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - "narou.gemspec"
     - "spec/**/*"
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
 
 Metrics/ClassLength:
   CountComments: false
@@ -30,7 +30,7 @@ Metrics/BlockNesting:
 Metrics/CyclomaticComplexity:
   Max: 8
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 140
   AllowURI: true
   URISchemes:
@@ -56,9 +56,6 @@ Style/AndOr:
 Style/BlockDelimiters:
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 Style/CollectionMethods:
   PreferredMethods:
     detect: "detect"
@@ -106,7 +103,7 @@ Style/NumericLiterals:
 
 # has_ から始まるメソッドは許可する
 Naming/PredicateName:
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
     - "is_"
     - "have_"
   NamePrefix:
@@ -116,7 +113,7 @@ Naming/PredicateName:
 Style/GlobalVars:
   Enabled: false
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
 Layout/LeadingCommentSpace:
@@ -137,7 +134,7 @@ Style/NegatedIf:
 Style/Not:
   Enabled: true
 
-PercentLiteralDelimiters:
+Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     "%":  "!!"
     "%i": "()"
@@ -158,7 +155,7 @@ Style/RedundantReturn:
 Style/RedundantSelf:
   Enabled: false
 
-SignalException:
+Style/SignalException:
   EnforcedStyle: only_raise
 
 Layout/SpaceAfterComma:
@@ -179,10 +176,10 @@ Style/StringLiterals:
 Style/SymbolProc:
   Enabled: true
 
-Layout/Tab:
+Layout/IndentationStyle:
   Enabled: true
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: false
 
 Style/TrailingCommaInArrayLiteral:
@@ -197,7 +194,7 @@ Style/TrivialAccessors:
 Style/UnlessElse:
   Enabled: true
 
-VariableName:
+Naming/VariableName:
   EnforcedStyle: snake_case
 
 Style/WordArray:
@@ -221,13 +218,13 @@ Style/FrozenStringLiteralComment:
 Layout/MultilineOperationIndentation:
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: true
 
 Style/NumericPredicate:
   Enabled: false
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: false
 
 Lint/RescueException:
@@ -241,3 +238,6 @@ Style/FormatStringToken:
 
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
+
+Style/StderrPuts:
+  Enabled: false

data/ChangeLog.md

@@ -1,6 +1,33 @@
 更新履歴 - ChangeLog
 ====================
 
+3.7.0: 2021/01/23
+-----------------
+#### 修正内容
+- Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+- device を kobo に設定し、_ebook-filename-length-limit でファイル名が制限され
+  た場合に send コマンドが正常に実行できない不具合を修正
+
+3.6.0: 2021/01/02
+-----------------
+#### 修正内容
+- Ruby 3.0 に対応
+
+
+3.5.1: 2020/03/21
+-----------------
+#### 修正内容
+- 小説家になろう系列の挿絵をダウンロード時に、サムネイル画像を取得するように
+  なってしまっていたのを修正
+- Ruby 2.7 で narou setting -l を実行時に警告が大量に出ていたのを修正
+
+
+3.5.0: 2020/02/16
+-----------------
+#### 修正内容
+- Ruby 2.7 に対応
+
+
 3.4.8: 2019/11/27
 -----------------
 #### 修正内容

data/Gemfile

@@ -2,17 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in narou.gemspec
 gemspec
-
-# development gems
-
-gem "rspec"
-gem "rspec-core"
-gem "rspec-retry"
-gem "rspec_junit_formatter"
-gem "timecop"
-gem "pry"
-gem "pry-byebug"
-gem "better_errors"
-gem "binding_of_caller"
-gem "awesome_print"
-gem "simplecov", require: false, group: :test

data/Gemfile.lock

@@ -1,156 +1,141 @@
 PATH
   remote: .
   specs:
-    narou (3.4.8)
-      activesupport (~> 5.2)
+    narou (3.7.0)
+      activesupport (>= 6.1, < 8.0)
       diff-lcs (~> 1.2, >= 1.2.5)
       erubis (~> 2.7)
+      ffi (>= 1.4.2)
       haml (>= 5.1.2, < 6)
       mail (~> 2.6.0, >= 2.6.6)
       memoist (~> 0.11.0)
       open_uri_redirections (~> 0.2, >= 0.2.1)
       pony (~> 1, >= 1.11)
       rubyzip (~> 2.0, >= 2.0.0)
-      sass (~> 3.4, >= 3.4.18)
-      sinatra (~> 1.4, >= 1.4.5)
-      sinatra-contrib (~> 1.4, >= 1.4.2)
+      sassc (~> 2.4)
+      sinatra (~> 2.0, >= 2.0.8.1)
+      sinatra-contrib (~> 2.0, >= 2.0.8.1)
       systemu (~> 2.6, >= 2.6.5)
       termcolorlight (~> 1.0, >= 1.1.1)
       tilt (~> 2.0, >= 2.0.10)
       unicode-display_width (~> 1.4)
+      webrick (~> 1.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     awesome_print (1.8.0)
-    backports (3.15.0)
-    better_errors (2.5.0)
-      coderay (>= 1.0.0)
-      erubi (>= 1.0.0)
-      rack (>= 0.9.0)
-    binding_of_caller (0.8.0)
-      debug_inspector (>= 0.0.1)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    debug_inspector (0.0.3)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    erubi (1.7.1)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     erubis (2.7.0)
-    ffi (1.9.25)
-    ffi (1.9.25-java)
-    haml (5.1.2)
+    ffi (1.14.2)
+    ffi (1.14.2-java)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
-    i18n (1.7.0)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    json (2.1.0-java)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
     memoist (0.11.0)
-    method_source (0.9.2)
-    mime-types (3.3)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    minitest (5.13.0)
-    multi_json (1.14.1)
+    mime-types-data (3.2020.1104)
+    minitest (5.14.3)
+    multi_json (1.15.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     open_uri_redirections (0.2.1)
     pony (1.13.1)
       mail (>= 2.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry (0.12.2-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry (0.13.1-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
       spoon (~> 0.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rack (1.6.11)
-    rack-protection (1.5.5)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-retry (0.6.1)
+      rspec-support (~> 3.10.0)
+    rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.8.0)
+    rspec-support (3.10.1)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubyzip (2.0.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    simplecov (0.16.1)
+    ruby2_keywords (0.0.4)
+    rubyzip (2.3.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    sinatra-contrib (2.1.0)
       multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
+      mustermann (~> 1.0)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
+      tilt (~> 2.0)
     spoon (0.0.6)
       ffi
     systemu (2.6.5)
     temple (0.8.2)
     termcolorlight (1.1.1)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
     tilt (2.0.10)
-    timecop (0.9.1)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    timecop (0.9.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
+    webrick (1.7.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  awesome_print
-  better_errors
-  binding_of_caller
+  awesome_print (~> 1.8)
   narou!
-  pry
-  pry-byebug
-  rspec
-  rspec-core
-  rspec-retry
-  rspec_junit_formatter
-  simplecov
-  timecop
+  pry (~> 0.12)
+  pry-byebug (~> 3.8)
+  rspec (~> 3.10)
+  rspec-retry (~> 0.6)
+  rspec_junit_formatter (~> 0.4)
+  simplecov (~> 0.20)
+  timecop (~> 0.9)
 
 BUNDLED WITH
-   1.17.2
+   2.2.3

data/README.md

@@ -34,13 +34,18 @@ Narou.rb - 小説家になろうのダウンローダ＆縦書き整形＆管理
 更新履歴 - ChangeLog
 --------------------
 
-3.4.8: 2019/11/27
+3.7.0: 2021/01/23
 -----------------
 #### 修正内容
-- 小説タイトルが長すぎる場合、backup コマンドでファイルを作成した際にエラーが
-  出るため、ファイル名を端折る処理を導入
-- `デスマーチからはじまる異世界狂想曲` のプリセットファイルにバグが混入していた
-  のを修正
+- Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+- device を kobo に設定し、_ebook-filename-length-limit でファイル名が制限され
+  た場合に send コマンドが正常に実行できない不具合を修正
+
+
+3.6.0: 2021/01/02
+-----------------
+#### 修正内容
+- Ruby 3.0 に対応
 
 ----
 

data/lib/command/setting.rb

@@ -118,7 +118,7 @@ module Command
       settings.each do |scope, scoped_settings|
         stream_io.puts "[#{scope.capitalize} Variables]"
         scoped_settings.each do |name, value|
-          if value =~ / /
+          if value.to_s =~ / /
             value = "'#{value}'"
           end
           stream_io.puts "<bold><green>#{name}</green></bold>=#{value}".termcolor
@@ -537,8 +537,8 @@ module Command
         "webui.theme" => {
           type: :select, help: "WEB UI 用テーマ選択",
           invisible: true,
-          select_keys: Narou.get_theme_names,
-          select_summaries: Narou.get_theme_names,
+          select_keys: Narou.theme_names,
+          select_summaries: Narou.theme_names,
           tab: :webui
         },
         "webui.table.reload-timing" => {