bindery-cli 0.2.1 → 0.3.0

data/lib/bindery/cli.rb

@@ -4,7 +4,7 @@ require "rbconfig"
 
 module Bindery
   # 命令行入口：解析子命令并分发
-  # 支持: init / new book / build / clean / validate / watch / serve / status / version / help
+  # 支持: init / new book / build / clean / validate / watch / serve / cover / status / version / help
   class CLI
     def self.start(argv)
       new.run(argv)
@@ -23,16 +23,14 @@ module Bindery
         cmd_clean(rest)
       when "validate"
         cmd_validate(rest)
-      when "cover"
-        cmd_cover(rest)
       when "rename"
         cmd_rename(rest)
       when "watch"
         cmd_watch(rest)
       when "serve"
         cmd_serve(rest)
-      when "web"
-        cmd_web(rest)
+      when "cover"
+        cmd_cover(rest)
       when "status"
         cmd_status(rest)
       when "version", "-v", "--version"
@@ -109,19 +107,6 @@ module Bindery
       Generators::VolumeGenerator.call(book_id, volume_name, chapters: options[:chapters])
     end
 
-    # ---------- bindery cover <book-id> ----------
-    def cmd_cover(args)
-      id = args.first
-      if id.nil?
-        warn "用法: bindery cover <book-id>"
-        exit 1
-      end
-      project_root = Project.root!
-      book = Bindery::Book.find(id, project_root)
-      path = Bindery::Cover.generate(book)
-      puts "已生成封面: #{path}"
-    end
-
     # ---------- bindery rename chapters <book-id> ----------
     def cmd_rename(args)
       type, book_id = args
@@ -351,7 +336,7 @@ module Bindery
 
     # ---------- bindery serve [--port N] [--host H] ----------
     def cmd_serve(args)
-      options = { port: 8000, host: "127.0.0.1" }
+      options = { port: nil, host: "127.0.0.1" }
       parser = OptionParser.new do |o|
         o.on("--port N", Integer) { |v| options[:port] = v }
         o.on("--host H") { |v| options[:host] = v }
@@ -363,9 +348,9 @@ module Bindery
       Bindery::Server.new(project_root, host: options[:host], port: options[:port]).start
     end
 
-    # ---------- bindery web [--port N] [--host H] ----------
-    def cmd_web(args)
-      options = { port: 8000, host: "127.0.0.1" }
+    # ---------- bindery cover [--port N] [--host H] ----------
+    def cmd_cover(args)
+      options = { port: nil, host: "127.0.0.1" }
       parser = OptionParser.new do |o|
         o.on("--port N", Integer) { |v| options[:port] = v }
         o.on("--host H") { |v| options[:host] = v }
@@ -375,8 +360,9 @@ module Bindery
       project_root = Project.root!
       Index.rebuild(project_root)
 
-      url = "http://#{options[:host]}:#{options[:port]}/cover"
       server = Bindery::Server.new(project_root, host: options[:host], port: options[:port])
+      server.listen # 先绑定端口（未指定 --port 时由系统自动分配），再拿到实际端口拼 URL
+      url = "http://#{options[:host]}:#{server.port}/cover"
       thread = Thread.new do
         begin
           server.start
@@ -384,7 +370,6 @@ module Bindery
           warn "服务启动失败: #{e.message}"
         end
       end
-      sleep 0.5 # 等服务就绪
       open_browser(url)
       puts "封面生成器已打开: #{url}（Ctrl-C 退出）"
       thread.join
@@ -439,7 +424,6 @@ module Bindery
                   --translator 译者  --isbn ISBN  --cover 自动生成封面
           bindery new chapter <book-id> <数量>               批量创建章节（编号自动接续）
           bindery new volume <book-id> <卷名> [--chapters N] 新建卷（平铺 md，h2=卷名/h3=章名）
-          bindery cover <book-id>                           自动生成装饰性封面
           bindery rename chapters <book-id>                 按标题自动更新章节文件名
           bindery build <id>                                构建单本书的 epub
           bindery build --all                               批量构建所有书
@@ -451,8 +435,8 @@ module Bindery
           bindery validate --all                            校验所有书
           bindery clean [--all]                             清理构建产物（--all 连 books.json 一起删）
           bindery watch [--interval 秒]                      监听 books/ 自动重建
-          bindery serve [--port N] [--host H]                启动本地书库站点
-          bindery web [--port N]                             打开 Web 封面生成器
+          bindery serve [--port N] [--host H]                启动本地书库站点（不加 --port 时自动选空闲端口）
+          bindery cover [--port N] [--host H]                打开 Web 封面生成器（不加 --port 时自动选空闲端口）
           bindery status                                     查看所有书籍状态
           bindery version                                    查看版本号
       HELP

data/lib/bindery/generators/templates/project/README.md.erb

@@ -19,9 +19,6 @@ bindery new chapter <书籍ID> <数量>
 # 按标题自动更新章节文件名（chapter-0001-标题.md）
 bindery rename chapters <书籍ID>
 
-# 单独生成封面
-bindery cover <书籍ID>
-
 # 构建一本书
 bindery build <书籍ID>
 
@@ -45,7 +42,7 @@ bindery watch
 bindery serve
 
 # 打开 Web 封面生成器（自动填充书籍信息）
-bindery web
+bindery cover
 
 # 清理构建产物
 bindery clean --all

data/lib/bindery/server.rb

@@ -20,20 +20,33 @@ module Bindery
       ".svg"  => "image/svg+xml",
     }.freeze
 
-    # 封面编辑器页面（随 gem 一起打包）
+    # 书库与封面编辑器页面（随 gem 一起打包）
     ASSETS_DIR = Pathname.new(__dir__) + "assets"
 
