hanami-cli 2.2.0.beta2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d62ed9aeff86f86693ffdf5acafb274e6e97a535a177bf46131c8c33141fc0e9
-  data.tar.gz: 86da7248a20712451a83b8e5167870e34fd508f2e5f41a107d9bf3a4dea1d376
+  metadata.gz: af8c95d39ccda17c32851a787f8ef309b6af8936d1bb1eca4780a8f57969af66
+  data.tar.gz: a4aff54793a12526acf3919a16657fea36d496645fad596f2d214f3baf00e974
 SHA512:
-  metadata.gz: affe042dfe0daf2dc93e1252b06d2d51dd5ea605c1287ad2500371bed6ee98e902cf9d19667458f86edadabb671f923b986bcd2a76a0e7d8821f4e0b9af6ecf6
-  data.tar.gz: b1a097c66c10495ef31fd0783083d542ac6e7a5be7ab94f11b9e1a0d68dc865e04d6f970e08b88d33dd3939b47736cc8893989cb037d070d3c5d2ff86d35ccad
+  metadata.gz: 4a82b7839e9890b5dc3ed61b6e95ba3cc42dc1ba217d8d2f60b77fe2dd09a566331a1164f3ea8236ecb25f303bc64203388c5d1803ae38f0f5bffc18a9d9c60d
+  data.tar.gz: a3b6a3321bab8c5089c601849e47f159efe839413ac40292042c75f78b1ffd43d976ffc8615ed1ade575aba1e8b8a01fb299ac0cf2265e122cbb509c2dd497f3

data/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 Hanami Command Line Interface
 
