klipbook 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46b3e5dc284ae3b57f4d007d64dc957a5ac753b
-  data.tar.gz: 5a41f2a5b679f6d0b5ff1351a1c5591bd0dbe462
+  metadata.gz: f132dad97344e2d4aa75b9ebdb0e10be4e983e8e
+  data.tar.gz: f38310d3b68338bc0f4f2b033ec4da4e5ba7388b
 SHA512:
-  metadata.gz: 7d4d87a1725f1854198cb1e44454045063a2091fcb97e0f537a06fe482bb80d87128a3e494a095991f903fbd588f47e03570897e51150b9812dc3f5a53ef3b13
-  data.tar.gz: a07db029211b741a764b6ea0e442d797403e5c07a24a734271d02d8bbaa3a018ad148bed9e60aaa46c1cee3b90e15c4347df069295c45c74076ed08486e741a0
+  metadata.gz: d9febc14521644a805b71423c7bd7a07964575ea3a5f4bc0631e087ef51c062a5729851ad39eac0c24285dc904f1690af0fdc6b9e82784dd5361a42dc5744c8e
+  data.tar.gz: 3ad42a80ada1ebd515e1fd8d20839276f43f43902376075466d092f6f0bedd47dbd8329d8e44529e22822842363cc85737b5521450f2c7934b4b0152c341deef

data/CHANGELOG.txt

@@ -1,8 +1,10 @@
-== 2.1.2 / 2014-07-25
+== 2.1.3 / 2014-07-25
 
 * Minor changes
 
-	* Removed Rainbow gem and pry-debugger gems
+	* Removed Rainbow, RR, pry-debugger gems
+	* Updated dependent gems
+	* Updated tests to use RSpec 3
 	* Tested on Ruby 2.1.2
 
 == 2.1.0 / 2013-12-11

data/Gemfile

@@ -1,22 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'slop'
-gem 'mechanize'
-
-group :test do
-  gem 'rake'
-end
+gem 'slop', '~> 3.6'
+gem 'mechanize', '~> 2.7'
 
 group :development do
-  gem 'rspec'
-  gem 'rr'
-  gem 'bundler'
-  gem 'jeweler', '~> 1.8.8'
-  gem 'pry-byebug'
-  gem 'cucumber'
-  gem 'aruba'
+  gem 'rspec', '~> 3.0'
+  gem 'jeweler', '~> 1.8'
+  gem 'pry-byebug', '~> 1.3'
+  gem 'cucumber', '~> 1.3'
+  gem 'aruba', '~> 0.6'
   gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-cucumber'
-  gem 'terminal-notifier-guard' if RUBY_PLATFORM.downcase.include?('darwin12')
+  gem 'guard-rspec', '~> 4.3'
+  gem 'guard-cucumber', '~> 1.4'
+  gem 'terminal-notifier-guard', '~> 1.5'
 end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
-    aruba (0.5.3)
+    addressable (2.3.6)
+    aruba (0.6.0)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
@@ -12,27 +12,27 @@ GEM
       debugger-linecache (~> 1.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.3.9)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     columnize (0.8.9)
-    cucumber (1.3.10)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
+      multi_test (>= 0.1.1)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.15)
+    domain_name (0.5.19)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (0.8.8)
+    faraday (0.8.9)
       multipart-post (~> 1.2.0)
     ffi (1.9.3)
-    formatador (0.2.4)
+    formatador (0.2.5)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    git (1.2.6)
+    git (1.2.7)
     github_api (0.10.1)
       addressable
       faraday (~> 0.8.1)
@@ -40,23 +40,22 @@ GEM
       multi_json (~> 1.4)
       nokogiri (~> 1.5.2)
       oauth2
-    guard (2.2.4)
+    guard (2.6.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-cucumber (1.4.0)
+    guard-cucumber (1.4.1)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (4.2.0)
-      guard (>= 2.1.1)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    hashie (2.0.5)
-    highline (1.6.20)
+    hashie (3.2.0)
+    highline (1.6.21)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    httpauth (0.2.0)
     jeweler (1.8.8)
       builder
       bundler (~> 1.0)
@@ -67,13 +66,12 @@ GEM
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    listen (2.4.0)
+    jwt (1.0.0)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
+    lumberjack (1.0.9)
     mechanize (2.7.3)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
@@ -84,49 +82,52 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       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)
+    mime-types (2.3)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     net-http-digest_auth (1.4)
-    net-http-persistent (2.9)
+    net-http-persistent (2.9.4)
     nokogiri (1.5.10)
     ntlm-http (0.1.1)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (1.3.2)
+    pry-byebug (1.3.3)
       byebug (~> 2.7)
-      pry (~> 0.9.12)
+      pry (~> 0.10)
     rack (1.5.2)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (4.0.1)
+    rdoc (4.1.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)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    slop (3.6.0)
+    terminal-notifier-guard (1.5.3)
+    thor (0.19.1)
     timers (1.1.0)