-    def initialize(project_root, host: "127.0.0.1", port: 8000)
+    attr_reader :port
+
+    # port 为 nil 时不预先指定端口，由操作系统自动分配一个空闲端口
+    def initialize(project_root, host: "127.0.0.1", port: nil)
       @project_root = project_root
       @host = host
       @port = port
     end
 
+    # 绑定监听地址，并返回实际监听的端口号（未指定 --port 时可用于提前拿到自动分配的端口）
+    def listen
+      return @port if @server
+
+      @server = TCPServer.new(@host, @port || 0)
+      @port = @server.addr[1]
+    rescue Errno::EADDRINUSE
+      raise Bindery::Error, "端口 #{@port} 已被占用，换个端口试试（--port N），或不指定 --port 让系统自动分配"
+    end
+
     def start
-      server = TCPServer.new(@host, @port)
+      listen
       puts "服务已启动: http://#{@host}:#{@port} （Ctrl-C 退出）"
       loop do
-        client = server.accept
+        client = @server.accept
         begin
           respond(client)
         rescue StandardError => e
@@ -50,7 +63,7 @@ module Bindery
       puts "\n服务已停止"
     ensure
       begin
-        server.close
+        @server&.close
       rescue StandardError
         nil
       end
@@ -72,7 +85,7 @@ module Bindery
         end
       end
 
-      path = (URI::DEFAULT_PARSER.unescape(raw_path.split("?").first) rescue raw_path)
+      path = (URI::RFC2396_PARSER.unescape(raw_path.split("?").first) rescue raw_path)
       path = "/" if path.nil? || path.empty?
       path = path.gsub("..", "") # 防目录穿越
 
@@ -84,12 +97,11 @@ module Bindery
 
       case path
       when "/", "/index.html"
-        body = index_html
-        send_response(client, 200, MIME[".html"], body, method)
+        serve_file(client, ASSETS_DIR + "index.html", MIME[".html"], method)
       when "/books.json"
         serve_file(client, Project.index_file(@project_root), MIME[".json"], method)
       when "/cover"
-        serve_file(client, ASSETS_DIR + "index.html", MIME[".html"], method)
+        serve_file(client, ASSETS_DIR + "cover.html", MIME[".html"], method)
       when %r{\A/epub/([\w\-.]+\.epub)\z}
         serve_file(client, Project.output_dir(@project_root) + "epub" + Regexp.last_match(1), MIME[".epub"], method)
       when %r{\A/cover/([\w\-]+)\z}
@@ -99,56 +111,6 @@ module Bindery
       end
     end
 
-    def index_html
-      index_file = Project.index_file(@project_root)
-      data = if index_file.file?
-               JSON.parse(index_file.read)
-             else
-               Bindery::Index.rebuild(@project_root)
-             end
-      books = data["books"] || []
-
-      rows = books.map do |b|
-        id = escape_html(b["id"].to_s)
-        title = escape_html(b["title"].to_s)
-        author = escape_html(b["author"].to_s)
-        epub_link = if b["epub"]
-                      %(<a href="/epub/#{id}.epub" download>下载 EPUB</a>)
-                    else
-                      "<em>未构建</em>"
-                    end
-        cover = %(<img src="/cover/#{id}" class="cover" alt="">)
-        "<li class=\"book\">#{cover}<div class=\"info\"><h2>#{title}</h2><p class=\"author\">#{author}</p>#{epub_link}</div></li>"
-      end.join("\n")
-
-      <<~HTML
-        <!doctype html>
-        <html lang="zh-CN">
-        <head>
-          <meta charset="utf-8">
-          <meta name="viewport" content="width=device-width, initial-scale=1">
-          <title>#{escape_html(@project_root.basename.to_s)} · 书库</title>
-          <style>
-            body { font-family: system-ui, -apple-system, sans-serif; max-width: 720px; margin: 2em auto; padding: 0 1em; color: #222; }
-            h1 { font-size: 1.6em; border-bottom: 1px solid #eee; padding-bottom: .4em; }
-            ul { list-style: none; padding: 0; }
-            .book { display: flex; gap: 1em; padding: 1em 0; border-bottom: 1px solid #f0f0f0; }
-            .cover { width: 64px; height: 102px; object-fit: cover; background: #f5f5f5; border-radius: 4px; }
-            .info h2 { margin: 0; font-size: 1.1em; }
-            .author { color: #666; margin: .3em 0 .5em; }
-            a { color: #b45309; }
-            em { color: #999; }
-          </style>
-        </head>
-        <body>
-          <h1>#{escape_html(@project_root.basename.to_s)} · 书库</h1>
-          <p>共 #{books.size} 本书</p>
-          <ul>#{rows}</ul>
-        </body>
-        </html>
-      HTML
-    end
-
     def serve_cover(client, id, method)
       book_dir = Project.books_dir(@project_root) + id
       return not_found(client, method) unless book_dir.directory?
@@ -230,9 +192,5 @@ module Bindery
       client.write(headers)
       client.write(body) unless method == "HEAD"
     end
-
-    def escape_html(str)
-      str.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;").gsub('"', "&quot;")
-    end
   end
 end

data/lib/bindery/version.rb

@@ -1,3 +1,3 @@
 module Bindery
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bindery-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Billow Wang
@@ -24,6 +24,7 @@ files:
 - README.md
 - exe/bindery
 - lib/bindery.rb
+- lib/bindery/assets/cover.html
 - lib/bindery/assets/index.html
 - lib/bindery/book.rb
 - lib/bindery/builder.rb