[whimsy] branch master updated: Simplify; no need fo whimsy gem here

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new bb33a54  Simplify; no need fo whimsy gem here
bb33a54 is described below

commit bb33a541e9004a00c5e4a1cad0859a1306ac0db5
Author: Sebb <se...@apache.org>
AuthorDate: Sat Aug 7 23:32:15 2021 +0100

    Simplify; no need fo whimsy gem here
---
 lib/Gemfile             | 2 --
 lib/spec/spec_helper.rb | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Gemfile b/lib/Gemfile
index 6fd3ef8..bc81476 100644
--- a/lib/Gemfile
+++ b/lib/Gemfile
@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-root = '../..'
 # lib needs these at run-time
 gem 'json'
 gem 'nokogiri'
@@ -11,6 +10,5 @@ gem 'pdf-reader'
 
 # For Travis testing
 group :test do
-  gem 'whimsy-asf', path: File.expand_path('..', __dir__)
   gem 'rspec'
 end
diff --git a/lib/spec/spec_helper.rb b/lib/spec/spec_helper.rb
index 44009d5..634d8c3 100644
--- a/lib/spec/spec_helper.rb
+++ b/lib/spec/spec_helper.rb
@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift '/srv/whimsy/lib'
+# Use relative paths for CI such as Travis
+lib = File.expand_path('..', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 
 require 'whimsy/asf'
 require 'whimsy/asf/config' # must be loaded before updating config