narou 1.4.1.1 → 1.4.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f9acd2c32953f999fa05542ee880063b338a577
-  data.tar.gz: 26f36b7388a838aa334ba9aa16dad3fd50a69a29
+  metadata.gz: 0a1797a6b3e930caf7864207b026e7bcfcc495f4
+  data.tar.gz: 0841fe186112b837b3c9b2c76ea1f720568a9d4f
 SHA512:
-  metadata.gz: b69ebd3d737b2acf83a7eac4ac963209f48bb0a54fc2b6e80b67b2139ca7577e56f6ccbe5f9fee3851cff7a688299f9dd17d794311aa9a84bce817844bef8307
-  data.tar.gz: fe80c8370e965207525243ba5359c535cb72300938dab2b19aa752237f374bfe710297664e07ea1469130eaf54daad50c0c3e179a966b124add350c56d3f2710
+  metadata.gz: 37f1f5ac7a3b3597d42e706c26746bbe965734147af4b84f817083f1a331b4a1a34692bdfc0375ab4860f37e6e5c84831e61cd31da28dd880ac0028487ff6654
+  data.tar.gz: f99e88ddd9ba24bd6160d52ed0a63838d606bc7b08674cfcaf23d18c83ecea31597e9873a0f0deb7fb6a1169a031c3512d62f7f6388c0017ffdcebc07b41515e

data/lib/command/convert.rb

@@ -59,6 +59,9 @@ module Command
       @opt.on("--no-strip", "MOBIをstripしない") {
         @options["no-strip"] = true
       }
+      @opt.on("--no-zip", "i文庫用のzipファイルを作らない") {
+        @options["no-zip"] = true
+      }
       @opt.on("--no-open", "出力時に保存フォルダを開かない") {
         @options["no-open"] = true
       }
@@ -109,6 +112,9 @@ module Command
         end
       end
       @device = Narou.get_device
+      if @device && @device.ibunko?
+        change_settings_for_ibunko
+      end
       convert_novels(argv)
     end
 
@@ -135,14 +141,19 @@ module Command
         @converted_txt_path = res[:converted_txt_path]
         @use_dakuten_font = res[:use_dakuten_font]
 
-        ebook_file = convert_txt_to_ebook_file
+        if @device && @device.ibunko?
+          ebook_file = archive_ibunko_zipfile
+        else
+          ebook_file = convert_txt_to_ebook_file
+        end
         next if ebook_file.nil?
         if ebook_file
           copied_file_path = copy_to_converted_file(ebook_file)
           if copied_file_path
             puts copied_file_path.encode(Encoding::UTF_8) + " へコピーしました"
           end
-          if @device && @device.connecting? && File.extname(ebook_file) == @device.ebook_file_ext
+          if @device && @device.physical_support? &&
+             @device.connecting? && File.extname(ebook_file) == @device.ebook_file_ext
             if @argument_target_type == :novel
               Send.execute_and_rescue_exit([@device.name, target])
             else
@@ -167,6 +178,9 @@ module Command
       exit 1
     end
 
+    #
+    # 直接指定されたテキストファイルを変換する
+    #
     def convert_txt(target)
       return NovelConverter.convert_file(target, @enc, @output_filename, @options["inspect"])
     rescue ArgumentError => e
@@ -185,6 +199,9 @@ module Command
       return nil
     end
 
+    #
+    # 変換された整形済みテキストファイルをデバイスに対応した書籍データに変換する
+    #
     def convert_txt_to_ebook_file
       return false if @options["no-epub"]
       # epub
@@ -223,6 +240,56 @@ module Command
       return mobi_path
     end
 
+    #
+    # i文庫用にテキストと挿絵ファイルをzipアーカイブ化する
+    #
+    def archive_ibunko_zipfile
+      return false if @options["no-zip"]
+      require "zip"
+      Zip.unicode_names = true
+      dirpath = File.dirname(@converted_txt_path)
+      zipfile_path = @converted_txt_path.sub(/.txt$/, @device.ebook_file_ext)
+      File.delete(zipfile_path) if File.exists?(zipfile_path)
+      Zip::File.open(zipfile_path, Zip::File::CREATE) do |zip|
+        zip.add(File.basename(@converted_txt_path), @converted_txt_path)
+        illust_dirpath = File.join(dirpath, Illustration::ILLUST_DIR)
+        # 挿絵
+        if File.exists?(illust_dirpath)
+          Dir.glob(File.join(illust_dirpath, "*")) do |img_path|
+            zip.add(File.join(Illustration::ILLUST_DIR, File.basename(img_path)), img_path)
+          end
+        end
+        # 表紙画像
+        cover_name = NovelConverter.get_cover_filename(dirpath)
+        if cover_name
+          zip.add(cover_name, File.join(dirpath, cover_name))
+        end
+      end
+      puts File.basename(zipfile_path) + " を出力しました"
+      puts "<bold><green>#{@device.display_name}用ファイルを出力しました</green></bold>".termcolor
+      return zipfile_path
+    end
+
+    #
+    # i文庫用に設定を強制設定する
+    #
+    def change_settings_for_ibunko
+      settings = LocalSetting.get["local_setting"]
+      modified = false
+      %w(enable_half_indent_bracket enable_dakuten_font).each do |word|
+        name = "force.#{word}"
+        if settings[name].nil? || settings[name] == true
+          settings[name] = false
+          puts "#{name} を#{@device.display_name}用に false に強制変更しました"
+          modified = true
+        end
+      end
+      LocalSetting.get.save_settings("local_setting") if modified
+    end
+
+    #
+    # convert.copy_to で指定されたディレクトリに書籍データをコピーする
+    #
     def copy_to_converted_file(src_path)
       copy_to_dir = @options["copy_to"]
       return nil unless copy_to_dir

