bookshelf 1.0.0 → 1.1.0

data/README.md

@@ -35,15 +35,13 @@ dependencies.
 There's no requirements here; just make sure you cleared the correct dependency based
 on the formats you want to export to.
 
-## Getting Started
-
-We first need to generate a new bookshelf project
+## Creating a new Book
 
-    $ bookshelf new my_bookshelf
+    $ bookshelf new my_book
 
-This command creates a directory `my_bookshelf` with the following structure:
+This command creates a directory `my_book` with the following structure:
 
-    my_bookshelf
+    my_book
     ├── assets  
     │   ├── fonts
     │   ├── images
@@ -51,7 +49,7 @@ This command creates a directory `my_bookshelf` with the following structure:
     │       ├── _fonts.scss
     │       ├── epub.scss
     │       └── html.scss
-    ├── books
+    ├── text
     ├── config
     │   ├── config.yml
     │   └── helper.rb
@@ -63,17 +61,8 @@ This command creates a directory `my_bookshelf` with the following structure:
         └── html
             └── layout.erb
             
-## Creating a new Book
-
-To add a book create a folder under the `books` directory, named as per the title.
-
-    my_bookshelf
-    └── books
-        └── my_book
-
-Copy the `config.yml` file from `my_bookshelf/config/config.yml` into `my_bookshelf/books/my_book`
 
-Update `my_bookshelf/config/config.yml` to reflect the books title, author and other attributes.
+Update `my_book/config/config.yml` to reflect the books title, author and other attributes.
 
 ## Authoring
 
@@ -81,31 +70,29 @@ Now, create the content for your book by creating markdown or textile files into
 
 *Option 1 - Directories for chapters:*
 
-    my_bookshelf
-    └── books
-        └── my_book
-            ├── 01_introduction
-            │   ├── 01_section_1.markdown
-            │   ├── 02_section_2.markdown
-            │   └── ...
-            ├── 02_chapter_1
-            │   ├── 01_section_1.markdown
-            │   ├── 02_section_2.markdown
-            │   └── ...
-            ├── 03_chapter_2
-            ├── 04_chapter_3
-            └── ...
+    my_book
+    └── text
+        ├── 01_introduction
+        │   ├── 01_section_1.markdown
+        │   ├── 02_section_2.markdown
+        │   └── ...
+        ├── 02_chapter_1
+        │   ├── 01_section_1.markdown
+        │   ├── 02_section_2.markdown
+        │   └── ...
+        ├── 03_chapter_2
+        ├── 04_chapter_3
+        └── ...
 
 *Option 2 - Files for chapters:*
 
-    my_bookshelf
-    └── books
-        └── my_book
-            ├── 01_introduction.markdown
-            ├── 02_chapter_1.markdown
-            ├── 03_chapter_2.markdown
-            ├── 04_chapter_3.markdown
-            └── ...
+    my_book
+    └── text
+        ├── 01_introduction.markdown
+        ├── 02_chapter_1.markdown
+        ├── 03_chapter_2.markdown
+        ├── 04_chapter_3.markdown
+        └── ...
 
 Note that you if the number of chapters in your book is likely to exceed 10, you should add an extra 0 to the front of the chapter directory/file names
 

data/lib/bookshelf.rb

@@ -47,8 +47,8 @@ module Bookshelf
   autoload :Dependency, "bookshelf/dependency"
   autoload :Stats,      "bookshelf/stats"
 
-  def self.config(book_dir = nil)
-    path = book_dir.join("config.yml")
+  def self.config
+    path = Pathname.new("config/config.yml")
     content = File.read(path)
     erb = ERB.new(content).result
     YAML.load(erb).with_indifferent_access

data/lib/bookshelf/cli.rb

@@ -32,15 +32,8 @@ module Bookshelf
         raise Error, "The --only option need to be one of: #{FORMATS.join(", ")}"
       end
 
-      book_dirs = if options[:book]
-        [Bookshelf.root_dir.join("books/#{options[:book]}")]
-      else
-        Dir.glob(Bookshelf.root_dir.join("books/*")).map{|book_dir| Pathname.new(book_dir) }
-      end
-
-      book_dirs.each do |book_dir|
-        Bookshelf::Exporter.run(book_dir, options)        
-      end
+      book_dir = Pathname.new("text")
+      Bookshelf::Exporter.run(book_dir, options)
     end
 
     desc "version", "Prints the Bookshelf's version information"

data/lib/bookshelf/exporter.rb

