klipbook 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c23d7ac916e9878b64bdc8b0fdca59d0185cfe35
-  data.tar.gz: 3e78a7b8f33b4b6f85c1f39470bd960b0293169a
+  metadata.gz: d3037bf853bd7bf7df5dbf9eaf706b5e2b2aca40
+  data.tar.gz: 17882844c725d1f2464b3320294252823b04d830
 SHA512:
-  metadata.gz: 8c6a73d2e9e8c8f730a381edd767520a2341a4fbd28612a8ccee03b0d31fb36f5e72290adbcc2912e814a895c44bd443fec1a0d56c4b759b257c30bcb97946d0
-  data.tar.gz: ed4cd0809d555814d5f4c83dfa8e3cafa19dbc9f9e3bcff6ab94841d7398d7831d1e37d734a8a98af72f6be9647a4ef140993c9ed7daa74990a1908686b1b9db
+  metadata.gz: 2b994c3ada7655bfacde42017cc9e94072912bb89c72dde3b7be1f1171fe22cbf6dcee61a28d99b536ade0e6308dfb292f4476601e414bf61f886311e34045f9
+  data.tar.gz: d7e099518000d5bdf4e95f9efff094aa92b15f959540f1adb1f690c6223a1a5e04c28543569dec54bdc0bae9beb72c151ec1de48504dd737c23826b2e725f9e3

data/CHANGELOG.txt

@@ -1,3 +1,9 @@
+== 2.1.0 / 2013-12-11
+
+* Feature changes
+
+	* Reworked parameters for better clarity. tosjon and tohtml are now supported.
+
 == 2.0.0 / 2013-02-12
 
 * Feature changes

data/README.md

