From c0fe0f25de926312bdf97fc404b9e7292ed0500f Mon Sep 17 00:00:00 2001 From: Simon Neutert Date: Sun, 6 Oct 2024 21:55:30 +0200 Subject: [PATCH] dockered test setup and dependency bump --- Dockerfile.test | 2 +- Gemfile | 4 ++++ Gemfile.lock | 10 ++++++++++ config.ru | 3 ++- justfile | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Dockerfile.test b/Dockerfile.test index a002de5..bcf7a8a 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -51,4 +51,4 @@ EXPOSE 9292 COPY --from=gembuilder /usr/local/bundle/ /usr/local/bundle/ COPY --chown=${USERNAME} . ${WORKDIR} -CMD ["bundle", "exec rake"] +CMD ["bundle", "exec", "rake"] diff --git a/Gemfile b/Gemfile index e39a519..432ea5b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,12 +2,16 @@ source 'https://rubygems.org' +gem 'fiddle', '~> 1.1' +gem 'logger', '~> 1.6' gem 'minitar-cli', '~> 0.12' +gem 'ostruct', '~> 0.6.0' gem 'puma', '~> 6.4' gem 'rack-unreloader', '~> 2.1' gem 'rackup', '~> 2.1.0' gem 'rake', '~> 13.1' gem 'redcarpet', '~> 3.6' +gem 'reline', '~> 0.5.10' gem 'rexml', '~> 3.3' gem 'roda', '~> 3.84' gem 'tantiny', '0.3.3' diff --git a/Gemfile.lock b/Gemfile.lock index d83c128..401c30e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,10 +5,13 @@ GEM coderay (1.1.3) concurrent-ruby (1.3.4) diff-lcs (1.5.1) + fiddle (1.1.2) hashie (5.0.0) htmlbeautifier (1.4.3) + io-console (0.7.2) json (2.7.2) language_server-protocol (3.17.0.3) + logger (1.6.1) method_source (1.1.0) minitar (0.12.1) minitar-cli (0.12) @@ -16,6 +19,7 @@ GEM powerbar (~> 1.0) minitest (5.25.1) nio4r (2.7.3) + ostruct (0.6.0) parallel (1.26.3) parser (3.3.5.0) ast (~> 2.4.1) @@ -39,6 +43,8 @@ GEM rake (13.2.1) redcarpet (3.6.0) regexp_parser (2.9.2) + reline (0.5.10) + io-console (~> 0.5) rexml (3.3.8) roda (3.84.0) rack @@ -96,9 +102,12 @@ PLATFORMS x86_64-linux DEPENDENCIES + fiddle (~> 1.1) htmlbeautifier + logger (~> 1.6) minitar-cli (~> 0.12) minitest (~> 5.21) + ostruct (~> 0.6.0) pry puma (~> 6.4) rack-test @@ -106,6 +115,7 @@ DEPENDENCIES rackup (~> 2.1.0) rake (~> 13.1) redcarpet (~> 3.6) + reline (~> 0.5.10) rexml (~> 3.3) roda (~> 3.84) rubocop (~> 1.66) diff --git a/config.ru b/config.ru index c36e828..e77fa6e 100644 --- a/config.ru +++ b/config.ru @@ -4,6 +4,7 @@ dev = ENV['RACK_ENV'] == 'development' prod = ENV['RACK_ENV'] == 'production' require 'pry' unless prod +require 'logger' require 'yaml' require 'tantiny' require 'redcarpet' @@ -12,7 +13,7 @@ require 'roda' require 'fileutils' require 'digest' require 'rack/deflater' - +require 'fiddle' require 'ostruct' require 'rack/unreloader' diff --git a/justfile b/justfile index bcf4497..482037f 100644 --- a/justfile +++ b/justfile @@ -9,7 +9,7 @@ reset_default_memos: @bundle exec rake reset_default_memos test: - @docker buildx build -f Dockerfile.test . -t labra-test && docker run --rm -it --name labra-test labra-test + @docker build -f Dockerfile.test . -t labra-test && docker run --rm -it labra-test pretty_js: @npx prettier --write assets/js/**/*.js