@@ -50,7 +50,7 @@ module Bookshelf
     end
 
     def config
-      Bookshelf.config(book_dir)
+      Bookshelf.config
     end
   end
 end

data/lib/bookshelf/generator.rb

@@ -14,62 +14,47 @@ module Bookshelf
       File.dirname(__FILE__) + "/../../templates"
     end
 
-    def copy_html_templates
-      copy_file "layout.erb"  , "templates/html/layout.erb"
-      copy_file "layout.css"  , "templates/html/layout.css"
-      copy_file "user.css"    , "templates/html/user.css"
-      copy_file "syntax.css"  , "templates/html/syntax.css"
-    end
-
-    def copy_epub_templates
-      copy_file "cover.erb"   , "templates/epub/cover.erb"
-      copy_file "epub.css"    , "templates/epub/user.css"
-      copy_file "epub.erb"    , "templates/epub/page.erb"
-      copy_file "cover.png"   , "templates/epub/cover.png"
+    def copy_top_level
+      copy_file "Gemfile", "Gemfile"
+      copy_file "README.md", "README.md"
     end
 
-    def copy_sample_page
-      copy_file "sample.md"   , "text/01_Welcome.md"
+    def copy_assets
+      copy_file "epub.scss"    , "assets/styles/epub.scss"
+      copy_file "html.scss"    , "assets/styles/html.scss"
+      copy_file "html.scss"    , "assets/styles/_fonts.scss"
+      empty_directory "assets/fonts"
+      empty_directory "assets/images"
     end
 
     def copy_config_file
-      @name = full_name
-      @uid = Digest::MD5.hexdigest("#{Time.now}--#{rand}")
-      @year = Date.today.year
-      template "config.erb", "config/bookshelf.yml"
+      template "config.erb", "config/config.yml"
     end
 
     def copy_helper_file
       copy_file "helper.rb", "config/helper.rb"
     end
 
-    def create_directories
+    def copy_templates
+      copy_file "layout.erb"  , "templates/html/layout.erb"
+      copy_file "cover.erb"   , "templates/epub/cover.erb"
+      copy_file "epub.erb"    , "templates/epub/page.erb"
+    end
+
+    def create_empty_directories
       empty_directory "output"
-      empty_directory "images"
-      empty_directory "code"
+      empty_directory "text"
     end
 
     def create_git_files
       create_file ".gitignore" do
         "output/*.{html,epub,pdf}\noutput/tmp"
       end
-
+      create_file "assets/fonts/.gitkeep"
+      create_file "assets/images/.gitkeep"
+      create_file "assets/styles/.gitkeep"
       create_file "output/.gitkeep"
-      create_file "images/.gitkeep"
-      create_file "code/.gitkeep"
-    end
-
-    def copy_guardfile
-      copy_file "Guardfile", "Guardfile"
-    end
-
-    private
-    # Retrieve user's name using finger.
-    # Defaults to <tt>John Doe</tt>.
-    #
-    def full_name
-      name = `finger $USER 2> /dev/null | grep Login | colrm 1 46`.chomp
-      name.present? ? name.squish : "John Doe"
+      create_file "text/.gitkeep"
     end
   end
 end

data/lib/bookshelf/parser.rb

@@ -30,7 +30,7 @@ module Bookshelf
       # Return the configuration file.
       #
       def config
-        Bookshelf.config(book_dir)
+        Bookshelf.config
       end
 
       # Render a eRb template using +locals+ as data seed.

data/lib/bookshelf/version.rb

@@ -1,7 +1,7 @@
 module Bookshelf
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end

data/templates/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gem "bookshelf"

data/templates/config.erb

@@ -1,5 +1,5 @@
 # The book's title. Will be used everywhere!
-title: "[Your Book Title]"
+title: 
 
 # The book's language.
 language: en
@@ -13,23 +13,23 @@ language: en
 #   This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License.
 #   This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
 #
-copyright: "Copyright (C) <%= @year %> <%= @name %>."
+copyright: 
 
 # Who's publishing this book.
-publisher: "<%= @name %>"
+publisher: 
 
 # When this book was published.
-published_at: "<%= Date.today %>"
+published_at: 
 
 # Some book description.
-subject: "[Your book description]"
+subject: 
 
-# Some keywords that identify this book.
-keywords: "[Your book keywords (comma-separated)]"
+# Some keywords that identify this book (comma separated.
+keywords: 
 
 # Some unique identification. Works great with your domain
 # like `http://yourbook.example.com`.