@@ -110,7 +110,7 @@ them into a single JSON file.
 $ klipbook tojson -i "My Clippings.txt" -o books.json
 ```
 
-You can rerun collate on an existing JSON file to add new books. By default existing
+You can rerun tojson on an existing JSON file to add new books. By default existing
 books in the JSON file will not be overwritten. This can be changed with the `--force`
 flag.
 

data/bin/klipbook

@@ -72,7 +72,7 @@ rescue
 end
 
 def book_file(file_path)
-  Klipbook::Collate::BookFile.from_json(raw_json_from_file(file_path))
+  Klipbook::ToJson::BookFile.from_json(raw_json_from_file(file_path))
 end
 
 #########
@@ -147,11 +147,12 @@ end
 
 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" +
+         "Klipbook writes 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}"
+    exit 0
   end
 
   command "list" do
@@ -189,7 +190,7 @@ opts = Slop.parse(help: true) do
 
       books = fetch_books(opts)
 
-      Klipbook::Commands::Collate.new(books, book_file(outfile_path)).call(outfile_path, opts[:force])
+      Klipbook::Commands::ToJson.new(books, book_file(outfile_path)).call(outfile_path, opts[:force])
     end
   end
 
@@ -211,7 +212,7 @@ opts = Slop.parse(help: true) do
 
       outdir_path = ensure_outdir(opts)
 
-      Klipbook::Commands::PrettyPrint.new(books).call(outdir_path, opts[:force])
+      Klipbook::Commands::ToHtml.new(books).call(outdir_path, opts[:force])
     end
   end
 

data/features/support/env.rb

@@ -7,6 +7,10 @@ $LOAD_PATH << File.expand_path('../../../lib', __FILE__)
 require 'klipbook'
 require 'fileutils'
 
+Before do
+  @aruba_timeout_seconds = 40
+end
+
 Before('@slow') do
   @aruba_io_wait_seconds = 40
 end

data/klipbook.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "klipbook"
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ray Grasso"]
-  s.date = "2013-12-11"
+  s.date = "2013-12-12"
   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"]
@@ -41,13 +41,10 @@ Gem::Specification.new do |s|
     "features/tojson.feature",
     "klipbook.gemspec",
     "lib/klipbook.rb",
-    "lib/klipbook/collate/book_file.rb",
-    "lib/klipbook/commands/collate.rb",
     "lib/klipbook/commands/list_books.rb",
-    "lib/klipbook/commands/pretty_print.rb",
+    "lib/klipbook/commands/tohtml.rb",
+    "lib/klipbook/commands/tojson.rb",
     "lib/klipbook/config.rb",
-    "lib/klipbook/pretty_print/html_book_summary.erb",
-    "lib/klipbook/pretty_print/html_printer.rb",
     "lib/klipbook/sources/amazon_site/book_scraper.rb",
     "lib/klipbook/sources/amazon_site/site_scraper.rb",
     "lib/klipbook/sources/book.rb",
@@ -57,17 +54,20 @@ Gem::Specification.new do |s|
     "lib/klipbook/sources/kindle_device/entry_parser.rb",
     "lib/klipbook/sources/kindle_device/file.rb",
     "lib/klipbook/sources/kindle_device/file_parser.rb",
+    "lib/klipbook/tohtml/html_book_summary.erb",
+    "lib/klipbook/tohtml/html_printer.rb",
+    "lib/klipbook/tojson/book_file.rb",
     "lib/klipbook/util/blank.rb",
     "lib/klipbook/util/struct_to_json.rb",
     "lib/klipbook/version.rb",
-    "spec/lib/klipbook/collate/book_file_spec.rb",
     "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/commands/tohtml_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",
     "spec/lib/klipbook/sources/kindle_device/file_spec.rb",
+    "spec/lib/klipbook/tohtml/html_printer_spec.rb",
+    "spec/lib/klipbook/tojson/book_file_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/rspec2.rb",
     "spec/support/with_rr.rb"

data/lib/klipbook/commands/{pretty_print.rb → tohtml.rb}

@@ -1,6 +1,6 @@
 module Klipbook::Commands
-  class PrettyPrint
-    def initialize(books, pretty_printer=Klipbook::PrettyPrint::HtmlPrinter.new)
+  class ToHtml
+    def initialize(books, pretty_printer=Klipbook::ToHtml::HtmlPrinter.new)
       @books = books
       @pretty_printer = pretty_printer
     end

data/lib/klipbook/commands/{collate.rb → tojson.rb}

@@ -1,5 +1,5 @@
 module Klipbook::Commands
-  class Collate
+  class ToJson
     def initialize(books, book_file)
       @books = books
       @book_file = book_file

data/lib/klipbook/{pretty_print → tohtml}/html_printer.rb

@@ -1,6 +1,6 @@
 require 'erb'
 
-module Klipbook::PrettyPrint
+module Klipbook::ToHtml
   class HtmlPrinter
     def initialize(message_stream=$stdout)
       @message_stream = message_stream

data/lib/klipbook/{collate → tojson}/book_file.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'rainbow'
 
-module Klipbook::Collate
+module Klipbook::ToJson
   class BookFile
     attr_reader :books
 

data/lib/klipbook/version.rb

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

data/lib/klipbook.rb

@@ -3,9 +3,9 @@ require 'klipbook/util/blank'
 require 'klipbook/util/struct_to_json'
 require 'klipbook/version'
 
-require 'klipbook/commands/collate'
+require 'klipbook/commands/tojson'
 require 'klipbook/commands/list_books'
-require 'klipbook/commands/pretty_print'
+require 'klipbook/commands/tohtml'
 
 require 'klipbook/sources/book'
 require 'klipbook/sources/clipping'
@@ -21,5 +21,5 @@ require 'klipbook/sources/amazon_site/book_scraper'
 
 require 'klipbook/config'
 
-require 'klipbook/pretty_print/html_printer'
-require 'klipbook/collate/book_file'
+require 'klipbook/tohtml/html_printer'
+require 'klipbook/tojson/book_file'

data/spec/lib/klipbook/commands/{pretty_print_spec.rb → tohtml_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Klipbook::Commands::PrettyPrint do
+describe Klipbook::Commands::ToHtml do
 
-  let (:it) { Klipbook::Commands::PrettyPrint.new(books, pretty_printer) }
+  let (:it) { Klipbook::Commands::ToHtml.new(books, pretty_printer) }
 
   let (:pretty_printer) do
     Object.new.tap do |fake_printer|

data/spec/lib/klipbook/{pretty_print → tohtml}/html_printer_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 # This is more of an integration test but what the heck
 # it can live in here for now
 
-describe Klipbook::PrettyPrint::HtmlPrinter do
+describe Klipbook::ToHtml::HtmlPrinter do
 
   before(:all) do
     @output_dir = Dir.mktmpdir
@@ -29,7 +29,7 @@ describe Klipbook::PrettyPrint::HtmlPrinter do
 
   describe '#print_to_file' do
 
-    subject { Klipbook::PrettyPrint::HtmlPrinter.new(message_stream).print_to_file(book, @output_dir, force) }
+    subject { Klipbook::ToHtml::HtmlPrinter.new(message_stream).print_to_file(book, @output_dir, force) }
 
     let(:force) { false }
 

data/spec/lib/klipbook/{collate → tojson}/book_file_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Klipbook::Collate::BookFile do
+describe Klipbook::ToJson::BookFile do
 
   describe '.from_json' do
 
-    subject { Klipbook::Collate::BookFile.from_json(json) }
+    subject { Klipbook::ToJson::BookFile.from_json(json) }
 
     context 'with empty json' do
 
@@ -32,7 +32,7 @@ describe Klipbook::Collate::BookFile do
           b.author = "Author two"
         end
       ]
-      Klipbook::Collate::BookFile.new(books)
+      Klipbook::ToJson::BookFile.new(books)
     end
 
     it "adds any books that don't already exist" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klipbook
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ray Grasso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -225,13 +225,10 @@ files:
 - features/tojson.feature
 - klipbook.gemspec
 - lib/klipbook.rb
-- lib/klipbook/collate/book_file.rb
-- lib/klipbook/commands/collate.rb
 - lib/klipbook/commands/list_books.rb
-- lib/klipbook/commands/pretty_print.rb
+- lib/klipbook/commands/tohtml.rb
+- lib/klipbook/commands/tojson.rb
 - lib/klipbook/config.rb
-- lib/klipbook/pretty_print/html_book_summary.erb
-- lib/klipbook/pretty_print/html_printer.rb
 - lib/klipbook/sources/amazon_site/book_scraper.rb
 - lib/klipbook/sources/amazon_site/site_scraper.rb
 - lib/klipbook/sources/book.rb
@@ -241,17 +238,20 @@ files:
 - lib/klipbook/sources/kindle_device/entry_parser.rb
 - lib/klipbook/sources/kindle_device/file.rb
 - lib/klipbook/sources/kindle_device/file_parser.rb
+- lib/klipbook/tohtml/html_book_summary.erb
+- lib/klipbook/tohtml/html_printer.rb
+- lib/klipbook/tojson/book_file.rb
 - lib/klipbook/util/blank.rb
 - lib/klipbook/util/struct_to_json.rb
 - lib/klipbook/version.rb
-- spec/lib/klipbook/collate/book_file_spec.rb
 - 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/commands/tohtml_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
 - spec/lib/klipbook/sources/kindle_device/file_spec.rb
+- spec/lib/klipbook/tohtml/html_printer_spec.rb
+- spec/lib/klipbook/tojson/book_file_spec.rb
 - spec/spec_helper.rb
 - spec/support/rspec2.rb
 - spec/support/with_rr.rb