softcover 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d11057ebeea09cb563797b0bd041806d981e9731a35d25f3b2c4a8197982f4e2
-  data.tar.gz: af6811fa06aff4fc4e2502aaf6410540d754dd61c335072134fca94f7fa40a19
+  metadata.gz: 29616f4e2783a39aec430923eb597ccfa391e88ec2c82711310c609464faa0b9
+  data.tar.gz: 88e41af733eef6aaa01bbca7d7227fb30d7cd6431fe1c95578e2fa8a9771b7ea
 SHA512:
-  metadata.gz: a6abbbdee93d942c6dd4f2368a3d8288f5e7e06c10407d819ca014ce00109f62bfe7b773258551e2f6d60553ee5ee723369ab59503488397861732a86d09dac6
-  data.tar.gz: 9fd31614391b186465d4b610d2cd06799e82941d1998b4342918120790e08f81610032b085ba932092c6660c55cc858700941e4c75e7ca5398ea0e86140c13f5
+  metadata.gz: d620f7ab02d8d781d49d92ab6005d2f33207259a32bc00e76ddcac8e976c1fd3fdb6ecce40cf9582ba3917ec2ebdedcc86bc0f95b9bc600b2f56f1fed26e4d72
+  data.tar.gz: c9b8868c8a4fe698a1798dfd9620b2659da245aab02e0443d4bda94a3f7776bd38ecccc3a7deba45d1fc6b105b975442b8b9244eac483e3f1541f6afc1de0971

data/Gemfile.lock

@@ -1,20 +1,19 @@
 PATH
   remote: .
   specs:
-    softcover (1.6.3)
+    softcover (1.6.4)
       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)
       rest-client (>= 1.8.0)
       ruby-progressbar (~> 1.10)
       sanitize (~> 4.6.3)
@@ -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)
@@ -68,17 +67,16 @@ GEM
       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)
+    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)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     msgpack (1.2.10)
     multi_json (1.14.1)
     netrc (0.11.0)
@@ -95,7 +93,7 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
     rack (1.6.13)
@@ -104,11 +102,9 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (13.0.1)
-    rb-fsevent (0.9.8)
+    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)
@@ -122,7 +118,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    ruby-prof (1.3.1)
+    ruby-prof (1.4.1)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.4)
     sanitize (4.6.6)
@@ -150,7 +146,7 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tins (1.24.1)
+    tins (1.25.0)
       sync
     tzinfo (1.2.7)
       thread_safe (~> 0.1)

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/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/version.rb

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

data/softcover.gemspec

@@ -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 'listen', '~> 3.2.1'
   gem.add_dependency 'sanitize', '~> 4.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 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: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -267,28 +267,14 @@ 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
@@ -627,7 +613,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