softcover 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6a21bd4cc9be67346bdd8d744a2234057d8077c2148d58704f5cf9db7b958a4
-  data.tar.gz: 9e846f860efc0ed6b2fb4eea126e3739d9de6ba7b0ff4786601caff4ad394d03
+  metadata.gz: 9271b77de55b41ba59269be86695d5f07b8d680e9e563d29a0a616559c7905e9
+  data.tar.gz: caf61a0d47c3fe3bfbe90496529cc30457b95fa8b40961afc125ccffbc071131
 SHA512:
-  metadata.gz: de595cc895856375eaf332ef8ed793df5b545b895c74fbca3302767a85f8645b501a7c5f398b522231dcfb416bb2a23b8c37e27afe363320f1550c037457acd4
-  data.tar.gz: a35415b5d4ef224d7948919e7bd179e2f14abba8626245924a31f3e61103bd8383da6ce426451775481a2e136e5cf3d1097354284576b58e4cbed06b28ccc2f8
+  metadata.gz: a2c9a933f1262b686c43dc6babd675996fc17ce7e620f0b9e8308001e770b931af34189ef6af51a3e619a5440dc6529ee026b226a8d9e542749cbacc9ee9f771
+  data.tar.gz: 53a6989b47ff4ad782a6c796f25e2c59863bdf2694b2696ede22064182fb674c91d5a8dc29722e6740a8b747e9b8cba35452321be9e3809eb2a0093808238c55

data/.circleci/config.yml

@@ -0,0 +1,30 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@0.1.2
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.6.3-stretch-node-browsers-legacy
+    steps:
+      - checkout
+      - run:
+          name: install deps
+          command: |-
+              gem install -v 2.1.4 bundler
+              sudo apt-get update -qq
+              sudo apt-get install -qy cabextract
+              wget http://ftp.de.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.6_all.deb
+              sudo dpkg -i ttf-mscorefonts-installer_3.6_all.deb
+              sudo apt-get install -qy --no-install-recommends texlive-full texlive-fonts-recommended texlive-latex-extra texlive-fonts-extra fonts-gfs-bodoni-classic
+              sudo apt-get install -qq inkscape ghostscript
+              sudo -v && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sudo sh
+              echo 'export PATH=$PATH:`echo ~`' >> $BASH_ENV
+              curl -O -L https://github.com/IDPF/epubcheck/releases/download/v4.0.2/epubcheck-4.0.2.zip && unzip epubcheck-4.0.2.zip -d ~
+              curl -o ~/kindlegen http://softcover-binaries.s3.amazonaws.com/kindlegen && chmod +x ~/kindlegen
+              wget https://softcover-static.s3.amazonaws.com/Bodoni%2072%20Smallcaps%20Book.ttf && sudo cp 'Bodoni 72 Smallcaps Book.ttf' /usr/share/fonts/truetype/bodoni-classic
+              sudo fc-cache -fsv
+          # gem i softcover && softcover check # NOTE: enable to troubleshoot tex, gs, calibre, epubcheck, kindlegen issus
+      - ruby/bundle-install
+      - run:
+          name: specs
+          command: bundle exec rspec -f d

data/.gitignore

@@ -26,3 +26,4 @@ spec/fixtures/md-book/log/tralics.log
 .ruby-*
 .idea
 .rakeTasks
+vendor

data/.travis.yml

@@ -1,13 +1,20 @@
 rvm:
-  - "2.0.0"
+  - "2.6.1"
 
 before_install:
+  - gem install -v 2.1.4 bundler
   - sudo apt-get update -qq
-  - sudo apt-get install -qq texlive texlive-xetex texlive-latex-extra
-  - sudo apt-get install -qq inkscape
-  - sudo python -c "import sys; py3 = sys.version_info[0] > 2; u = __import__('urllib.request' if py3 else 'urllib', fromlist=1); exec(u.urlopen('http://status.calibre-ebook.com/linux_installer').read()); main(install_dir='`echo ~`')"
+  - sudo apt-get install -qy cabextract xfonts-utils
+  - wget http://ftp.de.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.6_all.deb
+  - sudo dpkg -i ttf-mscorefonts-installer_3.6_all.deb
+  - sudo apt-get install -qy --no-install-recommends texlive-full texlive-fonts-recommended texlive-latex-extra texlive-fonts-extra fonts-gfs-bodoni-classic
+  - sudo apt-get install -qq inkscape ghostscript
+  - sudo -v && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sudo sh
   - export PATH=$PATH:`echo ~`
-  - curl -O -L https://github.com/IDPF/epubcheck/releases/download/v3.0/epubcheck-3.0.zip && unzip epubcheck-3.0.zip -d ~
+  - curl -O -L https://github.com/IDPF/epubcheck/releases/download/v4.0.2/epubcheck-4.0.2.zip && unzip epubcheck-4.0.2.zip -d ~
   - curl -o ~/kindlegen http://softcover-binaries.s3.amazonaws.com/kindlegen && chmod +x ~/kindlegen
+  - wget https://softcover-static.s3.amazonaws.com/Bodoni%2072%20Smallcaps%20Book.ttf && sudo cp 'Bodoni 72 Smallcaps Book.ttf' /usr/share/fonts/truetype/bodoni-classic
+  - sudo fc-cache -fsv
+  #  - gem i softcover && softcover check # NOTE: enable to troubleshoot tex, gs, calibre, epubcheck, kindlegen issus
 
 script: "bundle exec rspec -f d"

data/Gemfile

@@ -15,7 +15,7 @@ gemspec
 group :test do
   gem 'rspec', '2.14.1'
   gem 'safe_yaml', '1.0.4'
-  gem 'webmock',   require: false
+  gem 'webmock', '~> 3',  require: false
   gem 'coveralls', require: false
   gem 'rack-test'
   gem 'ruby-prof'

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    softcover (1.5.10)
+    softcover (1.5.11)
       activesupport (~> 4.2.3)
       async_sinatra (~> 1.1.0)
-      coffee-script (~> 2.2.0)
-      curb (~> 0.9.7)
-      i18n (~> 0.7.0)
-      kramdown (~> 1.17)
+      coffee-script (>= 2.2.0)
+      curb (>= 0.9.7)
+      i18n (>= 0.7.0)
+      kramdown (>= 1.6.0)
       listen (~> 1.3.1)
       maruku (~> 0.7.1)
       msgpack (~> 1.2.0)
-      nokogiri (~> 1.10.8)
+      nokogiri (>= 1.6.0, < 2.0)
       polytexnic (~> 1.5.14)
       pygments.rb (~> 1.2.1)
       rb-fsevent (~> 0.9.3)
-      rest-client (~> 1.8.0)
+      rest-client (>= 1.8.0)
       ruby-progressbar (~> 1.4.2)
       sanitize (~> 4.6.3)
       sinatra (~> 1.4.4)
       sinatra-respond_to (~> 0.9.0)
       thin (~> 1.6.1)
