klipbook 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3037bf853bd7bf7df5dbf9eaf706b5e2b2aca40
-  data.tar.gz: 17882844c725d1f2464b3320294252823b04d830
+  metadata.gz: a46b3e5dc284ae3b57f4d007d64dc957a5ac753b
+  data.tar.gz: 5a41f2a5b679f6d0b5ff1351a1c5591bd0dbe462
 SHA512:
-  metadata.gz: 2b994c3ada7655bfacde42017cc9e94072912bb89c72dde3b7be1f1171fe22cbf6dcee61a28d99b536ade0e6308dfb292f4476601e414bf61f886311e34045f9
-  data.tar.gz: d7e099518000d5bdf4e95f9efff094aa92b15f959540f1adb1f690c6223a1a5e04c28543569dec54bdc0bae9beb72c151ec1de48504dd737c23826b2e725f9e3
+  metadata.gz: 7d4d87a1725f1854198cb1e44454045063a2091fcb97e0f537a06fe482bb80d87128a3e494a095991f903fbd588f47e03570897e51150b9812dc3f5a53ef3b13
+  data.tar.gz: a07db029211b741a764b6ea0e442d797403e5c07a24a734271d02d8bbaa3a018ad148bed9e60aaa46c1cee3b90e15c4347df069295c45c74076ed08486e741a0

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1.2

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.0.0

data/CHANGELOG.txt

@@ -1,3 +1,10 @@
+== 2.1.2 / 2014-07-25
+
+* Minor changes
+
+	* Removed Rainbow gem and pry-debugger gems
+	* Tested on Ruby 2.1.2
+
 == 2.1.0 / 2013-12-11
 
 * Feature changes

data/Gemfile

@@ -2,14 +2,17 @@ source 'http://rubygems.org'
 
 gem 'slop'
 gem 'mechanize'
-gem 'rainbow'
+
+group :test do
+  gem 'rake'
+end
 
 group :development do
   gem 'rspec'
   gem 'rr'
   gem 'bundler'
   gem 'jeweler', '~> 1.8.8'
-  gem 'pry-debugger'
+  gem 'pry-byebug'
   gem 'cucumber'
   gem 'aruba'
   gem 'guard'

data/Gemfile.lock

@@ -7,24 +7,22 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (3.2.2)
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.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)
+    columnize (0.8.9)
     cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       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.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)
@@ -106,11 +104,10 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
+    pry-byebug (1.3.2)
+      byebug (~> 2.7)
+      pry (~> 0.9.12)
     rack (1.5.2)
-    rainbow (1.1.4)
     rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
@@ -146,8 +143,8 @@ DEPENDENCIES
   guard-rspec
   jeweler (~> 1.8.8)
   mechanize
-  pry-debugger
-  rainbow
+  pry-byebug
+  rake
   rr
   rspec
   slop

data/README.md

@@ -1,5 +1,7 @@
 # Klipbook
 
