bookshop 0.1.4 → 0.1.5

data/lib/bookshop/commands/build.rb

@@ -21,7 +21,7 @@ module Bookshop
 
       def self.clean_builds(build_type)
         puts "Deleting any old builds"
-        FileUtils.rm_r Dir.glob('builds/#{build_type}/*')
+        FileUtils.rm_r Dir.glob("builds/#{build_type}/*"), :verbose => true
       end
 
       def self.generate_file(src, dest)
@@ -75,7 +75,11 @@ module Bookshop
                          builds/epub/OEBPS/assets/css/stylesheet.mobi.css )
         
         puts "Zipping up into epub"
-        cmd = %x[cd builds/epub/ && zip -X0 "book.epub" mimetype && zip -rDX9 "book.epub" * -x "*.DS_Store" -x mimetype]
+        if RUBY_PLATFORM =~ /linux|darwin|cygwin/
+          cmd = system("cd builds/epub/ && zip -X0 'book.epub' mimetype && zip -rDX9 'book.epub' * -x '*.DS_Store' -x mimetype")
+        elsif RUBY_PLATFORM =~ /mingw|mswin32/
+          cmd = system("cd builds/epub/ & ..\..\script\zip\zip.exe -X0 'book.epub' mimetype & ..\..\script\zip\zip.exe -rDX9 'book.epub' * -x mimetype")
+        end
         
         puts "Validating with epubcheck"
         cmd  = cmd = system("java -jar script/epubcheck/epubcheck.jar builds/epub/book.epub")
@@ -92,10 +96,6 @@ module Bookshop
         
         puts "Generating new html from erb"
         generate_file(BOOK_SOURCE, "builds/mobi/OEBPS/book.html")
-                
-        # Generate the cover.html file
-        puts "Generating new cover.html from erb"
-        generate_file("frontmatter/cover.html.erb","builds/mobi/OEBPS/cover.html")
               
         # Generate the nav.html file
         puts "Generating new toc.html from erb"
@@ -114,8 +114,12 @@ module Bookshop
                          builds/mobi/OEBPS/assets/css/stylesheet.html.css
                          builds/mobi/OEBPS/assets/css/stylesheet.epub.css )
         
-        puts "Zipping up into epub"
-        cmd = %x[cd builds/mobi/ && zip -X0 "book.epub" mimetype && zip -rDX9 "book.epub" * -x "*.DS_Store" -x mimetype]
+       puts "Zipping up into epub"
+       if RUBY_PLATFORM =~ /linux|darwin|cygwin/
+         cmd = system("cd builds/mobi/ && zip -X0 'book.epub' mimetype && zip -rDX9 'book.epub' * -x '*.DS_Store' -x mimetype")
+       elsif RUBY_PLATFORM =~ /mingw|mswin32/
+         cmd = system("cd builds/mobi/ & ..\..\script\zip\zip.exe -X0 'book.epub' mimetype & ..\..\script\zip\zip.exe -rDX9 'book.epub' * -x mimetype")
+       end
         
         puts "Validating with epubcheck"
         

data/lib/bookshop/generators/bookshop/app/app_generator.rb

@@ -17,27 +17,23 @@ module Bookshop
       end
 
       
-        # Create the project from templates
-        def create_base_project
-          raise GeneratorArgumentsError if app_path.nil?
-          puts "creating base project"
-          directory "templates", "#{app_path}"
-        end
-
-        # Adds third-party tools
-        # def add_tools
-        #   directory "tools/", "#{app_path}/tools/"
-        # end
+      # Create the project from templates
+      def create_base_project
+        raise GeneratorArgumentsError if app_path.nil?
+        puts "creating base project"
+        directory "templates", "#{app_path}"
+      end
 