-      thor (~> 0.18.1)
+      thor (>= 0.18.1, < 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -37,16 +37,17 @@ GEM
       rack (>= 1.4.1)
       sinatra (>= 1.3.2)
     coderay (1.1.2)
-    coffee-script (2.2.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    concurrent-ruby (1.1.6)
+    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)
     crass (1.0.6)
@@ -60,9 +61,11 @@ GEM
     execjs (2.7.0)
     ffi (1.12.2)
     hashdiff (1.0.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     json (1.8.6)
     kramdown (1.17.0)
     listen (1.3.1)
@@ -71,7 +74,9 @@ GEM
       rb-kqueue (>= 0.2)
     maruku (0.7.3)
     method_source (0.9.2)
-    mime-types (2.99.3)
+    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)
     msgpack (1.2.10)
@@ -104,10 +109,11 @@ GEM
       ffi (~> 1.0)
     rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
-    rest-client (1.8.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -123,10 +129,11 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
-    simplecov (0.18.2)
+    simplecov (0.16.1)
       docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
@@ -140,7 +147,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
-    thor (0.18.1)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     tins (1.24.1)
@@ -167,7 +174,7 @@ DEPENDENCIES
   ruby-prof
   safe_yaml (= 1.0.4)
   softcover!
-  webmock
+  webmock (~> 3)
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -1,7 +1,7 @@
 # Softcover
 
-<!-- [![Build Status](https://travis-ci.org/softcover/softcover.png?branch=master)](https://travis-ci.org/softcover/softcover) [![Coverage Status](https://coveralls.io/repos/softcover/softcover/badge.png)](https://coveralls.io/r/softcover/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)
+
 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/).
 
 For more details about Softcover, see [*The Softcover Book*](http://manual.softcover.io/book).

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

@@ -6,4 +6,3 @@
 % You can also include and use packages.
 % \usepackage{newunicodechar}
 % \newunicodechar{★}{\ensuremath{\star}}
-% \newunicodechar{ž}{\v{z}}

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

@@ -209,11 +209,11 @@
 
 % Add smallcaps
 \usepackage{fontspec}
-\setmainfont[ItalicFont     = Times Italic,
-             BoldFont       = Times Bold,
-             BoldItalicFont = Times Bold Italic,
-             SmallCapsFont=Bodoni 72 Smallcaps]
-            {Times}
+\setmainfont[ItalicFont     = Times New Roman Italic,
+             BoldFont       = Times New Roman Bold,
+             BoldItalicFont = Times New Roman Bold Italic,
+             SmallCapsFont  = Bodoni 72 Smallcaps]
+            {Times New Roman}
 \setmonofont{Courier}
 
 % Include custom commands.

data/lib/softcover/book.rb

@@ -80,6 +80,7 @@ class Softcover::Book
 
   # Opens the book in the browser (OS X & Linux).
   def open_in_browser
+    puts url
     `#{open} #{url}`
   end
 

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

@@ -6,4 +6,3 @@
 % You can also include and use packages.
 % \usepackage{newunicodechar}
 % \newunicodechar{★}{\ensuremath{\star}}
-% \newunicodechar{ž}{\v{z}}

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

@@ -209,11 +209,11 @@
 
 % Add smallcaps
 \usepackage{fontspec}
-\setmainfont[ItalicFont     = Times Italic,
-             BoldFont       = Times Bold,
-             BoldItalicFont = Times Bold Italic,
-             SmallCapsFont=Bodoni 72 Smallcaps]
-            {Times}
+\setmainfont[ItalicFont     = Times New Roman Italic,
+             BoldFont       = Times New Roman Bold,
+             BoldItalicFont = Times New Roman Bold Italic,
+             SmallCapsFont  = Bodoni 72 Smallcaps]
+            {Times New Roman}
 \setmonofont{Courier}
 
 % Include custom commands.

data/lib/softcover/builders/epub.rb

@@ -661,4 +661,4 @@ module Softcover
       end
     end
   end
-end
+end

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.5.10"
+  VERSION = "1.5.11"
 end

data/softcover.gemspec

@@ -20,22 +20,22 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'polytexnic', '~> 1.5.14'
   gem.add_dependency 'msgpack', '~> 1.2.0'
-  gem.add_dependency 'nokogiri', '~> 1.10.8'
-  gem.add_dependency 'thor', '~> 0.18.1'
+  gem.add_dependency 'nokogiri', '>= 1.6.0', '< 2.0'
+  gem.add_dependency 'thor', '>= 0.18.1', '< 2.0'
   gem.add_dependency 'activesupport', '~> 4.2.3'
-  gem.add_dependency 'i18n', '~> 0.7.0'
-  gem.add_dependency 'rest-client', '~> 1.8.0'
-  gem.add_dependency 'curb', '~> 0.9.7'
+  gem.add_dependency 'i18n', '>= 0.7.0'
+  gem.add_dependency 'rest-client', '>= 1.8.0'
+  gem.add_dependency 'curb', '>= 0.9.7'
   gem.add_dependency 'ruby-progressbar', '~> 1.4.2'
   gem.add_dependency 'maruku', '~> 0.7.1'
   gem.add_dependency 'pygments.rb', '~> 1.2.1'
-  gem.add_dependency 'kramdown', '~> 1.17'
+  gem.add_dependency 'kramdown', '>= 1.6.0'
 
   gem.add_dependency 'sinatra', '~> 1.4.4'
   gem.add_dependency 'thin', '~> 1.6.1'
   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 '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'

data/spec/webmock_helpers.rb

@@ -9,9 +9,9 @@ module WebmockHelpers
 
   def headers(with_content_length=true)
     hash = { 'Accept'=>'application/json',
-      'Accept-Encoding'=>'gzip, deflate',
+      'Accept-Encoding'=>/.+/,
       'Content-Type'=>'application/json',
-      'User-Agent'=>'Ruby'
+      'User-Agent'=>/.+/
     }
     hash['Content-Length'] = /.+/ if with_content_length
     hash
@@ -19,14 +19,14 @@ module WebmockHelpers
 
   def stub_valid_login(email, pass, api_key=TEST_API_KEY)
     stub_request(:post, "#{api_base_url}/login").
-      with(:body => { "email" => email, "password" => pass },
+      with(:body => { "email" => email, "password" => pass }.to_json,
            :headers => headers ).
       to_return(:status => 200, :body => {api_key: api_key}.to_json)
   end
 
   def stub_invalid_login(email, pass)
     stub_request(:post, "#{api_base_url}/login").
-      with(:body => { "email" => email, "password" => pass },
+      with(:body => { "email" => email, "password" => pass }.to_json,
            :headers => headers ).
       to_return(:status => 422, body: '')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -43,30 +43,42 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -85,42 +97,42 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.7
 - !ruby/object:Gem::Dependency
@@ -169,16 +181,16 @@ dependencies:
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -239,14 +251,14 @@ dependencies:
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
@@ -301,6 +313,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".pull_requests/1371777843"
 - ".pull_requests/1371928784"