narou 3.5.0.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95bf07d5d411dc375dc6fdef96d6539c2f3d66b63bd71f0f48ab883f16e42ffc
-  data.tar.gz: 53e35c22ca89fb11c8c27945c23790f174e418ce353e818ff28d5374caf30cee
+  metadata.gz: 19f8ca4a5c4225bab91baaf79b822783531ec9165aff057cd7711f8dd0836ab2
+  data.tar.gz: 852f0b011c02a4a961b0944b4b563e56fb0513761090d07e98d7c47b42917c26
 SHA512:
-  metadata.gz: 41a54f0b642fc2aea1a5e8d52b196c7b9ab6353bfd27bc3f0dbb5f8c5d867432a5783c1640bb64c37451a9ab84a41078f09b85cb5bd4b65043d4d302d248b7a8
-  data.tar.gz: 84a52aff09cddeed454fcd07f6b25385c75a3f807145f59f1086fe611a03d966237a4fa5a9e0251158b33f30a76debf8e7033503bc010c98d06b01622bef1e47
+  metadata.gz: 975b3f44546689d96febb73ae0f624db9808fd48671b8bb991e12b66cfac3f604c0717a84a17ee0a383af899df58b9b4780101ee4d98d09398cd0187cdb88889
+  data.tar.gz: 2cb5b7dc872a58f5e4312435967e62300c83ba013da3df7b3989dd12e8c96a88e61b493ef8f742bdc202e7143734a3d6ec19c9dd0dfc8121de18df4ae9b97936

data/.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/circleci-narou
     docker:
-      - image: circleci/ruby:2.5
+      - image: circleci/ruby:3.0
         environment:
           BUNDLE_JOBS: 1
           BUNDLE_RETRY: 3
@@ -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

@@ -56,9 +56,6 @@ Style/AndOr:
 Style/BlockDelimiters:
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 Style/CollectionMethods:
   PreferredMethods:
     detect: "detect"
@@ -179,7 +176,7 @@ Style/StringLiterals:
 Style/SymbolProc:
   Enabled: true
 
-Layout/Tab:
+Layout/IndentationStyle:
   Enabled: true
 
 Layout/TrailingEmptyLines:
@@ -241,3 +238,6 @@ Style/FormatStringToken:
 
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
+
+Style/StderrPuts:
+  Enabled: false

data/ChangeLog.md

@@ -1,6 +1,43 @@
 更新履歴 - ChangeLog
 ====================
 
+3.7.2: 2021/06/05
+-----------------
+#### 追加機能
+- folder コマンドに --no-open (-n) オプションを追加しました
+
+#### 修正内容
+- gem update を行うとクラッシュする場合があったのを修正
+  - psych 4.0 からの非互換に対応
+- その他軽微な修正
+
+3.7.1: 2021/04/01
+-----------------
+#### 修正内容
+- その他の小説の最新話掲載日を確認しようとするとクラッシュする不具合を修正
+
+
+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
 -----------------
 #### 修正内容

data/Gemfile.lock

@@ -1,119 +1,131 @@
 PATH
   remote: .
   specs:
-    narou (3.5.0)
-      activesupport (~> 5.2)
+    narou (3.7.1)
+      activesupport (>= 6.1, < 8.0)
       diff-lcs (~> 1.2, >= 1.2.5)
       erubis (~> 2.7)
+      ffi (~> 1.4, >= 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)
+      psych (~> 4.0)
       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.4.1)
+    activesupport (6.1.3.2)
       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)
-    byebug (11.1.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    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.12.2)
-    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.10)
       concurrent-ruby (~> 1.0)
+    jar-dependencies (0.4.1)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
     memoist (0.11.0)
-    method_source (0.9.2)
+    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.2021.0225)
+    minitest (5.14.4)
+    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-byebug (3.8.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.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    rack (1.6.12)
-    rack-protection (1.5.5)
+      pry (~> 0.13.0)
+    psych (4.0.0)
+    psych (4.0.0-java)
+      jar-dependencies (>= 0.1.7)
+    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.1)
-      ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    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.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.9.2)
+    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.18.2)
+    ruby2_keywords (0.0.4)
+    rubyzip (2.3.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
+      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)
     tilt (2.0.10)
-    timecop (0.9.1)
-    tzinfo (1.2.6)
-      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
@@ -124,11 +136,11 @@ DEPENDENCIES
   narou!
   pry (~> 0.12)
   pry-byebug (~> 3.8)
