hanami-cli 2.0.0.beta1 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2d0f04510c5ac3d7c729c2830997ec692f9d9be7161b199cf87fcfd1284cf3
-  data.tar.gz: 970de26f0dfdaba799141c24b72ea84ab94721d378f62c3bbbfe494e9a63c3bd
+  metadata.gz: 2652fcd9f660db53b10864142c4a96a0acf3991330b5a5d1b3f0270b5dcbc8ff
+  data.tar.gz: 983957c43ad1d96d7e77db6924346a6021928229eca699d0aafc28c7fcc41cd8
 SHA512:
-  metadata.gz: 5dab4fa87022146327320394b66cdd8efb18ca9c2f98eb743bc65f38017a5904a0f06db3d45aca5990e51fac27868f0e9c026feab80639bf97791353670a219b
-  data.tar.gz: 594c4c1f6fa03910543700dbcfa0ff16f5be462cc4f39b19c9918d66de3b071beeb9e8b187ae39d3f55285296126d1378a188cd87b08d575d00d9ef1a0b21ffd
+  metadata.gz: 9ad2064d1634dfae55848d8e318a7e6b4a0022c56e50b7ed83634e0bc29b5bcd18ba8a8adad14d764125e219827955cbbeef2dc8cc7b788da5543e7f263f5c56
+  data.tar.gz: e911ef639b84a76e24a7b30ed7d778a0f4deb43fee8bd406cc52d44188f1ddc0de16622db87f406f42f6551c8fccc67e8fbe9ae4c6b7b8947610df06dfd21d32

data/.rubocop.yml

@@ -7,9 +7,10 @@ inherit_from:
 Layout/LineLength:
   Exclude:
     - Gemfile
+    - 'spec/**/*.rb'
 Lint/EmptyFile:
   Exclude:
-    - "spec/fixtures/**/*.rb"
+    - 'spec/fixtures/**/*.rb'
 Naming/HeredocDelimiterNaming:
   Enabled: false
 Naming/MethodParameterName:
@@ -21,6 +22,8 @@ Style/BlockDelimiters:
   Enabled: false
 Style/CommentedKeyword:
   Enabled: false
+Style/EmptyHeredoc:
+  Enabled: false
 Style/LambdaCall:
   Enabled: false
 Style/TrailingCommaInArguments:
@@ -29,3 +32,5 @@ Style/TrailingCommaInArrayLiteral:
   Enabled: false
 Style/TrailingCommaInHashLiteral:
   Enabled: false
+Style/StringConcatenation:
+  Enabled: false

data/CHANGELOG.md

@@ -2,14 +2,46 @@
 
 Hanami Command Line Interface
 
