softcover 1.0.beta3 → 1.0.beta4

data/lib/softcover/template/latex_styles/softcover.sty

@@ -18,6 +18,8 @@
 % Include graphics
 \usepackage{graphicx}
 \def\maxwidth#1{\ifdim\Gin@nat@width>#1 #1\else\Gin@nat@width\fi}
+% Support the \url command
+\usepackage{url}
 % Commands included by PolyTeXnic
 \usepackage{latex_styles/polytexnic_commands}
 % Links
@@ -143,6 +145,9 @@
 % Enable the \pbox command for paragraph boxes in tables.
 \usepackage{pbox}
 
+% Enable float placement options.
+\usepackage{float}
+
 % Define some commonly used Unicode characters.
 \usepackage{newunicodechar}
 \newunicodechar{—}{---}

data/lib/softcover/utils.rb

@@ -237,37 +237,30 @@ module Softcover::Utils
   def dependency_filename(label)
     case label
     when :latex
-      `which xelatex`.chomp
+      get_filename(:xelatex)
     when :ghostscript
-      `which gs`.chomp
-    when :convert
-      `which convert`.chomp
-    when :node
-      `which node`.chomp
-    when :phantomjs
-      `which phantomjs`.chomp
-    when :kindlegen
-      `which kindlegen`.chomp
-    when :java
-      `which java`.chomp
-    when :zip
-      `which zip`.chomp
+      get_filename(:gs)
     when :calibre
-      `which ebook-convert`.chomp
+      get_filename(:'ebook-convert')
     when :epubcheck
-      File.join(Dir.home, 'bin', 'epubcheck-3.0', 'epubcheck-3.0.jar')
+      default = File.join(Dir.home, 'bin', 'epubcheck-3.0', 'epubcheck-3.0.jar')
+      filename_or_default(:epubcheck, default)
     when :inkscape
-      filename = `which inkscape`.chomp
-      if filename.empty?
-        filename = '/Applications/Inkscape.app/Contents/Resources/bin/' +
-                   'inkscape'
-      end
-      filename
+      default = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape'
+      filename_or_default(:inkscape, default)
     else
-      raise "Unknown label #{label}"
+      get_filename(label)
     end
   end
 
+  def get_filename(name)
+    `which #{name}`.chomp
+  end
+
+  def filename_or_default(name, default)
+    (f = get_filename(name)).empty? ? default : f
+  end
+
   # Returns the language labels from the config file.
   def language_labels
     YAML.load_file(File.join(Softcover::Directories::CONFIG, 'lang.yml'))

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.0.beta3"
+  VERSION = "1.0.beta4"
 end

data/softcover.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'polytexnic', '~> 1.0.beta2'
+  gem.add_dependency 'polytexnic', '~> 1.0.beta5'
   gem.add_dependency 'msgpack', '~> 0.4.2'
   gem.add_dependency 'nokogiri', '~> 1.6.0'
   gem.add_dependency 'thor', '~> 0.18.1'
   gem.add_dependency 'activesupport', '~> 3.2.16'
+  gem.add_dependency 'i18n', '~> 0.6.11'
   gem.add_dependency 'rest-client', '~> 1.6.7'
   gem.add_dependency 'curb', '~> 0.8.5'
   gem.add_dependency 'ruby-progressbar', '~> 1.4.2'

data/spec/builders/pdf_spec.rb

@@ -39,7 +39,7 @@ describe Softcover::Builders::Pdf do
 
       it "should prepend the fontsize verbatim declaration for source code" do
         fontsize = '\begin{Verbatim}[fontsize=\relsize'
-        expect(File.read(Dir.glob('tmp/*.tmp.tex').first)).to include fontsize
+        expect(File.read(File.join('tmp', 'a_chapter.tmp.tex'))).to include fontsize
       end
 
       it "should replace the main file's \\includes with tmp files" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.0.beta3
+  version: 1.0.beta4
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.beta2
+        version: 1.0.beta5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.beta2
+        version: 1.0.beta5
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.16
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement