Skip to content

Commit

Permalink
FI-1767: Update to use new core version with ruby 3 (#5)
Browse files Browse the repository at this point in the history
* update core and ruby versions

* update to use skip behavior when a required request has not been made

* bump version
  • Loading branch information
Jammjammjamm authored Oct 28, 2022
1 parent 00323d8 commit 9117d5f
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.2
3.1.2
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 2.7.2
ruby 3.1.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.2
FROM ruby:3.1.2

ENV INSTALL_PATH=/opt/inferno/
ENV APP_ENV=production
Expand Down
154 changes: 82 additions & 72 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
PATH
remote: .
specs:
shc_vaccination_test_kit (0.0.2)
shc_vaccination_test_kit (0.1.0)
health_cards
inferno_core (> 0.1.3)
inferno_core (>= 0.4.2)

GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.4.6)
activesupport (6.1.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
bcp47 (0.3.3)
i18n
blueprinter (0.25.2)
byebug (11.1.3)
chunky_png (1.4.0)
coderay (1.1.3)
concurrent-ruby (1.1.9)
connection_pool (2.2.5)
concurrent-ruby (1.1.10)
connection_pool (2.3.0)
crack (0.4.5)
rexml
database_cleaner (1.99.0)
Expand All @@ -34,35 +34,34 @@ GEM
diff-lcs (1.5.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
dotenv (2.8.1)
dry-auto_inject (0.9.0)
dry-container (>= 0.3.4)
dry-configurable (0.12.0)
dry-configurable (0.13.0)
concurrent-ruby (~> 1.0)
dry-core (~> 0.5, >= 0.5.0)
dry-container (0.8.0)
dry-core (~> 0.6)
dry-container (0.9.0)
concurrent-ruby (~> 1.0)
dry-configurable (~> 0.1, >= 0.1.3)
dry-core (0.7.1)
dry-configurable (~> 0.13, >= 0.13.0)
dry-core (0.8.1)
concurrent-ruby (~> 1.0)
dry-equalizer (0.3.0)
dry-inflector (0.2.1)
dry-inflector (0.3.0)
dry-logic (1.2.0)
concurrent-ruby (~> 1.0)
dry-core (~> 0.5, >= 0.5)
dry-struct (1.4.0)
dry-core (~> 0.5, >= 0.5)
dry-types (~> 1.5)
ice_nine (~> 0.11)
dry-system (0.18.1)
dry-system (0.20.0)
concurrent-ruby (~> 1.0)
dry-auto_inject (>= 0.4.0)
dry-configurable (~> 0.11, >= 0.11.1)
dry-container (~> 0.7, >= 0.7.2)
dry-core (~> 0.3, >= 0.3.1)
dry-equalizer (~> 0.2)
dry-configurable (~> 0.13, >= 0.13.0)
dry-container (~> 0.9, >= 0.9.0)
dry-core (~> 0.5, >= 0.5)
dry-inflector (~> 0.1, >= 0.1.2)
dry-struct (~> 1.0)
dry-transformer (0.1.1)
dry-types (1.5.1)
concurrent-ruby (~> 1.0)
dry-container (~> 0.3)
Expand All @@ -71,7 +70,7 @@ GEM
dry-logic (~> 1.0, >= 1.0.2)
factory_bot (6.2.0)
activesupport (>= 5.0.0)
faraday (1.10.0)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -87,13 +86,15 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fhir_client (5.0.3)
activesupport (>= 3)
addressable (>= 2.3)
Expand All @@ -110,7 +111,7 @@ GEM
date_time_precision (>= 0.8)
mime-types (>= 3.0)
nokogiri (>= 1.11.4)
fhir_models (4.2.1)
fhir_models (4.2.2)
bcp47 (>= 0.3)
date_time_precision (>= 0.8)
mime-types (>= 3.0)
Expand All @@ -120,92 +121,101 @@ GEM
date_time_precision (>= 0.8)
mime-types (>= 3.0)
nokogiri (>= 1.11.4)
hanami-controller (1.3.3)
hanami-utils (~> 1.3)
hanami-controller (2.0.0.beta1)
dry-configurable (~> 0.13, >= 0.13.0)
hanami-utils (~> 2.0.beta)
rack (~> 2.0)
hanami-router (1.3.2)
hanami-utils (~> 1.3)
http_router (= 0.11.2)
hanami-router (2.0.0.beta2)
mustermann (~> 1.0)
mustermann-contrib (~> 1.0)
rack (~> 2.0)
hanami-utils (1.3.8)
hanami-utils (2.0.0.beta1)
concurrent-ruby (~> 1.0)
transproc (~> 1.0)
dry-transformer (~> 0.1)
hansi (0.2.1)
hashdiff (1.0.1)
health_cards (1.0.0)
health_cards (1.1.0)
fhir_models (>= 4.0.0)
rqrcode
rqrcode_core (>= 1.2.0)
http-accept (1.7.0)
http-cookie (1.0.4)
http-cookie (1.0.5)
domain_name (~> 0.5)
http_router (0.11.2)
rack (>= 1.0.0)
url_mount (~> 0.2.1)
i18n (1.10.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
inferno_core (0.2.0.rc4)
inferno_core (0.4.2)
activesupport (~> 6.1)
blueprinter (= 0.25.2)
dotenv (~> 2.7)
dry-configurable (= 0.12.0)
dry-system (= 0.18.1)
dry-configurable (= 0.13.0)
dry-container (= 0.9.0)
dry-core (= 0.8.1)
dry-system (= 0.20.0)
faraday (~> 1.2)
faraday_middleware (~> 1.2)
fhir_client (>= 5.0.3)
fhir_models (~> 4.2.0)
hanami-controller (~> 1.3)
hanami-router (~> 1.3)
fhir_models (>= 4.2.2)
hanami-controller (= 2.0.0.beta1)
hanami-router (= 2.0.0.beta2)
oj (= 3.11.0)
pry
pry-byebug
puma (~> 5.3)
rake (~> 13.0)
sequel (~> 5.42.0)
sidekiq (~> 6.4.0)
sidekiq (~> 6.5.6)
sqlite3 (~> 1.4)
thor (~> 1.1.0)
jwt (2.3.0)
thor (~> 1.2.1)
jwt (2.5.0)
method_source (1.0.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
minitest (5.15.0)
minitest (5.16.3)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
multipart-post (2.2.3)
mustermann (1.1.2)
ruby2_keywords (~> 0.0.1)
mustermann-contrib (1.1.2)
hansi (~> 0.2.0)
mustermann (= 1.1.2)
netrc (0.11.0)
nio4r (2.5.8)
nokogiri (1.13.3-x86_64-darwin)
nokogiri (1.13.9-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.9-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.3-x86_64-linux)
nokogiri (1.13.9-x86_64-linux)
racc (~> 1.4)
oauth2 (1.4.9)
oauth2 (1.4.11)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
rack (>= 1.2, < 4)
oj (3.11.0)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.8.0)
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (~> 0.10)
public_suffix (4.0.6)
puma (5.6.2)
pry (>= 0.13, < 0.15)
public_suffix (5.0.0)
puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.3)
rack (2.2.4)
rake (13.0.6)
redis (4.6.0)
redis (4.8.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rqrcode (2.1.0)
rqrcode (2.1.2)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
Expand All @@ -224,28 +234,28 @@ GEM
rspec-support (3.10.3)
ruby2_keywords (0.0.5)
sequel (5.42.0)
sidekiq (6.4.1)
connection_pool (>= 2.2.2)
sidekiq (6.5.7)
connection_pool (>= 2.2.5)
rack (~> 2.0)
redis (>= 4.2.0)
sqlite3 (1.4.2)
thor (1.1.0)
tilt (2.0.10)
transproc (1.1.1)
tzinfo (2.0.4)
redis (>= 4.5.0, < 5)
sqlite3 (1.5.3-arm64-darwin)
sqlite3 (1.5.3-x86_64-darwin)
sqlite3 (1.5.3-x86_64-linux)
thor (1.2.1)
tilt (2.0.11)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
url_mount (0.2.1)
rack
unf_ext (0.0.8.2)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
zeitwerk (2.5.4)
zeitwerk (2.6.1)

PLATFORMS
arm64-darwin-21
x86_64-darwin-19
x86_64-linux

Expand All @@ -257,4 +267,4 @@ DEPENDENCIES
webmock (~> 3.11)

BUNDLED WITH
2.2.17
2.3.23
2 changes: 1 addition & 1 deletion lib/covid19_vci/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Covid19VCI
VERSION = '0.0.2'.freeze
VERSION = '0.1.0'.freeze
end
4 changes: 2 additions & 2 deletions shc_vaccination_test_kit.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://github.com/inferno-framework/shc-vaccination-test-kit'
spec.license = 'Apache-2.0'
spec.add_runtime_dependency 'health_cards'
spec.add_runtime_dependency 'inferno_core', '> 0.1.3'
spec.add_runtime_dependency 'inferno_core', '>= 0.4.2'
spec.add_development_dependency 'database_cleaner-sequel', '~> 1.8'
spec.add_development_dependency 'factory_bot', '~> 6.1'
spec.add_development_dependency 'rspec', '~> 3.10'
spec.add_development_dependency 'webmock', '~> 3.11'
spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
spec.required_ruby_version = Gem::Requirement.new('>= 3.1.2')
spec.metadata['homepage_uri'] = spec.homepage
spec.metadata['source_code_uri'] = 'https://github.com/inferno-framework/shc-vaccination-test-kit'
spec.files = [
Expand Down
12 changes: 6 additions & 6 deletions spec/covid19_vci/file_download_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ def run(runnable, inputs = {})
expect(result.result).to eq('pass')
end

it 'errors if the vci_file_download request has not been made' do
it 'skips if the vci_file_download request has not been made' do
result = run(test)

expect(result.result).to eq('error')
expect(result.result).to eq('skip')
expect(result.result_message).to match(/vci_file_download/)
end

Expand Down Expand Up @@ -154,10 +154,10 @@ def run(runnable, inputs = {})
expect(result.result).to eq('pass')
end

it 'errors if the vci_file_download request has not been made' do
it 'skips if the vci_file_download request has not been made' do
result = run(test)

expect(result.result).to eq('error')
expect(result.result).to eq('skip')
expect(result.result_message).to match(/vci_file_download/)
end

Expand Down Expand Up @@ -268,10 +268,10 @@ def run(runnable, inputs = {})
expect(result.result).to eq('pass')
end

it 'errors if the vci_file_download request has not been made' do
it 'skips if the vci_file_download request has not been made' do
result = run(test)

expect(result.result).to eq('error')
expect(result.result).to eq('skip')
expect(result.result_message).to match(/vci_file_download/)
end

Expand Down

0 comments on commit 9117d5f

Please sign in to comment.