data/lib/command/send.rb

@@ -46,11 +46,17 @@ module Command
       super
       device = get_device(argv)
       unless device
-        error "デバイス名を指定して下さい"
+        error "デバイス名が指定されていないか、間違っています。\n" +
+              "narou setting device=デバイス名 で指定出来ます。\n" +
+              "指定出来るデバイス名：" + Device::DEVICES.keys.join(", ")
+        exit 1
+      end
+      unless device.physical_support?
+        error "#{device.display_name} への直接送信は対応していません"
         exit 1
       end
       unless device.connecting?
-        error "#{device.name}が接続されていません"
+        error "#{device.display_name} が接続されていません"
         exit 1
       end
       send_all = false

data/lib/converterbase.rb

@@ -408,7 +408,7 @@ class ConverterBase
   def convert_dakuten_char_to_font(data)
     data.gsub!(/(.)[゛ﾞ]/) do
       m1 = $1
-      if m1 =~ /[ぁ-んァ-ヶι]/
+      if m1 =~ /[ぁ-んァ-ヶι]/ && @setting.enable_dakuten_font
         @use_dakuten_font = true
         "［＃濁点］#{m1}［＃濁点終わり］"
       else

data/lib/device.rb

@@ -19,12 +19,15 @@ class Device
     extend Device::Library::Linux
   end
 
-  attr_reader :name, :ebook_file_ext
+  attr_reader :name, :ebook_file_ext, :display_name
 
-  require_relative "device/kindle"
-  require_relative "device/kobo"
-  require_relative "device/reader"
-  DEVICES = { "kindle" => Kindle, "kobo" => Kobo, "reader" => Reader }
+  DEVICES = {}.tap do |h|
+    Dir.glob(File.join(File.dirname(__FILE__), "device", "*.rb")).each do |name|
+      name = File.basename(name, ".rb")
+      require_relative "device/#{name}"
+      h[name] = eval(name.capitalize)
+    end
+  end
 
   class UnknownDevice < StandardError; end
 
@@ -45,7 +48,8 @@ class Device
       raise UnknownDevice, "#{device_name} は存在しません"
     end
     @device = DEVICES[device_name.downcase]
-    @name = device_name.capitalize
+    @name = @device::NAME
+    @display_name = @device::DISPLAY_NAME
     @ebook_file_ext = @device::EBOOK_FILE_EXT
     create_device_check_methods
   end
@@ -107,6 +111,10 @@ class Device
     exit 1
   end
 
+  def physical_support?
+    @device::PHYSICAL_SUPPORT
+  end
+
   private
 
   def create_device_check_methods

data/lib/device/ibunko.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+module Device::Ibunko
+  PHYSICAL_SUPPORT = false
+  VOLUME_NAME = nil
+  DOCUMENTS_PATH_LIST = nil
+  EBOOK_FILE_EXT = ".zip"
+  NAME = "iBunko"
+  DISPLAY_NAME = "i文庫"
+end

data/lib/device/kindle.rb

@@ -4,7 +4,10 @@
 #
 
 module Device::Kindle
+  PHYSICAL_SUPPORT = true
   VOLUME_NAME = "Kindle"
   DOCUMENTS_PATH_LIST = %w(documents Documents Books)
   EBOOK_FILE_EXT = ".mobi"
+  NAME = "Kindle"
+  DISPLAY_NAME = "Kindle"
 end

data/lib/device/kobo.rb

@@ -4,7 +4,10 @@
 #
 
 module Device::Kobo
+  PHYSICAL_SUPPORT = true
   VOLUME_NAME = "KOBOeReader"
   DOCUMENTS_PATH_LIST = ["/"]
   EBOOK_FILE_EXT = ".kepub.epub"
+  NAME = "Kobo"
+  DISPLAY_NAME = "Kobo"
 end

data/lib/device/reader.rb

@@ -4,7 +4,10 @@
 #
 
 module Device::Reader
+  PHYSICAL_SUPPORT = true
   VOLUME_NAME = "READER"
   DOCUMENTS_PATH_LIST = ["Sony_Reader/media/books"]
   EBOOK_FILE_EXT = ".epub"
+  NAME = "Reader"
+  DISPLAY_NAME = "SonyReader"
 end

data/lib/novelconverter.rb

@@ -17,6 +17,7 @@ require_relative "localsetting"
 
 class NovelConverter
   NOVEL_TEXT_TEMPLATE_NAME = "novel.txt"
