klipbook 2.0.0 → 2.1.0

data/bin/klipbook

@@ -2,126 +2,222 @@
 
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 
-require 'gli'
 require 'klipbook'
+require 'slop'
 
-include GLI::App
+##########
+# Helpers
+##########
 
-program_desc "Collates the clippings you've saved on your Kindle into a nice html summary for each book."
+def get_book_source(opts)
+  exit_unless_valid_source(opts)
 
-SOURCE_HELP = "Two sources are currently supported: a file from a Kindle device and the Kindle site itself.\n\n" +
-              "Example file formats:\n\n" +
-              "   file:path/to/my-clippings-file.txt\n\n" +
-              "   site:my-kindle-user@blah.com:my-kindle-password\n\n" +
-              "Note that source and output file defaults can be stored in a file called ~/.klipbookrc\n\n" +
-              "This file is YAML formatted e.g.\n\n" +
-              "source: site:my-kindle-user@blah.com:my-kindle-password\n\n" +
-              "output: my/default/output/directory"
-
-version Klipbook::VERSION
+  max_books   = opts[:number].to_i
 
-desc 'Number of books to process'
-arg_name 'count'
-default_value 1
-flag [:n, :'num-books']
+  unless max_books > 0
+    $stderr.puts "Error: Specify a number of books greater than 0"
+    exit 127
+  end
 
-desc 'Collate your clippings into a single json file'
-arg_name 'source'
-long_desc "Clippings are fetched from the specified source, collated, and written into a single json file.\n\n" +
-          SOURCE_HELP
-command :collate do |c|
+  get_file_source(infile(opts), max_books) || get_site_source(credentials(opts), max_books)
+end
 
-  c.desc 'Specify the name of the json file to be written to.'
-  c.arg_name 'File-name'
-  c.flag [:c, :'output-file']
+def exit_unless_valid_source(opts)
+  unless opts[:infile] || opts[:credentials] || CONFIG[:credentials]
+    $stderr.puts "Error: #{SOURCE_HELP}"
+    exit 127
+  end
+end
 
-  c.desc 'Force overwrite of any existing book entries within the output file'
-  c.switch [:f, :force]
+def get_site_source(creds, max_books)
+  return nil unless creds
 
-  c.action do |globals,options,args|
-    book_file_path = output_file(options)
-    books = fetch_books(args, globals)
-    Klipbook::Commands::Collate.new(books, book_file(book_file_path)).call(book_file_path, options[:f])
+  unless creds =~ /(.+):(.+)/
+    $stderr.puts "Error: your credentials need to be in username:password format."
+    exit 127
   end
-end
 
-desc 'Pretty print your clippings into a html file for each book'
-arg_name 'source'
-long_desc "Clippings are fetched from the specified source before being written to html " +
-          "files in the output directory.\n\n" + SOURCE_HELP
-command :pprint do |c|
+  username = $1
+  password = $2
+  Klipbook::Sources::AmazonSite::SiteScraper.new(username, password, max_books)
+end
 
-  c.desc 'Override the directory path where html files are written'
-  c.arg_name 'Directory'
-  c.flag [:o, :'output-dir']
+def get_file_source(file, max_books)
+  return nil unless file
 
-  c.desc 'Force overwrite of any existing files'
-  c.switch [:f, :force]
+  Klipbook::Sources::KindleDevice::File.new(file, max_books)
+end
 
-  c.action do |globals,options,args|
-    books = fetch_books(args, globals)
-    Klipbook::Commands::PrettyPrint.new(books).call(output_dir(options), options[:f])
-  end
+def fetch_books(opts)
+  get_book_source(opts).books
 end
 
-desc 'List available books'
-arg_name 'source'
-long_desc "List the books from the specified source to screen.\n\n" + SOURCE_HELP
-command :list do |c|
-  c.action do |globals,options,args|
-    books = fetch_books(args, globals)
-    Klipbook::Commands::ListBooks.new(books).call
+def open_infile(file_path)
+  return nil unless file_path
+
+  unless File.exists? file_path
+    $stderr.puts "Error: could not open #{file_path}"
+    exit 127
   end
+
+  File.open(file_path, "r")
 end
 
-pre do |globals,command,options,args|
-  unless source_spec(args)
-    raise InvalidSourceError
+def raw_json_from_file(file_path)
+  File.open(file_path, 'r') do |f|
+    f.read
   end
