From ed60aed7086894c48bea6c4825ce65295295cafb Mon Sep 17 00:00:00 2001 From: Simon Neutert Date: Sat, 20 Jan 2024 16:42:49 +0100 Subject: [PATCH 1/2] Ruby v3.3.0 --- .github/workflows/ruby.yml | 53 ++++++++++++++++++++++++++++++++++++++ .rubocop.yml | 18 +++++++++++++ .tool-versions | 2 +- Dockerfile | 2 +- Gemfile.lock | 8 +++--- app.rb | 2 +- 6 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/ruby.yml diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml new file mode 100644 index 0000000..7ec47e1 --- /dev/null +++ b/.github/workflows/ruby.yml @@ -0,0 +1,53 @@ +name: ruby + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + ruby-qa: + runs-on: ubuntu-latest + + services: + postgres: + image: postgres:15-alpine + ports: ["5432:5432"] + env: + POSTGRES_USER: kaching + POSTGRES_PASSWORD: kaching + LC_ALL: C.UTF-8 + LANG: en_US.UTF-8 + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + env: + RACK_ENV: test + DATABASE_URL: localhost + DATABASE_USER: kaching + DATABASE_PASSWORD: kaching + DATABASE_NAME_SHARED: kaching_development + + strategy: + fail-fast: false + matrix: + ruby: ["ruby-3.3"] + os: [macos-latest, ubuntu-latest] + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + bundler-cache: true + + - name: Rubocop + run: bundle exec rubocop diff --git a/.rubocop.yml b/.rubocop.yml index cc4712a..64c298b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,3 +8,21 @@ # where the inspected file is and continue its way up to the root directory. # # See https://docs.rubocop.org/rubocop/configuration + +AllCops: + NewCops: enable + Exclude: + - "bin/**/*" + - "vendor/bundle/**/*" + +Metrics/BlockLength: + Exclude: + - "app.rb" + +Metrics/ClassLength: + Exclude: + - "app.rb" + +Lint/UselessAssignment: + Exclude: + - "app.rb" diff --git a/.tool-versions b/.tool-versions index f2a971a..3294aed 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.2.2 +ruby 3.3.0 diff --git a/Dockerfile b/Dockerfile index 66e5b8a..44c5cbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2-slim-bullseye +FROM ruby:3.3-slim-bullseye RUN apt-get update && apt-get install -y \ build-essential \ diff --git a/Gemfile.lock b/Gemfile.lock index 382cb9c..7eaecb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,12 +40,12 @@ GEM mini_portile2 (2.8.5) money (6.16.0) i18n (>= 0.6.4, <= 2) - nokogiri (1.15.5) + nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.3.0.3) @@ -128,4 +128,4 @@ DEPENDENCIES solargraph (~> 0.50.0) BUNDLED WITH - 2.4.20 + 2.5.5 diff --git a/app.rb b/app.rb index c08bd23..e02a849 100644 --- a/app.rb +++ b/app.rb @@ -220,7 +220,7 @@ class App < Roda year = r.params.fetch('year', Time.now.year).to_i page = r.params.fetch('page', 1).to_i per_page = r.params.fetch('per_page', 10).to_i - + @auditlogs = client.v1.audit_logs.of_year(tenant_account_id:, year:) @auditlogs.map! do |auditlog| auditlog['realized_at'] = Time.parse(auditlog['environment_snapshot']['realized_at']) From 55f4c53df420a4800785b55807fb92c9d70e6661 Mon Sep 17 00:00:00 2001 From: Simon Neutert Date: Sat, 20 Jan 2024 16:44:48 +0100 Subject: [PATCH 2/2] update gems :rocket: --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7eaecb2..b41775c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/simonneutert/ka-ching-client.git - revision: 6dc993a5416b51d50fe241f932c3f172124bd9e7 + revision: 40fef1c1d5b2d59c303b7cf8e829a2bf403b9b08 branch: main specs: - ka-ching-client (0.4.4) + ka-ching-client (0.5.2) faraday (>= 2.7.10, < 2.9.0) httpx (>= 0.22.4, < 1.3.0) @@ -15,7 +15,7 @@ GEM base64 (0.2.0) benchmark (0.3.0) coderay (1.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) diff-lcs (1.5.0) e2mmap (0.1.0) faraday (2.8.1) @@ -24,9 +24,9 @@ GEM ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) htmlbeautifier (1.4.2) - http-2-next (1.0.2) - httpx (1.2.0) - http-2-next (>= 1.0.1) + http-2-next (1.0.3) + httpx (1.2.1) + http-2-next (>= 1.0.3) i18n (1.14.1) concurrent-ruby (~> 1.0) jaro_winkler (1.5.6) @@ -48,7 +48,7 @@ GEM nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.3.0.3) + parser (3.3.0.4) ast (~> 2.4.1) racc pry (0.14.2)