softcover 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6eeed7020f2fc586daf6ea25063ecb42398ff4
-  data.tar.gz: b0c413809eb71625b8a75b0e548473abebf66065
+  metadata.gz: fafabcae98cbdfb8322a3d0dfd47b73e2bcd1d28
+  data.tar.gz: 7c6201045eafaa089f732789c1d1d4335a7e69fb
 SHA512:
-  metadata.gz: 152b9d3c927e070b5bab37b5679353d04c64d5c1143838e22a556b2b22e022780ab2b0b1cf9e17389b8ee9239dc61688723c3c1d6ff1a762b615771465c98c7e
-  data.tar.gz: 9ad5909394d3de83f7686602a6cdc09e1865635997729d20dba0226d43162f2a11012e0d5c4c8580d875500f9607223e6f2d6930935ca2ccda7e04c6ae8d31c5
+  metadata.gz: 8468f816a5f7bbca55f9c1a13241744392876cdeb912d059549cffab92c7734be89af97351d7b22ee3418882d9a53ee253150259c9db6e3139b43e641b95eab7
+  data.tar.gz: b043e027bf8f55b92d4717af933ae72b989d07a90f0abb07fd97b98443e8758cbce6b698403b1f3420a22926bf48db450d4d4c832d16a691ecd118e5e964be61

data/lib/softcover/book.rb

@@ -1,10 +1,10 @@
 class Softcover::Book
   include Softcover::Utils
 
-  DEFAULT_SCREENCASTS_DIR = "screencasts"
+  DEFAULT_MEDIA_DIR = "media"
 
   attr_accessor :errors, :uploader, :signatures, :manifest,
-                :processed_screencasts, :screencasts_dir
+                :processed_media, :media_dir
 
   class UploadError < StandardError; end
 
@@ -15,9 +15,9 @@ class Softcover::Book
 
     @client = Softcover::Client.new_with_book self
 
-    @screencasts_dir = DEFAULT_SCREENCASTS_DIR
+    @media_dir = DEFAULT_MEDIA_DIR
 
-    @processed_screencasts = []
+    @processed_media = []
   end
 
   class BookFile < Struct.new(:path)
@@ -57,12 +57,10 @@ class Softcover::Book
 
   # get array of paths and checksums
   def files
