natra 0.0.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 658b9672e1386eed1e00db2574dc861a51f2da3d1c588e40e0a36c1ba21f21d5
-  data.tar.gz: a29dc7d8656b63b7969bfdc87584328640b0c59477c1f1155b18f16bf4513952
+  metadata.gz: b1eefefa19c93fe43aaa3517a2340b733bd4eacacf7de8d503358aae9a050628
+  data.tar.gz: e6fbb6a64d467edb3cfca2cc7dc195e81bd49b408ba72846e1ba06733b183d9f
 SHA512:
-  metadata.gz: 7b30a4f5100eb6114c765acc10d6f8e76a4e0dff6f058937c804e601f913af0eaee46e119cfce5b68f7cd4444a2432373f0c07d423d575826bac263b2b7942ce
-  data.tar.gz: 400f123137a0f51877491db54d69d26d2b3474c722406c864848699db564171aaa8f937898bf08c59dcc672f9d6fb37c075078e4c102d4bc6840fe8584c6aa07
+  metadata.gz: a59ad552ba765c8c0a3f9e2db6ecf40fa82b2fab457403191f39e2cd4107c7c05350cbba4c645454c25f1ad0d696c891f1c4b6018718a71c702eb1b1e20058e1
+  data.tar.gz: 78a9793a0257e56a3e65431859e1648558be2f940fc2e94874f2bd77c9689a3c8099c885d272f611903fbe3a2208c08fc105771ec9abe30f36f99e7bac75c7b0

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10
+    groups:
+      development:
+        dependency-type: development
+      runtime:
+        dependency-type: production
+
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly

data/.github/workflows/ci.yml

@@ -0,0 +1,50 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.3', '3.4']
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run specs
+        run: bundle exec rspec
+      - name: Coverage summary
+        if: always() && matrix.ruby == '3.3'
+        run: |
+          {
+            echo '### Coverage'
+            ruby -rjson -e 'r = JSON.parse(File.read("coverage/.last_run.json"))["result"]; puts "- Line: #{r["line"]}%"; puts "- Branch: #{r["branch"]}%"'
+          } >> "$GITHUB_STEP_SUMMARY"
+      - name: Upload coverage report
+        if: always() && matrix.ruby == '3.3'
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage
+          path: coverage/
+
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+      - name: RuboCop
+        run: bundle exec rubocop

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+.idea
+.env

data/.rubocop.yml

@@ -0,0 +1,26 @@
+AllCops:
+  TargetRubyVersion: 3.3
+  NewCops: enable
+  SuggestExtensions: false
+  Exclude:
+    - 'lib/natra/generators/*/templates/**/*'
+    - 'lib/natra/generators/*/template/**/*'
+    - 'vendor/**/*'
+    - 'coverage/**/*'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'Guardfile'
+    - 'natra.gemspec'
+    - 'spec/**/*'
+
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/natra/generators/app/app_generator.rb'
+
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/natra/generators/model/model_generator.rb'
+
+Gemspec/RequireMFA:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+3.3.10

data/CHANGELOG.md