-        #Change the permissions so tools are executable 
-        def chmod_tools
-          chmod "#{app_path}/script/epubcheck/epubcheck.jar", 0755
-          chmod "#{app_path}/script/epubcheck/lib/jing.jar", 0755
-          chmod "#{app_path}/script/epubcheck/lib/saxon.jar", 0755
-          chmod "#{app_path}/script/kindlegen/kindlegen.exe", 0755
-          chmod "#{app_path}/script/kindlegen/kindlegen_mac", 0755
-          chmod "#{app_path}/script/kindlegen/kindlegen_linux", 0755
-        end
+      #Change the permissions so tools are executable 
+      def chmod_tools
+        chmod "#{app_path}/script/epubcheck/epubcheck.jar", 0755
+        chmod "#{app_path}/script/epubcheck/lib/jing.jar", 0755
+        chmod "#{app_path}/script/epubcheck/lib/saxon.jar", 0755
+        chmod "#{app_path}/script/kindlegen/kindlegen.exe", 0755
+        chmod "#{app_path}/script/kindlegen/kindlegen_mac", 0755
+        chmod "#{app_path}/script/kindlegen/kindlegen_linux", 0755
+        chmod "#{app_path}/script/zip/zip.exe", 0755
+      end
        
              
       

data/lib/bookshop/generators/bookshop/app/templates/book/assets/css/stylesheet.epub.css

@@ -2,10 +2,10 @@
 /* written  by Hakon Wium Lie and Bert Bos, November 2005          */
 /* You may reuse this style sheet for any purpose without any fees */
 