-    unf (0.1.3)
+    unf (0.1.4)
       unf_ext
     unf_ext (0.0.6)
     webrobots (0.1.1)
@@ -135,16 +136,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  bundler
-  cucumber
+  aruba (~> 0.6)
+  cucumber (~> 1.3)
   guard
-  guard-cucumber
-  guard-rspec
-  jeweler (~> 1.8.8)
-  mechanize
-  pry-byebug
-  rake
-  rr
-  rspec
-  slop
+  guard-cucumber (~> 1.4)
+  guard-rspec (~> 4.3)
+  jeweler (~> 1.8)
+  mechanize (~> 2.7)
+  pry-byebug (~> 1.3)
+  rspec (~> 3.0)
+  slop (~> 3.6)
+  terminal-notifier-guard (~> 1.5)

data/Guardfile

@@ -1,14 +1,15 @@
 
-group 'backend' do
-
-  guard 'rspec', :cli => '--color --format doc' do
+group 'specs' do
+  guard 'rspec', :cmd => 'bundle exec rspec' do
     # Regexp watch patterns are matched with Regexp#match
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})         { |m| "spec/lib/#{m[1]}_spec.rb" }
 
     watch('spec/spec_helper.rb') { "spec" }
   end
+end
 
+group 'cukes' do
   guard 'cucumber', :cli => '--tags ~@slow' do
     watch(%r{^features/.+\.feature$})
     watch(%r{^features/support/.+$})                      { 'features' }

data/features/step_definitions/tohtml_steps.rb

@@ -25,9 +25,9 @@ end
 Then /^I should find a file in the folder "([^"]*)" named "([^"]*)" that contains "([^"]*)" clippings$/ do |output_folder, file_name, clipping_count|
   in_current_dir do
     file_path = File.join(output_folder, file_name)
-    File.exists?(file_path).should be_true
+    expect(File.exists?(file_path)).to be_truthy
     File.open(file_path, 'r') do |f|
