klipbook 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c23d7ac916e9878b64bdc8b0fdca59d0185cfe35
+  data.tar.gz: 3e78a7b8f33b4b6f85c1f39470bd960b0293169a
+SHA512:
+  metadata.gz: 8c6a73d2e9e8c8f730a381edd767520a2341a4fbd28612a8ccee03b0d31fb36f5e72290adbcc2912e814a895c44bd443fec1a0d56c4b759b257c30bcb97946d0
+  data.tar.gz: ed4cd0809d555814d5f4c83dfa8e3cafa19dbc9f9e3bcff6ab94841d7398d7831d1e37d734a8a98af72f6be9647a4ef140993c9ed7daa74990a1908686b1b9db

data/.ruby-version

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

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'gli'
+gem 'slop'
 gem 'mechanize'
 gem 'rainbow'
 
@@ -8,8 +8,7 @@ group :development do
   gem 'rspec'
   gem 'rr'
   gem 'bundler'
-  gem 'jeweler', '~> 1.6.4'
-  gem 'rcov', '>= 0'
+  gem 'jeweler', '~> 1.8.8'
   gem 'pry-debugger'
   gem 'cucumber'
   gem 'aruba'

data/Gemfile.lock

@@ -1,98 +1,138 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+    addressable (2.3.5)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
-    builder (3.0.0)
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
-    coderay (1.0.8)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.2)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
     columnize (0.3.6)
