softcover 1.6.3 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d11057ebeea09cb563797b0bd041806d981e9731a35d25f3b2c4a8197982f4e2
-  data.tar.gz: af6811fa06aff4fc4e2502aaf6410540d754dd61c335072134fca94f7fa40a19
+  metadata.gz: '03961f991d4553331d9dad48a1f3cda5754cd493e12c6161ba9157955831cbe7'
+  data.tar.gz: c9780421d820bb9e9068daebff29a2aff74ee4f958cae2292ee5f6bb79739e65
 SHA512:
-  metadata.gz: a6abbbdee93d942c6dd4f2368a3d8288f5e7e06c10407d819ca014ce00109f62bfe7b773258551e2f6d60553ee5ee723369ab59503488397861732a86d09dac6
-  data.tar.gz: 9fd31614391b186465d4b610d2cd06799e82941d1998b4342918120790e08f81610032b085ba932092c6660c55cc858700941e4c75e7ca5398ea0e86140c13f5
+  metadata.gz: c5a786aa431d8b3fb533275a3951750846b7555fb7513346d91205caa81a30767303fe3854d44d0c6cb97323986ba11d0c1a0ab6b0c8c0147fc379e2f56ec2dc
+  data.tar.gz: 4a673b41f0e6105f973a7066ef66ba42c0fde254b8d1d2ba9541e3a2a100d68069d54a96fda7931bdd7707e96c90cc4dd67d7e59e2e91a4755a50376b5a8d4b8

data/Gemfile.lock

@@ -1,23 +1,22 @@
 PATH
   remote: .
   specs:
-    softcover (1.6.3)
+    softcover (1.7.2)
       activesupport (~> 4.2.3)
       async_sinatra (~> 1.1.0)
       coffee-script (>= 2.2.0)
       curb (>= 0.9.7)
       i18n (>= 0.7.0)
       kramdown (>= 1.6.0)
-      listen (~> 1.3.1)
+      listen (~> 3.2.1)
       maruku (~> 0.7.1)
       msgpack (~> 1.2.0)
       nokogiri (>= 1.6.0, < 2.0)
-      polytexnic (~> 1.5.16)
-      pygments.rb (~> 1.2.1)
-      rb-fsevent (~> 0.9.3)
+      polytexnic (~> 1.6)
+      pygments.rb (~> 2.1)
       rest-client (>= 1.8.0)
       ruby-progressbar (~> 1.10)
-      sanitize (~> 4.6.3)
+      sanitize (>= 4.6.3, < 5.3.0)
       sinatra (~> 1.4.4)
       sinatra-respond_to (~> 0.9.0)
       thin (~> 1.6.1)
@@ -26,7 +25,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -36,84 +35,83 @@ GEM
     async_sinatra (1.1.0)
       rack (>= 1.4.1)
       sinatra (>= 1.3.2)
-    coderay (1.1.2)
+    coderay (1.1.3)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
-    curb (0.9.10)
+    curb (0.9.11)
     daemons (1.3.1)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    ffi (1.12.2)
+    ffi (1.14.2)
     hashdiff (1.0.1)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    kramdown (1.17.0)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
+    json (2.3.1)
+    kramdown (2.3.0)
+      rexml
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     maruku (0.7.3)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    mime-types-data (3.2021.0225)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
     msgpack (1.2.10)
-    multi_json (1.14.1)
     netrc (0.11.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (1.5.0)
-      nokogiri
-    polytexnic (1.5.16)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogumbo (2.0.4)
+      nokogiri (~> 1.8, >= 1.8.4)
+    polytexnic (1.6.2)
       json (~> 2.3.0)
-      kramdown (~> 1.17)
+      kramdown (>= 1.17, < 3.0)
       msgpack (~> 1.2.0)
-      nokogiri (~> 1.10.8)
-      pygments.rb (~> 1.2.1)
-    pry (0.13.1)
+      nokogiri (>= 1.6.0, < 2.0)
+      pygments.rb (~> 2.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.4)
-    pygments.rb (1.2.1)
-      multi_json (>= 1.0.0)
+    public_suffix (4.0.6)
+    pygments.rb (2.1.0)
+    racc (1.5.2)
     rack (1.6.13)
     rack-protection (1.5.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (13.0.1)
-    rb-fsevent (0.9.8)
+    rake (13.0.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.5)
-      ffi (>= 0.5.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -122,13 +120,13 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    ruby-prof (1.3.1)
-    ruby-progressbar (1.10.1)
+    ruby-prof (1.4.3)
+    ruby-progressbar (1.11.0)
     safe_yaml (1.0.4)
-    sanitize (4.6.6)
+    sanitize (5.2.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -147,17 +145,17 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tins (1.24.1)
+    tins (1.28.0)
       sync
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    webmock (3.8.3)
+    webmock (3.12.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/lib/softcover/article_template/html/stylesheets/softcover.css

@@ -162,6 +162,12 @@ body #book {
   margin-top: -0.4em;
 }
 
+#book .code .highlight .linenos {
+  color: #666;
+  font-weight: normal;
+}
+
+/* Include `.lineno` for backward-compatibility with Pygments 1. */
 #book .code .highlight .lineno {
   color: #666;
   font-weight: normal;
@@ -434,7 +440,7 @@ body #book {
   color: red;
 }
 
-#book .sc {
+#book .smallcaps {
   font-variant: small-caps;
 }
 

data/lib/softcover/book_template/html/stylesheets/softcover.css

@@ -162,6 +162,12 @@ body #book {
   margin-top: -0.4em;
 }
 