+rescue
+  ""
+end
 
-  odir = output_dir(options)
-  if odir && !File.exists?(odir)
-    raise "Output directory doesn't exist: #{odir}"
-  end
+def book_file(file_path)
+  Klipbook::Collate::BookFile.from_json(raw_json_from_file(file_path))
+end
 
-  if globals[:n].to_i == 0
-    raise 'Specify a number of books greater than 0'
-  end
+#########
+# Params
+#########
 
-  true
+def infile(opts)
+  open_infile(opts[:infile])
 end
 
-on_error do |exception|
-  true
+def credentials(opts)
+  puts "Using credentials from ~/.klipbookrc" if !opts[:credentials] && CONFIG[:credentials]
+
+  opts[:credentials] || CONFIG[:credentials]
 end
 
-def book_file(file_path)
-  raw_json = if File.exist?(file_path)
-               File.open(file_path, 'r') do |f|
-                 f.read
-               end
-             else
-               ''
-             end
+def ensure_outfile(opts)
+  unless opts[:outfile] || CONFIG[:outfile]
+    $stderr.puts("Error: Please specify an outfile.")
+    exit(127)
+  end
 
-  Klipbook::Collate::BookFile.from_json(raw_json)
+  outfile_path(opts)
 end
 
-def source_spec(args)
-  @source_spec ||= (args[0] || Klipbook::Config.new.read[:source])
+def outfile_path(opts)
+  puts "Using outfile from ~/.klipbookrc" if !opts[:outfile] && CONFIG[:outfile]
+
+  opts[:outfile] || CONFIG[:outfile]
 end
 
-def fetch_books(args, globals)
-  Klipbook::Sources::BookSource.new(source_spec(args), globals[:n].to_i).books
+def ensure_outdir(opts)
+  unless opts[:outdir] || CONFIG[:outdir]
+    $stderr.puts("Error: Please specify an outdir.")
+    exit(127)
+  end
+
+  outdir = outdir_path(opts)
+
+  unless File.exists?(outdir)
+    $stderr.puts("Error: Outdir does not exist.")
+    exit(127)
+  end
+
+  outdir
 end
 
-def output_dir(options)
-  @output_dir ||= (options[:o] || Klipbook::Config.new.read[:output] || Dir.pwd)
+def outdir_path(opts)
+  puts "Using outdir from ~/.klipbookrc" if !opts[:outdir] && CONFIG[:outdir]
+
+  opts[:outdir] || CONFIG[:outdir] || Dir.pwd
 end
 
-def output_file(options)
-  @output_file ||= (options[:c] || Klipbook::Config.new.read[:output_file] || File.join(Dir.pwd, 'books.json'))
+##########
+# Go time
+##########
+
+CONFIG = Klipbook::Config.new.read
+
+DEFAULT_MAXBOOKS=5
+SOURCE_HELP = "You must specify either `--credentials` or `--infile` as an input."
+
+CONFIG_HELP = "Note that credentials, outdir, and outfile defaults can be stored in a file called ~/.klipbookrc\n\n" +
+              "This file is YAML formatted e.g.\n\n" +
+              ":credentials: my-kindle-user@blah.com:my-kindle-password\n" +
+              ":outdir: my/default/output/directory\n" +
+              ":outfile: my/default/output/file.json\n"
+
+def banner_for_command(command, description)
+  "Usage: klipbook #{command} [options]\n\n#{description}\n\n#{SOURCE_HELP}\n"
 end
 
-exit run(ARGV)
+opts = Slop.parse(help: true) do
+  banner "Usage: klipbook <command> [options]\n\n" +
+         "Klipbook pretty prints the clippings you've saved on your Kindle into JSON or pretty html.\n\n" +
+         CONFIG_HELP + "\n"
+
+  on :v, :version, "Print the version." do
+    puts "Klipbook version #{Klipbook::VERSION}"
+  end
+
+  command "list" do
+    desc = "List the books on the site or in the clippings file."
+
+    banner banner_for_command("list", desc)
+
+    description desc
+
+    on :c, :credentials=, "<username>:<password> for Kindle site"
+    on :i, :infile=,      "Input file (default STDIN)"
+    on :n, :number=,      "Maximum number of books to list (default is #{DEFAULT_MAXBOOKS})", default: DEFAULT_MAXBOOKS
+
+    run do |opts, args|
+      books = fetch_books(opts)
+      Klipbook::Commands::ListBooks.new(books).call
+    end
+  end
+
+  command "tojson" do
+    desc = "Print book highlights as JSON. Note that this will update an existing JSON file in place with new entries."
+
+    banner banner_for_command("tojson", desc)
+
+    description desc
+
+    on :c, :credentials=, "<username>:<password> for Kindle site"
+    on :i, :infile=,      "Input file (default STDIN)"
+    on :n, :number=,      "Maximum number of books to print as json (default is #{DEFAULT_MAXBOOKS})", default: DEFAULT_MAXBOOKS
+    on :o, :outfile=,     "Output JSON file (default STDOUT)"
+    on :f, :force,        "Force overwrite of any existing book entries within the output file"
+
+    run do |opts, args|
+      outfile_path = ensure_outfile(opts)
+
+      books = fetch_books(opts)
+
+      Klipbook::Commands::Collate.new(books, book_file(outfile_path)).call(outfile_path, opts[:force])
+    end
+  end
+
+  command "tohtml" do
+    desc = "Print book highlights as HTML."
+
+    banner banner_for_command("tohtml", desc)
+
+    description desc
+
+    on :c, :credentials=, "<username>:<password> for Kindle site"
+    on :i, :infile=,      "Input file (default STDIN)"
+    on :n, :number=,      "Maximum number of books to print as html (default is #{DEFAULT_MAXBOOKS})", default: DEFAULT_MAXBOOKS
+    on :o, :outdir=,      "Directory to write HTML files to (default pwd)"
+    on :f, :force,        "Force overwrite of existing files"
+
+    run do |opts, args|
+      books = fetch_books(opts)
+
+      outdir_path = ensure_outdir(opts)
+
+      Klipbook::Commands::PrettyPrint.new(books).call(outdir_path, opts[:force])
+    end
+  end
+
+  # Default action is to output help
+  run do |opts, args|
+    puts opts.help
+  end
+end
 

data/features/step_definitions/list_steps.rb

@@ -6,10 +6,10 @@ Given /^I have a clippings file "([^"]*)" that contains no clippings$/ do |input
 end
 
 When /^I list "([^"]*)" books in the file "([^"]*)"$/ do |book_count, input_file|
-  run_simple(unescape("klipbook -n #{book_count} list file:#{input_file}"), false)
+  run_simple(unescape("klipbook list -n #{book_count} -i #{input_file}"), false)
 end
 
 # FIXME This step currently assumes you have site: set up in your klipbookrc
 When /^I list "([^"]*)" books from the kindle site$/ do |book_count|
-  run_simple(unescape("klipbook -n #{book_count} list"), false)
+  run_simple(unescape("klipbook list -n #{book_count}"), false)
 end

data/features/step_definitions/{pretty_print_steps.rb → tohtml_steps.rb}

@@ -14,12 +14,12 @@ Given /^a file that contains clippings for 3 books called "([^"]*)"$/ do |file_n
   in_current_dir { FileUtils.cp(CLIPPING_FILE, file_name) }
 end
 
-When /^I pretty print clippings for "([^"]*)" books from the file "([^"]*)" to the output directory "([^"]*)"$/ do |book_count, input_file, output_dir|
-  run_pretty_print_file(book_count, output_dir, input_file, false)
+When /^I tohtml clippings for "([^"]*)" books from the file "([^"]*)" to the output directory "([^"]*)"$/ do |book_count, input_file, output_dir|
+  run_tohtml_file(book_count, output_dir, input_file, false)
 end
 
-When /^I pretty print clippings for "([^"]*)" books from the file "([^"]*)" to the output directory "([^"]*)" forcefully$/ do |book_count, input_file, output_dir|
-  run_pretty_print_file(book_count, output_dir, input_file, true)
+When /^I tohtml clippings for "([^"]*)" books from the file "([^"]*)" to the output directory "([^"]*)" forcefully$/ do |book_count, input_file, output_dir|
+  run_tohtml_file(book_count, output_dir, input_file, true)
 end
 
 Then /^I should find a file in the folder "([^"]*)" named "([^"]*)" that contains "([^"]*)" clippings$/ do |output_folder, file_name, clipping_count|