+[![Build Status](https://travis-ci.org/grassdog/klipbook.png)](https://travis-ci.org/grassdog/klipbook)
+
 Klipbook takes the highlights and notes that you've created on your Kindle and
 outputs them into nice html or JSON.
 
@@ -129,7 +131,7 @@ Kindle Touch.
 
 ## Tested platforms
 
-Klipbook has been tested on Mac OSX Mavericks using MRI 2.0.0
+Klipbook has been tested on Mac OSX Mavericks using Ruby 2.1.2.
 
 ## Contributing to Klipbook
 
@@ -138,5 +140,5 @@ your changes, and submit a well described pull request.
 
 ## Copyright
 
-Copyright (c) 2013 Ray Grasso. See LICENSE.txt for further details.
+Copyright (c) 2014 Ray Grasso. See LICENSE.txt for further details.
 

data/Rakefile

@@ -44,5 +44,5 @@ Cucumber::Rake::Task.new(:allfeatures) do |t|
 end
 
 desc 'Default: run specs'
-task :default => :spec
+task :default => [ :spec, :features ]
 

data/klipbook.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: klipbook 2.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "klipbook"
-  s.version = "2.1.1"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Ray Grasso"]
-  s.date = "2013-12-12"
+  s.date = "2014-07-25"
   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"]
@@ -21,6 +23,7 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     ".ruby-version",
+    ".travis.yml",
     ".yardopts",
     "CHANGELOG.txt",
     "Gemfile",
@@ -41,6 +44,7 @@ Gem::Specification.new do |s|
     "features/tojson.feature",
     "klipbook.gemspec",
     "lib/klipbook.rb",
+    "lib/klipbook/colours.rb",
     "lib/klipbook/commands/list_books.rb",
     "lib/klipbook/commands/tohtml.rb",
     "lib/klipbook/commands/tojson.rb",
@@ -74,8 +78,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/grassdog/klipbook"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
+  s.rubygems_version = "2.2.2"
   s.summary = "Klipbook creates a nice html summary of the clippings you've created on your Kindle."
 
   if s.respond_to? :specification_version then
@@ -84,12 +87,11 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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.8.8"])
-      s.add_development_dependency(%q<pry-debugger>, [">= 0"])
+      s.add_development_dependency(%q<pry-byebug>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
@@ -98,12 +100,11 @@ Gem::Specification.new do |s|
     else
       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.8.8"])
-      s.add_dependency(%q<pry-debugger>, [">= 0"])
+      s.add_dependency(%q<pry-byebug>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<aruba>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
@@ -113,12 +114,11 @@ Gem::Specification.new do |s|
   else
     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.8.8"])
-    s.add_dependency(%q<pry-debugger>, [">= 0"])
+    s.add_dependency(%q<pry-byebug>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])

data/lib/klipbook/colours.rb

@@ -0,0 +1,16 @@
+module Colours
+  GREEN = "\033[32m"
+  YELLOW = "\033[33m"
+
+  def self.green(message)
+    colorize(message, GREEN)
+  end
+
+  def self.yellow(message)
+    colorize(message, YELLOW)
+  end
+
+  def self.colorize(message, color)
+    "#{color}#{message}\033[0m"
+  end
+end

data/lib/klipbook/commands/tojson.rb

@@ -6,10 +6,11 @@ module Klipbook::Commands
     end
 
     def call(output_file_path, force, message_stream=$stdout)
-      File.open(output_file_path, 'w') do |output_file|
-        @book_file.add_books(@books, force)
+      message_stream.puts "\nWriting book json to file: #{output_file_path}"
+
+      @book_file.add_books(@books, force)
 
-        message_stream.puts "\nWriting book json to file: #{output_file.path}"
+      File.open(output_file_path, 'w') do |output_file|
         output_file.puts @book_file.to_json
       end
     end

data/lib/klipbook/tohtml/html_printer.rb

@@ -7,17 +7,15 @@ module Klipbook::ToHtml
     end
 
     def print_to_file(book, output_dir, force)
-      require 'rainbow'
-
       filename = filename_for_book(book)
       filepath = File.join(output_dir, filename)
 
       if !force && File.exists?(filepath)
-        @message_stream.puts("Skipping ".foreground(:yellow) + filename)
+        @message_stream.puts(Colours.yellow("Skipping ") + filename)
         return
       end
 
-      @message_stream.puts("Writing ".foreground(:green) + filename)
+      @message_stream.puts(Colours.green("Writing ") + filename)
       File.open(filepath, 'w') do |f|
         f.write generate_html(book)
       end

data/lib/klipbook/tojson/book_file.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'rainbow'
 
 module Klipbook::ToJson
   class BookFile
@@ -25,10 +24,10 @@ module Klipbook::ToJson
           if force
             replace_book(new_book, message_stream)
           else
-            message_stream.puts "Skipping: ".foreground(:yellow) + "#{new_book.title_and_author}"
+            message_stream.puts Colours.yellow("Skipping: ") + "#{new_book.title_and_author}"
           end
         else
-          message_stream.puts "Adding: ".foreground(:green) + "#{new_book.title_and_author}"
+          message_stream.puts Colours.green("Adding: ") + "#{new_book.title_and_author}"
           @books.push(new_book)
         end
       end
@@ -49,7 +48,7 @@ module Klipbook::ToJson
     end
 
     def replace_book(new_book, message_stream)
-      message_stream.puts "Updating: ".foreground(:green) + "#{new_book.title_and_author}"
+      message_stream.puts Colours.green("Updating: ") + "#{new_book.title_and_author}"
 
       old_book = find_book(new_book)
       @books.delete(old_book)

data/lib/klipbook/version.rb

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

data/lib/klipbook.rb

@@ -2,6 +2,7 @@
 require 'klipbook/util/blank'
 require 'klipbook/util/struct_to_json'
 require 'klipbook/version'
+require 'klipbook/colours'
 
 require 'klipbook/commands/tojson'
 require 'klipbook/commands/list_books'

data/spec/spec_helper.rb

@@ -8,7 +8,3 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 $LOAD_PATH << File.expand_path('../../../lib', __FILE__)
 require 'klipbook'
-
-RSpec.configure do |config|
-  config.mock_with :rr
-end

data/spec/support/with_rr.rb

@@ -1,6 +1,6 @@
 require 'rr'
 
-RSpec.configuration.backtrace_clean_patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
+RSpec.configuration.backtrace_exclusion_patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
 
 module RSpec
   module Core

metadata

@@ -1,195 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: klipbook
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ray Grasso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.8
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Process your Kindle clippings file to generate a nicely formatted compilation
@@ -202,10 +188,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
-- .ruby-version
-- .yardopts
+- ".document"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.txt
 - Gemfile
 - Gemfile.lock
@@ -225,6 +212,7 @@ files:
 - features/tojson.feature
 - klipbook.gemspec
 - lib/klipbook.rb
+- lib/klipbook/colours.rb
 - lib/klipbook/commands/list_books.rb
 - lib/klipbook/commands/tohtml.rb
 - lib/klipbook/commands/tojson.rb
@@ -265,17 +253,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Klipbook creates a nice html summary of the clippings you've created on your