+#book .code .highlight .linenos {
+  color: #666;
+  font-weight: normal;
+}
+
+/* Include `.lineno` for backward-compatibility with Pygments 1. */
 #book .code .highlight .lineno {
   color: #666;
   font-weight: normal;
@@ -434,7 +440,7 @@ body #book {
   color: red;
 }
 
-#book .sc {
+#book .smallcaps {
   font-variant: small-caps;
 }
 

data/lib/softcover/builder.rb

@@ -31,25 +31,10 @@ module Softcover
       def ensure_style_file_locations
         styles_dir = Softcover::Directories::STYLES
         mkdir styles_dir
-        fix_custom_include
         files = Dir.glob('*.sty')
         FileUtils.mv(files, styles_dir)
       end
 
-      # Fixes the custom include.
-      # The template includes the custom style file as an example
-      # of file inclusion. Unfortunately, the location of 'custom.sty', has
-      # changed, which will result in older templates spontaneously breaking.
-      def fix_custom_include
-        first_chapter = File.join('chapters', 'a_chapter.tex')
-        if File.exist?(first_chapter)
-          text = File.read(first_chapter)
-          text.gsub!('<<(custom.sty',
-                     "<<(#{Softcover::Directories::STYLES}/custom.sty" )
-          File.write(first_chapter, text)
-        end
-      end
-
       # Writes out the PolyTeXnic commands from polytexnic.
       def write_polytexnic_commands_file
         Polytexnic.write_polytexnic_style_file(styles_dir)
@@ -83,4 +68,4 @@ module Softcover
       end
 
   end
-end
+end

data/lib/softcover/cli.rb

@@ -205,8 +205,8 @@ module Softcover
     method_option :polytex,
                   :type => :boolean,
                   :default => false,
-                  :aliases => "-p",
-                  :desc => "Generate a PolyTeX document."
+                  :aliases => %w[-p --latex -l],
+                  :desc => "Generate a LaTeX document."
     method_option :article,
                   :type => :boolean,
                   :default => false,
@@ -267,7 +267,7 @@ module Softcover
     # ===============================================
     # Utilities
     # ===============================================
-    desc "exercises", "Add exercise id elements as spans (warning: files are overwritten)"
+    desc "exercises", "Add exercise id elements as spans"
     define_method "exercises" do
       Softcover::Commands::Exercises.add_to_chapters!
     end

data/lib/softcover/commands/check.rb

@@ -43,7 +43,7 @@ module Softcover
          [:java,        'Java'],
          [:zip,         'zip'],
          [:epubcheck,   'EpubCheck'],
-         [:python2,     'Python 2']
+         [:python3,     'Python 3']
         ]
       end
 
@@ -86,8 +86,8 @@ module Softcover
           message += "      ∟ Unzip and place epubcheck-4.2.2/ in a directory on your path"
         when :inkscape
           message  = "Inkscape (https://inkscape.org/)"
-        when :python2
-          message = "Configure your shell so that `python` runs Python 2"
+        when :python3
+          message = "Configure your shell so that `python3` runs Python 3"
         else
           raise "Unknown label #{label}"
         end

data/lib/softcover/commands/server.rb

@@ -11,16 +11,14 @@ module Softcover::Commands::Server
     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('.')
