softcover 1.7.5 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35f8216b104c6b6341a7ff95524712cc97fdafd2153fff6d6c69bcab3f113a06
-  data.tar.gz: 691d43d5226885e4796440ec770bd0c19df2466fd180b3194a0de0f971a94c36
+  metadata.gz: 10ad29d53f34aed6c8b77b1a2f865001b8cd8f462a6da9fe9458650ca5ea8d58
+  data.tar.gz: 2ff71d58d7c0e40a0cc59c94c21902c38a483b1de063ee87fb408ea6d3896875
 SHA512:
-  metadata.gz: 5a891f8b339375b86a3a4259b7fc9dc07d7f57aa1e2da8d8df3448ad2866a12af4c0ded3720675cbf33dd79121cf33cd4c6e590f096e91015684472a2cb5600c
-  data.tar.gz: 101c6147113f550d1b56109ec33da95559198f7cd03e14838fd1b0bf44a5a127203d0f4a5e8c95d1960d34454fdcf05a6f1f5bc70298e11097078c1f7be0f23e
+  metadata.gz: 51164e791bd53574c7d143c8284af53c3279056bede0d98925f4cfa044d2765b75a9631b903734442ea5874c9a287566401bd3b4dfabdae6773281fd17824069
+  data.tar.gz: cddb5948112f74f02fa96a62a4d54f2a40f10e52be99ac51ffcea3e2bef5821e0053e51907a41822da15a41c5724066cbfe8b98f2ecd01b511c1f2678cc4280d

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    softcover (1.7.5)
-      activesupport (~> 4.2.3)
+    softcover (1.8.1)
+      activesupport (= 4.2.11.3)
       async_sinatra (~> 1.1.0)
       coffee-script (>= 2.2.0)
       curb (>= 0.9.7)
@@ -11,12 +11,12 @@ PATH
       listen (~> 3.7.1)
       maruku (~> 0.7.1)
       msgpack (~> 1.2.0)
-      nokogiri (>= 1.6.0, < 2.0)
-      polytexnic (~> 1.7.2)
+      nokogiri (>= 1.14.0, < 2.0)
+      polytexnic (~> 1.8.0)
       pygments.rb (~> 2.1)
       rest-client (>= 1.8.0)
       ruby-progressbar (~> 1.10)
-      sanitize (>= 4.6.3, < 5.3.0)
+      sanitize (~> 6.0.1)
       sinatra (~> 1.4.4)
       sinatra-respond_to (~> 0.9.0)
       thin (~> 1.6.1)
@@ -30,8 +30,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     async_sinatra (1.1.0)
       rack (>= 1.4.1)
       sinatra (>= 1.3.2)
@@ -40,7 +40,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -50,7 +50,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    curb (1.0.0)
+    curb (1.0.5)
     daemons (1.4.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
@@ -61,12 +61,12 @@ GEM
     ffi (1.15.5)
     hashdiff (1.0.1)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -75,33 +75,33 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.15.0)
