softcover 0.6.10 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef4d9aa77bc1f4a22c64871d5e8fafb18994875
-  data.tar.gz: 83699d357e811c2fd6cee9e4e8852a89058172b5
+  metadata.gz: 61bd49f3b8a3353e6ec2337fdbb106034190e783
+  data.tar.gz: fb0e6e1d6f0a088cbec3e16e2202fce24446aa5e
 SHA512:
-  metadata.gz: 54fce6cdcd78b0e736b60eb950e03a669cc86fbf1d0778fd3057f6e7e2654016a37574699f40c5bb4121d73b19a1b91ba17b6bd9b20c6bf51d1769d1c242fa83
-  data.tar.gz: 36067b6fa74f26ca4883ce0018828e571adad5ac9ac42098097cf6438e3c95df43a74daa2f28663bf504148aeda284167f766d8baab5685ab1e88a2fbc9d05e4
+  metadata.gz: 7320553767b7915b937bc88d4cbec6c909d17d7aa99b4c874b8d07f6453a35bd682ffb07a4c52d0a228a38875fd3b5c6e1d4ecca86bf2b2e38f644d4ab0553e9
+  data.tar.gz: 221b381059780a02c6da6fcc7381c52e1baf8d209aba80eeab0a0aa4fdc4d17d87dfcf327e859280c3b44928d6d9f8199b7fe290c93c79ccfd604c2562de66f7

data/.gitignore

@@ -24,3 +24,4 @@ pygments.sty
 .api_token
 .project_id
 spec/fixtures/md-book/log/tralics.log
+.ruby-*

data/lib/softcover/book_manifest.rb

@@ -54,7 +54,7 @@ class Softcover::BookManifest < OpenStruct
   class Section < OpenStruct
   end
 
-  MD_PATH = 'Book.txt'
+  TXT_PATH  = 'Book.txt'
   YAML_PATH = "book.yml"
 
   def initialize(options = {})
@@ -70,6 +70,8 @@ class Softcover::BookManifest < OpenStruct
 
     marshal_load attrs
 
+    write_master_latex_file(self)
+
     if polytex?
       tex_filename = filename + '.tex'
       self.chapters = []
@@ -88,18 +90,17 @@ class Softcover::BookManifest < OpenStruct
       else
         self.frontmatter = []
       end
-      self.author = base_contents.scan(/^\s*\\author\{(.*?)\}/).flatten.first
       chapter_includes(base_contents).each_with_index do |name, i|
         slug = File.basename(name, '.*')
-        title_regex = /^\s*\\chapter{(.*)}/
+        chapter_title_regex = /^\s*\\chapter{(.*)}/
         content = File.read(File.join(polytex_dir, slug + '.tex'))
-        title = content[title_regex, 1]
+        chapter_title = content[chapter_title_regex, 1]
         j = 0
         sections = content.scan(/^\s*\\section{(.*)}/).flatten.map do |name|
           Section.new(name: name, section_number: j += 1)
         end
         chapters.push Chapter.new(slug: slug,
-                                  title: title,
+                                  title: chapter_title,
                                   sections: sections,
                                   chapter_number: i + 1)
       end
@@ -224,7 +225,7 @@ class Softcover::BookManifest < OpenStruct
   end
 
   def self.valid_directory?
-    [YAML_PATH, MD_PATH].any? { |f| File.exist?(f) }
+    [YAML_PATH, TXT_PATH].any? { |f| File.exist?(f) }
   end
 
   # Changes the directory until in the book's root directory.
@@ -245,7 +246,7 @@ class Softcover::BookManifest < OpenStruct
   def source_files
     self.class.find_book_root!
     md_tex = /.*(?:\.md|\.tex)/
-    File.readlines(MD_PATH).select { |path| path =~ md_tex }.map(&:strip)
+    File.readlines(TXT_PATH).select { |path| path =~ md_tex }.map(&:strip)
   end
 
   def basenames
@@ -263,7 +264,7 @@ class Softcover::BookManifest < OpenStruct
   end
 
   def read_from_md
-    { chapters: chapter_objects, filename: MD_PATH }
+    { chapters: chapter_objects, filename: TXT_PATH }
   end
 
 

data/lib/softcover/builders/html.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 module Softcover
   module Builders
     class Html < Builder
