modulorails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55dbb40ab0e717d0204e96ded91f37a2384d6a068cc588d4c4c9db90e96c2d91
-  data.tar.gz: e6f08f5aeec11a0249d8323604f17471120a066e696308c6ad9d0b2e4ed93cd7
+  metadata.gz: f695c4454203bb2d22353b7cff523da2315c7ce5472300208f1774d6aed2be5a
+  data.tar.gz: f02062f1a5878154caa982fbf70dd5d584cdd1b07a90f5614aa4e01d27b79b20
 SHA512:
-  metadata.gz: f4c82055e0f2037c6f4ff7831659be156ff501eb4fbe80ac52089f1857f20ff1db40e81446d0bf2bbfba1df6bba7638b05b54bb114623ff856eb9fce5cb65641
-  data.tar.gz: 79732d5ad59379f2988ac10d8dac50f99d1984365fca5487ead432cb8d7f2e1b39b666e344dc02f051c267ffe9da19dcc4a82785ecda669c638bed101ee23fe0
+  metadata.gz: 93943d5cd4726cce846e10c09149ff39b19adadbdf823a3ffc4032e524184ebd1fd50a83be07286ea50938062995df3a6166edd206461efeb400b85e00101d31
+  data.tar.gz: 92b4689741e9468f395656200ff35096553e332e84958892adaedccfb6b14fb674f01078ae3a8588d104838d9e080422de7ae414224add37ed0c9a533aaf0508

data/.dockerignore