@@ -33,11 +33,11 @@ Then /^I should find a file in the folder "([^"]*)" named "([^"]*)" that contain
 end
 
 # FIXME This step currently assumes you have site: set up in your klipbookrc
-When /^I pretty print clippings for "([^"]*)" books from the kindle site to the output directory "([^"]*)"$/ do |book_count, output_dir|
-  run_simple(unescape("klipbook -n #{book_count} pprint -o #{output_dir}"), false)
+When /^I tohtml clippings for "([^"]*)" books from the kindle site to the output directory "([^"]*)"$/ do |book_count, output_dir|
+  run_simple(unescape("klipbook tohtml -n #{book_count} -o #{output_dir}"), false)
 end
 
-Then /^I should find "([^"]*)" pretty printed files containing clippings in the directory "([^"]*)"$/ do |file_count, output_dir|
+Then /^I should find "([^"]*)" html files containing clippings in the directory "([^"]*)"$/ do |file_count, output_dir|
   in_current_dir do
     files = Dir['output/*.html']
     files.should have(file_count.to_i).items
@@ -49,13 +49,13 @@ Then /^I should find "([^"]*)" pretty printed files containing clippings in the
   end
 end
 
-def run_pretty_print_file(book_count, output, input, force=false)
+def run_tohtml_file(book_count, output, input, force=false)
   force_str = if force
     '-f'
   else
     ''
   end
 
-  run_simple(unescape("klipbook -n #{book_count} pprint #{force_str} -o #{output} file:#{input}"), false)
+  run_simple(unescape("klipbook tohtml -n #{book_count} #{force_str} -o #{output} -i #{input}"), false)
 end
 

data/features/step_definitions/tojson_steps.rb

