From afce07c2838eedc0187a55ad7d0ebaa9098ef5d0 Mon Sep 17 00:00:00 2001 From: Bharati Date: Thu, 4 Feb 2021 17:38:19 +0100 Subject: [PATCH 1/6] active version and bundler versions are updated --- Gemfile.lock | 6 +++--- cirneco.gemspec | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8717b79..942acf8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: cirneco (0.9.28) - activesupport (>= 4.2.5, < 6) + activesupport (>= 4.2.5) base32-url (~> 0.5) bergamasco (~> 0.3) bolognese (~> 0.9) @@ -206,7 +206,7 @@ PLATFORMS ruby DEPENDENCIES - bundler (~> 1.0) + bundler (~> 2.2.7) cirneco! codeclimate-test-reporter (~> 1.0, >= 1.0.0) rack-test (~> 0) @@ -218,4 +218,4 @@ DEPENDENCIES webmock (~> 3.0, >= 3.0.1) BUNDLED WITH - 1.16.4 + 2.2.7 diff --git a/cirneco.gemspec b/cirneco.gemspec index 13bb1a7..209e4af 100644 --- a/cirneco.gemspec +++ b/cirneco.gemspec @@ -21,10 +21,10 @@ Gem::Specification.new do |s| s.add_dependency 'base32-url', '~> 0.5' s.add_dependency 'nokogiri', '~> 1.8.1' s.add_dependency 'builder', '~> 3.2', '>= 3.2.2' - s.add_dependency 'activesupport', '>= 4.2.5', '< 6' + s.add_dependency 'activesupport', '>= 4.2.5' s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1' s.add_dependency 'thor', '~> 0.19' - s.add_development_dependency 'bundler', '~> 1.0' + s.add_development_dependency 'bundler', '~> 2.2.7' s.add_development_dependency 'rspec', '~> 3.4' s.add_development_dependency 'rspec-xsd', '~> 0.1.0' s.add_development_dependency 'rake', '~> 12.0' From c98b04b27004f74f81cd9f0104913f15d0a07d55 Mon Sep 17 00:00:00 2001 From: Bharati Date: Mon, 1 Mar 2021 11:02:41 +0100 Subject: [PATCH 2/6] nokogiri version updated --- Gemfile.lock | 149 +++++++++++++++++++++++++----------------------- cirneco.gemspec | 2 +- 2 files changed, 78 insertions(+), 73 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 942acf8..6137153 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,19 +9,19 @@ PATH builder (~> 3.2, >= 3.2.2) dotenv (~> 2.1, >= 2.1.1) maremma (>= 4.1, < 5) - nokogiri (~> 1.8.1) + nokogiri (~> 1.8) thor (~> 0.19) GEM remote: https://rubygems.org/ specs: - activesupport (5.2.2) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) base32-url (0.5) benchmark_methods (0.7) bergamasco (0.3.17) @@ -58,33 +58,33 @@ GEM rdf-rdfxml (~> 2.0) rdf-turtle (~> 2.2) thor (~> 0.19) - builder (3.2.3) - citeproc (1.0.9) + builder (3.2.4) + citeproc (1.0.10) namae (~> 1.0) - citeproc-ruby (1.1.10) + citeproc-ruby (1.1.13) citeproc (~> 1.0, >= 1.0.9) csl (~> 1.5) codeclimate-test-reporter (1.0.7) simplecov colorize (0.8.1) - concurrent-ruby (1.1.3) - crack (0.4.3) - safe_yaml (~> 1.0.0) - crass (1.0.4) - csl (1.5.0) + concurrent-ruby (1.1.8) + crack (0.4.5) + rexml + crass (1.0.6) + csl (1.5.2) namae (~> 1.0) - csl-styles (1.0.1.9) + csl-styles (1.0.1.10) csl (~> 1.0) - diff-lcs (1.3) + diff-lcs (1.4.4) docile (1.1.5) - dotenv (2.5.0) - ebnf (1.1.3) - rdf (~> 3.0) - sxp (~> 1.0) - edtf (3.0.4) - activesupport (>= 3.0, < 6.0) + dotenv (2.7.6) + ebnf (1.2.0) + rdf (~> 3.1) + sxp (~> 1.1) + edtf (3.0.6) + activesupport (>= 3.0, < 7.0) excon (0.62.0) - faraday (0.15.4) + faraday (0.14.0) multipart-post (>= 1.2, < 3) faraday-encoding (0.0.5) faraday @@ -92,68 +92,69 @@ GEM faraday (>= 0.7.4, < 1.0) gender_detector (0.1.2) unicode_utils (>= 1.3.0) - haml (5.0.4) + haml (5.2.1) temple (>= 0.8.0) tilt hamster (3.0.0) concurrent-ruby (~> 1.0) - hashdiff (0.3.7) + hashdiff (1.0.1) htmlentities (4.3.4) - i18n (1.6.0) + i18n (1.8.9) concurrent-ruby (~> 1.0) iso8601 (0.9.1) - json (2.1.0) + json (2.5.1) json-ld (2.2.1) multi_json (~> 1.12) rdf (>= 2.2.8, < 4.0) jsonlint (0.2.0) oj (~> 2) trollop (~> 2) - latex-decode (0.3.1) + latex-decode (0.3.2) link_header (0.0.8) - loofah (2.2.3) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - maremma (4.2.1) + maremma (4.2.6) activesupport (>= 4.2.5, < 6) addressable (>= 2.3.6) builder (~> 3.2, >= 3.2.2) - excon (~> 0.60) - faraday (~> 0.14) + excon (~> 0.60, < 0.63) + faraday (~> 0.14, < 0.15) faraday-encoding (~> 0.0.4) faraday_middleware (~> 0.12.0) multi_json (~> 1.12) nokogiri (~> 1.8.1) oj (>= 2.8.3) mini_portile2 (2.3.0) - minitest (5.11.3) - multi_json (1.13.1) - multipart-post (2.0.0) - namae (1.0.1) - nokogiri (1.8.4) + minitest (5.14.4) + multi_json (1.15.0) + multipart-post (2.1.1) + namae (1.0.2) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) oj (2.18.5) - pandoc-ruby (2.0.2) - postrank-uri (1.0.23) - addressable (>= 2.3.0, < 2.6) - nokogiri (>= 1.6.1, < 1.9) + pandoc-ruby (2.1.4) + postrank-uri (1.0.24) + addressable (>= 2.4.0) + nokogiri (>= 1.8.0) public_suffix (>= 2.0.0, < 2.1) public_suffix (2.0.5) - rack (2.0.5) + rack (2.2.3) rack-test (0.8.3) rack (>= 1.0, < 3) - rake (12.3.1) - rdf (3.0.10) + rake (12.3.3) + rdf (3.1.12) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) - rdf-aggregate-repo (2.2.1) - rdf (>= 2.2, < 4.0) - rdf-rdfa (3.0.1) - haml (~> 5.0) + rdf-aggregate-repo (3.1.0) + rdf (~> 3.1) + rdf-rdfa (3.1.2) + haml (~> 5.1) htmlentities (~> 4.3) - rdf (~> 3.0) - rdf-aggregate-repo (>= 2.2, < 4.0) - rdf-xsd (~> 3.0) + rdf (~> 3.1, >= 3.1.2) + rdf-aggregate-repo (~> 3.1) + rdf-vocab (~> 3.1, >= 3.1.5) + rdf-xsd (~> 3.1) rdf-rdfxml (2.2.1) htmlentities (~> 4.3) rdf (>= 2.2, < 4.0) @@ -162,45 +163,49 @@ GEM rdf-turtle (2.2.2) ebnf (~> 1.1) rdf (>= 2.2, < 4.0) - rdf-xsd (3.0.1) - rdf (~> 3.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) + rdf-vocab (3.1.11) + rdf (~> 3.1, >= 3.1.12) + rdf-xsd (3.1.1) + rdf (~> 3.1) + rexml (~> 3.2) + rexml (3.2.4) + 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.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) rspec-xsd (0.1.0) nokogiri (~> 1.6) rspec (~> 3) - safe_yaml (1.0.4) + safe_yaml (1.0.5) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sxp (1.0.2) - rdf (~> 3.0) - temple (0.8.1) + sxp (1.1.0) + rdf (~> 3.1) + temple (0.8.2) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.9) - trollop (2.9.9) - tzinfo (1.2.5) + tilt (2.0.10) + trollop (2.9.10) + tzinfo (1.2.9) thread_safe (~> 0.1) unicode_utils (1.4.0) vcr (3.0.3) - webmock (3.4.2) + webmock (3.12.0) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) PLATFORMS ruby @@ -218,4 +223,4 @@ DEPENDENCIES webmock (~> 3.0, >= 3.0.1) BUNDLED WITH - 2.2.7 + 2.2.8 diff --git a/cirneco.gemspec b/cirneco.gemspec index 209e4af..887c732 100644 --- a/cirneco.gemspec +++ b/cirneco.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.add_dependency 'bergamasco', '~> 0.3' s.add_dependency 'bolognese', '~> 0.9' s.add_dependency 'base32-url', '~> 0.5' - s.add_dependency 'nokogiri', '~> 1.8.1' + s.add_dependency 'nokogiri', '~> 1.8' s.add_dependency 'builder', '~> 3.2', '>= 3.2.2' s.add_dependency 'activesupport', '>= 4.2.5' s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1' From 8c05e654f9e6420e5db0a37e3671f4d5e1ad1215 Mon Sep 17 00:00:00 2001 From: Bharati Vanganuru Date: Tue, 9 Mar 2021 11:54:46 +0100 Subject: [PATCH 3/6] Update cirneco.gemspec Gem versions are adjusted --- cirneco.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cirneco.gemspec b/cirneco.gemspec index 887c732..43e953a 100644 --- a/cirneco.gemspec +++ b/cirneco.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.license = 'MIT' # Declary dependencies here, rather than in the Gemfile - s.add_dependency 'maremma', '>= 4.1', '< 5' + s.add_dependency 'maremma', '>= 4.1' s.add_dependency 'bergamasco', '~> 0.3' s.add_dependency 'bolognese', '~> 0.9' s.add_dependency 'base32-url', '~> 0.5' @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_dependency 'builder', '~> 3.2', '>= 3.2.2' s.add_dependency 'activesupport', '>= 4.2.5' s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1' - s.add_dependency 'thor', '~> 0.19' + s.add_dependency 'thor', '>= 0.19' s.add_development_dependency 'bundler', '~> 2.2.7' s.add_development_dependency 'rspec', '~> 3.4' s.add_development_dependency 'rspec-xsd', '~> 0.1.0' From 5d6af3ec2eab1cc88056db154b5fbdd64dca246f Mon Sep 17 00:00:00 2001 From: Bharati Vanganuru Date: Tue, 9 Mar 2021 11:56:07 +0100 Subject: [PATCH 4/6] Update Gemfile.lock --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6137153..a01d4e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,9 +8,9 @@ PATH bolognese (~> 0.9) builder (~> 3.2, >= 3.2.2) dotenv (~> 2.1, >= 2.1.1) - maremma (>= 4.1, < 5) + maremma (>= 4.1) nokogiri (~> 1.8) - thor (~> 0.19) + thor (>= 0.19) GEM remote: https://rubygems.org/ @@ -143,17 +143,17 @@ GEM rack-test (0.8.3) rack (>= 1.0, < 3) rake (12.3.3) - rdf (3.1.12) + rdf (3.1.13) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-aggregate-repo (3.1.0) rdf (~> 3.1) - rdf-rdfa (3.1.2) - haml (~> 5.1) + rdf-rdfa (3.1.3) + haml (~> 5.2) htmlentities (~> 4.3) - rdf (~> 3.1, >= 3.1.2) + rdf (~> 3.1, >= 3.1.13) rdf-aggregate-repo (~> 3.1) - rdf-vocab (~> 3.1, >= 3.1.5) + rdf-vocab (~> 3.1, >= 3.1.11) rdf-xsd (~> 3.1) rdf-rdfxml (2.2.1) htmlentities (~> 4.3) @@ -163,7 +163,7 @@ GEM rdf-turtle (2.2.2) ebnf (~> 1.1) rdf (>= 2.2, < 4.0) - rdf-vocab (3.1.11) + rdf-vocab (3.1.12) rdf (~> 3.1, >= 3.1.12) rdf-xsd (3.1.1) rdf (~> 3.1) @@ -202,7 +202,7 @@ GEM thread_safe (~> 0.1) unicode_utils (1.4.0) vcr (3.0.3) - webmock (3.12.0) + webmock (3.12.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) From 307c94ab0e9f399963d387ec5f784de72df88361 Mon Sep 17 00:00:00 2001 From: Bharati Vanganuru Date: Tue, 9 Mar 2021 12:00:16 +0100 Subject: [PATCH 5/6] Update Gemfile.lock --- Gemfile.lock | 106 +++++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 45 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a01d4e6..cff2fde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ PATH cirneco (0.9.28) activesupport (>= 4.2.5) base32-url (~> 0.5) - bergamasco (~> 0.3) - bolognese (~> 0.9) + bergamasco (>= 0.3) + bolognese (>= 0.9) builder (~> 3.2, >= 3.2.2) dotenv (~> 2.1, >= 2.1.1) maremma (>= 4.1) @@ -34,30 +34,33 @@ GEM oj (>= 2.8.3) pandoc-ruby (~> 2.0, >= 2.0.0) safe_yaml (~> 1.0, >= 1.0.4) - bibtex-ruby (4.4.7) + bibtex-ruby (6.0.0) latex-decode (~> 0.0) - bolognese (0.15.9) - activesupport (>= 4.2.5, < 6) + bolognese (1.6.6) + activesupport (>= 4.2.5) benchmark_methods (~> 0.7) - bibtex-ruby (~> 4.1) + bibtex-ruby (>= 5.1.0) builder (~> 3.2, >= 3.2.2) citeproc-ruby (~> 1.1, >= 1.1.10) colorize (~> 0.8.1) + concurrent-ruby (~> 1.1, >= 1.1.5) csl-styles (~> 1.0, >= 1.0.1.8) edtf (~> 3.0, >= 3.0.4) + faraday (~> 1.0, >= 1.0.1) gender_detector (~> 0.1.2) iso8601 (~> 0.9.1) - json-ld (~> 2.1, >= 2.1.2) - jsonlint (~> 0.2.0) + json-ld (~> 3.1, >= 3.1.4) + jsonlint (~> 0.3.0) loofah (~> 2.0, >= 2.0.3) - maremma (>= 3.5.7, < 5) + maremma (>= 4.3, < 5) namae (~> 1.0) - nokogiri (~> 1.8.1) - oj (>= 2.8.3) + nokogiri (~> 1.10.4) + oj (~> 3.10) + oj_mimic_json (~> 1.0, >= 1.0.1) postrank-uri (~> 1.0, >= 1.0.18) - rdf-rdfxml (~> 2.0) - rdf-turtle (~> 2.2) - thor (~> 0.19) + rdf-rdfxml (~> 3.1) + rdf-turtle (~> 3.1) + thor (~> 1.0, >= 1.0.1) builder (3.2.4) citeproc (1.0.10) namae (~> 1.0) @@ -78,18 +81,23 @@ GEM diff-lcs (1.4.4) docile (1.1.5) dotenv (2.7.6) - ebnf (1.2.0) + ebnf (2.1.2) + htmlentities (~> 4.3) rdf (~> 3.1) + scanf (~> 1.0) sxp (~> 1.1) edtf (3.0.6) activesupport (>= 3.0, < 7.0) - excon (0.62.0) - faraday (0.14.0) + excon (0.71.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords faraday-encoding (0.0.5) faraday - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) + faraday-net_http (1.0.1) + faraday_middleware (1.0.0) + faraday (~> 1.0) gender_detector (0.1.2) unicode_utils (>= 1.3.0) haml (5.2.1) @@ -103,36 +111,43 @@ GEM concurrent-ruby (~> 1.0) iso8601 (0.9.1) json (2.5.1) - json-ld (2.2.1) - multi_json (~> 1.12) - rdf (>= 2.2.8, < 4.0) - jsonlint (0.2.0) - oj (~> 2) - trollop (~> 2) + json-canonicalization (0.2.1) + json-ld (3.1.9) + htmlentities (~> 4.3) + json-canonicalization (~> 0.2) + link_header (~> 0.0, >= 0.0.8) + multi_json (~> 1.14) + rack (~> 2.0) + rdf (~> 3.1) + jsonlint (0.3.0) + oj (~> 3) + optimist (~> 3) latex-decode (0.3.2) link_header (0.0.8) loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - maremma (4.2.6) - activesupport (>= 4.2.5, < 6) + maremma (4.8) + activesupport (>= 4.2.5) addressable (>= 2.3.6) builder (~> 3.2, >= 3.2.2) - excon (~> 0.60, < 0.63) - faraday (~> 0.14, < 0.15) + excon (~> 0.71.0) + faraday (~> 1.0, >= 1.0.1) faraday-encoding (~> 0.0.4) - faraday_middleware (~> 0.12.0) - multi_json (~> 1.12) - nokogiri (~> 1.8.1) + faraday_middleware (~> 1.0) + nokogiri (~> 1.10.4) oj (>= 2.8.3) - mini_portile2 (2.3.0) + oj_mimic_json (~> 1.0, >= 1.0.1) + mini_portile2 (2.4.0) minitest (5.14.4) multi_json (1.15.0) multipart-post (2.1.1) namae (1.0.2) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - oj (2.18.5) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + oj (3.11.2) + oj_mimic_json (1.0.1) + optimist (3.0.1) pandoc-ruby (2.1.4) postrank-uri (1.0.24) addressable (>= 2.4.0) @@ -155,14 +170,14 @@ GEM rdf-aggregate-repo (~> 3.1) rdf-vocab (~> 3.1, >= 3.1.11) rdf-xsd (~> 3.1) - rdf-rdfxml (2.2.1) + rdf-rdfxml (3.1.1) htmlentities (~> 4.3) - rdf (>= 2.2, < 4.0) - rdf-rdfa (>= 2.2, < 4.0) - rdf-xsd (>= 2.2, < 4.0) - rdf-turtle (2.2.2) - ebnf (~> 1.1) - rdf (>= 2.2, < 4.0) + rdf (~> 3.1) + rdf-rdfa (~> 3.1) + rdf-xsd (~> 3.1) + rdf-turtle (3.1.3) + ebnf (~> 2.1) + rdf (~> 3.1, >= 3.1.8) rdf-vocab (3.1.12) rdf (~> 3.1, >= 3.1.12) rdf-xsd (3.1.1) @@ -185,7 +200,9 @@ GEM rspec-xsd (0.1.0) nokogiri (~> 1.6) rspec (~> 3) + ruby2_keywords (0.0.4) safe_yaml (1.0.5) + scanf (1.0.0) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) @@ -194,10 +211,9 @@ GEM sxp (1.1.0) rdf (~> 3.1) temple (0.8.2) - thor (0.20.3) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - trollop (2.9.10) tzinfo (1.2.9) thread_safe (~> 0.1) unicode_utils (1.4.0) From 4d0bf5933deeb81126c859f14971f213f08e59b7 Mon Sep 17 00:00:00 2001 From: Bharati Vanganuru Date: Tue, 9 Mar 2021 12:01:00 +0100 Subject: [PATCH 6/6] Update cirneco.gemspec --- cirneco.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cirneco.gemspec b/cirneco.gemspec index 43e953a..a2470e0 100644 --- a/cirneco.gemspec +++ b/cirneco.gemspec @@ -16,8 +16,8 @@ Gem::Specification.new do |s| # Declary dependencies here, rather than in the Gemfile s.add_dependency 'maremma', '>= 4.1' - s.add_dependency 'bergamasco', '~> 0.3' - s.add_dependency 'bolognese', '~> 0.9' + s.add_dependency 'bergamasco', '>= 0.3' + s.add_dependency 'bolognese', '>= 0.9' s.add_dependency 'base32-url', '~> 0.5' s.add_dependency 'nokogiri', '~> 1.8' s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'