-
 html { 
   margin: 0;
-  font: 10pt/1.26 "Gill Sans", sans-serif;
+  font-family: "Gill Sans", sans-serif;
+	font-size: 10pt;
 }
 
 body { 
@@ -88,8 +88,6 @@ div.sidebar {
   background: #CCC;
   padding: 0.5em 1em;
   page-break-inside: avoid;
-  column-count: 2;
-  column-gap: 1.5em;
 }
 
 div.sidebar h2 {
@@ -100,7 +98,6 @@ div.sidebar h2 {
 
 div.figure {
   margin: 1em 0;
-  counter-increment: figure;
 }
 
 div.figure .caption, div.table .caption {
@@ -112,19 +109,8 @@ div.figure .caption, div.table .caption {
   margin: 0 0 1.2em -40%;
 }
 
-div.figure .caption::before {
-  content: "Figure " counter(figure) ": ";
-  font-weight: bold;
-}
-
-div.table .caption::before {
-  content: "Table " counter(table) ": ";
-  font-weight: bold;
-}
-
 div.table {
   margin: 1em 0;
-  counter-increment: table;
 }
 
 div.table th {
@@ -143,110 +129,11 @@ table.lined td, table.lined th {
   padding-bottom: 0.2em;
 }
 
-
-@page {
-  margin: 27mm 16mm 27mm 16mm;
-  size: 7in 9.25in;
-
-  @footnotes {
-    border-top: thin solid black;
-    padding-top: 0.3em;
-    margin-top: 0.6em;
-    margin-left: 30%;
-  }
-}
-
-
-/* define default page and names pages: cover, blank, frontmatter */
-
-@page :left {
-  @top-left {
-    font: 11pt "Gill Sans", serif;
-    content: "Cascading Style Sheets";
-    vertical-align: bottom;
-    padding-bottom: 2em;
-  }
-
-  @bottom-left {
-    font: 11pt "Gill Sans", serif;
-    content: counter(page);
-    padding-top: 2em;
-    vertical-align: top;
-  }
-}
-
-@page :right {
-  @top-right {
-    font: 11pt "Gill Sans", serif;
-    content: string(header, first); 
-    vertical-align: bottom;
-    padding-bottom: 2em; 
-  }
-
-  @bottom-right {
-    font: 11pt "Gill Sans", serif;
-    content: counter(page);
-    text-align: right;
-    vertical-align: top;
-    padding-top: 2em;
-  }
-}
-
-@page frontmatter :left {
-  @top-left {
-    font: 11pt "Gill Sans", serif;
-    content: string(title);
-    vertical-align: bottom;
-    padding-bottom: 2em;
-  }
-
-  @bottom-left {
-    font: 11pt "Gill Sans", serif;
-    content: counter(page, lower-roman);
-    padding-top: 2em;
-    vertical-align: top;
-  }
-}
-
-@page cover { margin: 0; }
-
-@page frontmatter :right {
-  @top-right {
-    font: 11pt "Gill Sans", serif;
-    content: string(header, first); 
-    vertical-align: bottom;
-    padding-bottom: 2em; 
-  }
-
-  @bottom-right {
-    font: 11pt "Gill Sans", serif;
-    content: counter(page, lower-roman);
-    text-align: right;
-    vertical-align: top;
-    padding-top: 2em;
-  }
-}
-
-@page blank :left {
-  @top-left { content: normal }
-  @bottom-left { content: normal }
-}
-
-@page blank :right {
-  @top-right { content: normal }
-  @bottom-right { content: normal }
-}
-
 /* footnotes */
 
 .footnote {
   display: none;                   /* default rule */
 
-  display: prince-footnote;        /* prince-specific rules */
-  position: footnote;
-  footnote-style-position: inside;
-
-  counter-increment: footnote;
   margin-left: 1.4em;
   font-size: 90%;
   line-height: 1.4;
@@ -289,11 +176,6 @@ table.lined td, table.lined th {
    will use all of them.
 */
 
-/* which section uses which named page */
-
-div.halftitlepage, div.titlepage, div.imprint, div.dedication { page: blank }
-div.foreword, div.toc, div.preface { page: frontmatter }
-
 
 /* page breaks */
 
@@ -305,53 +187,6 @@ div.appendix, div.bibliography, div.glossary, div.index, div.colophon {
 }
 div.backcover { page-break-before: left }
 
-/* the front cover; this code is probably not very reusable by other books */
-
-div.frontcover { page: cover; }
-
-div.frontcover img {
-  position: absolute;
-  width: 7in; height: 9.25in;
-  left: 0; top: 0;
-  z-index: -1;
-}
-
-div.frontcover h1 {
-  position: absolute;
-  left: 2cm; top: 1cm;
-  color: white;
-  font-size: 44pt;
-  font-weight: normal;
-}
-
-div.frontcover h2 {
-  position: absolute;
-  right: 0; top: 5cm;
-  color: black;
-  background: white;
-  font-size: 16pt;
-  font-weight: normal;
-  padding: 0.2em 5em 0.2em 1em;
-  letter-spacing: 0.15em;
-}
-
-div.frontcover h3 {
-  position: absolute;
-  left: 2cm; top: 7cm;
-  color: white;
-  font-size: 24pt;
-  font-weight: normal;
-}
-
-div.frontcover p {
-  position: absolute;
-  left: 2cm; bottom: 1.5cm;
-  font-size: 24pt;
-  color: black;
-  font-weight: bold;
-  text-transform: uppercase;
-}
-
 
 /* titlepage, halftitlepage */
 
@@ -387,26 +222,6 @@ ol.toc > li {
   font-weight: bold;
   margin-bottom: 0.5em;
 }
-ol.toc a::after {
-  content: leader('.') target-counter(attr(href), page);
-  font-style: normal;
-}
-ol.toc > li.frontmatter a::after {
-  content: leader('.') target-counter(attr(href), page, lower-roman);
-  font-style: normal;
-}
-ol.toc > li.backmatter a::after {
-  content: leader('.') target-counter(attr(href), page);
-  font-style: normal;
-}
-ol.toc > li.chapter::before {
-  content: "Chapter " counter(toc-chapter, decimal);
-  display: block;
-  margin: 1em 0 0.1em -2.5cm;
-  font-weight: normal;
-  counter-increment: toc-chapter;
-  page-break-after: avoid;
-}
 
 /* chapter numbers */
 
@@ -414,7 +229,6 @@ div.chapter { counter-increment: chapter; }
 
 h1::before {
   white-space: pre;
-  margin-left: -2.5cm;
   font-size: 50%;
   content: "\B0  \B0  \B0  \B0  \B0 \A";  /* ornaments */
 }
@@ -425,20 +239,13 @@ div.frontcover h1::before, div.titlepage h1::before, div.halftitlepage h1::befor
   content: normal;                  /* that is, none */
 }
 
-h1 { string-set: header content();}
-div.chapter h1 { string-set: header "Chapter " counter(chapter) ": " content(); }
-
 /* index */
 
 ol.index { 
   list-style-type: none;
   margin: 0; padding: 0;
-  column-count: 2;
-  column-gap: 1em;
 }
 
-ul.index a::after { content: ", " target-counter(attr(href), page); }
-
 
 span.element, span.attribute {
   text-transform: uppercase;
@@ -448,12 +255,4 @@ span.element, span.attribute {
 span.property { font-weight: bold }
 code, span.css, span.value, span.declaration {
   font: 90% "Lucida Console", "Lucida Sans Typewriter", monospace;
-}
-
-
-@media screen, handheld {
-  html { margin: 1em; font: 14px "Gill Sans", sans-serif; }
-  h1 { margin-bottom: 0.5em }
-  div.frontcover, div.halftitlepage, 
-  div.dedication, div.foreword, div.toc, div.index { display: none }
 }

data/lib/bookshop/generators/bookshop/app/templates/book/assets/css/stylesheet.mobi.css

@@ -2,10 +2,20 @@
 /* written  by Hakon Wium Lie and Bert Bos, November 2005          */
 /* You may reuse this style sheet for any purpose without any fees */
 
+/* Font Sets */
+
+@font-face {
+  font-family: GillSans;
+  font-weight: normal;
+  font-style:  normal;
+  src:         url(../fonts/GillSans.ttc);
+}
+
+/* Main Styles */
 
 html { 
   margin: 0;
-  font: 10pt/1.26 "Gill Sans", sans-serif;
+  font-size: 10pt/1.26;
 }
 
 body { 
@@ -13,7 +23,6 @@ body {
 }
 
 h1, h2, h3, h4, h5, h6 { 
-  font-family: "Gill Sans", sans-serif;
   margin: 2em 0 0.5em 0;
   page-break-after: avoid;
 } 
@@ -88,8 +97,6 @@ div.sidebar {
   background: #CCC;
   padding: 0.5em 1em;
   page-break-inside: avoid;
-  column-count: 2;
-  column-gap: 1.5em;
 }
 
 div.sidebar h2 {
@@ -100,7 +107,6 @@ div.sidebar h2 {
 
 div.figure {
   margin: 1em 0;
-  counter-increment: figure;
 }
 
 div.figure .caption, div.table .caption {
@@ -124,7 +130,6 @@ div.table .caption::before {
 
 div.table {
   margin: 1em 0;
-  counter-increment: table;
 }
 
 div.table th {
@@ -143,110 +148,14 @@ table.lined td, table.lined th {
   padding-bottom: 0.2em;
 }
 
-
-@page {
-  margin: 27mm 16mm 27mm 16mm;
-  size: 7in 9.25in;
-
-  @footnotes {
-    border-top: thin solid black;
-    padding-top: 0.3em;
-    margin-top: 0.6em;
-    margin-left: 30%;
-  }
-}
-
-
-/* define default page and names pages: cover, blank, frontmatter */
-
-@page :left {
-  @top-left {
-    font: 11pt "Gill Sans", serif;
-    content: "Cascading Style Sheets";
-    vertical-align: bottom;
-    padding-bottom: 2em;
-  }
-
-  @bottom-left {
-    font: 11pt "Gill Sans", serif;
-    content: counter(page);
-    padding-top: 2em;
-    vertical-align: top;
-  }
-}
-
-@page :right {
-  @top-right {
-    font: 11pt "Gill Sans", serif;
-    content: string(header, first); 
-    vertical-align: bottom;
-    padding-bottom: 2em; 
-  }
-
-  @bottom-right {
-    font: 11pt "Gill Sans", serif;
-    content: counter(page);
-    text-align: right;
-    vertical-align: top;
-    padding-top: 2em;
-  }
-}
-
-@page frontmatter :left {
-  @top-left {
-    font: 11pt "Gill Sans", serif;
-    content: string(title);
-    vertical-align: bottom;
-    padding-bottom: 2em;
-  }
-
-  @bottom-left {
-    font: 11pt "Gill Sans", serif;
-    content: counter(page, lower-roman);
-    padding-top: 2em;
-    vertical-align: top;
-  }
-}
-
-@page cover { margin: 0; }
-
-@page frontmatter :right {
-  @top-right {
-    font: 11pt "Gill Sans", serif;
-    content: string(header, first); 
-    vertical-align: bottom;
-    padding-bottom: 2em; 
-  }
-
-  @bottom-right {
-    font: 11pt "Gill Sans", serif;
-    content: counter(page, lower-roman);
-    text-align: right;
-    vertical-align: top;
-    padding-top: 2em;
-  }
-}
-
-@page blank :left {
-  @top-left { content: normal }
-  @bottom-left { content: normal }
-}
-
-@page blank :right {
-  @top-right { content: normal }
-  @bottom-right { content: normal }
-}
-
 /* footnotes */
 
 .footnote {
   display: none;                   /* default rule */
 
-  display: prince-footnote;        /* prince-specific rules */
   position: footnote;
   footnote-style-position: inside;
 
-  counter-increment: footnote;
   margin-left: 1.4em;
   font-size: 90%;
   line-height: 1.4;
@@ -305,53 +214,6 @@ div.appendix, div.bibliography, div.glossary, div.index, div.colophon {
 }
 div.backcover { page-break-before: left }
 
-/* the front cover; this code is probably not very reusable by other books */
-
-div.frontcover { page: cover; }
-
-div.frontcover img {
-  position: absolute;
-  width: 7in; height: 9.25in;
-  left: 0; top: 0;
-  z-index: -1;
-}
-
-div.frontcover h1 {
-  position: absolute;
-  left: 2cm; top: 1cm;
-  color: white;
-  font-size: 44pt;
-  font-weight: normal;
-}
-
-div.frontcover h2 {
-  position: absolute;
-  right: 0; top: 5cm;
-  color: black;
-  background: white;
-  font-size: 16pt;
-  font-weight: normal;
-  padding: 0.2em 5em 0.2em 1em;
-  letter-spacing: 0.15em;
-}
-
-div.frontcover h3 {
-  position: absolute;
-  left: 2cm; top: 7cm;
-  color: white;
-  font-size: 24pt;
-  font-weight: normal;
-}
-
-div.frontcover p {
-  position: absolute;
-  left: 2cm; bottom: 1.5cm;
-  font-size: 24pt;
-  color: black;
-  font-weight: bold;
-  text-transform: uppercase;
-}
-
 
 /* titlepage, halftitlepage */
 
@@ -373,7 +235,7 @@ div.imprint img {
 	width: 200px; height: 157px;
 }
 
-/* TOC */
+/* TOC 
 
 ol.toc, ol.toc ol { 
   list-style-type: none;
@@ -407,11 +269,10 @@ ol.toc > li.chapter::before {
   counter-increment: toc-chapter;
   page-break-after: avoid;
 }
+*/
 
 /* chapter numbers */
 
-div.chapter { counter-increment: chapter; }
-
 h1::before {
   white-space: pre;
   margin-left: -2.5cm;
@@ -419,22 +280,14 @@ h1::before {
   content: "\B0  \B0  \B0  \B0  \B0 \A";  /* ornaments */
 }
 
-div.chapter h1::before { content: "Chapter " counter(chapter) " \A"; }
-
-div.frontcover h1::before, div.titlepage h1::before, div.halftitlepage h1::before {
-  content: normal;                  /* that is, none */
-}
-
 h1 { string-set: header content();}
-div.chapter h1 { string-set: header "Chapter " counter(chapter) ": " content(); }
 
 /* index */
 
 ol.index { 
   list-style-type: none;
   margin: 0; padding: 0;
-  column-count: 2;
-  column-gap: 1em;
+
 }
 
 ul.index a::after { content: ", " target-counter(attr(href), page); }
@@ -448,12 +301,4 @@ span.element, span.attribute {
 span.property { font-weight: bold }
 code, span.css, span.value, span.declaration {
   font: 90% "Lucida Console", "Lucida Sans Typewriter", monospace;
-}
-
-
-@media screen, handheld {
-  html { margin: 1em; font: 14px "Gill Sans", sans-serif; }
-  h1 { margin-bottom: 0.5em }
-  div.frontcover, div.halftitlepage, 
-  div.dedication, div.foreword, div.toc, div.index { display: none }
 }