-  rspec (~> 3.9)
+  rspec (~> 3.10)
   rspec-retry (~> 0.6)
   rspec_junit_formatter (~> 0.4)
-  simplecov (~> 0.18)
+  simplecov (~> 0.20)
   timecop (~> 0.9)
 
 BUNDLED WITH
-   1.17.3
+   2.2.15

data/README.md

@@ -34,10 +34,15 @@ Narou.rb - 小説家になろうのダウンローダ＆縦書き整形＆管理
 更新履歴 - ChangeLog
 --------------------
 
-3.5.0: 2020/02/16
+3.7.2: 2021/06/05
 -----------------
+#### 追加機能
+- folder コマンドに --no-open (-n) オプションを追加しました
+
 #### 修正内容
-- Ruby 2.7 に対応
+- gem update を行うとクラッシュする場合があったのを修正
+  - psych 4.0 からの非互換に対応
+- その他軽微な修正
 
 ----
 

data/lib/command/browser.rb

@@ -45,7 +45,7 @@ module Command
         if @options["vote"]
           # TODO: 最新話の場所をAPIで取得する
           data_dir = Downloader.get_novel_data_dir_by_target(data["id"])
-          latest_index = YAML.load_file(File.join(data_dir, Downloader::TOC_FILE_NAME))["subtitles"].last["index"]
+          latest_index = YAML.unsafe_load_file(File.join(data_dir, Downloader::TOC_FILE_NAME))["subtitles"].last["index"]
           open_url = "#{toc_url + latest_index}/#my_novelpoint"
         else
           open_url = toc_url

data/lib/command/diff.rb

@@ -212,8 +212,8 @@ module Command
       cache_sections = []
       cache_section_list.each do |path|
         match_latest_path = File.join(novel_dir, File.basename(path))
-        latest_novel_sections << YAML.load_file(match_latest_path) if File.exist?(match_latest_path)
-        cache_sections << YAML.load_file(path)
+        latest_novel_sections << YAML.unsafe_load_file(match_latest_path) if File.exist?(match_latest_path)
+        cache_sections << YAML.unsafe_load_file(path)
       end
 
       novel_info = Database.instance[id]

data/lib/command/folder.rb

@@ -23,7 +23,12 @@ module Command
     narou folder musyoku
     narou folder 0
     narou f 0
+
+  Options:
       EOS
+      @opt.on("-n", "--no-open", "フォルダを開かずにパスだけ表示する") {
+        @options["no-open"] = true
+      }
     end
 
     def execute(argv)
@@ -33,7 +38,7 @@ module Command
       argv.each do |target|
         dir = Downloader.get_novel_data_dir_by_target(target)
         if dir
-          Helper.open_directory(dir)
+          Helper.open_directory(dir) unless @options["no-open"]
           puts dir
         else
           error "#{target} は存在しません"

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" => {

data/lib/command/update/general_lastup_updater.rb

@@ -4,6 +4,7 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
+require "net/http"
 require_relative "../../narou/api"
 
 module Command
@@ -63,7 +64,7 @@ module Command
           interval.wait
           begin
             downloader = Downloader.new(id)
-            next unless downloader.get_latest_table_of_contents(through_error: true)
+            next unless downloader.get_latest_table_of_contents(downloader.load_toc_file, through_error: true)
             dates = {
               "novelupdated_at" => downloader.get_novelupdated_at,
               "general_lastup" => downloader.get_general_lastup,

data/lib/converterbase.rb

@@ -995,7 +995,7 @@ class ConverterBase
   # URL っぽい文字列を一旦別のIDに置き換えてあとで復元することで、変換処理の影響を受けさせない
   #
   def replace_url(data)
-    data.gsub!(URI.regexp(%w(http https))) do |match|
+    data.gsub!(URI::DEFAULT_PARSER.make_regexp(%w(http https))) do |match|
       @url_list << match
       "［＃ＵＲＬ＝#{@url_list.size - 1}］"
     end

data/lib/device.rb

@@ -91,13 +91,12 @@ class Device
   end
 
   def eject
-    if ejectable?
-      begin
-        Device.eject(@device_module::VOLUME_NAME)
-      rescue CantEject => e
-        error e.message
-      end
-    end
+    return unless ejectable?
+
+    Device.eject(@device_module::VOLUME_NAME)
+    yield if block_given?
+  rescue CantEject => e
+    error e.message
   end
 
   def self.support_eject?