Skip to content

Commit

Permalink
Merge pull request #85 from collectionspace/update-nokogiri
Browse files Browse the repository at this point in the history
update ruby version, bundler, nokogiri
  • Loading branch information
kspurgin authored Mar 4, 2022
2 parents c711b03 + 6ededba commit 53b0199
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 8 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.DS_Store
Gemfile.lock
/.bundle/
/.yardoc
/_yardoc/
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
3.1.0
81 changes: 81 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
PATH
remote: .
specs:
cspace_config_untangler (1.9.8)
dry-configurable (~> 0.12)
facets (~> 3.1.0)
http (~> 4.4.1)
nokogiri (~> 1.13.2)
thor (~> 0.20.3)

GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
coderay (1.1.3)
concurrent-ruby (1.1.9)
diff-lcs (1.4.4)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dry-configurable (0.13.0)
concurrent-ruby (~> 1.0)
dry-core (~> 0.6)
dry-core (0.7.1)
concurrent-ruby (~> 1.0)
facets (3.1.0)
ffi (1.15.4)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
http (4.4.1)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 2.2)
http-parser (~> 1.2.0)
http-cookie (1.0.4)
domain_name (~> 0.5)
http-form_data (2.3.0)
http-parser (1.2.3)
ffi-compiler (>= 1.0, < 2.0)
method_source (1.0.0)
mini_portile2 (2.8.0)
nokogiri (1.13.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
racc (1.6.0)
rake (13.0.6)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
thor (0.20.3)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)

PLATFORMS
ruby

DEPENDENCIES
bundler (~> 2.3.8)
cspace_config_untangler!
pry (~> 0.13.0)
rake (~> 13.0.6)
rspec (~> 3.10)

BUNDLED WITH
2.3.8
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ _Note: there may be field_defs in a profile which do not match any form_fields.

== Setup

* Tested with Ruby 2.7.4
* Tested with Ruby 3.1.0
* Do `bundle --version`
** If the version of Bundler is lower than 2.2.29, do `gem update bundler`
** Bundler should come standard with Ruby 2.7.0, but may be an older version. If you get an error that you don't have Bundler installed when you try to check the version, do `gem install bundler`
Expand Down
5 changes: 2 additions & 3 deletions cspace_config_untangler.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}){ |f| File.basename(f) }
spec.require_paths = ['lib']

spec.add_development_dependency "bundler", "~> 2.2.29"
spec.add_development_dependency "bundler", "~> 2.3.8"
spec.add_development_dependency "pry", "~> 0.13.0"
# spec.add_development_dependency 'ruby_jard'
# spec.add_development_dependency "byebug"
# spec.add_development_dependency "pry-byebug"
spec.add_development_dependency "rake", "~> 13.0.6"
Expand All @@ -38,6 +37,6 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency "dry-configurable", "~> 0.12"
spec.add_runtime_dependency "facets", "~> 3.1.0"
spec.add_runtime_dependency "http", "~> 4.4.1"
spec.add_runtime_dependency "nokogiri", "~> 1.12.5"
spec.add_runtime_dependency "nokogiri", "~> 1.13.2"
spec.add_runtime_dependency "thor", "~> 0.20.3"
end
2 changes: 1 addition & 1 deletion lib/cspace_config_untangler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module CspaceConfigUntangler
extend Dry::Configurable

# Change these variables to reflect your desired directory structure and main profile
default_datadir = '/Users/kristina/code/untangler-cspace-config/data'
default_datadir = '/Users/kristina/code/cs/untangler-cspace-config/data'
default_main_profile_name = 'core'
# The publicly available web directory from which the CSV Importer will request mappers
default_mapper_uri_base = 'https://raw.githubusercontent.com/collectionspace/cspace-config-untangler/main/data/mappers'
Expand Down
2 changes: 1 addition & 1 deletion lib/cspace_config_untangler/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module CspaceConfigUntangler
VERSION = '1.9.8'
VERSION = '1.9.9'
end

0 comments on commit 53b0199

Please sign in to comment.