@@ -0,0 +1,17 @@
+
+When /^I tojson clippings for "([^"]*)" books from the file "([^"]*)" to the output file "([^"]*)"$/ do |book_count, input_file, output_file|
+  run_tojson(book_count, output_file, input_file)
+end
+
+Then /^I should find a file called "([^"]*)" that contains "([^"]*)"$/ do |output_file, expected_text|
+  in_current_dir do
+    File.exists?(output_file).should be_true
+    File.open(output_file, 'r') do |f|
+      f.read.should match(/#{expected_text}/m)
+    end
+  end
+end
+
+def run_tojson(book_count, output_file, input_file)
+  run_simple(unescape("klipbook tojson -n #{book_count} -o #{output_file} -i #{input_file}"), false)
+end

data/features/{pretty_print.feature → tohtml.feature}

@@ -1,4 +1,4 @@
-Feature: klipbook pretty prints the clippings from a clippings file
+Feature: klipbook outputs the clippings from a clippings file into a set of HTML files
   As an avid reader and note taker
   I want to see a pretty html summary for each of the books that I've read
   So that I can refer to a nice summary of passages I enjoyed in the book
@@ -6,7 +6,7 @@ Feature: klipbook pretty prints the clippings from a clippings file
   Scenario: File with clippings for a book
     Given a directory named "output"
     And a file that contains clippings for 3 books called "input.txt"
-    When I pretty print clippings for "3" books from the file "input.txt" to the output directory "output"
+    When I tohtml clippings for "3" books from the file "input.txt" to the output directory "output"
     Then I should find a file in the folder "output" named "Lean Software Development: An Agile Toolkit by Mary Poppendieck and Tom Poppendieck.html" that contains "13" clippings
     Then I should find a file in the folder "output" named "Instapaper: Long Reads by Instapaper: Long Reads.html" that contains "4" clippings
     Then I should find a file in the folder "output" named "Clean Code: A Handbook of Agile Software Craftsmanship by Robert C. Martin.html" that contains "3" clippings
@@ -16,7 +16,7 @@ Feature: klipbook pretty prints the clippings from a clippings file
     Given a directory named "output"
     And a file in "output" named "Clean Code: A Handbook of Agile Software Craftsmanship by Robert C. Martin.html"
     And a file that contains clippings for 3 books called "input.txt"
-    When I pretty print clippings for "3" books from the file "input.txt" to the output directory "output"
+    When I tohtml clippings for "3" books from the file "input.txt" to the output directory "output"
     Then the output should contain "Skipping Clean Code: A Handbook of Agile Software Craftsmanship by Robert C. Martin.html"
     And the exit status should be 0
 
@@ -24,28 +24,28 @@ Feature: klipbook pretty prints the clippings from a clippings file
     Given a directory named "output"
     And a file in "output" named "Clean Code: A Handbook of Agile Software Craftsmanship by Robert C. Martin.html"
     And a file that contains clippings for 3 books called "input.txt"
-    When I pretty print clippings for "3" books from the file "input.txt" to the output directory "output" forcefully
+    When I tohtml clippings for "3" books from the file "input.txt" to the output directory "output" forcefully
     Then the output should contain "Writing Clean Code: A Handbook of Agile Software Craftsmanship by Robert C. Martin.html"
     And the exit status should be 0
 
   Scenario: Attempt to write with a bad number of books
     Given a directory named "output"
     And a file that contains clippings for 3 books called "input.txt"
-    When I pretty print clippings for "notanumber" books from the file "input.txt" to the output directory "output"
-    Then the output should contain "error: Specify a number of books greater than 0"
-    And the exit status should be 1
+    When I tohtml clippings for "notanumber" books from the file "input.txt" to the output directory "output"
+    Then the output should contain "Error: Specify a number of books greater than 0"
+    And the exit status should be 127
 
   Scenario: Attempt to write to a non-existent directory
     Given there is not a directory named "output"
     And a file that contains clippings for 3 books called "input.txt"
-    When I pretty print clippings for "3" books from the file "input.txt" to the output directory "output"
-    Then the output should contain "error: Output directory doesn't exist: output"
-    And the exit status should be 1
+    When I tohtml clippings for "3" books from the file "input.txt" to the output directory "output"
+    Then the output should contain "Error: Outdir does not exist."
+    And the exit status should be 127
 
   @slow
   Scenario: Site with clippings for a book
     Given a directory named "output"
-    When I pretty print clippings for "1" books from the kindle site to the output directory "output"
-    Then I should find "1" pretty formated files containing clippings in the directory "output"
+    When I tohtml clippings for "1" books from the kindle site to the output directory "output"
+    Then I should find "1" html files containing clippings in the directory "output"
     And the exit status should be 0
 

data/features/{collate.feature → tojson.feature}

@@ -1,11 +1,11 @@
-Feature: klipbook collates clippings from a clippings file
+Feature: klipbook outputs clippings from a clippings file into a JSON file
   As an avid reader and note taker
   I want to see a single JSON file collating the clippings of the books that I've read
   So that I can export them to other tools for my enjoyment
 
   Scenario: File with clippings for a book
     Given a file that contains clippings for 3 books called "input.txt"
-    When I collate clippings for "3" books from the file "input.txt" to the output file "books.json"
+    When I tojson clippings for "3" books from the file "input.txt" to the output file "books.json"
     Then I should find a file called "books.json" that contains "Lean Software Development: An Agile Toolkit"
     And the exit status should be 0
 

data/klipbook.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "klipbook"
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ray Grasso"]
-  s.date = "2013-02-13"
+  s.date = "2013-12-11"
   s.description = "Process your Kindle clippings file to generate a nicely formatted compilation of the clippings of the books you've read"
   s.email = "ray.grasso@gmail.com"
   s.executables = ["klipbook"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".ruby-version",
     ".yardopts",
     "CHANGELOG.txt",
     "Gemfile",
@@ -30,14 +31,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "bin/klipbook",
     "example.png",
-    "features/collate.feature",
     "features/fixtures/clippings-for-three-books.txt",
     "features/list.feature",
-    "features/pretty_print.feature",
-    "features/step_definitions/collate_steps.rb",
     "features/step_definitions/list_steps.rb",
-    "features/step_definitions/pretty_print_steps.rb",
+    "features/step_definitions/tohtml_steps.rb",
+    "features/step_definitions/tojson_steps.rb",
     "features/support/env.rb",
+    "features/tohtml.feature",
+    "features/tojson.feature",
     "klipbook.gemspec",
     "lib/klipbook.rb",
     "lib/klipbook/collate/book_file.rb",
@@ -50,7 +51,6 @@ Gem::Specification.new do |s|
     "lib/klipbook/sources/amazon_site/book_scraper.rb",
     "lib/klipbook/sources/amazon_site/site_scraper.rb",
     "lib/klipbook/sources/book.rb",
-    "lib/klipbook/sources/book_source.rb",
     "lib/klipbook/sources/clipping.rb",
     "lib/klipbook/sources/invalid_source_error.rb",
     "lib/klipbook/sources/kindle_device/entry.rb",
@@ -64,7 +64,6 @@ Gem::Specification.new do |s|
     "spec/lib/klipbook/commands/list_books_spec.rb",
     "spec/lib/klipbook/commands/pretty_print_spec.rb",
     "spec/lib/klipbook/pretty_print/html_printer_spec.rb",
-    "spec/lib/klipbook/sources/book_source_spec.rb",
     "spec/lib/klipbook/sources/book_spec.rb",
     "spec/lib/klipbook/sources/kindle_device/entry_parser_spec.rb",
     "spec/lib/klipbook/sources/kindle_device/file_parser_spec.rb",
@@ -76,61 +75,55 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/grassdog/klipbook"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.14"
   s.summary = "Klipbook creates a nice html summary of the clippings you've created on your Kindle."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gli>, [">= 0"])
+      s.add_runtime_dependency(%q<slop>, [">= 0"])
       s.add_runtime_dependency(%q<mechanize>, [">= 0"])
       s.add_runtime_dependency(%q<rainbow>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
       s.add_development_dependency(%q<pry-debugger>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<guard-cucumber>, [">= 0"])
-      s.add_development_dependency(%q<terminal-notifier-guard>, [">= 0"])
     else
-      s.add_dependency(%q<gli>, [">= 0"])
+      s.add_dependency(%q<slop>, [">= 0"])
       s.add_dependency(%q<mechanize>, [">= 0"])
       s.add_dependency(%q<rainbow>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
       s.add_dependency(%q<pry-debugger>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<aruba>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<guard-cucumber>, [">= 0"])
-      s.add_dependency(%q<terminal-notifier-guard>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gli>, [">= 0"])
+    s.add_dependency(%q<slop>, [">= 0"])
     s.add_dependency(%q<mechanize>, [">= 0"])
     s.add_dependency(%q<rainbow>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
     s.add_dependency(%q<pry-debugger>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<guard-cucumber>, [">= 0"])
-    s.add_dependency(%q<terminal-notifier-guard>, [">= 0"])
   end
 end
 

data/lib/klipbook/collate/book_file.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'rainbow'
 
 module Klipbook::Collate
   class BookFile
@@ -21,9 +22,13 @@ module Klipbook::Collate
     def add_books(new_books, force, message_stream=$stdout)
       new_books.each do |new_book|
         if book_exists?(new_book)
-          replace_book(new_book, message_stream) if force
+          if force
+            replace_book(new_book, message_stream)
+          else
+            message_stream.puts "Skipping: ".foreground(:yellow) + "#{new_book.title_and_author}"
+          end
         else
-          message_stream.puts "Adding: #{new_book.title_and_author}"
+          message_stream.puts "Adding: ".foreground(:green) + "#{new_book.title_and_author}"
           @books.push(new_book)
         end
       end
@@ -44,7 +49,7 @@ module Klipbook::Collate
     end
 
     def replace_book(new_book, message_stream)
-      message_stream.puts "Updating: #{new_book.title_and_author}"
+      message_stream.puts "Updating: ".foreground(:green) + "#{new_book.title_and_author}"
 
       old_book = find_book(new_book)
       @books.delete(old_book)

data/lib/klipbook/sources/kindle_device/file.rb

@@ -1,12 +1,13 @@
 module Klipbook::Sources
   module KindleDevice
     class File
-      def initialize(file_path, max_books, file_parser=FileParser.new)
-        @file_text = ::File.open(file_path, 'r') {|f| f.read.strip }
+      def initialize(infile, max_books, file_parser=FileParser.new)
+        @file_text = infile.read.strip
         @file_parser = file_parser
         @max_books = max_books
       end
 
+      # TODO Shift max books here
       def books
         @books ||= build_books.take(@max_books)
       end
@@ -25,7 +26,7 @@ module Klipbook::Sources
 
       def build_sorted_book_list(sorted_entries)
         books_from_entries(sorted_entries).sort do |book_a, book_b|
-          -(book_a.last_update <=> book_b.last_update)
+          book_b.last_update <=> book_a.last_update
         end
       end
 

data/lib/klipbook/version.rb

@@ -1,3 +1,3 @@
 module Klipbook
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end