Merge pull request #520 from nimblehq/release/5.16.0

malparty · web-flow · commit 8ac0ecef21c5 · 2024-06-13T11:12:45.000+07:00
Release – 5.16.0
diff --git a/.github/workflows/test_generated_app.yml b/.github/workflows/test_generated_app.yml
@@ -9,9 +9,9 @@ env:
   DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}
   DOCKER_REGISTRY_USERNAME: ${{ github.repository_owner }}
   DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
-  RUBY_VERSION: 3.2.2
-  NODE_VERSION: 18
-  RAILS_VERSION: 7.1.2
+  RUBY_VERSION: 3.3.1
+  NODE_VERSION: 22
+  RAILS_VERSION: 7.1.3
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/test_production_build.yml b/.github/workflows/test_production_build.yml
@@ -6,9 +6,9 @@ env:
   APP_NAME: rails-templates
   DOCKER_IMAGE: ${{ github.repository }}
   DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}
-  RUBY_VERSION: 3.2.2
-  NODE_VERSION: 18
-  RAILS_VERSION: 7.1.2
+  RUBY_VERSION: 3.3.1
+  NODE_VERSION: 22
+  RAILS_VERSION: 7.1.3
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/test_template.yml b/.github/workflows/test_template.yml
@@ -3,7 +3,7 @@ name: Test the codebase of the template
 on: push
 
 env:
-  RUBY_VERSION: 3.2.2
+  RUBY_VERSION: 3.3.1
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.template/Gemfile.lock b/.template/Gemfile.lock
@@ -21,7 +21,8 @@ GEM
     racc (1.7.1)
     rainbow (3.1.1)
     regexp_parser (2.8.1)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -65,6 +66,7 @@ GEM
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
+    strscan (3.1.0)
     unicode-display_width (2.4.2)
 
 PLATFORMS
diff --git a/.template/addons/docker/docker-compose.dev.yml.tt b/.template/addons/docker/docker-compose.dev.yml.tt
@@ -1,4 +1,4 @@
-version: '3.2'
+version: '3.8'
 
 services:
   db:
diff --git a/.template/addons/docker/docker-compose.test.yml.tt b/.template/addons/docker/docker-compose.test.yml.tt
@@ -1,4 +1,4 @@
-version: '3.2'
+version: '3.8'
 
 services:
   db:
diff --git a/.template/addons/docker/docker-compose.yml.tt b/.template/addons/docker/docker-compose.yml.tt
@@ -1,11 +1,12 @@
-version: '3.2'
+version: '3.8'
 
 services:
   db:
     image: postgres:<%= POSTGRES_VERSION %>
     container_name: <%= CONTAINERIZED_APP_NAME %>-db
     environment:
       - POSTGRES_DB=<%= APP_NAME %>_production
+      - POSTGRES_PASSWORD=postgres
     ports:
       - "5432:5432"
 
diff --git a/.template/addons/semaphore/.semaphore/README.md.tt b/.template/addons/semaphore/.semaphore/README.md.tt
diff --git a/.template/addons/semaphore/.semaphore/promotion-production.yml.tt b/.template/addons/semaphore/.semaphore/promotion-production.yml.tt
diff --git a/.template/addons/semaphore/.semaphore/promotion-staging.yml.tt b/.template/addons/semaphore/.semaphore/promotion-staging.yml.tt
diff --git a/.template/addons/semaphore/.semaphore/semaphore.yml.tt b/.template/addons/semaphore/.semaphore/semaphore.yml.tt
diff --git a/.template/addons/semaphore/template.rb b/.template/addons/semaphore/template.rb
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs >= 18
-ruby 3.2.2
+ruby 3.3.1
diff --git a/Gemfile.tt b/Gemfile.tt
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 ruby '<%= RUBY_VERSION %>'
 
 # Backend
-gem 'rails', '7.1.2' # Latest stable
+gem 'rails', '~> 7.1' # Latest stable
 gem 'pg' # Use Postgresql as database
 gem 'puma' # Use Puma as the app server
 gem 'mini_magick' # A ruby wrapper for ImageMagick or GraphicsMagick command line
@@ -53,7 +53,7 @@ group :development, :test do
   # Code Analysis
   gem 'bullet' # help to kill N+1 queries and unused eager loading
   gem 'brakeman', require: false # A static analysis security vulnerability scanner for Ruby on Rails applications