-    @listener.filter(filter_regex)
-
-    @listener.change do |modified|
+    @listener = Listen.to('.', only: filter_regex, ignore: /html\//) do |modified|
       first_modified = modified.try(:first)
       unless first_modified =~ ignore_regex
         rebuild first_modified
         Process.kill("HUP", server_pid)
       end
     end
+
     @listener.start
   end
 
@@ -65,3 +63,15 @@ module Softcover::Commands::Server
     start_server port, bind
   end
 end
+
+# Listen >=2.8 patch to silence duplicate directory errors. USE AT YOUR OWN RISK
+require 'listen/record/symlink_detector'
+module Listen
+  class Record
+    class SymlinkDetector
+      def _fail(_, _)
+        fail Error, "Don't watch locally-symlinked directory twice"
+      end
+    end
+  end
+end

data/lib/softcover/utils.rb

@@ -274,12 +274,9 @@ module Softcover::Utils
       else
         ""
       end
-    when :python2
-      python = get_filename(:python2)
-      # Python 2 stupidly outputs the version number to STDERR instead of STDOUT.
-      require 'open3'
-      stdout, stderr, status = Open3.capture3("#{python} --version")
-      stderr.match(/Python 2/) ? python : ""
+    when :python3
+      python = get_filename(:python3)
+      `#{python} --version`.match(/Python 3\.*/) ? python : ""
     else
       get_filename(label)
     end

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.6.3"
+  VERSION = "1.7.2"
 end

data/softcover.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["michael@softcover.io"]
   gem.description   = %q{Command-line interface for softcover.io}
   gem.summary       = %q{An ebook production system & sales and marketing platform for technical authors}
-  gem.homepage      = "http://manual.softcover.io/book"
+  gem.homepage      = "https://github.com/softcover/softcover"
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'polytexnic', '~> 1.5.16'
+  gem.add_dependency 'polytexnic', '~> 1.6'
   gem.add_dependency 'msgpack', '~> 1.2.0'
   gem.add_dependency 'nokogiri', '>= 1.6.0', '< 2.0'
   gem.add_dependency 'thor', '>= 0.18.1', '< 2.0'
@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'curb', '>= 0.9.7'
   gem.add_dependency 'ruby-progressbar', '~> 1.10'
   gem.add_dependency 'maruku', '~> 0.7.1'
-  gem.add_dependency 'pygments.rb', '~> 1.2.1'
+  gem.add_dependency 'pygments.rb', '~> 2.1'
   gem.add_dependency 'kramdown', '>= 1.6.0'
 
   gem.add_dependency 'sinatra', '~> 1.4.4'
@@ -36,7 +36,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'async_sinatra', '~> 1.1.0'
   gem.add_dependency 'sinatra-respond_to', '~> 0.9.0'
   gem.add_dependency 'coffee-script', '>= 2.2.0'
-  gem.add_dependency 'listen', '~> 1.3.1'
-  gem.add_dependency 'rb-fsevent', '~> 0.9.3'
-  gem.add_dependency 'sanitize', '~> 4.6.3'
+  gem.add_dependency 'listen', '~> 3.2.1'
+  gem.add_dependency 'sanitize', '>= 4.6.3', '< 5.3.0'
 end

data/spec/builders/pdf_spec.rb

@@ -73,7 +73,7 @@ describe Softcover::Builders::Pdf do
 
       context "after removing Book.txt" do
         before { FileUtils.rm Softcover::BookManifest::TXT_PATH }
-        it "should still build the book" do
+        it "should still build the book (run ulimit -n 1024 if this fails)" do
           expect(Softcover::BookManifest::TXT_PATH).not_to exist
           expect { @builder.build! }.not_to raise_error
         end

data/spec/cli_spec.rb

@@ -48,7 +48,7 @@ describe Softcover::CLI do
 
   context "softcover new options" do
     subject { `softcover help new` }
-    it { should include '-p, [--polytex]' }
+    it { should include '-p, --latex, -l, [--polytex]' }
     it { should include '-a, [--article]' }
   end
 
@@ -155,6 +155,19 @@ describe Softcover::CLI do
     it_should_behave_like "book"
   end
 
+  describe "LaTeX books" do
+
+    before(:all) do
+      remove_book
+      chdir_to_fixtures
+      silence { `softcover new book --latex` }
+      chdir_to_book
+    end
+    after(:all) { remove_book }
+
+    it_should_behave_like "book"
+  end
+
   describe "Markdown books" do
 
     before(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.2
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.16
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.16
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -267,42 +267,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.0
   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
 description: Command-line interface for softcover.io
 email:
 - michael@softcover.io
@@ -608,7 +600,7 @@ files:
 - spec/utils_spec.rb
 - spec/webmock_helpers.rb
 - tasks/run_specs.rake
-homepage: http://manual.softcover.io/book
+homepage: https://github.com/softcover/softcover
 licenses:
 - MIT
 metadata: {}
@@ -627,7 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: An ebook production system & sales and marketing platform for technical authors