-      f.read.should match(/<footer>\s+#{clipping_count} clippings &bull;/m)
+      expect(f.read).to match(/<footer>\s+#{clipping_count} clippings &bull;/m)
     end
   end
 end
@@ -40,10 +40,10 @@ end
 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
+    expect(files.size).to eq(file_count.to_i)
     files.each do |fname|
       File.open(fname, 'r') do |f|
-        f.read.should match(/<footer>\s+\d+ clippings &bull;/m)
+        expect(f.read).to match(/<footer>\s+\d+ clippings &bull;/m)
       end
     end
   end

data/features/step_definitions/tojson_steps.rb

@@ -5,9 +5,9 @@ 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
+    expect(File.exists?(output_file)).to be_truthy
     File.open(output_file, 'r') do |f|
-      f.read.should match(/#{expected_text}/m)
+      expect(f.read).to match(/#{expected_text}/m)
     end
   end
 end

data/klipbook.gemspec

@@ -2,11 +2,11 @@
 # 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
+# stub: klipbook 2.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "klipbook"
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -72,9 +72,7 @@ Gem::Specification.new do |s|
     "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"
+    "spec/spec_helper.rb"
   ]
   s.homepage = "https://github.com/grassdog/klipbook"
   s.licenses = ["MIT"]
@@ -85,45 +83,42 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     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_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-byebug>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<aruba>, [">= 0"])
+      s.add_runtime_dependency(%q<slop>, ["~> 3.6"])
+      s.add_runtime_dependency(%q<mechanize>, ["~> 2.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_development_dependency(%q<pry-byebug>, ["~> 1.3"])
+      s.add_development_dependency(%q<cucumber>, ["~> 1.3"])
+      s.add_development_dependency(%q<aruba>, ["~> 0.6"])
       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<guard-rspec>, ["~> 4.3"])
+      s.add_development_dependency(%q<guard-cucumber>, ["~> 1.4"])
+      s.add_development_dependency(%q<terminal-notifier-guard>, ["~> 1.5"])
     else
-      s.add_dependency(%q<slop>, [">= 0"])
-      s.add_dependency(%q<mechanize>, [">= 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-byebug>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<aruba>, [">= 0"])
+      s.add_dependency(%q<slop>, ["~> 3.6"])
+      s.add_dependency(%q<mechanize>, ["~> 2.7"])
+      s.add_dependency(%q<rspec>, ["~> 3.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_dependency(%q<pry-byebug>, ["~> 1.3"])
+      s.add_dependency(%q<cucumber>, ["~> 1.3"])
+      s.add_dependency(%q<aruba>, ["~> 0.6"])
       s.add_dependency(%q<guard>, [">= 0"])
-      s.add_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_dependency(%q<guard-cucumber>, [">= 0"])
+      s.add_dependency(%q<guard-rspec>, ["~> 4.3"])
+      s.add_dependency(%q<guard-cucumber>, ["~> 1.4"])
+      s.add_dependency(%q<terminal-notifier-guard>, ["~> 1.5"])
     end
   else
-    s.add_dependency(%q<slop>, [">= 0"])
-    s.add_dependency(%q<mechanize>, [">= 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-byebug>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<aruba>, [">= 0"])
+    s.add_dependency(%q<slop>, ["~> 3.6"])
+    s.add_dependency(%q<mechanize>, ["~> 2.7"])
+    s.add_dependency(%q<rspec>, ["~> 3.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8"])
+    s.add_dependency(%q<pry-byebug>, ["~> 1.3"])
+    s.add_dependency(%q<cucumber>, ["~> 1.3"])
+    s.add_dependency(%q<aruba>, ["~> 0.6"])
     s.add_dependency(%q<guard>, [">= 0"])
-    s.add_dependency(%q<guard-rspec>, [">= 0"])
-    s.add_dependency(%q<guard-cucumber>, [">= 0"])
+    s.add_dependency(%q<guard-rspec>, ["~> 4.3"])
+    s.add_dependency(%q<guard-cucumber>, ["~> 1.4"])
+    s.add_dependency(%q<terminal-notifier-guard>, ["~> 1.5"])
   end
 end
 

data/lib/klipbook/version.rb

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

data/spec/lib/klipbook/commands/list_books_spec.rb

@@ -1,11 +1,9 @@
 require 'spec_helper'
 
-describe Klipbook::Commands::ListBooks do
+RSpec.describe Klipbook::Commands::ListBooks do
 
   let (:output) do
-    Object.new.tap do |fake_output|
-      stub(fake_output).puts
-    end
+    double("output", puts: nil)
   end
 
   describe '#call' do
@@ -18,7 +16,7 @@ describe Klipbook::Commands::ListBooks do
 
       it 'displays a message saying that the clipping file contains no books' do
         subject
-        output.should have_received.puts('No books available')
+        expect(output).to have_received(:puts).with('No books available')
       end
     end
 
@@ -32,13 +30,13 @@ describe Klipbook::Commands::ListBooks do
 
       it 'displays a message describing the book list' do
         subject
-        output.should have_received.puts('Book list:')
+        expect(output).to have_received(:puts).with('Book list:')
       end
 
       it 'displays an indexed list of book titles including the author when available' do
         subject
-        output.should have_received.puts('[1] My first fake title')
-        output.should have_received.puts('[2] Another fake book by Rock Riphard')
+        expect(output).to have_received(:puts).with('[1] My first fake title')
+        expect(output).to have_received(:puts).with('[2] Another fake book by Rock Riphard')
       end
     end
   end

data/spec/lib/klipbook/commands/tohtml_spec.rb

@@ -1,19 +1,15 @@
 require 'spec_helper'
 
-describe Klipbook::Commands::ToHtml do
+RSpec.describe Klipbook::Commands::ToHtml do
 
   let (:it) { Klipbook::Commands::ToHtml.new(books, pretty_printer) }
 
   let (:pretty_printer) do
-    Object.new.tap do |fake_printer|
-      stub(fake_printer).print_to_file
-    end
+    double(print_to_file: nil)
   end
 
   let (:message_stream) do
-    Object.new.tap do |fake_stream|
-      stub(fake_stream).puts
-    end
+    double(puts: nil)
   end
 
   let (:book_one) { Klipbook::Book.new('book one') }
@@ -28,13 +24,13 @@ describe Klipbook::Commands::ToHtml do
 
     it 'prints a message displaying the output directory' do
       subject
-      message_stream.should have_received.puts('Using output directory: fake output dir')
+      expect(message_stream).to have_received(:puts).with('Using output directory: fake output dir')
     end
 
     it 'passes each book to the pretty printer' do
       subject
-      pretty_printer.should have_received.print_to_file(book_one, output_dir, true)
-      pretty_printer.should have_received.print_to_file(book_two, output_dir, true)
+      expect(pretty_printer).to have_received(:print_to_file).with(book_one, output_dir, true)
+      expect(pretty_printer).to have_received(:print_to_file).with(book_two, output_dir, true)
     end
   end
 end

data/spec/lib/klipbook/sources/book_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Klipbook::Book do
+RSpec.describe Klipbook::Book do
   describe '#title_and_author' do
 
     subject { book.title_and_author }
@@ -13,7 +13,7 @@ describe Klipbook::Book do
       end
 
       it 'only contains the title' do
-        subject.should == 'Book title'
+        expect(subject).to eq 'Book title'
       end
     end
 
@@ -26,7 +26,7 @@ describe Klipbook::Book do
       end
 
       it 'contains the title and author' do
-        subject.should == 'Book title by Rob Ripjaw'
+        expect(subject).to eq 'Book title by Rob Ripjaw'
       end
     end
   end