+## v2.0.0.beta3 - 2022-09-21
+
+### Added
+
+- [Luca Guidi] New applications to support Puma server out of the box. Add the `puma` gem to `Gemfile` and generate `config/puma.rb`.
+- [Luca Guidi] New applications to support code reloading for `hanami server` via `hanami-reloader`. This gem is added to app's `Gemfile`.
+- [Marc Busqué] Introduce code reloading for `hanami console` via `#reload` method to be invoked within the console context.
+
+### Fixed
+
+- [Luca Guidi] Respect plural when generating code via `hanami new` and `hanami generate`. Example: `hanami new code_insights` => `CodeInsights` instead of `CodeInsight`
+- [Luca Guidi] Ensure `hanami generate action` to not crash when invoked with non-RESTful action names. Example: `hanami generate action talent.apply`
+
+### Changed
+
+- [Piotr Solnica] `hanami generate action` to add routes to `config/routes.rb` without the `define` block context. See https://github.com/hanami/hanami/pull/1208
+
+## v2.0.0.beta2 - 2022-08-16
+
+### Added
+
+- [Luca Guidi] Added `hanami generate slice` command, for generating a new slice [#32]
+- [Luca Guidi] Added `hanami generate action` command, for generating a new action in the app or a slice [#33]
+- [Marc Busqué] Added `hanami middlewares` command, for listing middleware configed in app and/or in `config/routes.rb` [#30]
+
+### Changed
+
+- [Marc Busqué, Tim Riley] `hanami` command will detect the app even when called inside nested subdirectories [#34]
+- [Seb Wilgosz] Include hanami-validations in generated app’s `Gemfile`, allowing action classes to specify `.params` [#31]
+- [Tim Riley] Include dry-types in generated app’s `Gemfile`, which is used by the types module defined in `lib/[app_name]/types.rb` (dry-types is no longer a hard dependency of the hanami gem as of 2.0.0.beta2) [#29]
+- [Tim Riley] Include dotenv in generated app’s `Gemfile`, allowing `ENV` values to be loaded from `.env*` files [#29]
+
 ## v2.0.0.beta1 - 2022-07-20
 
 ### Added
 
 - [Luca Guidi] Implemented `hanami new` to generate a new Hanami app
 - [Piotr Solnica] Implemented `hanami console` to start an interactive console (REPL)
-- [Marc Busque] Implemented `hanami server` to start a HTTP server based on Rack
-- [Marc Busque] Implemented `hanami routes` to print app routes
+- [Marc Busqué] Implemented `hanami server` to start a HTTP server based on Rack
+- [Marc Busqué] Implemented `hanami routes` to print app routes
 - [Luca Guidi] Implemented `hanami version` to print app Hanami version
 
 ## v2.0.0.alpha8.1 - 2022-05-23

data/hanami-cli.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bundler", "~> 2.1"
   spec.add_dependency "rake", "~> 13.0"
   spec.add_dependency "dry-cli", "~> 0.7"
-  spec.add_dependency "dry-files", "~> 0.2", ">= 0.2.0"
+  spec.add_dependency "dry-files", "~> 0.3", ">= 0.3.0"
   spec.add_dependency "dry-inflector", "~> 0.2"
 
   spec.add_development_dependency "rspec", "~> 3.9"

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

@@ -8,21 +8,22 @@ module Hanami
     module Commands
       module App
         class Command < Hanami::CLI::Command
+          ACTION_SEPARATOR = "."
+
           module Environment
-            def call(**opts)
+            def call(*args, **opts)
               env = opts[:env]
 
               hanami_env = env ? env.to_s : ENV.fetch("HANAMI_ENV", "development")
 
               ENV["HANAMI_ENV"] = hanami_env
 
-              super(**opts)
+              super(*args, **opts)
             end
           end
 
           def self.inherited(klass)
             super
-            klass.option(:env, required: false, desc: "App's environment")
             klass.prepend(Environment)
           end
 

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

@@ -25,6 +25,7 @@ module Hanami
 
           desc "App REPL"
 
+          option :env, required: false, desc: "Application environment"
           option :repl, required: false, desc: "REPL gem that should be used ('pry' or 'irb')"
 
           # @api private

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

@@ -15,6 +15,7 @@ module Hanami
                 out.puts "=> database #{database.name} created"
               else
                 out.puts "=> failed to create database #{database.name}"
+                exit $?.exitstatus
               end
             end
           end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "hanami/cli/command"
+require "hanami/cli/commands/app/command"
 require "hanami/cli/generators/app/action"
 require "dry/inflector"
 require "dry/files"
@@ -11,7 +11,7 @@ module Hanami
     module Commands
       module App
         module Generate
-          class Action < Command
+          class Action < App::Command
             # TODO: ideally the default format should lookup
             #       slice configuration (Action's `default_response_format`)
             DEFAULT_FORMAT = "html"
@@ -20,13 +20,13 @@ module Hanami
             DEFAULT_SKIP_VIEW = false
             private_constant :DEFAULT_SKIP_VIEW
 
-            argument :slice, required: true, desc: "Slice name"
             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"
-            option :format, required: false, type: :string, default: DEFAULT_FORMAT, desc: "Template format"
-            option :skip_view, required: false, type: :boolean, default: DEFAULT_SKIP_VIEW,
-                               desc: "Skip view and template generation"
+            # option :format, required: false, type: :string, default: DEFAULT_FORMAT, desc: "Template format"
+            # option :skip_view, required: false, type: :boolean, default: DEFAULT_SKIP_VIEW,
+            #                    desc: "Skip view and template generation"
+            option :slice, required: false, desc: "Slice name"
 
             def initialize(fs: Dry::Files.new, inflector: Dry::Inflector.new,
                            generator: Generators::App::Action.new(fs: fs, inflector: inflector), **)
@@ -35,8 +35,8 @@ module Hanami
             end
 
             # rubocop:disable Metrics/ParameterLists
-            def call(slice:, name:, url: nil, http: nil, format: DEFAULT_FORMAT, skip_view: DEFAULT_SKIP_VIEW, **)
-              slice = inflector.underscore(Shellwords.shellescape(slice))
+            def call(name:, url: nil, http: nil, format: DEFAULT_FORMAT, skip_view: DEFAULT_SKIP_VIEW, slice: nil, **)
+              slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
               name = inflector.underscore(Shellwords.shellescape(name))
               *controller, action = name.split(ACTION_SEPARATOR)
 
@@ -44,15 +44,12 @@ module Hanami
                 raise ArgumentError.new("cannot parse controller and action name: `#{name}'\n\texample: users.show")
               end
 
-              generator.call(slice, controller, action, url, http, format, skip_view)
+              generator.call(app.namespace, controller, action, url, http, format, skip_view, slice)
             end
             # rubocop:enable Metrics/ParameterLists
 
             private
 
-            ACTION_SEPARATOR = "."
-            private_constant :ACTION_SEPARATOR
-
             attr_reader :generator
           end
         end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "hanami"
+require "hanami/cli/middleware_stack_inspector"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        # List registered middlewares in the app router
+        #
+        # It outputs middlewares registered along with the paths where they
+        # apply:
+        #
+        # ```
+        # $ hanami middlewares
+        # /    Rack::Session::Cookie
+        # ```
+        #
+        # Given arguments can be inspected:
+        #
+        # ```
+        # $ hanami middlewares --with-arguments
+        # /    Rack::Session::Cookie args: [{:secret=>"foo"}]
+        # ```
+        class Middlewares < Hanami::CLI::Command
+          desc "List all the registered middlewares"
+
+          DEFAULT_WITH_ARGUMENTS = false
+
+          option :with_arguments, default: DEFAULT_WITH_ARGUMENTS, required: false,
+                                  desc: "Include inspected arguments", type: :boolean
+
+          # @api private
+          def call(with_arguments: DEFAULT_WITH_ARGUMENTS)
+            require "hanami/prepare"
+
+            if Hanami.app.router
+              inspector = MiddlewareStackInspector.new(stack: Hanami.app.router.middleware_stack)
+              out.puts inspector.inspect(include_arguments: with_arguments)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "hanami"
-require "hanami/router/inspector"
 
 module Hanami
   module CLI
@@ -40,6 +39,7 @@ module Hanami
 
           # @api private
           def call(format: DEFAULT_FORMAT, **)
+            require "hanami/router/inspector"
             require "hanami/prepare"
             inspector = Hanami::Router::Inspector.new(formatter: resolve_formatter(format))
             app.router(inspector: inspector)

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

@@ -9,7 +9,8 @@ module Hanami
         require_relative "app/console"
         require_relative "app/server"
         require_relative "app/routes"
-        # require_relative "app/generate"
+        require_relative "app/generate"
+        require_relative "app/middlewares"
         # require_relative "app/db/create"
         # require_relative "app/db/create_migration"
         # require_relative "app/db/drop"
@@ -27,17 +28,14 @@ module Hanami
             register "version", Commands::App::Version, aliases: ["v", "-v", "--version"]
             register "install", Commands::App::Install
             register "console", Commands::App::Console, aliases: ["c"]
-            register "server",  Commands::App::Server,  aliases: ["s"]
-            register "routes",  Commands::App::Routes
+            register "server", Commands::App::Server, aliases: ["s"]
+            register "routes", Commands::App::Routes
+            register "middlewares", Commands::App::Middlewares
 
-            # FIXME: temporary disabled for Hanami v2.0.0.alpha2
-            # register "install", Install
-
-            # FIXME: temporary disabled for Hanami v2.0.0.alpha2
-            # register "generate", aliases: ["g"] do |prefix|
-            #   prefix.register "slice", Generate::Slice
-            #   prefix.register "action", Generate::Action
-            # end
+            register "generate", aliases: ["g"] do |prefix|
+              prefix.register "slice", Generate::Slice
+              prefix.register "action", Generate::Action
+            end
           end
         end
       end

data/lib/hanami/cli/commands/db/utils/database.rb

@@ -30,7 +30,14 @@ module Hanami
             }.freeze
 
             def self.[](app)
-              config = DatabaseConfig.new(app.settings.database_url)
+              database_url =
+                if app.key?(:settings) && app[:settings].respond_to?(:database_url)
+                  app[:settings].database_url
+                else
+                  ENV.fetch("DATABASE_URL")
+                end
+
+              config = DatabaseConfig.new(database_url)
 
               resolver = SCHEME_MAP.fetch(config.db_type) do
                 raise "#{config.db_type} is not a supported db scheme"

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "shellwords"
+require "open3"
 require_relative "database"
 
 module Hanami
@@ -10,6 +11,10 @@ module Hanami
         module Utils
           class Postgres < Database
             def create_command
+              existing_stdout, status = Open3.capture2(cli_env_vars, "psql -t -c '\\l #{escaped_name}'")
+
+              return true if status.success? && existing_stdout.include?(escaped_name)
+
               system(cli_env_vars, "createdb #{escaped_name}")
             end
 

data/lib/hanami/cli/commands.rb

@@ -2,6 +2,13 @@
 
 module Hanami
   module CLI
+    # Returns true if the CLI is being called from inside an Hanami app.
+    #
+    # This is typically used to determine whether to register commands that are applicable either
+    # inside or outside an app.
+    #
+    # @api public
+    # @since 2.0.0
     def self.within_hanami_app?
       File.exist?("config/app.rb") ||
         File.exist?("app.rb")
@@ -10,7 +17,8 @@ module Hanami
     module Commands
     end
 
-    def self.register_commands!(within_hanami_app = Hanami::CLI.within_hanami_app?)
+    # @api private
+    def self.register_commands!(within_hanami_app = within_hanami_app?)
       commands = if within_hanami_app
                    require_relative "commands/app"
                    Commands::App

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

@@ -1,12 +1,12 @@
-# auto_register: false
 # frozen_string_literal: true
 
-require "<%= underscored_slice_name %>/action"
-
-module <%= classified_slice_name %>
+module <%= camelized_app_name %>
   module Actions
 <%= module_controller_declaration %>
-<%= module_controller_offset %>class <%= classified_action_name %> < <%= classified_slice_name %>::Action
+<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_app_name %>::Action
+<%= module_controller_offset %>  def handle(*, response)
+<%= module_controller_offset %>    response.body = self.class.name
+<%= module_controller_offset %>  end
 <%= module_controller_offset %>end
 <%= module_controller_end %>
   end

data/lib/hanami/cli/generators/app/action/slice_action.erb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module <%= camelized_slice_name %>
+  module Actions
+<%= module_controller_declaration %>
+<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_slice_name %>::Action
+<%= module_controller_offset %>  def handle(*, response)
+<%= module_controller_offset %>    response.body = self.class.name
+<%= module_controller_offset %>  end
+<%= module_controller_offset %>end
+<%= module_controller_end %>
+  end
+end

data/lib/hanami/cli/generators/app/action/template.html.erb

@@ -1,2 +1,2 @@
-<h1><%= classified_slice_name %>::Views::<%= classified_controller_name %>::<%= classified_action_name %></h1>
+<h1><%= camelized_slice_name %>::Views::<%= camelized_controller_name %>::<%= camelized_action_name %></h1>
 <h2><%= template_path %></h2>

data/lib/hanami/cli/generators/app/action/view.erb

@@ -3,10 +3,10 @@
 
 require "<%= underscored_slice_name %>/view"
 
-module <%= classified_slice_name %>
+module <%= camelized_slice_name %>
   module Views
 <%= module_controller_declaration %>
-<%= module_controller_offset %>class <%= classified_action_name %> < <%= classified_slice_name %>::View
+<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_slice_name %>::View
 <%= module_controller_offset %>end
 <%= module_controller_end %>
   end

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

@@ -5,6 +5,7 @@ require "dry/files"
 require "hanami/cli/generators/app/action_context"
 require "hanami/cli/url"
 
+# rubocop:disable Metrics/ParameterLists
 module Hanami
   module CLI
     module Generators
@@ -15,35 +16,15 @@ module Hanami
             @inflector = inflector
           end
 
-          # rubocop:disable Metrics/AbcSize
-          # rubocop:disable Metrics/ParameterLists
           # rubocop:disable Layout/LineLength
-          def call(slice, controller, action, url, http, format, skip_view, context: ActionContext.new(inflector, slice, controller, action))
-            slice_directory = fs.join("slices", slice)
-            raise ArgumentError.new("slice not found `#{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)
-            )
-
-            fs.chdir(slice_directory) do
-              fs.mkdir(directory = fs.join("actions", controller))
-              fs.write(fs.join(directory, "#{action}.rb"), t("action.erb", context))
-
-              unless skip_view
-                fs.mkdir(directory = fs.join("views", controller))
-                fs.write(fs.join(directory, "#{action}.rb"), t("view.erb", context))
-
-                fs.mkdir(directory = fs.join("templates", controller))
-                fs.write(fs.join(directory, "#{action}.#{format}.erb"), t(template_format(format), context))
-              end
+          def call(app, controller, action, url, http, format, skip_view, slice, context: ActionContext.new(inflector, app, slice, controller, action))
+            if slice
+              generate_for_slice(controller, action, url, http, format, skip_view, slice, context)
+            else
+              generate_for_app(controller, action, url, http, format, skip_view, context)
             end
           end
           # rubocop:enable Layout/LineLength
-          # rubocop:enable Metrics/ParameterLists
-          # rubocop:enable Metrics/AbcSize
 
           private
 
@@ -61,20 +42,58 @@ module Hanami
           private_constant :ROUTE_RESTFUL_HTTP_METHODS
 
           ROUTE_RESTFUL_URL_SUFFIXES = {
-            "index" => "",
-            "new" => "/new",
-            "create" => "",
-            "edit" => "/:id/edit",
-            "update" => "/:id",
-            "show" => "/:id",
-            "destroy" => "/:id"
+            "index" => [],
+            "new" => ["new"],
+            "create" => [],
+            "edit" => [":id", "edit"],
+            "update" => [":id"],
+            "show" => [":id"],
+            "destroy" => [":id"]
           }.freeze
           private_constant :ROUTE_RESTFUL_URL_SUFFIXES
 
+          PATH_SEPARATOR = "/"
+          private_constant :PATH_SEPARATOR
+
           attr_reader :fs
 
           attr_reader :inflector
 
+          def generate_for_slice(controller, action, url, http, _format, _skip_view, slice, context)
+            slice_directory = fs.join("slices", slice)
+            raise ArgumentError.new("slice not found `#{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)
+            )
+
+            fs.chdir(slice_directory) do
+              fs.mkdir(directory = fs.join("actions", controller))
+              fs.write(fs.join(directory, "#{action}.rb"), t("slice_action.erb", context))
+
+              # unless skip_view
+              #   fs.mkdir(directory = fs.join("views", controller))
+              #   fs.write(fs.join(directory, "#{action}.rb"), t("view.erb", context))
+              #
+              #   fs.mkdir(directory = fs.join("templates", controller))
+              #   fs.write(fs.join(directory, "#{action}.#{format}.erb"), t(template_format(format), context))
+              # end
+            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)
+            )
+
+            fs.mkdir(directory = fs.join("app", "actions", controller))
+            fs.write(fs.join(directory, "#{action}.rb"), t("action.erb", context))
+          end
+
           def slice_matcher(slice)
             /slice[[:space:]]*:#{slice}/
           end
@@ -104,7 +123,10 @@ module Hanami
           alias_method :t, :template
 
           def route_url(controller, action, url)
-            CLI::URL.call(url || ("/#{controller.join('/')}" + ROUTE_RESTFUL_URL_SUFFIXES.fetch(action)))
+            action = ROUTE_RESTFUL_URL_SUFFIXES.fetch(action) { [action] }
+            url ||= "#{PATH_SEPARATOR}#{(controller + action).join(PATH_SEPARATOR)}"
+
+            CLI::URL.call(url)
           end
 
           def route_http(action, http)
@@ -121,3 +143,4 @@ module Hanami
     end
   end
 end
+# rubocop:enable Metrics/ParameterLists

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

@@ -8,20 +8,20 @@ module Hanami
     module Generators
       module App
         class ActionContext < SliceContext
-          def initialize(inflector, slice, controller, action)
+          def initialize(inflector, app, slice, controller, action)
             @controller = controller
             @action = action
-            super(inflector, nil, slice, nil)
+            super(inflector, app, slice, nil)
           end
 
-          def classified_controller_name
+          def camelized_controller_name
             controller.map do |token|
               inflector.camelize(token)
             end.join(NAMESPACE_SEPARATOR)
           end
 
-          def classified_action_name
-            inflector.classify(action)
+          def camelized_action_name
+            inflector.camelize(action)
           end
 
           def underscored_controller_name

data/lib/hanami/cli/generators/app/slice/action.erb

@@ -1,9 +1,7 @@
 # auto_register: false
 # frozen_string_literal: true
 
-require "<%= underscored_app_name %>/action"
-
-module <%= classified_slice_name %>
-  class Action < <%= classified_app_name %>::Action
+module <%= camelized_slice_name %>
+  class Action < <%= camelized_app_name %>::Action
   end
 end

data/lib/hanami/cli/generators/app/slice/entities.erb

@@ -1,7 +1,7 @@
 # auto_register: false
 # frozen_string_literal: true
 
-module <%= classified_slice_name %>
+module <%= camelized_slice_name %>
   module Entities
   end
 end

data/lib/hanami/cli/generators/app/slice/repository.erb

@@ -3,8 +3,8 @@
 require "<%= underscored_app_name %>/repository"
 require_relative "entities"
 
-module <%= classified_slice_name %>
-  class Repository < <%= classified_app_name %>::Repository
+module <%= camelized_slice_name %>
+  class Repository < <%= camelized_app_name %>::Repository
     struct_namespace Entities
   end
 end

data/lib/hanami/cli/generators/app/slice/routes.erb

@@ -1,2 +1,3 @@
-  slice :<%= underscored_slice_name %>, at: "<%= slice_url_prefix %>" do
-  end
+
+slice :<%= underscored_slice_name %>, at: "<%= slice_url_prefix %>" do
+end

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

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module <%= camelized_slice_name %>
+  class Slice < Hanami::Slice
+  end
+end

data/lib/hanami/cli/generators/app/slice/view.erb

@@ -3,7 +3,7 @@
 
 require "<%= underscored_app_name %>/view"
 
-module <%= classified_slice_name %>
-  class View < <%= classified_app_name %>::View
+module <%= camelized_slice_name %>
+  class View < <%= camelized_app_name %>::View
   end
 end

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

@@ -14,23 +14,26 @@ module Hanami
             @inflector = inflector
           end
 
-          def call(app, slice, slice_url_prefix, context: SliceContext.new(inflector, app, slice, slice_url_prefix)) # rubocop:disable Metrics/AbcSize
-            fs.inject_line_before_last(fs.join("config", "routes.rb"), /end/, t("routes.erb", context).chomp)
+          def call(app, slice, slice_url_prefix, context: SliceContext.new(inflector, app, slice, slice_url_prefix))
+            fs.inject_line_at_class_bottom(
+              fs.join("config", "routes.rb"), "class Routes", t("routes.erb", context).chomp
+            )
 
             fs.mkdir(directory = "slices/#{slice}")
 
             fs.chdir(directory) do
+              # fs.write("config/slice.rb", t("slice.erb", context))
               fs.write("action.rb", t("action.erb", context))
-              fs.write("view.rb", t("view.erb", context))
-              fs.write("entities.rb", t("entities.erb", context))
-              fs.write("repository.rb", t("repository.erb", context))
+              # fs.write("view.rb", t("view.erb", context))
+              # fs.write("entities.rb", t("entities.erb", context))
+              # fs.write("repository.rb", t("repository.erb", context))
 
               fs.write("actions/.keep", t("keep.erb", context))
-              fs.write("views/.keep", t("keep.erb", context))
-              fs.write("templates/.keep", t("keep.erb", context))
-              fs.write("templates/layouts/.keep", t("keep.erb", context))
-              fs.write("entities/.keep", t("keep.erb", context))
-              fs.write("repositories/.keep", t("keep.erb", context))
+              # fs.write("views/.keep", t("keep.erb", context))
+              # fs.write("templates/.keep", t("keep.erb", context))
+              # fs.write("templates/layouts/.keep", t("keep.erb", context))
+              # fs.write("entities/.keep", t("keep.erb", context))
+              # fs.write("repositories/.keep", t("keep.erb", context))
             end
           end
 

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

@@ -13,8 +13,8 @@ module Hanami
             super(inflector, app)
           end
 
-          def classified_slice_name
-            inflector.classify(slice)
+          def camelized_slice_name
+            inflector.camelize(slice)
           end
 
           def underscored_slice_name

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

@@ -19,8 +19,8 @@ module Hanami
           Version.gem_requirement
         end
 
-        def classified_app_name
-          inflector.classify(app)
+        def camelized_app_name
+          inflector.camelize(app)
         end
 
         def underscored_app_name

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

@@ -3,7 +3,7 @@
 
 require "hanami/action"
 
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
   class Action < Hanami::Action
   end
 end

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

@@ -2,7 +2,7 @@
 
 require "hanami"
 
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
   class App < Hanami::App
   end
 end

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

@@ -2,13 +2,22 @@
 
 source "https://rubygems.org"
 
-gem "rake"
-
+gem "hanami", "<%= hanami_version %>"
 gem "hanami-router", "<%= hanami_version %>"
 gem "hanami-controller", "<%= hanami_version %>"
-gem "hanami", "<%= hanami_version %>"
+gem "hanami-validations", "<%= hanami_version %>"
 
+gem "dry-types"
 gem "puma"
+gem "rake"
+
+group :development, :test do
+  gem "dotenv"
+end
+
+group :cli, :development do
+  gem "hanami-reloader"
+end
 
 group :cli, :development, :test do
   gem "hanami-rspec"

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+max_threads_count = ENV.fetch("HANAMI_MAX_THREADS", 5)
+min_threads_count = ENV.fetch("HANAMI_MIN_THREADS") { max_threads_count }
+threads min_threads_count, max_threads_count
+
+port        ENV.fetch("HANAMI_PORT", 2300)
+environment ENV.fetch("HANAMI_ENV", "development")
+workers     ENV.fetch("HANAMI_WEB_CONCURRENCY", 2)
+
+on_worker_boot do
+  Hanami.shutdown
+end
+
+preload_app!

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

@@ -1 +1 @@
-# <%= classified_app_name %>
+# <%= camelized_app_name %>

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

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require "hanami/routes"
-
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
   class Routes < Hanami::Routes
-    define do
-      root { "Hello from Hanami" }
-    end
+    root { "Hello from Hanami" }
   end
 end

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

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require "<%= underscored_app_name %>/types"
-require "hanami/settings"
 
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
   class Settings < Hanami::Settings
+    # Define your app settings here, for example:
+    #
+    # setting :my_flag, default: false, constructor: Types::Params::Bool
   end
 end

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

@@ -1,10 +1,11 @@
-# auto_register: false
 # frozen_string_literal: true
 
 require "dry/types"
 
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
+  Types = Dry.Types
+
   module Types
-    include Dry.Types
+    # Define your custom types here
   end
 end

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

@@ -4,7 +4,7 @@
 require "dry/validation"
 require "dry/schema/messages/i18n"
 
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
   module Validator < Dry::Validation::Contract
     config.messages.backend = :i18n
     config.messages.top_namespace = "validation"

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

@@ -40,6 +40,7 @@ module Hanami
             fs.write("config/app.rb", t("app.erb", context))
             fs.write("config/settings.rb", t("settings.erb", context))
             fs.write("config/routes.rb", t("routes.erb", context))
+            fs.write("config/puma.rb", t("puma.erb", context))
 
             fs.write("lib/tasks/.keep", t("keep.erb", context))
             fs.write("lib/#{app}/types.rb", t("types.erb", context))

data/lib/hanami/cli/middleware_stack_inspector.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Hanami
+  module CLI
+    # @api private
+    class MiddlewareStackInspector
+      def initialize(stack:)
+        @stack = stack
+      end
+
+      def inspect(include_arguments: false)
+        max_path_length = @stack.map { |(path)| path.length }.max
+
+        @stack.map { |path, middlewares|
+          middlewares.map { |(middleware, arguments)|
+            "#{path.ljust(max_path_length + 3)} #{format_middleware(middleware)}".tap { |line|
+              line << " #{format_arguments(arguments)}" if include_arguments
+            }
+          }
+        }.join("\n") + "\n"
+      end
+
+      private
+
+      def format_middleware(middleware)
+        case middleware
+        when Class
+          middleware.name || "(class)"
+        when Module
+          middleware.name || "(module)"
+        else
+          "#{middleware.class.name} (instance)"
+        end
+      end
+
+      def format_arguments(arguments)
+        "args: #{arguments.inspect}"
+      end
+    end
+  end
+end

data/lib/hanami/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Hanami
   module CLI
-    VERSION = "2.0.0.beta1"
+    VERSION = "2.0.0.beta3"
   end
 end

data/lib/hanami/console/context.rb

@@ -34,8 +34,9 @@ module Hanami
           hanami_app
         end
 
-        define_method(:app) do
-          hanami_app
+        define_method(:reload) do
+          puts "Reloading..."
+          Kernel.exec("#{$PROGRAM_NAME} console")
         end
 
         define_method(:method_missing) do |name, *args, &block|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +175,7 @@ files:
 - lib/hanami/cli/commands/app/generate/action.rb
 - lib/hanami/cli/commands/app/generate/slice.rb
 - lib/hanami/cli/commands/app/install.rb
+- lib/hanami/cli/commands/app/middlewares.rb
 - lib/hanami/cli/commands/app/routes.rb
 - lib/hanami/cli/commands/app/server.rb
 - lib/hanami/cli/commands/app/version.rb
@@ -189,6 +190,7 @@ files:
 - lib/hanami/cli/error.rb
 - lib/hanami/cli/generators/app/action.rb
 - lib/hanami/cli/generators/app/action/action.erb
+- lib/hanami/cli/generators/app/action/slice_action.erb
 - lib/hanami/cli/generators/app/action/template.erb
 - lib/hanami/cli/generators/app/action/template.html.erb
 - lib/hanami/cli/generators/app/action/view.erb
@@ -199,6 +201,7 @@ files:
 - lib/hanami/cli/generators/app/slice/keep.erb
 - lib/hanami/cli/generators/app/slice/repository.erb
 - lib/hanami/cli/generators/app/slice/routes.erb
+- lib/hanami/cli/generators/app/slice/slice.erb
 - lib/hanami/cli/generators/app/slice/view.erb
 - lib/hanami/cli/generators/app/slice_context.rb
 - lib/hanami/cli/generators/context.rb
@@ -209,20 +212,15 @@ files:
 - lib/hanami/cli/generators/gem/app/env.erb
 - lib/hanami/cli/generators/gem/app/gemfile.erb
 - lib/hanami/cli/generators/gem/app/keep.erb
-- lib/hanami/cli/generators/gem/app/operation.erb
+- lib/hanami/cli/generators/gem/app/puma.erb
 - lib/hanami/cli/generators/gem/app/rakefile.erb
 - lib/hanami/cli/generators/gem/app/readme.erb
-- lib/hanami/cli/generators/gem/app/relation.erb
-- lib/hanami/cli/generators/gem/app/repository.erb
 - lib/hanami/cli/generators/gem/app/routes.erb
 - lib/hanami/cli/generators/gem/app/settings.erb
-- lib/hanami/cli/generators/gem/app/transformations.erb
 - lib/hanami/cli/generators/gem/app/types.erb
 - lib/hanami/cli/generators/gem/app/validator.erb
-- lib/hanami/cli/generators/gem/app/view.erb
-- lib/hanami/cli/generators/gem/app/view_context.erb
-- lib/hanami/cli/generators/gem/app/view_part.erb
 - lib/hanami/cli/generators/version.rb
+- lib/hanami/cli/middleware_stack_inspector.rb
 - lib/hanami/cli/rake_tasks.rb
 - lib/hanami/cli/repl/core.rb
 - lib/hanami/cli/repl/irb.rb

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

@@ -1,9 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-require "hanami/operation"
-
-module <%= classified_app_name %>
-  class Operation < Hanami::Operation
-  end
-end

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

@@ -1,7 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-module <%= classified_app_name %>
-  class Relation < Hanami::Relation
-  end
-end

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

@@ -1,9 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-require "hanami/repository"
-
-module <%= classified_app_name %>
-  class Repository < Hanami::Repository
-  end
-end

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

@@ -1,13 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-require "dry/transformer"
-
-module <%= classified_app_name %>
-  module Transformations
-    extend Dry::Transformer::Registry
-
-    import Dry::Transformer::ArrayTransformations
-    import Dry::Transformer::HashTransformations
-  end
-end

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

@@ -1,9 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-require "hanami/view"
-
-module <%= classified_app_name %>
-  class View < Hanami::View
-  end
-end

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

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami/view/context"
-
-module <%= classified_app_name %>
-  module Views
-    class Context < Hanami::View::Context
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami/view/part"
-
-module <%= classified_app_name %>
-  module Views
-    class Part < Hanami::View::Part
-    end
-  end
-end