+## v2.2.0 - 2024-11-05
+
+### Changed
+
+- [Kyle Plump] Add `--gateway` optiopn to `generate relation` (#261)
+- [Tim Riley] Depend on stable release of dry-operation in new app `Gemfile` (#262)
+- [Tim Riley] Depend on newser dry-types with a simpler version constraint in new app `Gemfile` (#263)
+- [Adam Lassek] Point to Hanami's own migrations guide from generated migration files (#264)
+
+## v2.2.0.rc1 - 2024-10-29
+
+### Added
+
+- [Tim Riley, François Beausoleil] Generate a `config/db/seeds.rb` file in new apps (#255, #256)
+
+### Changed
+
+- [Tim Riley] Add `--env` and `-e` options to all app commands, for setting the Hanami env (#246)
+- [Tim Riley] Keep test database in sync by applying `hanami db` commands to both development and test databases when invoked in development environment (#247)
+- [Kyle Plump] Add `--skip-route` flag to `generate action` and `generate slice` commands (#227)
+- [Tim Riley] Include a `change do` block in generated migrations (#254)
+- [Tim Riley] Generate MySQL database URL in `.env` that works with standard Homebrew MySQL installation (#249)
+- [Tim Riley, Adam Lassek] Remove ROM extension boilerplate in operations generated by `hanami new` and `generate operation` (this is now applied automatically) (#240, #252)
+- [François Beausoleil] Print a warning when running `db seed` but expected seeds files could not be found (#256)
+- [Seb Wilgosz] Only register `generate` subcommands if the relevant gems are bundled (#242)
+- [Anderson Saunders] When both IRB and pry are loaded, use IRB as the default engine for `hanami console` (#182)
+
+### Fixed
+
+- [Tim Riley] Fix error dumping structure when there are no migrations (#244)
+- [Tim Riley] Stop erroneous misconfigured DB warnings from `hanami db` commands when a database is configured once but shared across sliaces (#253)
+
 ## v2.2.0.beta2 - 2024-09-25
 
 ### Added

data/lib/hanami/cli/commands/app/command.rb

@@ -18,8 +18,8 @@ module Hanami
           # @api private
           ACTION_SEPARATOR = "." # TODO: rename to container key separator
 
-          # Overloads {Hanami::CLI::Commands::App::Command#call} to ensure an appropriate `HANAMI_ENV`
-          # environment variable is set.
+          # Overloads {Hanami::CLI::Commands::App::Command#call} to ensure an appropriate
+          # `HANAMI_ENV` environment variable is set.
           #
           # Uses an `--env` option if provided, then falls back to an already-set `HANAMI_ENV`
           # environment variable, and defaults to "development" in the absence of both.
@@ -27,6 +27,12 @@ module Hanami
           # @since 2.0.0
           # @api private
           module Environment
+            # @since 2.2.0
+            # @api private
+            def self.prepended(klass)
+              klass.option :env, desc: "App environment (development, test, production)", aliases: ["e"]
+            end
+
             # @since 2.0.0
             # @api private
             def call(*args, **opts)
@@ -37,7 +43,7 @@ module Hanami
               ENV["HANAMI_ENV"] = hanami_env
               Hanami::Env.load
 
-              super(*args, **opts)
+              super
             end
           end
 

data/lib/hanami/cli/commands/app/console.rb

@@ -51,11 +51,7 @@ module Hanami
           private
 
           def resolve_engine(engine, opts)
-            if engine
-              ENGINES.fetch(engine).(app, opts)
-            else
-              ENGINES.map { |(_, loader)| loader.(app, opts) }.compact.first
-            end
+            ENGINES.fetch(engine, ENGINES[DEFAULT_ENGINE]).call(app, opts)
           end
         end
       end

data/lib/hanami/cli/commands/app/db/command.rb

@@ -17,15 +17,23 @@ module Hanami
             option :app, required: false, type: :flag, default: false, desc: "Use app database"
             option :slice, required: false, desc: "Use database for slice"
 
+            # @api private
             attr_reader :system_call
 
+            # @api private
+            attr_reader :test_env_executor
+
             def initialize(
               out:, err:,
               system_call: SystemCall.new,
+              test_env_executor: InteractiveSystemCall.new(out: out, err: err),
+              nested_command: false,
               **opts
             )
               super(out: out, err: err, **opts)
               @system_call = system_call
+              @test_env_executor = test_env_executor
+              @nested_command = nested_command
             end
 
             def run_command(klass, ...)
@@ -34,9 +42,15 @@ module Hanami
                 inflector: inflector,
                 fs: fs,
                 system_call: system_call,
+                test_env_executor: test_env_executor,
+                nested_command: true,
               ).call(...)
             end
 
+            def nested_command?
+              @nested_command
+            end
+
             private
 
             def databases(app: false, slice: nil, gateway: nil)
@@ -77,7 +91,7 @@ module Hanami
               end
             end
 
-            def all_databases # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+            def all_databases # rubocop:disable Metrics/AbcSize
               slices = [app] + app.slices.with_nested
 
               slice_gateways_by_database_url = slices.each_with_object({}) { |slice, hsh|
@@ -92,7 +106,9 @@ module Hanami
 
               slice_gateways_by_database_url.each_with_object([]) { |(url, slice_gateways), arr|
                 slice_gateways_with_config = slice_gateways.select {
-                  _1[:slice].root.join("config", "db").directory?
+                  migrate_dir = _1[:gateway] == :default ? "migrate" : "#{_1[:gateway]}_migrate"
+
+                  _1[:slice].root.join("config", "db", migrate_dir).directory?
                 }
 
                 db_slice_gateway = slice_gateways_with_config.first || slice_gateways.first
@@ -102,7 +118,7 @@ module Hanami
                   system_call: system_call
                 )
 
-                warn_on_misconfigured_database database, slice_gateways.map { _1.fetch(:slice) }
+                warn_on_misconfigured_database database, slice_gateways_with_config.map { _1.fetch(:slice) }
 
                 arr << database
               }
@@ -126,7 +142,7 @@ module Hanami
 
                   #{slices.map { "- " + _1.root.relative_path_from(_1.app.root).join("config", "db").to_s }.join("\n")}
 
-                  Migrating database using #{database.slice.slice_name.to_s.inspect} slice only.
+                  Using config in #{database.slice.slice_name.to_s.inspect} slice only.
 
                 STR
               elsif !database.db_config_dir?
@@ -140,6 +156,66 @@ module Hanami
                 STR
               end
             end
+
+            # Invokes the currently executing `hanami` CLI command again, but with any `--env` args
+            # removed and the `HANAMI_ENV=test` env var set.
+            #
+            # This is called by certain `db` commands only, and runs only if the Hanami env is
+            # `:development`. This behavior important to streamline the local development
+            # experience, making sure that the test databases are kept in sync with operations run
+            # on the development databases.
+            #
+            # Spawning an entirely new process to change the env is a compromise approach until we
+            # can have an API for reinitializing the DB subsystem in-process with a different env.
+            def re_run_development_command_in_test
+              # Only invoke a new process if we've been called as `hanami`. This avoids awkward
+              # failures when testing commands via RSpec, for which the $0 is "/full/path/to/rspec".
+              return unless $0.end_with?("hanami")
+
+              # If this special env key is set, then a re-run has already been invoked. This would
+              # mean the current command is actually a nested command run by another db command. In
+              # this case, don't trigger a re-runs, because one is already in process.
+              return if nested_command?
+
+              # Re-runs in test are for development-env commands only.
+              return unless Hanami.env == :development
+
+              cmd = $0
+              cmd = "bundle exec #{cmd}" if ENV.key?("BUNDLE_BIN_PATH")
+
+              test_env_executor.call(
+                cmd, *argv_without_env_args,
+                env: {
+                  "HANAMI_ENV" => "test",
+                  "HANAMI_CLI_DB_COMMAND_RE_RUN_IN_TEST" => "true"
+                }
+              )
+            end
+
+            def re_running_in_test?
+              ENV.key?("HANAMI_CLI_DB_COMMAND_RE_RUN_IN_TEST")
+            end
+
+            # Returns the `ARGV` with every option argument included, but the `-e` or `--env` args
+            # removed.
+            def argv_without_env_args
+              new_argv = ARGV.dup
+
+              env_arg_index = new_argv.index {
+                _1 == "-e" || _1 == "--env" || _1.start_with?("-e=") || _1.start_with?("--env=")
+              }
+
+              if env_arg_index
+                # Remove the env argument
+                env_arg = new_argv.delete_at(env_arg_index)
+
+                # If the env argument is not in combined form ("--env foo" rather than "--env=foo"),
+                # then remove the following argument too
+                new_argv.delete_at(env_arg_index) if ["-e", "--env"].include?(env_arg)
+              end
+
+              new_argv
+            end
           end
         end
       end

data/lib/hanami/cli/commands/app/db/create.rb

@@ -29,6 +29,8 @@ module Hanami
               exit_codes.each do |code|
                 break command_exit.(code) if code > 0
               end
+
+              re_run_development_command_in_test
             end
           end
         end

data/lib/hanami/cli/commands/app/db/drop.rb

@@ -29,6 +29,8 @@ module Hanami
               exit_codes.each do |code|
                 break exit code if code > 0
               end
+
+              re_run_development_command_in_test
             end
           end
         end

data/lib/hanami/cli/commands/app/db/migrate.rb

@@ -25,7 +25,16 @@ module Hanami
                 end
               end
 
-              run_command(Structure::Dump, app: app, slice: slice, gateway: gateway, command_exit: command_exit) if dump
+              # Only dump for the initial command, not a re-run of the command in test env
+              if dump && !re_running_in_test?
+                run_command(
+                  Structure::Dump,
+                  app: app, slice: slice, gateway: gateway,
+                  command_exit: command_exit
+                )
+              end
+
+              re_run_development_command_in_test
             end
 
             private

data/lib/hanami/cli/commands/app/db/prepare.rb

@@ -58,7 +58,9 @@ module Hanami
               end
 
               # Finally, load the seeds for the slice overall, which is a once-per-slice operation.
-              run_command(DB::Seed, app: app, slice: slice)
+              run_command(DB::Seed, app: app, slice: slice) unless re_running_in_test?
+
+              re_run_development_command_in_test
             end
           end
         end

data/lib/hanami/cli/commands/app/db/seed.rb

@@ -25,7 +25,11 @@ module Hanami
                 next if seeded_slices.include?(database.slice)
 
                 seeds_path = database.slice.root.join(SEEDS_PATH)
-                next unless seeds_path.file?
+
+                unless seeds_path.file?
+                  out.puts "no seeds found at #{seeds_path.relative_path_from(database.slice.app.root)}"
+                  next
+                end
 
                 relative_seeds_path = seeds_path.relative_path_from(database.slice.app.root)
                 measure "seed data loaded from #{relative_seeds_path}" do

data/lib/hanami/cli/commands/app/db/structure/dump.rb

@@ -31,8 +31,11 @@ module Hanami
                         throw :dump_failed, false
                       end
 
-                      File.open(database.structure_file, "a") do |f|
-                        f.puts "#{database.schema_migrations_sql_dump}\n"
+                      migrations_sql = database.schema_migrations_sql_dump
+                      if migrations_sql
+                        File.open(database.structure_file, "a") do |f|
+                          f.puts "#{migrations_sql}\n"
+                        end
                       end
 
                       true

data/lib/hanami/cli/commands/app/db/structure/load.rb

@@ -44,6 +44,8 @@ module Hanami
                 exit_codes.each do |code|
                   break command_exit.(code) if code > 0
                 end
+
+                re_run_development_command_in_test
               end
             end
           end

data/lib/hanami/cli/commands/app/db/utils/postgres.rb

@@ -55,11 +55,14 @@ module Hanami
               end
 
               def schema_migrations_sql_dump
-                search_path = slice["db.gateway"].connection
+                migrations_sql = super
+                return unless migrations_sql
+                
+                search_path = gateway.connection
                   .fetch("SHOW search_path").to_a.first
                   .fetch(:search_path)
 
-                +"SET search_path TO #{search_path};\n\n" << super
+                +"SET search_path TO #{search_path};\n\n" << migrations_sql
               end
 
               private

data/lib/hanami/cli/commands/app/generate/action.rb

@@ -25,6 +25,9 @@ module Hanami
             DEFAULT_SKIP_TESTS = false
             private_constant :DEFAULT_SKIP_TESTS
 
+            DEFAULT_SKIP_ROUTE = false
+            private_constant :DEFAULT_SKIP_ROUTE
+
             argument :name, required: true, desc: "Action name"
             option :url, required: false, type: :string, desc: "Action URL"
             option :http, required: false, type: :string, desc: "Action HTTP method"
@@ -41,6 +44,12 @@ module Hanami
               type: :flag,
               default: DEFAULT_SKIP_TESTS,
               desc: "Skip test generation"
+            option \
+              :skip_route,
+              required: false,
+              type: :flag,
+              default: DEFAULT_SKIP_ROUTE,
+              desc: "Skip route generation"
             option :slice, required: false, desc: "Slice name"
 
             # rubocop:disable Layout/LineLength
@@ -83,7 +92,8 @@ module Hanami
               http: nil,
               format: DEFAULT_FORMAT,
               skip_view: DEFAULT_SKIP_VIEW,
-              skip_tests: DEFAULT_SKIP_TESTS, # rubocop:disable Lint/UnusedMethodArgument
+              skip_tests: DEFAULT_SKIP_TESTS, # rubocop:disable Lint/UnusedMethodArgument,
+              skip_route: DEFAULT_SKIP_ROUTE,
               slice: nil,
               context: nil,
               **
@@ -96,7 +106,7 @@ module Hanami
                 raise InvalidActionNameError.new(name)
               end
 
-              generator.call(app.namespace, controller, action, url, http, format, skip_view, slice, context: context)
+              generator.call(app.namespace, controller, action, url, http, format, skip_view, skip_route, slice, context: context)
             end
 
             # rubocop:enable Metrics/ParameterLists

data/lib/hanami/cli/commands/app/generate/component.rb

@@ -15,10 +15,10 @@ module Hanami
             option :slice, required: false, desc: "Slice name"
 
             example [
-              %(operations.create_user               (MyApp::Operations::CreateUser)),
-              %(operations.user.create               (MyApp::Operations::Create::User)),
-              %(operations.create_user               --slice=admin (Admin::Operations::CreateUser)),
-              %(Operations::CreateUser               (MyApp::Operations::CreateUser)),
+              %(isbn_decoder               (MyApp::IsbnDecoder)),
+              %(recommenders.fiction       (MyApp::Recommenders::Fiction)),
+              %(isbn_decoder --slice=admin (Admin::IsbnDecoder)),
+              %(Exporters::Complete::CSV   (MyApp::Exporters::Complete::CSV)),
             ]
             attr_reader :generator
             private :generator

data/lib/hanami/cli/commands/app/generate/relation.rb

@@ -9,11 +9,13 @@ module Hanami
           # @api private
           class Relation < Command
             argument :name, required: true, desc: "Relation name"
+            option :gateway, desc: "Generate relation for gateway"
 
             example [
               %(books               (MyApp::Relation::Book)),
               %(books/drafts        (MyApp::Relations::Books::Drafts)),
               %(books --slice=admin (Admin::Relations::Books)),
+              %(books --slice=admin --gateway=extra (Admin::Relations::Books)),
             ]
 
             # @since 2.2.0
@@ -21,6 +23,24 @@ module Hanami
             def generator_class
               Generators::App::Relation
             end
+
+            def call(name:, slice: nil, gateway: nil)
+              if slice
+                generator.call(
+                  key: name,
+                  namespace: slice,
+                  base_path: fs.join("slices", inflector.underscore(slice)),
+                  gateway: gateway
+                )
+              else
+                generator.call(
+                  key: name,
+                  namespace: app.namespace,
+                  base_path: "app",
+                  gateway: gateway
+                )
+              end
+            end
           end
         end
       end

data/lib/hanami/cli/commands/app/generate/slice.rb

@@ -21,13 +21,25 @@ module Hanami
             SKIP_DB_DEFAULT = false
             private_constant :SKIP_DB_DEFAULT
 
+            # @since 2.2.0
+            # @api private
+            DEFAULT_SKIP_ROUTE = false
+            private_constant :DEFAULT_SKIP_ROUTE
+
             # @since 2.2.0
             # @api private
             option :skip_db,
-              type: :boolean,
+              type: :flag,
               required: false,
               default: SKIP_DB_DEFAULT,
               desc: "Skip database"
+            # @since 2.2.0
+            # @api private
+            option :skip_route,
+              type: :flag,
+              required: false,
+              default: DEFAULT_SKIP_ROUTE,
+              desc: "Skip route generation"
 
             example [
               "admin          # Admin slice (/admin URL prefix)",
@@ -50,7 +62,8 @@ module Hanami
             def call(
               name:,
               url: nil,
-              skip_db: SKIP_DB_DEFAULT
+              skip_db: SKIP_DB_DEFAULT,
+              skip_route: DEFAULT_SKIP_ROUTE
             )
               require "hanami/setup"
 
@@ -58,7 +71,7 @@ module Hanami
               name = inflector.underscore(Shellwords.shellescape(name))
               url = sanitize_url_prefix(name, url)
 
-              generator.call(app, name, url, skip_db: skip_db)
+              generator.call(app, name, url, skip_db: skip_db, skip_route: skip_route)
             end
 
             private

data/lib/hanami/cli/commands/app.rb

@@ -41,16 +41,28 @@ module Hanami
             end
 
             register "generate", aliases: ["g"] do |prefix|
-              prefix.register "action", Generate::Action
-              prefix.register "component", Generate::Component
-              prefix.register "migration", Generate::Migration
-              prefix.register "operation", Generate::Operation
-              prefix.register "part", Generate::Part
-              prefix.register "relation", Generate::Relation
-              prefix.register "repo", Generate::Repo
               prefix.register "slice", Generate::Slice
-              prefix.register "struct", Generate::Struct
-              prefix.register "view", Generate::View
+              prefix.register "component", Generate::Component
+
+              if Hanami.bundled?("hanami-controller")
+                prefix.register "action", Generate::Action
+              end
+
+              if Hanami.bundled?("dry-operation")
+                prefix.register "operation", Generate::Operation
+              end
+
+              if Hanami.bundled?("hanami-view")
+                prefix.register "view", Generate::View
+                prefix.register "part", Generate::Part
+              end
+
+              if Hanami.bundled?("hanami-db")
+                prefix.register "migration", Generate::Migration
+                prefix.register "relation", Generate::Relation
+                prefix.register "repo", Generate::Repo
+                prefix.register "struct", Generate::Struct
+              end
             end
           end
         end

data/lib/hanami/cli/generators/app/action.rb

@@ -21,12 +21,12 @@ module Hanami
 
           # @since 2.0.0
           # @api private
-          def call(app, controller, action, url, http, format, skip_view, slice, context: nil)
+          def call(app, controller, action, url, http, format, skip_view, skip_route, slice, context: nil)
             context ||= ActionContext.new(inflector, app, slice, controller, action)
             if slice
-              generate_for_slice(controller, action, url, http, format, skip_view, slice, context)
+              generate_for_slice(controller, action, url, http, format, skip_view, skip_route, slice, context)
             else
-              generate_for_app(controller, action, url, http, format, skip_view, context)
+              generate_for_app(controller, action, url, http, format, skip_view, skip_route, context)
             end
           end
 
@@ -72,15 +72,17 @@ module Hanami
           attr_reader :inflector
 
           # rubocop:disable Metrics/AbcSize
-          def generate_for_slice(controller, action, url, http, format, skip_view, slice, context)
+          def generate_for_slice(controller, action, url, http, format, skip_view, skip_route, slice, context)
             slice_directory = fs.join("slices", slice)
             raise MissingSliceError.new(slice) unless fs.directory?(slice_directory)
 
-            fs.inject_line_at_block_bottom(
-              fs.join("config", "routes.rb"),
-              slice_matcher(slice),
-              route(controller, action, url, http)
-            )
+            if generate_route?(skip_route)
+              fs.inject_line_at_block_bottom(
+                fs.join("config", "routes.rb"),
+                slice_matcher(slice),
+                route(controller, action, url, http)
+              )
+            end
 
             fs.mkdir(directory = fs.join(slice_directory, "actions", controller))
             fs.write(fs.join(directory, "#{action}.rb"), t("slice_action.erb", context))
@@ -95,12 +97,14 @@ module Hanami
             end
           end
 
-          def generate_for_app(controller, action, url, http, format, skip_view, context)
-            fs.inject_line_at_class_bottom(
-              fs.join("config", "routes.rb"),
-              "class Routes",
-              route(controller, action, url, http)
-            )
+          def generate_for_app(controller, action, url, http, format, skip_view, skip_route, context)
+            if generate_route?(skip_route)
+              fs.inject_line_at_class_bottom(
+                fs.join("config", "routes.rb"),
+                "class Routes",
+                route(controller, action, url, http)
+              )
+            end
 
             fs.mkdir(directory = fs.join("app", "actions", controller))
             fs.write(fs.join(directory, "#{action}.rb"), t("action.erb", context))
@@ -137,6 +141,14 @@ module Hanami
             true
           end
 
+          # @api private
+          # @since 2.2.0
+          def generate_route?(skip_route)
+            return false if skip_route
+
+            true
+          end
+
           # @api private
           # @since 2.1.0
           def generate_restful_view?(view, directory)

data/lib/hanami/cli/generators/app/component.rb

@@ -2,6 +2,7 @@
 
 require "erb"
 require "dry/files"
+
 module Hanami
   module CLI
     module Generators

data/lib/hanami/cli/generators/app/migration.rb

@@ -55,7 +55,9 @@ module Hanami
             ROM::SQL.migration do
               # Add your migration here.
               #
-              # See https://sequel.jeremyevans.net/rdoc/files/doc/migration_rdoc.html for details.
+              # See https://guides.hanamirb.org/v2.2/database/migrations/ for details.
+              change do
+              end
             end
           RUBY
           private_constant :FILE_CONTENTS

data/lib/hanami/cli/generators/app/relation.rb

@@ -19,8 +19,11 @@ module Hanami
 
           # @since 2.2.0
           # @api private
-          def call(key:, namespace:, base_path:)
+          def call(key:, namespace:, base_path:, gateway:)
             schema_name = key.split(KEY_SEPARATOR).last
+            body_content = ["schema :#{schema_name}, infer: true"]
+
+            body_content.prepend("gateway :#{gateway}") if gateway
 
             RubyFileWriter.new(
               fs: fs,
@@ -31,7 +34,7 @@ module Hanami
               base_path: base_path,
               extra_namespace: "Relations",
               relative_parent_class: "DB::Relation",
-              body: ["schema :#{schema_name}, infer: true"],
+              body: body_content,
             )
           end
 

data/lib/hanami/cli/generators/app/slice.rb

@@ -22,9 +22,11 @@ module Hanami
           def call(app, slice, url, context: nil, **opts)
             context ||= SliceContext.new(inflector, app, slice, url, **opts)
 
-            fs.inject_line_at_class_bottom(
-              fs.join("config", "routes.rb"), "class Routes", t("routes.erb", context).chomp
-            )
+            if context.generate_route?
+              fs.inject_line_at_class_bottom(
+                fs.join("config", "routes.rb"), "class Routes", t("routes.erb", context).chomp
+              )
+            end
 
             fs.mkdir(directory = "slices/#{slice}")
 

data/lib/hanami/cli/generators/app/slice_context.rb

@@ -54,6 +54,12 @@ module Hanami
             !options.fetch(:skip_db, false)
           end
 
+          # @since 2.2.0
+          # @api private
+          def generate_route?
+            !options.fetch(:skip_route, false)
+          end
+
           private
 
           attr_reader :slice

data/lib/hanami/cli/generators/context.rb

@@ -112,7 +112,7 @@ module Hanami
           elsif generate_postgres?
             "postgres://localhost/#{app}"
           elsif generate_mysql?
-            "mysql2://localhost/#{app}"
+            "mysql2://root@localhost/#{app}"
           else
             raise "Unknown database option: #{database_option}"
           end

data/lib/hanami/cli/generators/gem/app/gemfile.erb

@@ -14,8 +14,8 @@ source "https://rubygems.org"
 <%= hanami_gem("validations") %>
 <%= hanami_gem("view") %>
 
-gem "dry-types", "~> 1.0", ">= 1.6.1"
-gem "dry-operation", github: "dry-rb/dry-operation"
+gem "dry-types", "~> 1.7"
+gem "dry-operation"
 gem "puma"
 gem "rake"
 <%- if generate_sqlite? -%>

data/lib/hanami/cli/generators/gem/app/operation.erb

@@ -5,9 +5,5 @@ require "dry/operation"
 
 module <%= camelized_app_name %>
   class Operation < Dry::Operation
-    <%- if generate_db? -%>
-    # Provide `transaction do ... end` method for database transactions
-    include Dry::Operation::Extensions::ROM
-    <%- end -%>
   end
 end

data/lib/hanami/cli/generators/gem/app/seeds.erb

@@ -0,0 +1,15 @@
+# This seeds file should create the database records required to run the app.
+#
+# The code should be idempotent so that it can be executed at any time.
+#
+# To load the seeds, run `hanami db seed`. Seeds are also loaded as part of `hanami db prepare`.
+
+# For example, if you have appropriate repos available:
+#
+#   category_repo = Hanami.app["repos.category_repo"]
+#   category_repo.create(title: "General")
+#
+# Alternatively, you can use relations directly:
+#
+#   categories = Hanami.app["relations.categories"]
+#   categories.insert(title: "General")

data/lib/hanami/cli/generators/gem/app.rb

@@ -78,10 +78,11 @@ module Hanami
               fs.write("app/db/struct.rb", t("struct.erb", context))
               fs.write("app/structs/.keep", t("keep.erb", context))
 
-              fs.write("config/db/migrate/.keep" , t("keep.erb", context))
+              fs.write("config/db/seeds.rb", t("seeds.erb", context))
+              fs.write("config/db/migrate/.keep", t("keep.erb", context))
 
               if context.generate_sqlite?
-                fs.write("db/.keep" , t("keep.erb", context))
+                fs.write("db/.keep", t("keep.erb", context))
               end
             end
 

data/lib/hanami/cli/repl/irb.rb

@@ -24,8 +24,8 @@ module Hanami
             AUTO_INDENT: true,
             PROMPT_I: "#{prompt}> ",
             PROMPT_N: "#{prompt}> ",
-            PROMPT_S: "#{prompt} %l> ",
-            PROMPT_C: "#{prompt} ?> ",
+            PROMPT_S: "#{prompt}%l ",
+            PROMPT_C: "#{prompt}* ",
             RETURN: "=> %s\n"
           }
 

data/lib/hanami/cli/version.rb

@@ -6,6 +6,6 @@ module Hanami
     #
     # @api public
     # @since 2.0.0
-    VERSION = "2.2.0.beta2"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.2.0.beta2
+  version: 2.2.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -308,6 +308,7 @@ files:
 - lib/hanami/cli/generators/gem/app/relation.erb
 - lib/hanami/cli/generators/gem/app/repo.erb
 - lib/hanami/cli/generators/gem/app/routes.erb
+- lib/hanami/cli/generators/gem/app/seeds.erb
 - lib/hanami/cli/generators/gem/app/settings.erb
 - lib/hanami/cli/generators/gem/app/struct.erb
 - lib/hanami/cli/generators/gem/app/types.erb
@@ -353,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Hanami CLI