bookmaker 0.5.2 → 0.5.5

data/README.md

@@ -48,10 +48,13 @@ To create a new Bookmaker project, execute the following on the command line:
 
     $ bookmaker new mybook
 
-This command creates a directory <tt>mybook</tt> with the following structure:
+This command creates a directory <tt>mybook</tt> with the following structure (may be slightly different in production):
 
     mybook
     ├── _bookmaker.yml
+    ├── images
+    │   ├── cover.jpg
+    │   └── dp-logo.png
     ├── output
     ├── templates
     │   ├── epub
@@ -66,7 +69,7 @@ This command creates a directory <tt>mybook</tt> with the following structure:
     │       └── user.css
     └── text
         └── 01_Chapter
-            └──01_Welcome.md
+            └──01_Welcome.tex
 
 The <tt>_bookmaker.yml</tt> file holds the project's metadata. Update the relevant fields.
 
@@ -109,7 +112,7 @@ To create valid Mobi for Kindle, you need an appropriate cover image. **Bookmake
 
 **Bookmaker** needs the following dependencies satisfied:
 
-* [xelatex](en.wikipedia.org/wiki/XeTeX), available on via MacTeX (Mac) and MiKTex (Windows, unconfirmed).
+* [xelatex](http://en.wikipedia.org/wiki/XeTeX), available on via MacTeX (Mac) and MiKTex (Windows, unconfirmed).
 * LaTex to HTML conversion done within the gem itself.
 * HTML to EPUB via [Merovex-EeePub](https://github.com/Merovex/eeepub). Install it directly from Github
 * EPUB to Mobi via [Kindlegen](http://kindlegen.s3.amazonaws.com)
@@ -146,4 +149,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/bookmaker.rb

@@ -1,6 +1,6 @@
 # require "bookmaker/version"
 require "active_support/all"
-require "awesome_print"
+#require "awesome_print"
 require "eeepub"
 require "erb"
 require "logger"

data/lib/bookmaker/cli.rb

@@ -10,7 +10,7 @@ module Bookmaker
       true
     end
     def initialize(args = [], options = {}, config = {})
-      if config[:current_task].name == "new" && args.empty?
+      if (config[:current_task] || config[:current_command]).name == "new" && args.empty?
         raise Error, "The e-Book path is required. For details run: bookmaker help new"
       end
       super
@@ -37,6 +37,12 @@ module Bookmaker
       Bookmaker::Exporter.run(root_dir, options)
     end
     
+    desc "pdf", "Export PDF only"
+    def pdf
+      inside_ebook!
+      Bookmaker::Exporter.run(root_dir, {:only => 'pdf'})
+    end
+    
     desc "version", "Prints the Bookmaker's version information"
     map %w(-v --version) => :version
     def version

data/lib/bookmaker/version.rb

@@ -1,3 +1,3 @@
 module Bookmaker
-  VERSION = "0.5.2"
+  VERSION = "0.5.5"
 end

data/templates/config.erb

@@ -2,7 +2,12 @@
 title: "<%= @title %>"
 
 # The book's language.
-language: en
+language: "en"
+
+# Type: 'fiction' or 'nonfiction'
+type: 'fiction' 
+# Status: 'draft' or 'final'
+status: "draft"
 
 # Your book copyright info.
 # Here's some examples:
@@ -43,6 +48,23 @@ authors:
 # The base URL from your source code.
 base_url: http://example.com
 
+series:
+  title: 
+  books:
+    - "Bellicose"
+# 
+fonts:
+  serif: "Garamond"
+  sans:  "Tahoma"
+  mono:  "Courier"
+
+designer:
+  book: "Ben Wilson"
+  cover: "<%= @name %>"
+  
+editors:
+  text:
+
 #==========
 # Book Manifest
 sections:

data/templates/latex.erb

@@ -1,7 +1,7 @@
 \NeedsTeXFormat{LaTeX2e}[1996/06/01]
 \documentclass[12pt,twoside,makeidx,hidelinks]{memoir}
 \usepackage{layouts}[2001/04/29]
-\def\isfinal{<%= is_final %>}
+\def\isfinal{<%= (status == 'final') ? 1 : 0 %>}
 
 % Packages
 %=========
@@ -33,11 +33,22 @@
 
 % Page Layout
 %============
-\setstocksize{9in}{6in}
-\settrimmedsize{9in}{6in}{*}	% Use entire page
+<% 
+  if status == 'final'
+    stock_size = %w(9in 6in)
+    ul_margin  = %w(0.8in 0.5in)
+    trim_size  = %w(9in 6in)
+  else
+    stock_size = %w(11in 8.5in)
+    ul_margin  = %w(1.8in 1.5in)
+    trim_size  = %w(11in 6in)
+  end
+%>
+\setstocksize{<%=stock_size[0]%>}{<%=stock_size[1]%>}
+\settrimmedsize{<%=trim_size[0]%>}{<%=trim_size[1]%>}{*}	% Use entire page
 \settrims{0pt}{0pt}
 \setlrmarginsandblock{0.8in}{0.5in}{*}
-\setulmarginsandblock{0.8in}{0.5in}{*}
+\setulmarginsandblock{<%=ul_margin[0]%>}{<%=ul_margin[1]%>}{*}
 
 \setmarginnotes{0.1pt}{0.2in}{\onelineskip}
 \setheadfoot{\onelineskip}{2\onelineskip}
@@ -69,8 +80,8 @@
 % Page Heading
 %-------------
 \makepagestyle{ebook}
-\makeoddhead{ebook}{}{\normalfont\scshape\theauthor}{\normalfont\thepage}
-\makeevenhead{ebook}{\normalfont\thepage}{\normalfont\scshape \thetitle}{}
+\makeoddhead{ebook}{}{\textsf\theauthor}{\normalfont\thepage}
+\makeevenhead{ebook}{\normalfont\thepage}{\textsf \thetitle}{}
 
 \aliaspagestyle{title}{empty}
 
@@ -87,10 +98,10 @@
 \usepackage{xunicode}
 \usepackage{xltxtra}
 \defaultfontfeatures{Mapping=tex-text}
-\setmainfont{Liberation Serif}
-\setsansfont{TitilliumText22L Light}
-\setmonofont{Liberation Mono}
-\newfontinstance\scshape[Letters=SmallCaps, Numbers=Uppercase]{Liberation Mono}
+\setmainfont{<%= fonts['serif'] %>}
+\setsansfont{<%= fonts['sans'] %>}
+\setmonofont{<%= fonts['mono'] %>}
+\newfontinstance\scshape[Letters=SmallCaps, Numbers=Uppercase]{<%= fonts['small_caps'] || fonts['mono'] %>}
 \DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
 \ifdefined\disableligature
   \DisableLigatures[f]{encoding = *, family = * }
@@ -152,6 +163,20 @@
   {\newcommand{\pbreak}{\pfbreak}}%
   {\newcommand{\pbreak}{\begin{center} \# \# \# \end{center}}}
 
+% Series Title Page
+%==================
+\def\seriestitle#1{\def\theseriestitle{\uppercase{#1}}}
+\def\seriespage{\thispagestyle{empty}
+\begin{center}
+  \noindent{\large\theseriestitle}
+  \vskip10.5pt
+  \noindent Other Books in the series:
+  \vskip4pt
+  \theseriesbooks
+\end{center}\newpage}
+\def\seriesbook#1{\vskip.5pt{\noindent\hskip8pt\emph{#1}}\vskip1sp}
+\def\seriesbooks#1\endseriesbooks{\def\theseriesbooks{\let\book\seriesbook{#1}}}
+
 % Indices
 %=========
 \makeglossary
@@ -181,6 +206,12 @@
 \date{<%= published_at %>}
 \newdate{firstprint}{<%= published_at.split('-')[2]%>}{<%= published_at.split('-')[1]%>}{<%= published_at.split('-')[0]%>}
 
+<% unless series.nil? or series['books'].nil? %>
+\seriestitle{<%= series['title'] %>}
+\seriesbooks
+  <%= series['books'].map{ |b| "\\book{#{b}}" }.join("\n  ") %>
+\endseriesbooks
+<% end %>
 
 % Drafting Help
 %==============
@@ -202,44 +233,63 @@
 % Frontmatter
 %-------------
 \frontmatter
+  % r.1 - Half-Title
+  
+  % r.2 - Series Title Page
+  <%= "\\seriespage" unless series.nil? %>
+  
+  % r.3 Titlepage
   \begin{titlingpage}
-  \pagestyle{empty}
-  \begin{center}
-  \vspace*{\fill}
+    \pagestyle{empty}
+    \begin{center}
+    \vspace*{\fill}
 
-  \HUGE\textbf{\textsf\thetitle}
+    \HUGE\textbf{\textsf\thetitle}
 
-  \vspace*{0.25in}
-  \line(1,0){150}
-  \vspace*{0.25in}
+    \vspace*{0.25in}
+    \line(1,0){150}
+    \vspace*{0.25in}
 
-  \Large\textsf\theauthor
+    \Large\textsf\theauthor
 
-  \vspace*{\fill}
+    \vspace*{\fill}
 
-  \vspace*{\fill}
-  \includegraphics[width=0.25\textwidth]{images/dp-logo.png}\\[0cm]
-  \hspace*{\fill}\textsf{Dausha}\hspace*{\fill}\newline%
-  \textsf{Communications}
-  \end{center}
+    \vspace*{\fill}
+    \includegraphics[width=0.25\textwidth]{images/dp-logo.png}\\[0cm]
+    \hspace*{\fill}\textsf{Dausha}\hspace*{\fill}\newline%
+    \textsf{Communications}
+    \end{center}
   \end{titlingpage}
 
-  % r.3 Copyright Page
+  % r.4 Copyright Page
   \vspace*{\fill}
   \pagestyle{empty}
 
   \par\noindent\emph{\thetitle}
   \newline
   
-  \par\noindent This is a work of fiction. All characters and events portrayed in this
-  book are fictional, and any resemblance to real people or incidents is
-  purely coincidental.\newline
+  <% if type == 'fiction' %>
+  
+  \par\noindent This is a work of fiction. Names, characters, places and incidents are either
+  the product of the author's imagination or are used ficticiously, and any resemblance to
+  actual persons, living or dead, business establishments, events or locales is entirely
+  coincidental.\newline
+  <% end %>
 
   \par\noindent\emph{<%= copyright %>}\newline
   
-  \par\noindent Cover Design by <%= name %>\newline
+  <% unless designer['cover'].nil? || designer['cover'].empty? %>
+  \par\noindent Cover Design by <%= designer['cover'] %>\newline
+  <% end %>
 
-  \par\noindent Book Design by <%= name %>\newline
+  <% unless designer['book'].nil? || designer['book'].empty? %>
+  \par\noindent Book Design by <%= designer['book'] %>\newline
+  <% end %>
+
+  <% unless editors['text'].nil? || editors['text'].empty? %>
+  \par\noindent Book Design by <%= editors['text'].join(',') %>\newline
+  <% end %>
+  
 
   \par\noindent All rights reserved.\newline
 
@@ -257,10 +307,8 @@
   \par\noindent <%= identifier['type'] %> <%= identifier['id'] %>
   \vspace*{\fill}
   \newpage
-% \fi
 
-% Todolist
-%
+  % r.5 - Dedication
 
 \tableofcontents
 
@@ -270,12 +318,6 @@
 
 <%= contents %>
 
-% Todolist
-%
-% \ifdefined\isdraft
-%   \listoftodos
-% \fi
-
 % Back Matter
 %-------------
 \backmatter
@@ -287,15 +329,17 @@
 \begin{center}
 	\vspace*{\fill}
 	
-	\ifdefined\ReturningCharacters {\Large \par
+  {\Large \par
 	\noindent Thank you for reading
-	
+
 	\vspace*{0.125in}
 	{\LARGE\textbf{\textsf{\thetitle}}}
 	\vspace*{0.125in}
 	
-	\par
-	\noindent\ReturningCharacters{} will return in \emph{\NextBook}.} \vspace*{\fill} \fi
+	\ifdefined\ReturningCharacters
+  	\par
+  	\noindent\ReturningCharacters{} will return in \emph{\NextBook}.} \vspace*{\fill}
+	\fi
 	
 	{\LARGE\textbf{\textsf{Follow Me}}}
 	
@@ -307,13 +351,13 @@
 	\vspace*{\fill} 
 \end{center}
 
-% \notfinal{
+<% if (type == 'fiction' and status != 'final') or type == 'nonfiction' %>
 
 %% Glossary
 \printglossaries
 
 %% Index
 \printindex
-%  }
+<% end %>
 
 \end{document}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookmaker
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152979800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152979800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152978980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152978980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152978500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152978500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eeepub
-  requirement: &2152977980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152977980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &2152977300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152977300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152976660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152976660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152958140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152958140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: notifier
-  requirement: &2152957520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152957520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'ODO: Write a gem description'
 email:
 - dausha@gmail.com
@@ -166,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bookmaker
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'ODO: Write a gem summary'
@@ -174,3 +214,4 @@ test_files:
 - features/basic.feature
 - features/export.feature
 - features/support/setup.rb
+has_rdoc: