Merge pull request #55 from betadots/issue-34

Upgrade to Ruby 3 / Rails 7 and remove node.js dependency

.github/workflows/ci.yaml

@@ -43,12 +43,6 @@ jobs:
         bundler-cache: true
     - name: Setup config
       run: mv config/hdm.yml{.template,}
-    - name: Install webpacker
-      run: bundle exec rake webpacker:install
-    - name: Generate assets
-      run: bundle exec rake webpacker:compile
-    - name: Verify assets
-      run: bundle exec rake webpacker:verify_install
     - name: Run tests
       run: bundle exec rake test:all
 

.gitignore

@@ -6,7 +6,6 @@
 
 # Ignore bundler config.
 /.bundle
-/vendor
 /.vendor
 
 # Ignore the default SQLite database.
@@ -60,3 +59,6 @@ package-lock.json
 
 # Vagrant
 /.vagrant
+
+/app/assets/builds/*
+!/app/assets/builds/.keep

.rubocop.yml

@@ -9,5 +9,8 @@ AllCops:
   Include:
     - '**/*.rb'
   Exclude:
+    - bin/*
+    - config/application.rb
+    - config/environments/*
     - vendor/**/*
     - .vendor/**/*

.ruby-version

@@ -1 +1 @@
-ruby-2.5.9
+ruby-3.1.2

DEVELOPMENT.md

@@ -10,18 +10,12 @@
 In case you are using an Apple M1 Chip you might run into trouble building
 Ruby. A work around for that is using the command
 
-    rvm install 2.5.9 --with-cflags="-Wno-error=implicit-function-declaration"
+    rvm install 3.1.2 --with-cflags="-Wno-error=implicit-function-declaration"
 
 On intel you can proceed with the following:
 
-    rvm install 2.5.9
-    rvm use 2.5.9
-    gem install bundler
-
-## **yarn/nodejs**
-
-    brew install node@14
-    npm install -g yarn
+    rvm install 3.1.2
+    rvm use 3.1.2
 
 ## **Main part**
 
@@ -30,15 +24,14 @@ On intel you can proceed with the following:
     bundle config set --local path 'vendor/bundle'
     bundle config set --local with 'development'
     bundle install
-    yarn install --check-files
 
 ## **Configure hdm**
 
     cp config/hdm.yml.template config/hdm.yml
     # vim config/hdm.yml # adopt config
     bundle exec rails db:setup
     echo "secret" | EDITOR="vim" bundle exec rails credentials:edit
-    bundle exec rails server &
+    bin/dev
 
 For development there is per default a fake_puppet_db configured.
 It can be startet on a second shell:

Dockerfile

@@ -1,20 +1,12 @@
-FROM ruby:2.5.9-alpine as build
-
-RUN apk add --update --no-cache \
-      nodejs \
-      yarn
+FROM ruby:3.1.2-alpine as build
 
 ENV APP_HOME /hdm
 WORKDIR $APP_HOME
 
-COPY package.json $APP_HOME
-COPY yarn.lock $APP_HOME
-RUN yarn install --check-files
-
 COPY . $APP_HOME
 COPY config/hdm.yml.template $APP_HOME/config/hdm.yml
 
-FROM ruby:2.5.9-alpine
+FROM ruby:3.1.2-alpine
 
 RUN apk add --update --no-cache \
       binutils-gold \
@@ -35,7 +27,7 @@ RUN apk add --update --no-cache \
       # yarn \ # works without this but produces a short error, that yarn is not found
       tzdata
 
-RUN gem install bundler -v 2.3.6
+RUN gem install bundler -v 2.3.11
 
 COPY --from=build /hdm /hdm
 WORKDIR /hdm

Gemfile

@@ -1,24 +1,29 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "/~https://github.com/#{repo}.git" }
 
-ruby '2.5.9'
+ruby '3.1.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.1.5', '>= 6.1.0.0'
+gem 'rails', '~> 7.0.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
 gem 'puma', '~> 5.6'
-# Use SCSS for stylesheets
-gem 'sass-rails', '>= 6'
-# Transpile app-like JavaScript. Read more: /~https://github.com/rails/webpacker
-gem 'webpacker', '~> 5.0'
-# Turbolinks makes navigating your web application faster. Read more: /~https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
+
+# Asset handling
+gem 'sprockets-rails'
+gem 'importmap-rails'
+gem 'dartsass-rails'
+gem 'turbo-rails'
+gem 'stimulus-rails'
+gem 'bootstrap', '~> 4.6.0'
+gem 'bootstrap-icons-helper'
+gem 'jquery-rails'
+
 # Build JSON APIs with ease. Read more: /~https://github.com/rails/jbuilder
 # gem 'jbuilder', '~> 2.7'
 # Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 4.0'
+gem 'redis', '~> 4.0'
 # Use Active Model has_secure_password
 gem 'bcrypt', '~> 3.1.7'