+  NOVEL_TEXT_TEMPLATE_NAME_FOR_IBUNKO = "ibunko_novel.txt"
 
   attr_reader :use_dakuten_font
 
@@ -237,7 +238,8 @@ class NovelConverter
     toc = @toc
     cover_chuki = @cover_chuki
     device = Narou.get_device
-    Template.get(NOVEL_TEXT_TEMPLATE_NAME, binding)
+    tempalte_name = (device && device.ibunko? ? NOVEL_TEXT_TEMPLATE_NAME_FOR_IBUNKO : NOVEL_TEXT_TEMPLATE_NAME)
+    Template.get(tempalte_name, binding)
   end
 
   #

data/lib/novelsetting.rb

@@ -216,5 +216,10 @@ class NovelSetting
       value: 10,
       help: "ここで設定した値が `enable_convert_page_break` に反映される"
     },
+    {
+      name: "enable_dakuten_font",
+      value: true,
+      help: "濁点フォントを使用するか。false の場合は縦中横による擬似表現を使用する"
+    },
   ]
 end

data/lib/template.rb

@@ -9,6 +9,8 @@ require_relative "narou"
 class Template
   TEMPLATE_DIR = "template/"
 
+  class LoadError < StandardError; end
+
   #
   # テンプレートを元にファイルを作成
   #
@@ -49,7 +51,7 @@ class Template
       result = ERB.new(src, nil, "-").result(_binding)
       return result
     end
-    nil
+    raise LoadError, "テンプレートファイルが見つかりません。(#{src_filename}.erb)"
   end
 
   def self.invalid_templace_version?

data/lib/version.rb

@@ -3,7 +3,7 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
-Version = "1.4.1.1"
+Version = "1.4.2.rc1"
 
 cv_path = File.expand_path(File.join(File.dirname(__FILE__), "../commitversion"))
 if File.exists?(cv_path)

data/narou.gemspec

@@ -61,4 +61,5 @@ narou コマンドのインストール or アップデートが完了しまし
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.add_dependency "termcolor", ">=1.2.2"
+  gem.add_dependency "rubyzip", "~> 1.1.0"
 end

data/template/ibunko_novel.txt.erb

@@ -0,0 +1,41 @@
+<%# -*- coding: utf-8 -*- -%>
+<% Template.target_binary_version(1.0) -%>
+<%= toc["title"] %>
+<%= toc["author"] %>
+<%= cover_chuki %>
+――――――――――――――――――――――――
+あらすじ：
+<%= toc["story"] %>
+
+掲載ページ: <%= toc["toc_url"] %>
+――――――――――――――――――――――――
+
+<% sections.each_with_index do |section, i| -%>
+［＃改ページ］
+<% if section["chapter"] != "" -%>
+［＃ページの左右中央］
+
+
+［＃３字下げ］［＃ここから大見出し］<%= section["chapter"] %>［＃ここで大見出し終わり］
+
+
+［＃改ページ］
+<% end -%>
+
+［＃３字下げ］［＃ここから中見出し］<%= section["subtitle"].rstrip %>［＃ここで中見出し終わり］
+
+<% if section["element"]["introduction"] != "" -%>
+［＃ここから６字下げ］
+<%= section["element"]["introduction"] %>
+［＃ここで字下げ終わり］
+<% end -%>
+
+
+<%= section["element"]["body"] %>
+
+<% if section["element"]["postscript"] != "" -%>
+［＃ここから６字下げ］
+<%= section["element"]["postscript"] %>
+［＃ここで字下げ終わり］
+<% end -%>
+<% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narou
 version: !ruby/object:Gem::Version
-  version: 1.4.1.1
+  version: 1.4.2.rc1
 platform: ruby
 authors:
 - whiteleaf7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolor
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: 小説家になろうで公開されている小説の管理、及び電子書籍データへの変換を支援します。縦書用に特化されており、横書き用に特化されたWEB小説を違和感なく縦書で読むことが出来るようになります。
 email:
 - 2nd.leaf@gmail.com
@@ -40,6 +54,7 @@ files:
 - README.md
 - Rakefile
 - bin/narou
+- commitversion
 - lib/color.rb
 - lib/command.rb
 - lib/command/alias.rb
@@ -63,6 +78,7 @@ files:
 - lib/converterbase.rb
 - lib/database.rb
 - lib/device.rb
+- lib/device/ibunko.rb
 - lib/device/kindle.rb
 - lib/device/kobo.rb
 - lib/device/library/linux.rb
@@ -108,6 +124,7 @@ files:
 - preset/vertical_font.css
 - template/converter.rb.erb
 - template/diff.txt.erb
+- template/ibunko_novel.txt.erb
 - template/novel.txt.erb
 - template/replace.txt.erb
 - template/setting.ini.erb
@@ -118,7 +135,6 @@ files:
 - test/num_to_kanji.rb
 - webnovel/ncode.syosetu.com.yaml
 - webnovel/novel18.syosetu.com.yaml
-- commitversion
 homepage: http://whiteleaf.hatenablog.com/
 licenses:
 - MIT
@@ -149,12 +165,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Narou.rb ― 小説家になろうダウンローダ＆縦書用整形スクリプト