+    mime-types-data (3.2023.0218.1)
+    minitest (5.18.0)
     msgpack (1.2.10)
     netrc (0.11.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    nokogiri (1.14.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)
-    polytexnic (1.7.2)
+    polytexnic (1.8.0)
       json (~> 2.3.0)
       kramdown (>= 2.0, < 3.0)
       msgpack (~> 1.2.0)
       nokogiri (>= 1.6.0, < 2.0)
       pygments.rb (~> 2.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    pygments.rb (2.3.0)
-    racc (1.6.0)
+    public_suffix (5.0.1)
+    pygments.rb (2.3.1)
+    racc (1.6.2)
     rack (1.6.13)
     rack-protection (1.5.5)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rest-client (2.1.0)
@@ -118,13 +118,12 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    ruby-prof (1.4.3)
-    ruby-progressbar (1.11.0)
+    ruby-prof (1.6.1)
+    ruby-progressbar (1.13.0)
     safe_yaml (1.0.4)
-    sanitize (5.2.3)
+    sanitize (6.0.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
+      nokogiri (>= 1.12.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -145,21 +144,24 @@ GEM
       rack (~> 1.0)
     thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.10)
-    tins (1.31.0)
+    tilt (2.1.0)
+    tins (1.32.1)
       sync
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
-    webmock (3.14.0)
+    unf_ext (0.0.8.2)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  arm64-darwin-21
+  arm64-darwin-22
   x86_64-darwin-19
+  x86_64-darwin-21
 
 DEPENDENCIES
   coveralls

data/README.md

@@ -1,6 +1,6 @@
 # Softcover
 
-[![CircleCI](https://circleci.com/gh/softcover/softcover.svg?style=shield)](https://circleci.com/gh/softcover/softcover) [![Coverage Status](https://coveralls.io/repos/softcover/softcover/badge.svg)](https://coveralls.io/github/softcover/softcover)
+[![Coverage Status](https://coveralls.io/repos/softcover/softcover/badge.svg)](https://coveralls.io/github/softcover/softcover)
 
 Softcover is an ebook typesetting system for technical authors. This is the main gem, `softcover`, which depends on `polytexnic` to convert Markdown or PolyTeX input to HTML and LaTeX, and thence to EPUB, MOBI, and PDF. Authors can use Softcover to publish and optionally sell the resulting ebooks (as well as associated digital goods such as screencasts) on the [Softcover publishing platform](http://www.softcover.io/).
 

data/lib/softcover/article_template/latex_gitignore

@@ -8,7 +8,6 @@ tmp/
 generated_polytex/
 
 .highlight_cache
-.softcover-book
 
 # Generated HTML files
 html/*.html

data/lib/softcover/article_template/latex_styles/softcover.sty

@@ -40,6 +40,7 @@
 % American Mathematical Society extensions
 \usepackage{amsmath}
 \usepackage{amsfonts}
+\usepackage{amssymb}
 % 'Verbatim' environment
 \usepackage{fancyvrb}
 % Be able to resize text relative to other text

data/lib/softcover/article_template/markdown_gitignore

@@ -9,7 +9,6 @@ tmp/
 generated_polytex/
 
 .highlight_cache
-.softcover-book
 
 # Generated HTML files
 html/*.html

data/lib/softcover/book_template/latex_gitignore

@@ -8,7 +8,6 @@ tmp/
 generated_polytex/
 
 .highlight_cache
-.softcover-book
 
 # Generated HTML files
 html/*.html

data/lib/softcover/book_template/latex_styles/softcover.sty

@@ -40,6 +40,7 @@
 % American Mathematical Society extensions
 \usepackage{amsmath}
 \usepackage{amsfonts}
+\usepackage{amssymb}
 % 'Verbatim' environment
 \usepackage{fancyvrb}
 % Be able to resize text relative to other text

data/lib/softcover/book_template/markdown_gitignore

@@ -9,7 +9,6 @@ tmp/
 generated_polytex/
 
 .highlight_cache
-.softcover-book
 
 # Generated HTML files
 html/*.html

data/lib/softcover/builders/epub.rb

@@ -273,6 +273,12 @@ module Softcover
         end
       end
 
+      # Escapes spaces in filename directories.
+      # E.g., "Mobile Directory" becomes "Mobile\ Directory".
+      def escape_spaces(name)
+        name.gsub(' ', '\ ')
+      end
+
       # Returns HTML for HTML source that includes math.
       # As a side-effect, html_with_math creates PNGs corresponding to any
       # math in the given source. The technique involves using PhantomJS to
@@ -285,7 +291,8 @@ module Softcover
         content = File.read(File.join("html",
                                       "#{chapter.slug}.#{html_extension}"))
         pagejs = "#{File.dirname(__FILE__)}/utils/page.js"
-        url = "file://#{Dir.pwd}/html/#{chapter.slug}.#{html_extension}"
+        dir = escape_spaces(Dir.pwd)
+        url = "file://" + dir + "/html/#{chapter.slug}.#{html_extension}"
         cmd = "#{phantomjs} #{pagejs} #{url}"
         silence { silence_stream(STDERR) { system cmd } }
         # Sometimes in tests the phantomjs_source.html file is missing.

data/lib/softcover/cli.rb

@@ -97,11 +97,19 @@ module Softcover
     # ===============================================
 
     desc 'server', 'Run local server'
-    method_option :port, type: :numeric, default: 4000, aliases: '-p'
+    method_option :port, type: :numeric, aliases: '-p'
     method_option :bind, type: :string, default: '0.0.0.0', aliases: '-o'
+    method_option :pdf, type: :boolean, default: false
+    method_option :overfull, type: :boolean, default: false
     def server
       if Softcover::BookManifest::valid_directory?
-        Softcover::Commands::Server.run options[:port], options[:bind]
+        if options[:pdf]
+          port = options[:port] || 5000
+        else
+          port = options[:port] || 4000
+        end
+        Softcover::Commands::Server.run port, options[:bind],
+                                        options[:pdf], options[:overfull]
       else
         puts 'Not in a valid book directory.'
         exit 1

data/lib/softcover/commands/exercises.rb

@@ -22,7 +22,7 @@ module Softcover
         		str += line
 
         		case line
-        		when %r{\\subsubsection{Exercises}}
+        		when %r{\\subsection{Exercises}}
         			in_exercise = true
         		when %r{\\end{enumerate}}
         			in_exercise = false

data/lib/softcover/commands/server.rb

@@ -7,14 +7,14 @@ module Softcover::Commands::Server
   extend self
 
   # Listens for changes to the book's source files.
-  def listen_for_changes
+  def listen_for_changes(is_pdf=false, overfull=false)
     return if defined?(@no_listener) && @no_listener
     server_pid = Process.pid
     filter_regex = /(\.md|\.tex|custom\.sty|custom\.css|Book\.txt|book\.yml)$/
     @listener = Listen.to('.', only: filter_regex, ignore: /html\//) do |modified|
       first_modified = modified.try(:first)
       unless first_modified =~ ignore_regex
-        rebuild first_modified
+        rebuild(is_pdf, modified: first_modified, overfull: overfull)
         Process.kill("HUP", server_pid)
       end
     end
@@ -37,30 +37,42 @@ module Softcover::Commands::Server
     !Dir.glob(path('chapters/*.md')).empty?
   end
 
-  def rebuild(modified=nil)
+  def rebuild(is_pdf, modified: nil, overfull: nil)
     printf modified ? "=> #{File.basename modified} changed, rebuilding... " :
                       'Building...'
     t = Time.now
-    builder = Softcover::Builders::Html.new
-    builder.build
+
+    if is_pdf
+      if overfull
+        options = "--find-overfull"
+      else
+        options = "--once --nonstop --quiet"
+      end
+      system "softcover build:pdf #{options}"
+    else
+      builder = Softcover::Builders::Html.new
+      builder.build
+    end
     puts "Done. (#{(Time.now - t).round(2)}s)"
 
   rescue Softcover::BookManifest::NotFound => e
     puts e.message
   end
 
-  def start_server(port, bind)
+  def start_server(port, bind, is_pdf)
     require 'softcover/server/app'
-    puts "Running Softcover server on http://#{bind}:#{port}"
     Softcover::App.set :port, port
-    Softcover::App.set :bind, bind
+    unless is_pdf
+      puts "Running Softcover server on http://#{bind}:#{port}"
+      Softcover::App.set :bind, bind
+    end
     Softcover::App.run!
   end
 
-  def run(port, bind)
-    rebuild
-    listen_for_changes
-    start_server port, bind
+  def run(port, bind, is_pdf, overfull)
+    rebuild(is_pdf, overfull: overfull)
+    listen_for_changes(is_pdf, overfull)
+    start_server port, bind, is_pdf
   end
 end
 

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.7.5"
+  VERSION = "1.8.1"
 end

data/softcover.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'polytexnic', '~> 1.7.2'
+  gem.add_dependency 'polytexnic', '~> 1.8.0'
   gem.add_dependency 'msgpack', '~> 1.2.0'
-  gem.add_dependency 'nokogiri', '>= 1.6.0', '< 2.0'
+  gem.add_dependency 'nokogiri', '>= 1.14.0', '< 2.0'
   gem.add_dependency 'thor', '>= 0.18.1', '< 2.0'
-  gem.add_dependency 'activesupport', '~> 4.2.3'
+  gem.add_dependency 'activesupport', '4.2.11.3'
   gem.add_dependency 'i18n', '>= 0.7.0'
   gem.add_dependency 'rest-client', '>= 1.8.0'
   gem.add_dependency 'curb', '>= 0.9.7'
@@ -37,5 +37,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sinatra-respond_to', '~> 0.9.0'
   gem.add_dependency 'coffee-script', '>= 2.2.0'
   gem.add_dependency 'listen', '~> 3.7.1'
-  gem.add_dependency 'sanitize', '>= 4.6.3', '< 5.3.0'
+  gem.add_dependency 'sanitize', '~> 6.0.1'
 end

data/spec/commands/server_spec.rb

@@ -13,10 +13,12 @@ describe Softcover::Commands::Server do
   it '#run' do
     Softcover::App.should_receive :run!
 
-    port = 5000
-    bind = "localhost"
+    port     = 5000
+    bind     = "localhost"
+    pdf      = false
+    overfull = false
 
-    subject.run port, bind
+    subject.run port, bind, pdf, overfull
 
     expect(Softcover::App.port).to eq port
     expect(Softcover::App.bind).to eq bind

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.8.1
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -55,7 +55,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -83,16 +83,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.11.3
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -279,22 +279,16 @@ dependencies:
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.6.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.6.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 6.0.1
 description: Command-line interface for softcover.io
 email:
 - michael@softcover.io
@@ -506,7 +500,6 @@ files:
 - lib/softcover/book_template/images/cover.png
 - lib/softcover/book_template/images/figures/.gitkeep
 - lib/softcover/book_template/images/figures/01_michael_hartl_headshot.jpg
-- lib/softcover/book_template/images/figures/2011_michael_hartl.png
 - lib/softcover/book_template/images/testimonial_1.png
 - lib/softcover/book_template/latex_gitignore
 - lib/softcover/book_template/latex_styles/apple.eps