-  gem 'parser', '3.2.2.3' # Use correct parser version to avoid parser warnings
+  gem 'parser', '~> 3.3' # Use correct parser version to avoid parser warnings
   gem 'rubocop', require: false # A Ruby static code analyzer and formatter, based on the community Ruby style guide.
   gem 'rubocop-rails', require: false # A RuboCop extension focused on enforcing Rails best practices and coding conventions.
   gem 'rubocop-rspec', require: false # Code style checking for RSpec files
diff --git a/README.md b/README.md
@@ -16,9 +16,9 @@ with building complex applications over the years.
 
 ### Requirements
 
-- Install ruby and set your local ruby version to `3.2.2`
-- Install rails `7.1.2`
-- Install node `18.19.0` (For creating web application)
+- Install ruby and set your local ruby version to `3.3.1`
+- Install rails `7.1.3`
+- Install node `22.1.0` (For creating web application)
 
 > 📝 If running on Apple M1, to build docker image, please make sure to set platform to AMD64 by `export DOCKER_DEFAULT_PLATFORM=linux/amd64`
 
@@ -49,7 +49,6 @@ Available Addons:
 - `docker`
 - `nginx`
 - `phrase`
-- `semaphore`
 - `bootstrap`
 - `slim`
 - `devise`
diff --git a/rubocop/Gemfile.lock b/rubocop/Gemfile.lock
@@ -12,7 +12,8 @@ GEM
     racc (1.7.3)
     rainbow (3.1.1)
     regexp_parser (2.8.3)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -40,10 +41,12 @@ GEM
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
+    strscan (3.1.0)
     unicode-display_width (2.5.0)
 
 PLATFORMS
   arm64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   rspec
diff --git a/template.rb b/template.rb
@@ -9,9 +9,9 @@
 APP_NAME_HUMANIZED = app_name.split(/[-_]/).map(&:capitalize).join(' ').gsub(/ Web$/, '')
 DOCKER_REGISTRY_HOST = 'docker.io'
 DOCKER_IMAGE = "nimblehq/#{CONTAINERIZED_APP_NAME}".freeze
-RUBY_VERSION = '3.2.2'
-POSTGRES_VERSION = '15.2'
-REDIS_VERSION = '6.2.7'
+RUBY_VERSION = '3.3.1'
+POSTGRES_VERSION = '16.3'
+REDIS_VERSION = '7.0.9'
 # Variants
 API_VARIANT = options[:api] || ENV['API'] == 'true'
 WEB_VARIANT = !API_VARIANT
@@ -22,8 +22,8 @@
 }.freeze
 
 if WEB_VARIANT
-  NODE_VERSION = '18.19.0'
-  NODE_SOURCE_VERSION = '18' # Used in Dockerfile https://github.com/nodesource/distributions
+  NODE_VERSION = '22.1.0'
+  NODE_SOURCE_VERSION = '22' # Used in Dockerfile https://github.com/nodesource/distributions
 end
 
 def apply_template!(template_root)
@@ -95,7 +95,6 @@ def ask_for_all_variant_addons
   @install_github_action = yes?(install_addon_prompt('Github Action and Wiki'))
   @install_openapi = API_VARIANT || yes?(install_addon_prompt('OpenAPI'))
   @install_mock_server = @install_openapi && yes?(install_addon_prompt('Mock Server'))
-  @install_semaphore = yes?(install_addon_prompt('SemaphoreCI'))
   @install_nginx = yes?(install_addon_prompt('Nginx'))
   @install_phrase = yes?(install_addon_prompt('Phrase'))
   @install_crud = WEB_VARIANT && yes?(install_addon_prompt('Crud (includes Devise, Bootstrap and Slim)'))
@@ -112,7 +111,6 @@ def ask_for_web_variant_addons
 def apply_optional_addons
   apply '.template/addons/github/template.rb' if @install_github_action
   apply '.template/addons/openapi/template.rb' if @install_openapi
-  apply '.template/addons/semaphore/template.rb' if @install_semaphore
   apply '.template/addons/nginx/template.rb' if @install_nginx
   apply '.template/addons/phrase/template.rb' if @install_phrase
   apply '.template/addons/devise/template.rb' if @install_devise

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: '3.2'`
	`1`	`+version: '3.8'`
`2`	`2`
`3`	`3`	`services:`
`4`	`4`	`db:`