-uid: "<%= @uid %>"
+uid: 
 
 # Your book identification like ISBN or ISSN.
 identifier:
@@ -38,7 +38,5 @@ identifier:
 
 # This book authors.
 authors:
-  - "<%= @name %>"
-
-# The base URL from your source code.
-base_url: http://example.com
+  - 
+  

data/templates/cover.erb

@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC
-	  "-//W3C//DTD XHTML 1.1//EN"
-	  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= language %>">
   <head>
-    <title><%= title %></title>
-    <link rel="stylesheet" href="user.css" type="text/css" />
-    <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
+    <title></title>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" type="text/css" href="styles/epub.css"/>
   </head>
+
   <body>
-    <div>
-		<h1><%= title %></h1>
+    <div class="chapter">
+      <%= content %>
     </div>
   </body>
 </html>

data/templates/epub.erb

@@ -2,14 +2,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= language %>">
   <head>
-    <title></title>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css" href="user.css"/>
+    <title><%= title %></title>
+    <link rel="stylesheet" href="styles/epub.css" type="text/css" />
+    <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
   </head>
-
   <body>
-    <div class="chapter">
-      <%= content %>
+    <div>
+    <h1><%= title %></h1>
     </div>
   </body>
 </html>

data/templates/epub.scss

@@ -0,0 +1 @@
+@import "fonts";

data/templates/html.scss

@@ -0,0 +1 @@
+@import "fonts";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookshelf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70233285321100 !ruby/object:Gem::Requirement
+  requirement: &70107041166720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233285321100
+  version_requirements: *70107041166720
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70233285320640 !ruby/object:Gem::Requirement
+  requirement: &70107041166260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233285320640
+  version_requirements: *70107041166260
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70233285320220 !ruby/object:Gem::Requirement
+  requirement: &70107041165840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233285320220
+  version_requirements: *70107041165840
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70233285319800 !ruby/object:Gem::Requirement
+  requirement: &70107041165420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233285319800
+  version_requirements: *70107041165420
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70233285319380 !ruby/object:Gem::Requirement
+  requirement: &70107041165000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233285319380
+  version_requirements: *70107041165000
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70233285318960 !ruby/object:Gem::Requirement
+  requirement: &70107040946860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233285318960
+  version_requirements: *70107040946860
 - !ruby/object:Gem::Dependency
   name: eeepub-with-cover-support
-  requirement: &70233268785200 !ruby/object:Gem::Requirement
+  requirement: &70107040943560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233268785200
+  version_requirements: *70107040943560
 - !ruby/object:Gem::Dependency
   name: notifier
-  requirement: &70233268782640 !ruby/object:Gem::Requirement
+  requirement: &70107040942300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233268782640
+  version_requirements: *70107040942300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233268781540 !ruby/object:Gem::Requirement
+  requirement: &70107040940380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233268781540
+  version_requirements: *70107040940380
 - !ruby/object:Gem::Dependency
   name: test_notifier
-  requirement: &70233285350100 !ruby/object:Gem::Requirement
+  requirement: &70107053171060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233285350100
+  version_requirements: *70107053171060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233285349680 !ruby/object:Gem::Requirement
+  requirement: &70107053170640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233285349680
+  version_requirements: *70107053170640
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70233285349260 !ruby/object:Gem::Requirement
+  requirement: &70107053170220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233285349260
+  version_requirements: *70107053170220
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &70233285348840 !ruby/object:Gem::Requirement
+  requirement: &70107053169800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233285348840
+  version_requirements: *70107053169800
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70233285348420 !ruby/object:Gem::Requirement
+  requirement: &70107053169380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233285348420
+  version_requirements: *70107053169380
 description: A framework that generates PDF and e-Pub from Markdown, Textile, and
   HTML files.
 email:
@@ -204,17 +204,16 @@ files:
 - lib/bookshelf/toc/epub.rb
 - lib/bookshelf/toc/html.rb
 - lib/bookshelf/version.rb
-- templates/Guardfile
+- templates/Gemfile
+- templates/README.md
+- templates/_fonts.scss
 - templates/config.erb
 - templates/cover.erb
-- templates/cover.png
-- templates/ebook.png
-- templates/epub.css
 - templates/epub.erb
+- templates/epub.scss
 - templates/helper.rb
-- templates/layout.css
+- templates/html.scss
 - templates/layout.erb
-- templates/user.css
 homepage: https://bitbucket.org/bradcrawford/bookshelf
 licenses:
 - MIT