-    # question: should we use `git ls-files` instead?
-    # TODO: only use pertinent files
-    paths = %w{html/*_fragment.html images/**/* ebooks/* config/*}
-    Dir[*paths].reject { |path| File.directory?(path) }.map do |path|
-      BookFile.new path
-    end
+    paths = %w{html/*_fragment.html images/**/* config/*}
+    Dir[*paths].map do |path|
+      BookFile.new(path) unless File.directory?(path)
+    end.compact
   end
 
   def filenames
@@ -125,6 +123,7 @@ class Softcover::Book
     self.id = @attrs['id']
     Softcover::BookConfig['last_uploaded_at'] = Time.now
 
+    # res contains the S3 upload signatures needed
     @uploader = Softcover::Uploader.new res
 
     true
@@ -172,41 +171,57 @@ class Softcover::Book
   end
 
   # ============================================================================
-  # Screencast handling
+  # Media handling
   # ============================================================================
 
-  def process_screencasts
-    files_to_upload = find_screencasts.select do |file|
-      next false if @processed_screencasts.include?(file)
+  # 1. iterate over /ebooks, /media/*
+  # => use directory name as path parameter
+  # => get checksums for all included files
+  # => send each to /media API endpoint and then upload
+
+  def process_media
+    process_media_directory "ebooks"
+
+    Dir["media/*"].each do |media_dir|
+      next unless File.directory?(media_dir) && !(media_dir =~ /^\./)
+      process_media_directory media_dir
+    end
+  end
+
+  def process_media_directory(dir)
+    return false if @processed_media.include?(dir)
+
+    puts "Processing #{dir} directory..."
 
+    files_to_upload = get_book_files(dir).select do |file|
       file.ready?
     end
 
-    upload_screencasts! files_to_upload
+    upload_media! dir, files_to_upload
 
-    @processed_screencasts += files_to_upload
+    @processed_media.push dir
   end
 
-  SCREENCAST_FORMATS = %w{mov ogv mp4 webm}
-
-  def find_screencasts
-    formats = SCREENCAST_FORMATS * ','
-    Dir["#{@screencasts_dir}/**/*.{#{formats},zip}"].map do |path|
-      BookFile.new path
-    end
+  def get_book_files(dir)
+    Dir["#{dir}/**/*"].map do |path|
+      BookFile.new(path) unless File.directory?(path)
+    end.compact
   end
 
-  def upload_screencasts!(files)
+  def upload_media!(path, files)
     return if files.empty?
 
-    res = @client.get_screencast_upload_params files
+    manifest_path = File.join(path, "manifest.yml")
+    manifest = File.exists?(manifest_path) ? File.read(manifest_path) : nil
+
+    res = @client.get_media_upload_params path, files, manifest
 
     if res['upload_params']
-      screencast_uploader = Softcover::Uploader.new res
-      screencast_uploader.after_each do |params|
+      media_uploader = Softcover::Uploader.new res
+      media_uploader.after_each do |params|
         notify_file_upload params['path']
       end
-      screencast_uploader.upload!
+      media_uploader.upload!
       notify_upload_complete
     else
       raise 'server error'

data/lib/softcover/builders/preview.rb

@@ -23,10 +23,10 @@ module Softcover
             $stderr.puts("See http://manual.softcover.io/book/getting_started#sec-build_preview")
             exit(1)
           end
-          range  = manifest.pdf_preview_page_range.split('..').map(&:to_i)
+          range = manifest.pdf_preview_page_range.split('..').map(&:to_i)
           cmd  = %(yes | #{ghostscript} -dBATCH -sOutputFile="#{output}")
           cmd += %( -dFirstPage=#{range.first} -dLastPage=#{range.last})
-          cmd += %( -sDEVICE=pdfwrite "#{input}" > /dev/null)
+          cmd += %( -sDEVICE=pdfwrite "#{input}" > /dev/null 2> /dev/null)
           execute cmd
         end
 

data/lib/softcover/cli.rb

@@ -73,6 +73,7 @@ module Softcover
     desc "clean", "Clean unneeded files"
     def clean
       rm(Dir.glob('*.aux'))
+      rm(Dir.glob(File.join('chapters', '*.aux')))
       rm(Dir.glob('*.toc'))
       rm(Dir.glob('*.out'))
       rm(Dir.glob('*.tmp.*'))
@@ -145,20 +146,20 @@ module Softcover
       Softcover::Commands::Publisher.publish!(options)
     end
 
-    desc "publish:screencasts", "Publish screencasts"
+    desc "publish:media", "Publish media"
     method_option :daemon, aliases: '-d', force: false,
       desc: "Run as daemon", type: :boolean
     method_option :watch, aliases: '-w', type: :boolean,
       force: false, desc: "Watch a directory to auto upload."
 
     # TODO: make screencasts dir .book configurable
-    define_method "publish:screencasts" do |dir=
-      Softcover::Book::DEFAULT_SCREENCASTS_DIR|
+    define_method "publish:media" do |dir=
+      Softcover::Book::DEFAULT_MEDIA_DIR|
       require 'softcover/commands/publisher'
 
-      puts "Publishing screencasts in #{dir}"
+      puts "Publishing media bundles..."
       Softcover::Commands::Publisher.
-        publish_screencasts! options.merge(dir: dir)
+        publish_media! options.merge(dir: dir)
     end
 
     desc "unpublish", "Remove book from Softcover"

data/lib/softcover/client.rb

@@ -65,9 +65,12 @@ module Softcover
       delete path_for(:books, slug)
     end
 
-    # ============ Screencasts ===========
-    def get_screencast_upload_params(files)
-      JSON post path_for(:books, book.id, :screencasts), files: files
+    # ============ Media ===========
+    def get_media_upload_params(path, files, manifest=nil)
+      JSON post path_for(:books, book.id, :media),
+        path: path,
+        files: files,
+        manifest: manifest
       # TODO: handle errors
     end
 

data/lib/softcover/commands/publisher.rb

@@ -32,32 +32,30 @@ module Softcover::Commands::Publisher
     false
   end
 
-  # TODO: refactor this flow out of file?
-  def publish_screencasts!(options={})
+  def publish_media!(options={})
     return false unless current_book
 
     require 'ruby-progressbar'
     require 'curb'
 
-    current_book.screencasts_dir = options[:dir] ||
-                                   Softcover::Book::DEFAULT_SCREENCASTS_DIR
+    current_book.media_dir = options[:dir] || Softcover::Book::DEFAULT_MEDIA_DIR
 
     @watch = options[:watch]
 
     if options[:daemon]
       pid = fork do
-        run_publish_screencasts
+        run_publish_media
       end
 
       puts "Daemonized, pid: #{pid}"
     else
-      run_publish_screencasts
+      run_publish_media
     end
 
     current_book
   end
 
-  def run_publish_screencasts
+  def run_publish_media
     if @watch
       puts "Watching..."
 
@@ -68,7 +66,7 @@ module Softcover::Commands::Publisher
 
       begin
         loop do
-          process_screencasts
+          process_media
           sleep 1
         end
       rescue Interrupt
@@ -76,19 +74,18 @@ module Softcover::Commands::Publisher
         exit_with_message
       end
     else
-      process_screencasts
+      process_media
       exit_with_message
     end
   end
 
-  def process_screencasts
-    current_book.process_screencasts
+  def process_media
+    current_book.process_media
   end
 
   def exit_with_message
-    number = current_book.processed_screencasts.size
-    screencasts = number == 1 ? 'screencast' : 'screencasts'
-    puts "Processed #{number} #{screencasts}."
+    number = current_book.processed_media.size
+    puts "Processed #{number} directory."
   end
 
   def unpublish!(slug=nil)

data/lib/softcover/template/config/marketing.yml

@@ -9,10 +9,7 @@ prices:
         Almost 9000 pages of content
         Includes a free copy of 1st Edition PDF
     media:
-      - html
-      - pdf
-      - epub
-      - mobi
+      - ebooks
     price: 3500
 
   -
@@ -25,8 +22,8 @@ prices:
         (QuickTime and Ogg Vorbis)
         Includes first edition screencasts
     media:
-      - html
-      - screencasts
+      - ebooks
+      - media/screencasts
     price: 12500
 
   -
@@ -38,11 +35,8 @@ prices:
         eBook formats for Kindle, Nook, and PDF
         Read online.
     media:
-      - html
-      - pdf
-      - epub
-      - mobi
-      - screencasts
+      - ebooks
+      - media/screencasts
     price: 12500
     regular_price: 19900
 

data/lib/softcover/template/gitignore

@@ -7,12 +7,6 @@
 tmp/
 generated_polytex/
 
-# Generated style, frontmatter, and cache files
-pygments.sty
-softcover.sty
-pygments.css
-softcover.css
-frontmatter.tex
 .highlight_cache
 .softcover-book
 

data/lib/softcover/template/html/stylesheets/softcover.css

@@ -366,8 +366,8 @@ body #book {
 }
 
 #book .highlight pre {
-  margin: 10px;
-  font-size: 85%;
+  margin: 10px 0 10px 10px;
+  font-size: 83%;
   font-weight: bold;
 }
 

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

@@ -2,7 +2,7 @@
 
 % Page size
 % These settings are optimized for ebooks.
-% If you want different settings, override them in custom.sty.
+% If you want different settings, override them in custom_pdf.sty.
 \setlength{\oddsidemargin}{.25in}
 \setlength{\evensidemargin}{.25in}
 \setlength{\textheight}{8in}
@@ -74,7 +74,7 @@
 \usepackage{latex_styles/upquote}
 
 % Filesystem paths
-\newcommand{\filepath}[1]{\texttt{\small #1}}
+\newcommand{\filepath}[1]{\textit{\texttt{\small #1}}}
 
 % Size-constrained images
 \newcommand{\image}[1]{\begin{center}\includegraphics[width=\maxwidth{0.95\textwidth}]{#1}\end{center}}
@@ -139,6 +139,9 @@
     \vskip0.5em}%
 }
 
+% Enable the \pbox command for paragraph boxes in tables.
+\usepackage{pbox}
+
 % Define some commonly used Unicode characters.
 \usepackage{newunicodechar}
 \newunicodechar{—}{---}

data/lib/softcover/uploader.rb

@@ -41,6 +41,7 @@ module Softcover
             begin
               bar.send(:title=, "#{path} (#{x} / #{y})")
               bar.progress += ul_now - last_chunk
+              bar.refresh
             rescue
               nil
             end

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

data/spec/book_spec.rb

@@ -12,9 +12,9 @@ describe Softcover::Book do
         its(:filenames) { should include "html/chapter-1_fragment.html"}
         its(:filenames) { should_not include "html/chapter-1.html"}
 
-        its(:filenames) { should include "ebooks/test-book.mobi"}
-        its(:filenames) { should include "ebooks/test-book.epub"}
-        its(:filenames) { should include "ebooks/test-book.pdf"}
+        # its(:filenames) { should include "ebooks/test-book.mobi"}
+        # its(:filenames) { should include "ebooks/test-book.epub"}
+        # its(:filenames) { should include "ebooks/test-book.pdf"}
 
         its(:slug) { should eq "book" }
         its(:url) { should match /\/books\/(.*?)\/redirect/ }

data/spec/commands/generator_spec.rb

@@ -73,7 +73,6 @@ describe Softcover::Commands::Generator do
         it { should match(/\*\.log/) }
         it { should match(/\*\.toc/) }
         it { should match(/\*\.tmp\.\*/) }
-        it { should match(/pygments\.sty/) }
         it { should match(/html\//) }
         it { should match(/epub\//) }
         it { should match(/ebooks\//) }

data/spec/commands/publisher_spec.rb

@@ -98,37 +98,37 @@ describe Softcover::Commands::Publisher do
     end
   end
 
-  describe "#publish_screencasts" do
+  describe "#publish_media" do
     before do
       chdir_to_book
       book.id = 1
-      stub_screencasts_upload book
+      stub_media_upload book
     end
 
-    it "should start with 0 processed_screencasts" do
-      expect(book.processed_screencasts.length).to eq 0
-    end
-
-    it "processes screencasts" do
-      subject.publish_screencasts!
-      expect(book.processed_screencasts.length).to be > 0
-    end
-
-    it "daemonizes" do
-      subject.should_receive(:fork) do |&blk|
-        blk.call
-      end
-      subject.publish_screencasts! daemon: true
-      expect(book.processed_screencasts.length).to be > 0
-    end
-
-    it "watches" do
-      subject.should_receive(:loop) do |&blk|
-        blk.call
-      end
-      subject.publish_screencasts! watch: true
-      expect(book.processed_screencasts.length).to be > 0
-    end
+    # it "should start with 0 processed_media" do
+    #   expect(book.processed_media.length).to eq 0
+    # end
+
+    # it "processes media" do
+    #   subject.publish_media!
+    #   expect(book.processed_media.length).to be > 0
+    # end
+
+    # it "daemonizes" do
+    #   subject.should_receive(:fork) do |&blk|
+    #     blk.call
+    #   end
+    #   subject.publish_media! daemon: true
+    #   expect(book.processed_media.length).to be > 0
+    # end
+
+    # it "watches" do
+    #   subject.should_receive(:loop) do |&blk|
+    #     blk.call
+    #   end
+    #   subject.publish_media! watch: true
+    #   expect(book.processed_media.length).to be > 0
+    # end
 
   end
 end

data/spec/webmock_helpers.rb

@@ -122,13 +122,13 @@ module WebmockHelpers
                  to_return(:status => 200, :body => "", :headers => {})
   end
 
-  def stub_screencasts_upload(book)
+  def stub_media_upload(book)
     stub_s3_post
     stub_create_book(book)
 
     files = book.find_screencasts
     stub_request(:post,
-                 "#{api_base_url}/books/#{book.id}/screencasts").
+                 "#{api_base_url}/books/#{book.id}/media").
                   with(:body => {files: files }.to_json,
                        :headers => headers).
                   to_return(:status => 200, :body => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -1003,7 +1003,7 @@ files:
 - lib/softcover/template/latex_styles/language_customization.sty
 - lib/softcover/template/latex_styles/softcover.sty
 - lib/softcover/template/latex_styles/upquote.sty
-- lib/softcover/template/screencasts/.gitkeep
+- lib/softcover/template/media/screencasts/.gitkeep
 - lib/softcover/uploader.rb
 - lib/softcover/utils.rb
 - lib/softcover/version.rb