@@ -0,0 +1,58 @@
+# Changelog
+
+All notable changes to this project are documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [2.0.0] - 2026-10-04
+
+Changes since 0.0.8.
+
+### Added
+
+- `natra service_object NAME` generates a plain Ruby service object in `app/services`.
+- `natra new` generates `config/puma.rb` and the Oj initializer, which were in the templates but never copied, and `config/environment.rb` loads `config/initializers`.
+- `natra new --redis` adds the `redis` gem to the generated Gemfile.
+- GitHub Actions runs the specs on Ruby 3.3 and 3.4 and runs RuboCop. CI fails below 100% line and branch coverage.
+- A `.rubocop.yml` for the gem, and specs covering the CLI and every generator.
+- This changelog.
+
+### Changed
+
+- natra requires Ruby 3.3 or newer.
+- Dependency upgrades: thor 1.x (from 0.20), activesupport 8.1 (the runtime constraint is now `>= 6.1, < 9`), rubocop 1.x (from 0.63), Bundler 2.7, nokogiri 1.19, rack 3.2, rspec 3.13, rake 13.4, guard 2.20, guard-rubocop 1.5 and active_model_serializers 0.10.16, plus their transitive dependencies.
+- Coverage uses SimpleCov with branch coverage instead of Coveralls.
+- GitHub Actions replaces Travis CI, and Dependabot uses the GitHub-native configuration.
+- Generated apps target Ruby 3.3: `ruby '~> 3.3'` in the Gemfile, a `ruby:3.3-slim` Docker image with the build dependencies for pg, and the running Ruby in `.ruby-version` with `--rvm`.
+- Generated apps use current gems: ActiveRecord 8.1, pg 1.x, Sinatra 4 with Rack 3, Puma 6.4 or newer, sinatra-activerecord 2, database_cleaner-active_record and amazing_print.
+- Generated migrations (`add_extensions` and `natra model`) use `ActiveRecord::Migration[8.1]`, matching the generated Gemfile.
+- `natra new` runs `docker compose` instead of `docker-compose`, and the generated `docker-compose.yml` drops the obsolete `version` key, uses `depends_on` and PostgreSQL 17.
+- `natra new` only runs `git init` and `git add .` with `--git`, and runs `git init` once.
+- The generated `config/database.yml` reads database names from `DEV_DATABASE`, `TEST_DATABASE` and `PROD_DATABASE`, with defaults named after the app.
+- The generated `bin/setup` runs rake through `bundle exec`, and the generated README, RuboCop config and spec helper are updated for current tools.
+
+### Removed
+
+- Coveralls, from both the gem and generated apps.
+- `tux` from the generated Gemfile. Its last release was in 2011.
+- The `natra` gem from the generated Gemfile. Release 0.0.8 pins activesupport 5, which conflicts with ActiveRecord 8.
+- Travis CI configuration.
+
+### Fixed
+
+- `natra service_object` failed with "Could not find templates/service.rb.erb" because the generator looked in the wrong template directory.
+- `natra service_object` wrote to `app/service` instead of `app/services`.
+- `natra service_object` added `use XService` to `config.ru`, which broke every request because a service object is not Rack middleware.
+- Migrations generated by `natra model` had no ActiveRecord version, so ActiveRecord 5 and later refused to run them.
+- The CLI exited with status 0 on failures because it defined `exit_on_failure` instead of `exit_on_failure?`.
+- `bin/natra` had a bash shebang, so running it directly failed.
+- The `directory_name` regexp listed `|` twice, which made Ruby print a warning.
+- `natra new` passed the app path to `cd` without shell escaping.
+- The generated `config/database.yml` used literal `ENV['...']` strings as database names.
+- The generated spec helper called `ActiveRecord::Migrator.needs_migration?`, which no longer exists, and the generated welcome page lacked the heading its spec expects.
+
+[Unreleased]: https://github.com/jamesnjuguna0419/natra/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/jamesnjuguna0419/natra/compare/v0.0.8...v2.0.0

data/Gemfile

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org/'
+
 gemspec
-gem 'active_model_serializers', '~> 0.10.0.rc1'
-gem 'coveralls'
+
+gem 'active_model_serializers', '~> 0.10.16'
+
 group :development do
-  gem 'rake'
-  gem 'pry'
   gem 'guard'
-  gem 'rspec'
-  gem 'guard-rubocop'
   gem 'guard-rspec', require: false
+  gem 'guard-rubocop'
+  gem 'parallel', '< 2'
+  gem 'pry'
+  gem 'rake'
+  gem 'rspec'
+  gem 'simplecov', require: false
 end

data/Gemfile.lock

@@ -1,63 +1,76 @@
 PATH
   remote: .
   specs:
-    natra (0.0.7)
-      activesupport (~> 5.0)
-      thor (~> 0.18)
+    natra (2.0.0)
+      activesupport (>= 6.1, < 9)
+      thor (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
-      rack (~> 2.0)
+    actionpack (8.1.4)
+      actionview (= 8.1.4)
+      activesupport (= 8.1.4)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (8.1.4)
+      activesupport (= 8.1.4)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.8)
-      actionpack (>= 4.1, < 6)
-      activemodel (>= 4.1, < 6)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    active_model_serializers (0.10.16)
+      actionpack (>= 4.1)
+      activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activesupport (5.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ast (2.4.0)
-    builder (3.2.3)
+    activemodel (8.1.4)
+      activesupport (= 8.1.4)
+    activesupport (8.1.4)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (4.1.3)
+    builder (3.3.0)
     case_transform (0.2)
       activesupport
-    coderay (1.1.2)
-    concurrent-ruby (1.1.3)
-    coveralls (0.8.22)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
-      tins (~> 1.6)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    erubi (1.7.1)
-    ffi (1.9.25)
-    formatador (0.2.5)
-    guard (2.14.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.8)
+    connection_pool (3.0.2)
+    crass (1.0.7)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    erubi (1.13.1)
+    ffi (1.17.4)
+    ffi (1.17.4-aarch64-linux-gnu)
+    ffi (1.17.4-arm64-darwin)
+    ffi (1.17.4-x86_64-linux-gnu)
+    formatador (1.2.3)
+      reline
+    guard (2.20.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
+      logger (~> 1.6)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -65,103 +78,131 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
+    guard-rubocop (1.5.0)
       guard (~> 2.0)
-      rubocop (~> 0.20)
-    i18n (1.1.1)
+      rubocop (< 2.0)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
-    jsonapi-renderer (0.2.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    loofah (2.2.3)
+    io-console (0.9.4)
+    json (3.0.2)
+    jsonapi-renderer (0.2.2)
+    language_server-protocol (3.17.0.6)
+    lint_roller (1.1.0)
+    listen (3.10.1)
+      logger
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
+    loofah (2.25.2)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    lumberjack (1.0.13)
-    method_source (0.9.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
+      nokogiri (>= 1.12.0)
+    lumberjack (1.4.2)
+    method_source (1.1.0)
+    mini_portile2 (2.8.9)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
     nenv (0.3.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    notiffany (0.1.1)
+    nokogiri (1.19.4)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.19.4-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.4-x86_64-linux-gnu)
+      racc (~> 1.4)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.0.6)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    parallel (1.28.0)
+    parser (3.3.12.0)
+      ast (~> 2.4.1)
+      racc
+    prism (1.9.0)
+    pry (0.16.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+      reline (>= 0.6.0)
+    racc (1.8.1)
+    rack (3.2.7)
+    rack-session (2.1.2)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    rainbow (3.0.0)
-    rake (12.3.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rails-html-sanitizer (1.7.1)
+      loofah (~> 2.25, >= 2.25.2)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rainbow (3.1.1)
+    rake (13.4.2)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    regexp_parser (2.13.1)
+    reline (0.7.0)
+      io-console (~> 0.5)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.60.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.91.0)
+      json (>= 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.50.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     shellany (0.0.1)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    term-ansicolor (1.7.0)
-      tins (~> 1.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tins (1.18.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    simplecov (1.3.2)
+    thor (1.5.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.3.0)
+      unicode-emoji (~> 4.3)
+    unicode-emoji (4.3.0)
+    uri (1.1.1)
+    useragent (0.16.11)
 
 PLATFORMS
+  aarch64-linux
+  arm64-darwin
   ruby
+  x86_64-linux
 
 DEPENDENCIES
-  active_model_serializers (~> 0.10.0.rc1)
-  bundler (~> 1.16)
-  coveralls
+  active_model_serializers (~> 0.10.16)
   guard
   guard-rspec
   guard-rubocop
   natra!
+  parallel (< 2)
   pry
   rake
   rspec
+  simplecov
 
 BUNDLED WITH
-   1.17.1
+   2.7.2

data/Guardfile

@@ -1,5 +1,7 @@
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
+# frozen_string_literal: true
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 
   # Feel free to open issues for suggestions and improvements
@@ -15,7 +17,7 @@ guard :rspec, cmd: "bundle exec rspec" do
   dsl.watch_spec_files_for(ruby.lib_files)
 
   # Rails files
-  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  rails = dsl.rails(view_extensions: %w[erb haml slim])
   dsl.watch_spec_files_for(rails.app_files)
   dsl.watch_spec_files_for(rails.views)
 
@@ -39,11 +41,11 @@ guard :rspec, cmd: "bundle exec rspec" do
   # Turnip features and steps
   watch(%r{^spec/acceptance/(.+)\.feature$})
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
-    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+    Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance'
   end
 end
 
 guard :rubocop do
-  watch(%r{.+\.rb$})
+  watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
 end