From d32e5aba195bdb54f62ccf50a3fae4206f33747a Mon Sep 17 00:00:00 2001 From: Kristina Spurgin Date: Fri, 4 Mar 2022 16:47:11 -0500 Subject: [PATCH 1/2] update ruby version, bundler, nokogiri --- .gitignore | 1 - .ruby-version | 2 +- Gemfile.lock | 81 +++++++++++++++++++++++++++++++++ README.adoc | 2 +- cspace_config_untangler.gemspec | 5 +- lib/cspace_config_untangler.rb | 2 +- 6 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 08238b01..6e340522 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .DS_Store -Gemfile.lock /.bundle/ /.yardoc /_yardoc/ diff --git a/.ruby-version b/.ruby-version index 74500cee..fd2a0186 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 \ No newline at end of file +3.1.0 diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..faec3364 --- /dev/null +++ b/Gemfile.lock @@ -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 diff --git a/README.adoc b/README.adoc index 6f3b0872..165d2b4c 100644 --- a/README.adoc +++ b/README.adoc @@ -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` diff --git a/cspace_config_untangler.gemspec b/cspace_config_untangler.gemspec index 5b0d15df..5ea78c3e 100644 --- a/cspace_config_untangler.gemspec +++ b/cspace_config_untangler.gemspec @@ -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" @@ -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 diff --git a/lib/cspace_config_untangler.rb b/lib/cspace_config_untangler.rb index dbbc47e2..970476d7 100644 --- a/lib/cspace_config_untangler.rb +++ b/lib/cspace_config_untangler.rb @@ -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' From 6ededbad164469ff9cb7570ebc45b9665d560063 Mon Sep 17 00:00:00 2001 From: Kristina Spurgin Date: Fri, 4 Mar 2022 16:48:46 -0500 Subject: [PATCH 2/2] bump version --- lib/cspace_config_untangler/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cspace_config_untangler/version.rb b/lib/cspace_config_untangler/version.rb index 237c9480..7090961f 100644 --- a/lib/cspace_config_untangler/version.rb +++ b/lib/cspace_config_untangler/version.rb @@ -1,3 +1,3 @@ module CspaceConfigUntangler - VERSION = '1.9.8' + VERSION = '1.9.9' end