+      include Softcover::Utils
 
       def setup
         Dir.mkdir "html" unless File.directory?("html")
@@ -18,6 +19,8 @@ module Softcover
           RubyProf.start
         end
 
+        write_master_latex_file(manifest)
+
         if manifest.markdown?
           unless options[:'find-overfull']
             FileUtils.rm(Dir.glob(path("#{manifest.polytex_dir}/*.tex")))
@@ -25,7 +28,7 @@ module Softcover
           manifest.chapters.each do |chapter|
             write_latex_files(chapter, options)
           end
-          rewrite_master_latex_file
+
           # Reset the manifest to use PolyTeX.
           self.manifest = Softcover::BookManifest.new(source: :polytex,
                                                       verify_paths: false,
@@ -66,30 +69,6 @@ module Softcover
         end
       end
 
-      # Rewrites the master LaTeX file <name>.tex to use chapters from Book.txt.
-      def rewrite_master_latex_file
-        master_filename = Dir['*.tex'].reject { |f| f =~ /\.tmp/}.first
-        lines = File.readlines('Book.txt')
-        tex_file = []
-        lines.each do |line|
-          if line =~ /(.*)(?:\.md|\.tex)\s*$/
-            tex_file << "\\include{#{manifest.polytex_dir}/#{$1}}"
-          elsif line =~ /(.*):\s*$/  # frontmatter or mainmatter
-            tex_file << "\\#{$1}"
-          elsif line.strip == 'cover'
-            tex_file << '\\includepdf{images/cover.pdf}'
-          else # raw command, like 'maketitle' or 'tableofcontents'
-            tex_file << "\\#{line.strip}"
-          end
-        end
-        tex_file << '\end{document}'
-        content = File.read(master_filename)
-        content.gsub!(/(\\begin{document}\n)(.*)/m) do
-          $1 + tex_file.join("\n") + "\n"
-        end
-        File.write(master_filename, content)
-      end
-
       # Returns the converted HTML.
       def converted_html(basename)
         polytex_filename = basename + '.tex'

data/lib/softcover/builders/pdf.rb

@@ -2,6 +2,7 @@ module Softcover
   module Builders
     class Pdf < Builder
       include Softcover::Output
+      include Softcover::Utils
 
       def build!(options={})
         if manifest.markdown?
@@ -12,6 +13,9 @@ module Softcover
           self.manifest = Softcover::BookManifest.new(source: :polytex,
                                                       origin: :markdown)
         end
+
+        write_master_latex_file(manifest)
+
         # Build the PolyTeX filename so it accepts both 'foo' and 'foo.tex'.
         basename = File.basename(manifest.filename, '.tex')
         book_filename = basename + '.tex'
@@ -22,16 +26,17 @@ module Softcover
           return    # only gets called in test env
         elsif options[:'find-overfull']
           tmp_name = book_filename.sub('.tex', '.tmp.tex')
-          # The we do things, code listings show up as "Overfull", but they're
-          # actually fine, so filter them out.
+          # The way we do things, code listings show up as "Overfull", but
+          # they're actually fine, so filter them out.
           filter_out_listings = "grep -v 3.22281pt"
-          # It's hard to correlate Overfull line numbers with source files,
+          # Because each chapter typically lives in a separate file, it's
+          # hard to correlate Overfull line numbers with lines in the source,
           # so we use grep's -A flag to provide some context instead. Authors
-          # can then use their text editors to find the corresponding place
-          # in the text.
+          # can then use their text editors' search function to find the
+          # corresponding place in the text.
           show_context = 'grep -A 3 "Overfull \hbox"'
           cmd = "xelatex #{tmp_name} | #{filter_out_listings} | #{show_context}"
-          execute cmd
+          silence_stream(STDERR) { execute cmd }
           return
         end
 
@@ -66,7 +71,9 @@ module Softcover
         # Here we use `system` when making a preview because the preview command
         # needs to run after the main PDF build.
         if options[:quiet] || options[:silent]
-          silence { options[:preview] ? system(cmd) : execute(cmd) }
+          silence_stream(STDERR) do
+            silence { options[:preview] ? system(cmd) : execute(cmd) }
+          end
         else
           options[:preview] ? system(cmd) : execute(cmd)
         end

data/lib/softcover/cli.rb

@@ -144,9 +144,7 @@ module Softcover
       require 'softcover/commands/publisher'
 
       invoke :login unless logged_in?
-
-      slug = Softcover::BookManifest.new.slug
-      if ask("Type '#{slug}' to unpublish:") == slug
+      if ask("Type '#{unpublish_slug}' to unpublish:") == unpublish_slug
         puts "Unpublishing..." unless options[:silent]
         Softcover::Commands::Publisher.unpublish!
       else
@@ -172,11 +170,6 @@ module Softcover
                   :default => false,
                   :aliases => "-p",
                   :desc => "Generate a PolyTeX book."
-    method_option :simple,
-                  :type => :boolean,
-                  :default => false,
-                  :aliases => "-s",
-                  :desc => "Generate a simple book."
     def new(n)
       Softcover::Commands::Generator.generate_file_tree(n, options)
     end

data/lib/softcover/commands/generator.rb

@@ -9,7 +9,6 @@ module Softcover
       def generate_file_tree(name, options = {})
         @name = name
         @markdown = !options[:polytex]
-        @simple   = options[:simple]
 
         thor = Thor::Shell::Basic.new
 
@@ -25,8 +24,6 @@ module Softcover
         # file before the directory had been created, so we now create all
         # the directories first.
         directories.each do |path|
-          next if path =~ /\/simple_book/ && !@simple
-          next if path =~ /\/book/ && @simple
           (cp_path = path.dup).slice! template_dir + "/"
           unless File.exist?(cp_path)
             puts "Creating #{cp_path}" unless cp_path =~ /MathJax/
@@ -87,16 +84,9 @@ module Softcover
         File.expand_path File.join File.dirname(__FILE__), "../template"
       end
 
-      # Returns true for a simple book (no frontmatter, etc.).
-      def simple?
-        @simple
-      end
-
       # Returns a list of all the files and directories used to build the book.
       def all_files_and_directories
-        f = files_directories_maybe_markdown
-        simple? ? f.reject { |p| p =~ /\/book\.tex/ || p =~ /preface/ }
-                : f.reject { |p| p =~ /simple/ }
+        files_directories_maybe_markdown
       end
 
       # Returns the files and directories based on the input format.
@@ -106,8 +96,8 @@ module Softcover
           # Skip the PolyTeX chapter files, which will be generated later.
           fds.reject { |e| e =~ /\/chapters\/.*\.tex/ }
         else
-          # Skip the Markdown files & Book.txt.
-          fds.reject { |e| e =~ /(chapters\/.*\.md|Book\.txt)/ }
+          # Skip the Markdown files.
+          fds.reject { |e| e =~ /chapters\/.*\.md/ }
         end
       end
 

data/lib/softcover/commands/opener.rb

@@ -4,10 +4,14 @@ module Softcover
       extend self
 
       def open!
-        book = Softcover::Book.new
         book.open_in_browser
       end
 
+      # Returns the book to be opened.
+      def book
+        Softcover::Book.new(origin: Softcover::Utils::source)
+      end
+
     end
   end
 end

data/lib/softcover/commands/server.rb

@@ -29,7 +29,9 @@ module Softcover::Commands::Server
     ignores = ['generated_polytex', '\.tmp\.tex']
     # Ignore <book>.tex, which gets overwritten each time PolyTeXnic runs,
     # unless there's no Book.txt, which means the author is using raw LaTeX.
-    ignores << Regexp.escape(Dir.glob('*.tex').first) if File.exist?('Book.txt')
+    if File.exist?(Softcover::BookManifest::TXT_PATH)
+      ignores << Regexp.escape(Dir.glob('*.tex').first)
+    end
     /(#{ignores.join('|')})/
   end
 
@@ -51,13 +53,13 @@ module Softcover::Commands::Server
 
   def start_server(port)
     require 'softcover/server/app'
-    rebuild
     puts "Running Softcover server on http://localhost:#{port}"
     Softcover::App.set :port, port
     Softcover::App.run!
   end
 
   def run(port)
+    rebuild
     listen_for_changes
     start_server port
   end

data/lib/softcover/template/book.yml.erb

@@ -1,11 +1,12 @@
 ---
-title: <%= name %>
 slug: <%= name %>
 filename: <%= name %>
-subtitle: Change-me
-cover: images/cover.png
+title: Title of the Book
+subtitle: Change me
 description: Change me.
+author: Author Name
 copyright: <%= Time.new.year %>
 uuid: <%= SecureRandom.uuid %>
+cover: images/cover.png
 pdf_preview_page_range: 1..30
 epub_mobi_preview_chapter_range: 0..1

data/lib/softcover/template/softcover.sty

@@ -130,5 +130,15 @@
 \newcommand{\heading}[1]{\textbf{#1}}
 \newcommand{\kode}[1]{\textcolor{darkgreen}{\textbf{\texttt{#1}}}}
 
+% Subtitle command
+\usepackage{titling}
+\newcommand{\subtitle}[1]{%
+  \posttitle{%
+    \par\end{center}
+    \begin{center}\large#1\end{center}
+    \vskip0.5em}%
+}
+
 % Add custom commands
 \usepackage{custom}
+

data/lib/softcover/utils.rb

@@ -13,6 +13,11 @@ module Softcover::Utils
     Dir.glob(path('chapters/*.md')).empty? ? :polytex : :markdown
   end
 
+  # Returns the slug to be unpublished.
+  def unpublish_slug
+    Softcover::BookManifest.new(origin: source).slug
+  end
+
   def reset_current_book!
     @@current_book = nil
   end
@@ -54,6 +59,65 @@ module Softcover::Utils
     "#{number.round} #{UNITS[ exponent ]}"
   end
 
+
+  # Writes the master LaTeX file <name>.tex to use chapters from Book.txt.
+  # We skip this step if Book.txt doesn't exist, as that means the user
+  # is writing raw LaTeX.
+  def write_master_latex_file(manifest)
+    if File.exist?(Softcover::BookManifest::TXT_PATH)
+      File.write(master_filename(manifest), master_content(manifest))
+    end
+  end
+
+  # Returns the name of the master LaTeX file.
+  def master_filename(manifest)
+    "#{manifest.filename}.tex"
+  end
+
+  # Returns the lines of Book.txt as an array.
+  def book_txt_lines
+    File.readlines(Softcover::BookManifest::TXT_PATH)
+  end
+
+  # Returns the content for the master LaTeX file.
+  def master_content(manifest)
+    comment = /^\s*#.*$/
+    front_or_mainmatter = /(.*):\s*$/
+    source_file = /(.*)(?:\.md|\.tex)\s*$/
+
+    tex_file = [master_latex_header(manifest)]
+    book_txt_lines.each do |line|
+      if    line.match(comment)   # commented-out line
+        next
+      elsif line.match(source_file)
+        tex_file << "\\include{#{manifest.polytex_dir}/#{$1}}"
+      elsif line.match(front_or_mainmatter)  # frontmatter or mainmatter
+        tex_file << "\\#{$1}"
+      elsif line.strip == 'cover'
+        tex_file << '\\includepdf{images/cover.pdf}'
+      else # raw command, like 'maketitle' or 'tableofcontents'
+        tex_file << "\\#{line.strip}"
+      end
+    end
+    tex_file << '\end{document}'
+    tex_file.join("\n")
+  end
+
+  def master_latex_header(manifest)
+    subtitle = manifest.subtitle.nil? ? "" : "\\subtitle{#{manifest.subtitle}}"
+    <<-EOS
+\\documentclass[14pt]{extbook}
+\\usepackage{softcover}
+\\VerbatimFootnotes % Allows verbatim text in footnotes
+\\title{#{manifest.title}}
+#{subtitle}
+\\author{#{manifest.author}}
+\\date{#{manifest.date}}
+
+\\begin{document}
+    EOS
+  end
+
   # Returns the tmp version of a filename.
   # E.g., tmpify('foo.tex') => 'foo.tmp.tex'
   def tmpify(manifest, filename)

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "0.6.10"
+  VERSION = "0.7.0"
 end

data/softcover.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'polytexnic', '~> 0.6.10'
+  gem.add_dependency 'polytexnic', '~> 0.7.0'
   gem.add_dependency 'msgpack', '~> 0.4.2'
-  gem.add_dependency 'nokogiri', '~> 1.5.0'
+  gem.add_dependency 'nokogiri', '~> 1.6.0'
   gem.add_dependency 'thor'
   gem.add_dependency 'activesupport'
   gem.add_dependency 'rest-client'

data/spec/app_spec.rb

@@ -77,24 +77,4 @@ describe Softcover::App do
       end
     end
   end
-
-  context "simple book" do
-    before(:all) do
-      generate_book(simple: true)
-      Softcover::Builders::Html.new.build!
-    end
-    after(:all)  { remove_book }
-
-    before { chdir_to_book }
-
-    let(:manifest) { Softcover::BookManifest.new }
-    let(:chapter) { manifest.chapters[0] }
-
-    it 'redirects / to first chapter' do
-      get '/'
-      expect(last_response).to be_redirect
-      expect(last_response.location).to match chapter.slug
-    end
-  end
-
 end

data/spec/book_manifest_spec.rb

@@ -9,8 +9,8 @@ describe Softcover::BookManifest do
     context "in valid book directory" do
 
       describe "basic information" do
-        its(:title) { should eq "book" }
-        its(:subtitle) { should eq "Change-me" }
+        its(:title) { should eq "Title of the Book" }
+        its(:subtitle) { should eq "Change me" }
         its(:description) { should eq "Change me." }
         its(:cover) { should eq "images/cover.png" }
         its(:author) { should eq "Author Name" }
@@ -45,7 +45,7 @@ describe Softcover::BookManifest do
     context "in a valid book subdirectory" do
       before { Dir.chdir 'chapters' }
       describe "finding the manifest in a higher directory" do
-        its(:title) { should eq "book" }
+        its(:slug) { should eq "book" }
       end
     end
 

data/spec/builders/html_spec.rb

@@ -124,14 +124,29 @@ describe Softcover::Builders::Html do
       end
 
       describe "master LaTeX file" do
-        let(:master_file) { Dir['*.tex'].reject { |f| f =~ /\.tmp/}.first }
+        let(:master_file) { builder.master_filename(builder.manifest) }
         subject { File.read(master_file) }
+        it { should include "\\title{#{builder.manifest.title}}" }
+        it { should include "\\subtitle{#{builder.manifest.subtitle}}" }
+        it { should include "\\author{#{builder.manifest.author}}" }
+        it { should include '\date{}' }
+        it { should include '\begin{document}' }
         it { should include '\include{generated_polytex/preface}' }
         it { should include '\include{generated_polytex/a_chapter}' }
         it { should include '\include{generated_polytex/another_chapter}' }
         it { should include '\include{generated_polytex/yet_another_chapter}' }
         it { should include '\end{document}' }
       end
+
+      describe "commented-out lines of Book.txt" do
+        let(:lines) { ['chapters/foo.md', '# chapters/bar.md'] }
+        let(:content) { builder.master_content(builder.manifest) }
+        before { builder.stub(:book_txt_lines).and_return(lines) }
+        it "should be ignored" do
+          expect(content).to     include 'chapters/foo'
+          expect(content).not_to include 'chapters/bar'
+        end
+      end
     end
   end
 end

data/spec/builders/pdf_spec.rb

@@ -43,6 +43,14 @@ describe Softcover::Builders::Pdf do
       it "should write the correct PolyTeXnic commands file" do
         expect(File.read('polytexnic_commands.sty')).to match /newcommand/
       end
+
+      context "after removing Book.txt" do
+        before { FileUtils.rm Softcover::BookManifest::TXT_PATH }
+        it "should still build the book" do
+          expect(Softcover::BookManifest::TXT_PATH).not_to exist
+          expect { @builder.build! }.not_to raise_error
+        end
+      end
     end
   end
 

data/spec/cli_spec.rb

@@ -36,7 +36,6 @@ describe Softcover::CLI do
   context "softcover new options" do
     subject { `softcover help new` }
     it { should include '-p, [--polytex]' }
-    it { should include '-s, [--simple]' }
   end
 
   context "softcover new" do
@@ -127,4 +126,25 @@ describe Softcover::CLI do
 
     it_should_behave_like "book"
   end
+
+  describe "stubbed commands" do
+
+    context "unpublish" do
+      before { Softcover::Utils.stub(:source).and_return(:markdown) }
+      it "should have the right slug" do
+        Softcover::BookManifest.should_receive(:new).with(origin: :markdown)
+                               .and_return(OpenStruct.new(slug: ""))
+        Softcover::Utils.unpublish_slug
+      end
+    end
+
+
+    context "open" do
+      before { Softcover::Utils.stub(:source).and_return(:markdown) }
+      it "should have the right book" do
+        Softcover::Book.should_receive(:new).with(origin: :markdown)
+        Softcover::Commands::Opener::book
+      end
+    end
+  end
 end

data/spec/commands/generator_spec.rb

@@ -29,7 +29,7 @@ describe Softcover::Commands::Generator do
       subject(:yml) { YAML.load_file(File.join name, 'book.yml') }
 
       it "should have the right title" do
-        expect(yml['title']).to eq name
+        expect(yml['title']).to eq "Title of the Book"
       end
 
       it "should have the right copyright year" do
@@ -49,19 +49,15 @@ describe Softcover::Commands::Generator do
         expect { `softcover build` }.not_to raise_error
       end
 
-      describe "base LaTeX file" do
-        subject(:base) { 'foo_bar.tex' }
-        it { should exist }
-        it "should use the 14-point extbook doctype" do
-          expect(File.read(base)).to match(/\[14pt\]\{extbook\}/)
-        end
-      end
-
       it "should have chapter files" do
         expect('chapters/a_chapter.tex').to exist
         expect('chapters/another_chapter.tex').to exist
       end
 
+      it "should have Book.txt" do
+        expect(Softcover::BookManifest::TXT_PATH).to exist
+      end
+
       it "should not have the markdown files" do
         expect('chapters/a_chapter.md').not_to exist
       end
@@ -108,20 +104,6 @@ describe Softcover::Commands::Generator do
         it "should have a right style file" do
           expect('softcover.sty').to exist
         end
-
-        it "should include the right style file by default" do
-          book_base = File.read('foo_bar.tex')
-          expect(book_base).to match(/^\\usepackage{softcover}/)
-        end
-      end
-
-      describe "base LaTeX file" do
-        subject { File.read('foo_bar.tex') }
-
-        it { should match(/\\include{chapters\/a_chapter}/) }
-        it { should match(/\\include{chapters\/another_chapter}/) }
-        it { should match(/\\title{.*?}/) }
-        it { should match(/\\author{.*?}/) }
       end
 
       shared_examples "a chapter" do
@@ -140,128 +122,4 @@ describe Softcover::Commands::Generator do
       end
     end
   end
-
-  context "generate simple book_base in non-book directory" do
-
-    before(:all) do
-      chdir_to_non_book
-      @name = 'foo_bar'
-      Softcover::Commands::Generator.generate_file_tree @name, simple: true,
-                                                               polytex: true
-    end
-
-    let(:name) { @name }
-
-    before do
-      chdir_to_non_book
-    end
-
-    after(:all) do
-      chdir_to_non_book
-      FileUtils.rm_rf name
-    end
-
-    it "should copy files" do
-      expect(Softcover::Commands::Generator.verify!).to be_true
-    end
-
-    context "generated contents from template" do
-
-      before { Dir.chdir(name) }
-
-      it "should build all formats without error" do
-        expect { `softcover build` }.not_to raise_error
-      end
-
-      describe "base LaTeX file" do
-        subject(:base) { 'foo_bar.tex' }
-        it { should exist }
-
-        describe "contents" do
-          subject(:text) { File.read(base) }
-          it { should match /\[14pt\]\{extbook\}/ }
-          it { should_not match /frontmatter/ }
-          it { should_not match /mainmatter/ }
-        end
-      end
-
-      it "should have chapter files" do
-        expect('chapters/a_chapter.tex').to exist
-        expect('chapters/another_chapter.tex').to exist
-      end
-
-      it "should not have preface file" do
-        expect('chapters/preface.tex').not_to exist
-      end
-    end
-  end
-
-  context "generate Markdown book in non-book directory" do
-
-    before(:all) do
-      chdir_to_non_book
-      @name = 'foo_bar'
-      Softcover::Commands::Generator.generate_file_tree @name
-    end
-
-    let(:name) { @name }
-
-    before do
-      chdir_to_non_book
-    end
-
-    after(:all) do
-      chdir_to_non_book
-      FileUtils.rm_rf name
-    end
-
-    it "should copy files" do
-      expect(Softcover::Commands::Generator.verify!).to be_true
-    end
-
-    context "generated contents from template" do
-
-      before { Dir.chdir(name) }
-
-      it "should build all formats without error" do
-        expect { `softcover build` }.not_to raise_error
-      end
-
-      describe "base LaTeX file" do
-        subject(:base) { 'foo_bar.tex' }
-        it { should exist }
-        it "should use the 14-point extbook doctype" do
-          expect(File.read(base)).to match(/\[14pt\]\{extbook\}/)
-        end
-      end
-
-      it "should have the markdown files" do
-        expect('chapters/a_chapter.md').to exist
-        expect('chapters/another_chapter.md').to exist
-      end
-    end
-  end
-
-  context "overwriting" do
-    let(:name) { 'bar' }
-    before do
-      chdir_to_non_book
-      $stdin.should_receive(:gets).and_return("a")
-
-      silence do
-        2.times do
-          Softcover::Commands::Generator.generate_file_tree name, polytex: true
-        end
-      end
-    end
-
-    after do
-      chdir_to_non_book
-      FileUtils.rm_rf name
-    end
-
-    it "should overwrite files" do
-      expect(Softcover::Commands::Generator.verify!).to be_true
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'webmock/rspec'
-
 require 'webmock_helpers'
+require 'ostruct'
 
 # require 'simplecov'
 # SimpleCov.start

data/spec/webmock_helpers.rb

@@ -160,7 +160,6 @@ module WebmockHelpers
     Dir.chdir File.join File.dirname(__FILE__), "fixtures/"
     flags = []
     flags << '-p' unless options[:markdown]
-    flags << '-s' if options[:simple]
     silence { system "softcover new #{name} #{flags.join(' ')}" }
     chdir_to_book
     File.mkdir 'html' unless File.exist?('html')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.10
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.10
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -368,9 +368,12 @@ files:
 - .pull_requests/1385518404
 - .pull_requests/1385766008
 - .pull_requests/1385778329
+- .pull_requests/1385834422
+- .pull_requests/1385835007
+- .pull_requests/1385862948
+- .pull_requests/1386099285
+- .pull_requests/1386115582
 - .rspec
-- .ruby-gemset
-- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -415,7 +418,6 @@ files:
 - lib/softcover/template/.softcover-deploy
 - lib/softcover/template/Book.txt
 - lib/softcover/template/README.md
-- lib/softcover/template/book.tex
 - lib/softcover/template/book.yml.erb
 - lib/softcover/template/chapters/a_chapter.md
 - lib/softcover/template/chapters/a_chapter.tex
@@ -977,7 +979,6 @@ files:
 - lib/softcover/template/images/cover.png
 - lib/softcover/template/images/figures/.gitkeep
 - lib/softcover/template/polytexnic_commands.sty
-- lib/softcover/template/simple_book.tex
 - lib/softcover/template/softcover.sty
 - lib/softcover/template/upquote.sty
 - lib/softcover/uploader.rb
@@ -1028,7 +1029,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A typesetting system for technical authors

data/.ruby-gemset

@@ -1 +0,0 @@
-polytexnic

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0-p247

data/lib/softcover/template/book.tex

@@ -1,21 +0,0 @@
-\documentclass[14pt]{extbook}
-\usepackage{softcover}
-\VerbatimFootnotes % Allows verbatim text in footnotes
-
-\title{Title of the Book}
-\author{Author Name}
-\date{} % Leave blank, enter a date, or remove to use today's date.
-
-\begin{document}
-  \includepdf{images/cover.pdf}
-  \frontmatter
-  \maketitle
-  \tableofcontents
-  % List frontmatter sections here (preface, foreword, etc.).
-  \include{chapters/preface}
-  \mainmatter
-  % List chapters here in the order they should appear in the book.
-  \include{chapters/a_chapter}
-  \include{chapters/another_chapter}
-  \include{chapters/yet_another_chapter}
-\end{document}

data/lib/softcover/template/simple_book.tex

@@ -1,14 +0,0 @@
-\documentclass[14pt]{extbook}
-\usepackage{softcover}
-\VerbatimFootnotes % Allows verbatim text in footnotes
-
-\title{Title of the Book}
-\author{Author Name}
-\date{}  % Leave blank, enter a date, or remove to use today's date
-
-\begin{document}
-  \maketitle
-  % List chapters here in the order they should appear in the book.
-  \include{chapters/a_chapter}
-  \include{chapters/another_chapter}
-\end{document}