-    cucumber (1.2.1)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    debugger (1.2.4)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    debugger (1.6.3)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.8)
-    diff-lcs (1.1.3)
-    domain_name (0.5.6)
-      unf (~> 0.0.3)
-    ffi (1.1.5)
-    gherkin (2.11.2)
-      json (>= 1.4.6)
-    git (1.2.5)
-    gli (2.0.0)
-    guard (1.3.2)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-cucumber (1.2.0)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.4)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.4)
+    diff-lcs (1.2.5)
+    domain_name (0.5.15)
+      unf (>= 0.0.5, < 1.0.0)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    guard (2.2.4)
+      formatador (>= 0.2.4)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-cucumber (1.4.0)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (1.2.1)
-      guard (>= 1.1)
-    jeweler (1.6.4)
+    guard-rspec (4.2.0)
+      guard (>= 2.1.1)
+      rspec (>= 2.14, < 4.0)
+    hashie (2.0.5)
+    highline (1.6.20)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    httpauth (0.2.0)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
-    json (1.7.5)
-    listen (0.4.7)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    mechanize (2.5.1)
+      rdoc
+    json (1.8.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    listen (2.4.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    mechanize (2.7.3)
       domain_name (~> 0.5, >= 0.5.1)
-      mime-types (~> 1.17, >= 1.17.2)
+      http-cookie (~> 1.0)
+      mime-types (~> 2.0)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 2.5, >= 2.5.2)
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (~> 0.0, >= 0.0.9)
-    method_source (0.8.1)
-    mime-types (1.19)
-    net-http-digest_auth (1.2.1)
-    net-http-persistent (2.8)
-    nokogiri (1.5.5)
+      webrobots (>= 0.0.9, < 0.2)
+    method_source (0.8.2)
+    mime-types (2.0)
+    multi_json (1.8.2)
+    multi_test (0.0.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    net-http-digest_auth (1.4)
+    net-http-persistent (2.9)
+    nokogiri (1.5.10)
     ntlm-http (0.1.1)
-    pry (0.9.11.4)
-      coderay (~> 1.0.5)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.1)
-      debugger (~> 1.2.0)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
       pry (~> 0.9.10)
+    rack (1.5.2)
     rainbow (1.1.4)
-    rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
+    rake (10.1.0)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
-    rcov (0.9.11)
-    rr (1.0.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    slop (3.4.3)
-    terminal-notifier-guard (1.5.3)
-    thor (0.16.0)
-    unf (0.0.5)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    rr (1.1.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    slop (3.4.7)
+    thor (0.18.1)
+    timers (1.1.0)
+    unf (0.1.3)
       unf_ext
-    unf_ext (0.0.5)
-    webrobots (0.0.13)
+    unf_ext (0.0.6)
+    webrobots (0.1.1)
 
 PLATFORMS
   ruby
@@ -101,15 +141,13 @@ DEPENDENCIES
   aruba
   bundler
   cucumber
-  gli
   guard
   guard-cucumber
   guard-rspec
-  jeweler (~> 1.6.4)
+  jeweler (~> 1.8.8)
   mechanize
   pry-debugger
   rainbow
-  rcov
   rr
   rspec
-  terminal-notifier-guard
+  slop

data/README.md

@@ -27,11 +27,11 @@ device only keeps clippings that you made directly on it.
 
 ## How does it work?
 
-Klipbook supports three commands: `list`, `pprint`, and `collate`.
+Klipbook supports three commands: `list`, `tohtml`, and `tojson`.
 
-### Pretty print
+### To HTML
 
-`pprint` retrieves the clippings from your latest annotated books and writes them
+`tohtml` retrieves the clippings from your latest annotated books and writes them
 out into a pretty html file for each book.
 
 #### From a file
@@ -42,26 +42,26 @@ your Kindle device to your local drive via USB.
 Then write out a list of your clippings via:
 
 ```sh
-$ klipbook pprint "file:My Clippings.txt"
+$ klipbook tohtml -i "My Clippings.txt"
 ```
 
 This command will write the collected clippings for the latest annotated book to a
 file in the current directory. You can override the output directory with the
-`--output-dir` switch.
+`--outdir` switch.
 
 You can also specify a maximum count of books you'd like collated with the
-`--num-books` switch.
+`--number` switch.
 
 Klipbook will not overwrite an exiting file by default. You can change this with the
 `--force` flag.
 
 #### From the site
 
-Specify your Amazon username and password to klipbook and it will scrape the site and
+Specify your Amazon credentials to klipbook and it will scrape the site and
 output a clippings file.
 
 ```sh
-$ klipbook pprint site:my-username@blah.com:my-password
+$ klipbook tohtml -c my-username@blah.com:my-password
 ```
 
 The same flags above apply.
@@ -80,8 +80,8 @@ output directory, e.g.
 ```sh
 $ cat ~/.klipbookrc
 
-:source: site:my-username@blah.com:my-password
-:output: /path/to/my/default/output/directory
+:credentials: my-username@blah.com:my-password
+:outdir: /path/to/my/default/output/directory
 ```
 
 Command line options override the defaults stored in the rc file.
@@ -91,7 +91,7 @@ Command line options override the defaults stored in the rc file.
 The `list` command lists the books available in the specified source.
 
 ```sh
-$ klipbook list file:"My Clippings.txt"
+$ klipbook list -i "My Clippings.txt"
 
 Book list:
 [1] The Big Sleep by Raymond Chandler
@@ -99,19 +99,19 @@ Book list:
 ```
 
 By default it will only list the latest book. This can be overrided with the
-`--num-books` switch.
+`--number` switch.
 
-### Collate
+### To JSON
 
-`collate` pulls together the clippings from your latest annotated books and combines
+`tojson` pulls together the clippings from your latest annotated books and combines
 them into a single JSON file.
 
 ```sh
-$ klipbook collate -c books.json "file:My Clippings.txt"
+$ 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
-books in the JSON file will not be overwritten. This can be changed with the `force`
+books in the JSON file will not be overwritten. This can be changed with the `--force`
 flag.
 
 ## Installation
@@ -129,12 +129,12 @@ Kindle Touch.
 
 ## Tested platforms
 
-Klipbook has been tested on Mac OSX Mountain Lion using MRI 1.9.3. 
+Klipbook has been tested on Mac OSX Mavericks using MRI 2.0.0
 
 ## Contributing to Klipbook
 
 Fork the project on [Github](https://github.com/grassdog/klipbook), add tests for
-your changes, and submit a well described pull request. 
+your changes, and submit a well described pull request.
 
 ## Copyright
 

data/Rakefile

@@ -30,12 +30,6 @@ Rake::RDocTask.new do |rdoc|
 end
 
 require 'rspec/core/rake_task'
-desc 'Generate code coverage'
-RSpec::Core::RakeTask.new(:coverage) do |t|
-  t.pattern = './spec/**/*_spec.rb' # don't need this, it's default.
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
-end
 
 desc 'Run specs'
 RSpec::Core::RakeTask.new(:spec)