From 3b8c50b54d8587ad248ae2741522ef3d60acbece Mon Sep 17 00:00:00 2001
From: Chris Jaekl <chris@localhost>
Date: Fri, 13 Mar 2020 20:04:25 -0400
Subject: [PATCH] Housekeeping.

Update Gemfile to use https instead of http.
Switch require to require_relative.
---
 Gemfile      | 5 +++--
 Gemfile.lock | 8 +++++++-
 book.rb      | 8 ++++----
 main.rb      | 8 ++++----
 navigator.rb | 4 ++--
 page.rb      | 2 +-
 store.rb     | 2 +-
 walkdir.rb   | 4 ++--
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4978fce..e3b145e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 gem 'inifile'
+gem 'nokogiri'
 gem 'pg'
 gem 'rspec'
-gem 'tconn'
+gem 'rubyzip'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6829438..3cc58d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,11 @@
 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
     diff-lcs (1.3)
     inifile (3.0.0)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
     pg (1.1.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -17,14 +20,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
+    rubyzip (1.2.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   inifile
+  nokogiri
   pg
   rspec
+  rubyzip
 
 BUNDLED WITH
    2.0.2
diff --git a/book.rb b/book.rb
index cd14ab6..2f7b7a6 100644
--- a/book.rb
+++ b/book.rb
@@ -3,10 +3,10 @@ require 'nokogiri'
 require 'rubygems'
 require 'zip'
 
-require 'author'
-require 'classification'
-require 'cover'
-require 'store'
+require_relative 'author'
+require_relative 'classification'
+require_relative 'cover'
+require_relative 'store'
 
 class Book
   @@DC_NS_URL = 'http://purl.org/dc/elements/1.1/'
diff --git a/main.rb b/main.rb
index 7c08cf2..564ba8b 100644
--- a/main.rb
+++ b/main.rb
@@ -1,7 +1,7 @@
-require 'navigator'
-require 'page'
-require 'store'
-require 'walkdir'
+require_relative 'navigator'
+require_relative 'page'
+require_relative 'store'
+require_relative 'walkdir'
 
 @outputDir = 'output'
 
diff --git a/navigator.rb b/navigator.rb
index 70c13e3..881b1fa 100644
--- a/navigator.rb
+++ b/navigator.rb
@@ -1,5 +1,5 @@
-require 'page'
-require 'store'
+require_relative 'page'
+require_relative 'store'
 
 class Navigator
   def initialize(store)
diff --git a/page.rb b/page.rb
index a94c90f..638f9ad 100644
--- a/page.rb
+++ b/page.rb
@@ -1,6 +1,6 @@
 require 'fileutils'
 
-require 'store'
+require_relative 'store'
 
 class Page
   def initialize(store)
diff --git a/store.rb b/store.rb
index 92d1ce5..1ce5fd4 100644
--- a/store.rb
+++ b/store.rb
@@ -3,9 +3,9 @@ require 'csv'
 require 'fileutils'
 require 'inifile'
 require 'pg'
-require_relative 'tconn'
 
 require_relative 'series'
+require_relative 'tconn'
 
 class Store
   def unclassified_csv
diff --git a/walkdir.rb b/walkdir.rb
index b006455..bbb56a2 100644
--- a/walkdir.rb
+++ b/walkdir.rb
@@ -18,8 +18,8 @@
 # and Mrs. Pollifax volume 6, On the China Station, is
 # .../DorothyGilman/P06_On_the_China_Station.epub.
 
-require 'book'
-require 'store'
+require_relative 'book'
+require_relative 'store'
 
 class WalkDir
   def initialize(store, root)
-- 
2.30.2