Skip to content

Commit

Permalink
Re-add oci8 gem and reference CUL-forked zoom gem
Browse files Browse the repository at this point in the history
  • Loading branch information
elohanlon committed Nov 5, 2023
1 parent 690ee55 commit 7a5d48f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,17 @@ gem 'bootsnap', '>= 1.1.0', require: false

# For z3950
# gem 'zoom', '0.5.0'
gem 'alexandria-zoom', '0.6.0' # Using this gem instead of regular 'zoom' because this PR has not been merged: https://github.com/bricestacey/ruby-zoom/pull/4
# gem 'alexandria-zoom', '0.6.0' # Using this gem instead of regular 'zoom' because this PR has not been merged: https://github.com/bricestacey/ruby-zoom/pull/4
gem 'alexandria-zoom', git: 'https://github.com/cul/cul-zoom.git', branch: 'yaz-config-fallback'
# gem 'alexandria-zoom', path: '../cul-zoom'
# For MARC parsing (using fork until PR is merged into main project)
gem 'marc', '1.0.4'
# gem 'marc', path: '../ruby-marc'
gem 'rainbow', '~> 3.0'
# As of Ruby 3.0, need to explicitly include rexml because it's a bundled gem instead of a default gem
gem 'rexml', '~> 3.2', '>= 3.2.4'
# For oracle connections
#gem 'ruby-oci8', '~> 2.2.7'
gem 'ruby-oci8', '~> 2.2.7'
# For HTTP Requests
gem 'rest-client', '~> 2.0'
# For cron tasks
Expand Down
14 changes: 11 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
GIT
remote: https://github.com/cul/cul-zoom.git
revision: ef094e238aac2e6f5759240bd78fdf98b2f3f82b
branch: yaz-config-fallback
specs:
alexandria-zoom (0.6.0)
pkg-config (~> 1.5.1)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -70,8 +78,6 @@ GEM
tzinfo (~> 2.0)
airbrussh (1.4.0)
sshkit (>= 1.6.1, != 1.7.0)
alexandria-zoom (0.6.0)
pkg-config (~> 1.5.1)
ast (2.4.2)
bcrypt_pbkdf (1.1.0)
bindex (0.8.1)
Expand Down Expand Up @@ -270,6 +276,7 @@ GEM
rubocop-performance
rubocop-rails
rubocop-rspec
ruby-oci8 (2.2.12)
ruby-progressbar (1.11.0)
rubyzip (2.3.2)
sass (3.7.4)
Expand Down Expand Up @@ -324,7 +331,7 @@ PLATFORMS

DEPENDENCIES
activerecord-nulldb-adapter
alexandria-zoom (= 0.6.0)
alexandria-zoom!
bootsnap (>= 1.1.0)
byebug
capistrano (~> 3.17.0)
Expand All @@ -348,6 +355,7 @@ DEPENDENCIES
rspec (>= 3.11)
rspec-rails (~> 5.1)
rubocul (~> 4.0.3)
ruby-oci8 (~> 2.2.7)
rubyzip (>= 2.0)
sass-rails (~> 5.0)
sqlite3
Expand Down

0 comments on commit 7a5d48f

Please sign in to comment.