@@ -0,0 +1,14 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status
+*.gem
+gemfiles/*.lock
+Gemfile.lock

data/.gitignore

@@ -10,3 +10,5 @@
 # rspec failure tracking
 .rspec_status
 *.gem
+gemfiles/*.lock
+/config/database.yml

data/.travis.yml

@@ -1,9 +1,28 @@
 ---
 language: ruby
 cache: bundler
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
+
+ruby:
+  - '2.5'
+  - '2.6'
+  - '2.7'
+  - '3.0'
+  - '3.1'
+
 before_install:
   - gem install bundler -v 2.1.4
+
+gemfile:
+  - gemfiles/rails_52.gemfile
+  - gemfiles/rails_60.gemfile
+  - gemfiles/rails_61.gemfile
+  - gemfiles/rails_70.gemfile
+
+matrix:
+  exclude:
+    - gemfile: gemfiles/rails_70.gemfile
+      ruby: 2.5
+    - gemfile: gemfiles/rails_70.gemfile
+      ruby: 2.6
+
+script: bundle exec rake spec

data/Appraisals

@@ -0,0 +1,18 @@
+appraise "rails-52" do
+  gem 'rails', '~> 5.2', '>= 5.2.6'
+end
+
+appraise "rails-60" do
+  gem 'rails', '~> 6.0', '>= 6.0.4.4'
+end
+
+appraise "rails-61" do
+  gem 'rails', '~> 6.1', '>= 6.1.4.4'
+end
+
+# Rails 7 requires at least Ruby 2.7
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
+    appraise "rails-70" do
+      gem 'rails', '~> 7.0'
+    end
+end

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 This file is used to list changes made in each version of the gem.
 
+# 0.4.0
+
+Fixes, updates and health_check release.
+
+- Update generators for Docker and Gitlab CI.
+- Move all generators under the `modulorails` namespace.
+- Add dependency to `health_check` gem.
+- Fix error on database configuration validator when no database.yml exists.
+- Rescue if httparty can't post to configuration.endpoint.
+- Add dockerfiles to test on many Ruby versions.
+- Add appraisal to test on many Rails versions.
+
 # 0.3.0
 
 Docker release.

data/Dockerfile.ruby25

@@ -0,0 +1,34 @@
+#
+# BUILD IMAGE
+#
+FROM ruby:2.5-alpine
+
+WORKDIR /app
+
+RUN apk add --update --no-cache \
+    alpine-sdk \
+    tzdata
+
+RUN gem install bundler
+
+# Your RubyGems version (3.0.3)) has a bug that prevents `required_ruby_version` from working for
+# Bundler. Any scripts that use `gem install bundler` will break as soon as Bundler drops support
+# for your Ruby version. Please upgrade RubyGems to avoid future breakage and silence this warning
+# by running `gem update --system 3.2.3`
+RUN gem update --system 3.2.3
+
+COPY . .
+
+RUN bundle config set specific_platform true
+
+# Ensure the use of a Gemfile working with Ruby 2.5
+RUN sed -e 's/"..\/"/".\/"/' gemfiles/rails_52.gemfile > Gemfile
+
+# Install the basic dependencies
+RUN bundle install
+
+# Install dependencies for all supported Rails versions
+RUN bundle exec appraisal install
+
+# Run the tests
+CMD ['./entrypoints/appraisal_test.sh']

data/Dockerfile.ruby26

@@ -0,0 +1,28 @@
+#
+# BUILD IMAGE
+#
+FROM ruby:2.6-alpine
+
+WORKDIR /app
+
+RUN apk add --update --no-cache \
+    alpine-sdk \
+    tzdata
+
+RUN gem install bundler
+
+COPY . .
+
+RUN bundle config set specific_platform true
+
+# Ensure the use of a Gemfile working with Ruby 2.6
+RUN sed -e 's/"..\/"/".\/"/' gemfiles/rails_52.gemfile > Gemfile
+
+# Install the basic dependencies
+RUN bundle install
+
+# Install dependencies for all supported Rails versions
+RUN bundle exec appraisal install
+
+# Run the tests
+CMD ['./entrypoints/appraisal_test.sh']

data/Dockerfile.ruby27

@@ -0,0 +1,25 @@
+#
+# BUILD IMAGE
+#
+FROM ruby:2.7-alpine
+
+WORKDIR /app
+
+RUN apk add --update --no-cache \
+    alpine-sdk \
+    tzdata
+
+RUN gem install bundler
+
+COPY . .
+
+RUN bundle config set specific_platform true
+
+# Install the basic dependencies
+RUN bundle install
+
+# Install dependencies for all supported Rails versions
+RUN bundle exec appraisal install
+
+# Run the tests
+CMD ['./entrypoints/appraisal_test.sh']

data/Dockerfile.ruby30

@@ -0,0 +1,25 @@
+#
+# BUILD IMAGE
+#
+FROM ruby:3.0-alpine
+
+WORKDIR /app
+
+RUN apk add --update --no-cache \
+    alpine-sdk \
+    tzdata
+
+RUN gem install bundler
+
+COPY . .
+
+RUN bundle config set specific_platform true
+
+# Install the basic dependencies
+RUN bundle install
+
+# Install dependencies for all supported Rails versions
+RUN bundle exec appraisal install
+
+# Run the tests
+CMD ['./entrypoints/appraisal_test.sh']

data/Dockerfile.ruby31

@@ -0,0 +1,25 @@
+#
+# BUILD IMAGE
+#
+FROM ruby:3.1-alpine
+
+WORKDIR /app
+
+RUN apk add --update --no-cache \
+    alpine-sdk \
+    tzdata
+
+RUN gem install bundler
+
+COPY . .
+
+RUN bundle config set specific_platform true
+
+# Install the basic dependencies
+RUN bundle install
+
+# Install dependencies for all supported Rails versions
+RUN bundle exec appraisal install
+
+# Run the tests
+CMD ['./entrypoints/appraisal_test.sh']

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    modulorails (0.3.0)
+    modulorails (0.4.0)
       git (~> 1.7, >= 1.7.0)
+      health_check (~> 3.1)
       httparty
       i18n
       railties (>= 4.2.0)
@@ -10,97 +11,103 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (7.0.0)
+      actionview (= 7.0.0)
+      activesupport (= 7.0.0)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionview (7.0.0)
+      activesupport (= 7.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activemodel (7.0.0)
+      activesupport (= 7.0.0)
+    activerecord (7.0.0)
+      activemodel (= 7.0.0)
+      activesupport (= 7.0.0)
+    activesupport (7.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     erubi (1.10.0)
-    git (1.8.1)
+    git (1.10.2)
       rchardet (~> 1.8)
-    httparty (0.18.1)
+    health_check (3.1.0)
+      railties (>= 5.0)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.5)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.1)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
     multi_xml (0.6.0)
-    nokogiri (1.11.1-x86_64-darwin)
+    nokogiri (1.13.1-aarch64-linux)
       racc (~> 1.4)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    railties (7.0.0)
+      actionpack (= 7.0.0)
+      activesupport (= 7.0.0)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (12.3.3)
     rchardet (1.8.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.5.3)
 
 PLATFORMS
-  ruby
+  aarch64-linux
 
 DEPENDENCIES
   activerecord (>= 4.2.0)
+  appraisal
   modulorails!
   rake (~> 12.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.1.4
+   2.3.3

data/README.md

@@ -10,7 +10,7 @@ provides templates for the common configurations and defines common dependencies
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'modulorails', git: 'git://github.com/moduloTech/modulorails.git'
+gem 'modulorails'
 ```
 
 And then execute:
@@ -33,9 +33,21 @@ end
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+There are tests in `spec`. To run tests:
+- Build Docker images using `docker compose build`.
+- You can run tests on all supported Ruby versions using `docker compose up`.
+- Or you can run test on a specific Ruby version using one of the following commands:
+  - Ruby 2.5: `docker compose run ruby25`
+  - Ruby 2.6: `docker compose run ruby26`
+  - Ruby 2.7: `docker compose run ruby27`
+  - Ruby 3.0: `docker compose run ruby30`
+  - Ruby 3.1: `docker compose run ruby31`
+
+[Appraisal](https://github.com/thoughtbot/appraisal) is used to test the gem against many supported Rails versions:
+  - Rails 5.2, 6.0 and 6.1 on Ruby 2.5 and 2.6. 
+  - Rails 5.2, 6.0, 6.1 and 7.0 on Ruby 2.7, 3.0 and 3.1. 
+
+Travis CI is configured to automatically run tests in all supported Ruby versions and dependency sets after each push.
 
 ## Contributing
 

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/docker-compose.yml

@@ -0,0 +1,37 @@
+version: '3.7'
+
+services:
+  ruby25:
+    image: modulotechgroup/modulorails:testruby25
+    build:
+      context: .
+      dockerfile: Dockerfile.ruby25
+    command: ./entrypoints/appraisal_test.sh
+
+  ruby26:
+    image: modulotechgroup/modulorails:testruby26
+    build:
+      context: .
+      dockerfile: Dockerfile.ruby26
+    command: ./entrypoints/appraisal_test.sh
+
+  ruby27:
+    image: modulotechgroup/modulorails:testruby27
+    build:
+      context: .
+      dockerfile: Dockerfile.ruby27
+    command: ./entrypoints/appraisal_test.sh
+
+  ruby30:
+    image: modulotechgroup/modulorails:testruby30
+    build:
+      context: .
+      dockerfile: Dockerfile.ruby30
+    command: ./entrypoints/appraisal_test.sh
+
+  ruby31:
+    image: modulotechgroup/modulorails:testruby31
+    build:
+      context: .
+      dockerfile: Dockerfile.ruby31
+    command: ./entrypoints/appraisal_test.sh

data/entrypoints/appraisal_test.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Exit immediately if a command exits with a non-zero status
+set -e
+
+# Launch the tests
+bundle exec appraisal rake spec

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 5.2", ">= 5.2.6"
+
+gemspec path: "../"

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 6.0", ">= 6.0.4.4"
+
+gemspec path: "../"

data/gemfiles/rails_61.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 6.1", ">= 6.1.4.4"
+
+gemspec path: "../"

data/gemfiles/rails_70.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 7.0"
+
+gemspec path: "../"

data/lib/generators/{docker → modulorails/docker}/docker_generator.rb

@@ -2,7 +2,7 @@
 
 require 'rails/generators'
 
-class DockerGenerator < Rails::Generators::Base
+class Modulorails::DockerGenerator < Rails::Generators::Base
   source_root File.expand_path('templates', __dir__)
   desc 'This generator creates Dockerfiles for an app'
 

data/lib/generators/{docker → modulorails/docker}/templates/Dockerfile.prod.tt

@@ -1,4 +1,3 @@
-FROM surnet/alpine-wkhtmltopdf:3.12-0.12.6-small as wkhtmltopdf
 # BUILD IMAGE
 FROM ruby:<%= Modulorails.data.ruby_version %>-alpine as builder
 
@@ -7,12 +6,16 @@ WORKDIR /app
 
 RUN apk add --update --no-cache \
     alpine-sdk \
-    mysql-dev \
     nodejs \
-    sqlite-dev \
     tzdata \
     yarn \
-    shared-mime-info
+    shared-mime-info \
+    <%- adapter = Modulorails.data.adapter -%>
+    <%- if adapter =~ /mysql/ -%>
+    mysql-dev
+    <%- else -%>
+    postgresql-dev
+    <%- end -%>
 RUN gem install bundler -v <%= Modulorails.data.bundler_version %>
 
 COPY Gemfile Gemfile.lock ./
@@ -33,15 +36,17 @@ WORKDIR /app
 RUN apk add --update --no-cache \
     curl \
     git \
-    mysql-dev \
     nodejs \
-    sqlite-dev \
     tzdata \
-    shared-mime-info
+    shared-mime-info \
+    <%- adapter = Modulorails.data.adapter -%>
+    <%- if adapter =~ /mysql/ -%>
+    mysql-dev \
+    <%- else -%>
+    postgresql-dev \
+    <%- end -%>
     && rm -rf .git/
 
-# Replace segfault version with patched one
-COPY --from=wkhtmltopdf /bin/wkhtmltopdf /usr/bin/wkhtmltopdf
 COPY --from=builder /app .
 
 RUN bundle config --local path vendor/bundle \

data/lib/generators/{docker → modulorails/docker}/templates/Dockerfile.tt

@@ -1,6 +1,3 @@
-# Import wkhtmltopdf with qt patched because from alpine it's not and segfault
-FROM surnet/alpine-wkhtmltopdf:3.12-0.12.6-small as wkhtmltopdf
-
 FROM ruby:<%= Modulorails.data.ruby_version %>-alpine
 
 ENV RAILS_ENV=development
@@ -10,9 +7,13 @@ RUN apk add --update --no-cache \
     alpine-sdk \
     nodejs \
     yarn \
-    sqlite-dev \
     tzdata \
+    <%- adapter = Modulorails.data.adapter -%>
+    <%- if adapter =~ /mysql/ -%>
     mysql-dev
+    <%- else -%>
+    postgresql-dev
+    <%- end -%>
 RUN gem install bundler -v <%= Modulorails.data.bundler_version %>
 
 COPY Gemfile Gemfile.lock ./
@@ -20,9 +21,6 @@ RUN bundle install --jobs=2
 
 COPY . .
 
-# Replace segfault version with patched one
-COPY --from=wkhtmltopdf /bin/wkhtmltopdf /usr/bin/wkhtmltopdf
-
 EXPOSE 3000
 
 ENTRYPOINT ["./entrypoints/docker-entrypoint.sh"]

data/lib/generators/{docker → modulorails/docker}/templates/config/database.yml.tt

@@ -1,5 +1,7 @@
 <%- image_name = Modulorails.data.name.parameterize -%>
 <%- upper_image_name = image_name.upcase -%>
+<%- adapter = Modulorails.data.adapter -%>
+<%- if adapter =~ /mysql/ -%>
 development: &default
   adapter: mysql2
   encoding: utf8mb4
@@ -9,6 +11,15 @@ development: &default
   password: <%%= ENV.fetch('<%= upper_image_name %>_DATABASE_PASSWORD', '') %>
   host: <%%= ENV.fetch('<%= upper_image_name %>_DATABASE_HOST', 'database') %>
   port: <%%= ENV.fetch('<%= upper_image_name %>_DATABASE_PORT', 3306) %>
+<%- else -%>
+development: &default
+  adapter: pg
+  database: <%%= ENV.fetch('<%= upper_image_name %>_DATABASE_NAME', '<%= image_name %>') %>
+  username: <%%= ENV.fetch('<%= upper_image_name %>_DATABASE_USERNAME', 'postgres') %>
+  password: <%%= ENV.fetch('<%= upper_image_name %>_DATABASE_PASSWORD', 'postgres') %>
+  host: <%%= ENV.fetch('<%= upper_image_name %>_DATABASE_HOST', 'database') %>
+  port: <%%= ENV.fetch('<%= upper_image_name %>_DATABASE_PORT', 5432) %>
+<%- end -%>
 
 test:
   <<: *default