hanami-cli 2.0.2 → 2.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25756f5db8a50d2514adbcb3b56719fdb4fdb4d5200f4e7477a10dcfcd156d2
-  data.tar.gz: b9b0f986f68b15d91be3b5b3480ecca78489ff86a5d97c8a2107d67d337f9ba8
+  metadata.gz: '078a7a10f1196ed8635a9c27ee48ac10178cdcff50d2646138f61b55f79f86a7'
+  data.tar.gz: 870c056fc5da9f5952daf357ca2861f0e276510c6ca1e63a2f821af76ebdd09a
 SHA512:
-  metadata.gz: 331146358bab123bc7f0f5f8f16a08d6d72bf86ece0ae235c0dbfa6dc180436391224f12d36669299f1d76f2df81dd39c3d80edfd41612328c71687a7919d331
-  data.tar.gz: c1369af9afcd509bae629b63aa5d507181b0929fa49e7a8ceb0246e3fb646580285c22563f036a2f27897350cff18996439e8ca9ad5e215059fe0b7329509fb3
+  metadata.gz: d70ee9d87779f442c25517abfefde102460848e8a29ba9ef30ae28cc2b2593f73027dad42b99e5617820952a84fd22013a8de5d039fb2e6161a64fd2eef706a1
+  data.tar.gz: 815418cd1c416bea1f7a77c56dff20ed143b582795bbcd79904260509c8c62c7d62a7be76c11305d26dc793dd2c2a13fcba0532c365ad47278212159e40eff69

data/{.action_hero.yml → .repobot.yml}

@@ -3,9 +3,7 @@
 sources:
   - repo: hanami/template-gem
     sync:
-      - ".action_hero.yml.erb"
+      - ".repobot.yml.erb"
       - ".github/FUNDING.yml"
-      - ".rspec"
-      - ".rubocop.yml"
       - "CODE_OF_CONDUCT.md"
       - "LICENSE.md.erb"

data/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 Hanami Command Line Interface
 
+## v2.1.0.beta1 - 2023-06-29
+
+### Added
+
+- [Tim Riley] `hanami new` to generate default views, templates, and helpers
+- [Tim Riley] `hanami generate slice` to generate default views, templates, and helpers
+- [Tim Riley] `hanami generate action` to generate associated view and template
+- [Tim Riley] Introduced `hanami generate view`
+- [Tim Riley] `hanami new` to generate `Gemfile` with `hanami-view` and `hanami-webconsole` gems
+- [Tim Riley] `hanami new` to generate default error pages for `404` and `500` HTTP errors
+
+### Fixed
+
+- [Philip Arndt] `hanami server` to start only one Puma worker by default
+
+## v2.0.3 - 2023-02-01
+
+### Added
+
+- [Luca Guidi] Generate a default `.gitignore` when using `hanami new`
+
+### Fixed
+
+- [dsisnero] Ensure to run automatically bundle gems when using `hanami new` on Windows
+- [Luca Guidi] Ensure to generate the correct action identifier in routes when using `hanami generate action` with deeply nested action name
+
 ## v2.0.2 - 2022-12-25
 
 ### Added

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2014-2022 Luca Guidi
+Copyright © 2014 Hanami Team
 
 MIT License
 

data/README.md

@@ -44,4 +44,4 @@ Everyone interacting in the `Hanami::CLI` project's codebases, issue trackers, c
 
 ## Copyright
 
-Copyright © 2014-2022 Hanami Team – Released under MIT License
+Copyright © 2014 Hanami Team – Released under MIT License

data/lib/hanami/cli/bundler.rb

@@ -4,8 +4,8 @@ require "bundler"
 require "open3"
 require "etc"
 require "dry/files"
-require_relative "./system_call"
-require_relative "./errors"
+require_relative "system_call"
+require_relative "errors"
 
 module Hanami
   module CLI
@@ -146,10 +146,13 @@ module Hanami
       # @since 2.0.0
       # @api private
       def which(cmd)
+        exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
         # Adapted from https://stackoverflow.com/a/5471032/498386
         ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
-          exe = fs.join(path, cmd)
-          return exe if fs.executable?(exe) && !fs.directory?(exe)
+          exts.each do |ext|
+            exe = fs.join(path, "#{cmd}#{ext}")
+            return exe if fs.executable?(exe) && !fs.directory?(exe)
+          end
         end
 
         nil

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

@@ -20,12 +20,20 @@ module Hanami
               migration_code, migration_name = find_migration(target)
 
               if migration_name.nil?
-                out.puts "==> migration file for target #{target} was not found"
+                output = if target
+                           "==> migration file for target #{target} was not found"
+                         else
+                           "==> no migrations to rollback"
+                         end
+
+                out.puts output
                 return
               end
 
               measure "database #{database.name} rolled back to #{migration_name}" do
                 database.run_migrations(target: Integer(migration_code))
+
+                true
               end
 
               run_command Structure::Dump if dump
@@ -33,14 +41,30 @@ module Hanami
 
             private
 
-            def find_migration(code)
-              migration = database.applied_migrations.then { |migrations|
+            def find_migration(code) # rubocop:disable Metrics/PerceivedComplexity
+              applied_migrations = database.applied_migrations
+
+              return if applied_migrations.empty?
+
+              # Rollback to initial state if we have only one migration and
+              # no target is specified. In this case the rollback target
+              # will be the current migration timestamp minus 1
+              if applied_migrations.one? && code.nil?
+                migration = applied_migrations.first
+
+                migration_code = Integer(migration.split("_").first) - 1
+                migration_name = "initial state"
+
+                return [migration_code, migration_name]
+              end
+
+              # Otherwise rollback to target or to previous migration
+              migration =
                 if code
-                  migrations.detect { |m| m.split("_").first == code }
+                  applied_migrations.detect { |m| m.split("_").first == code }
                 else
-                  migrations.last
+                  applied_migrations[-2]
                 end
-              }
 
               return unless migration
 

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

@@ -139,7 +139,11 @@ module Hanami
                 @sequel_migrator ||= begin
                   require "sequel"
                   Sequel.extension :migration
-                  Sequel::TimestampMigrator.new(migrator.connection, migrations_path, {})
+
+                  require "rom/sql"
+                  ROM::SQL.with_gateway(gateway) do
+                    Sequel::TimestampMigrator.new(migrator.connection, migrations_path, {})
+                  end
                 end
               end
 

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

@@ -3,6 +3,7 @@
 require "dry/inflector"
 require "dry/files"
 require "shellwords"
+require_relative "../../../naming"
 require_relative "../../../errors"
 
 module Hanami
@@ -25,8 +26,8 @@ module Hanami
             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 :skip_view, required: false, type: :boolean, default: DEFAULT_SKIP_VIEW,
+                               desc: "Skip view and template generation"
             option :slice, required: false, desc: "Slice name"
 
             # rubocop:disable Layout/LineLength
@@ -48,7 +49,9 @@ module Hanami
             # @since 2.0.0
             # @api private
             def initialize(fs: Hanami::CLI::Files.new, inflector: Dry::Inflector.new,
+                           naming: Naming.new(inflector: inflector),
                            generator: Generators::App::Action.new(fs: fs, inflector: inflector), **)
+              @naming = naming
               @generator = generator
               super(fs: fs)
             end
@@ -59,7 +62,7 @@ module Hanami
             # @api private
             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))
+              name = naming.action_name(name)
               *controller, action = name.split(ACTION_SEPARATOR)
 
               if controller.empty?
@@ -73,7 +76,7 @@ module Hanami
 
             private
 
-            attr_reader :generator
+            attr_reader :naming, :generator
           end
         end
       end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "dry/inflector"
+require "dry/files"
+require "shellwords"
+require_relative "../../../naming"
+require_relative "../../../errors"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        module Generate
+          # @since 2.0.0
+          # @api private
+          class View < App::Command
+            # TODO: make this configurable
+            DEFAULT_FORMAT = "html"
+            private_constant :DEFAULT_FORMAT
+
+            # TODO: make engine configurable
+
+            argument :name, required: true, desc: "View name"
+            option :slice, required: false, desc: "Slice name"
+
+            example [
+              %(books.index               (MyApp::Actions::Books::Index)),
+              %(books.index --slice=admin (Admin::Actions::Books::Index)),
+            ]
+            attr_reader :generator
+            private :generator
+
+            # @since 2.0.0
+            # @api private
+            def initialize(
+              fs: Hanami::CLI::Files.new,
+              inflector: Dry::Inflector.new,
+              generator: Generators::App::View.new(fs: fs, inflector: inflector),
+              **
+            )
+              @generator = generator
+              super(fs: fs)
+            end
+
+            # @since 2.0.0
+            # @api private
+            def call(name:, format: DEFAULT_FORMAT, slice: nil, **)
+              slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
+
+              generator.call(app.namespace, name, format, slice)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,8 +7,8 @@ module Hanami
         # @since 2.0.0
         # @api private
         module Generate
-          require_relative "./generate/slice"
-          require_relative "./generate/action"
+          require_relative "generate/slice"
+          require_relative "generate/action"
         end
       end
     end

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

@@ -22,6 +22,7 @@ module Hanami
             register "generate", aliases: ["g"] do |prefix|
               prefix.register "slice", Generate::Slice
               prefix.register "action", Generate::Action
+              prefix.register "view", Generate::View
             end
           end
         end

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

@@ -0,0 +1 @@
+<h1><%= camelized_slice_name %>::Views::<%= camelized_controller_name %>::<%= camelized_action_name %></h1>

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module <%= camelized_slice_name %>
+  module Views
+<%= module_controller_declaration %>
+<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_slice_name %>::View
+<%= module_controller_offset %>end
+<%= module_controller_end %>
+  end
+end

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

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

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

@@ -1,12 +1,9 @@
-# auto_register: false
 # frozen_string_literal: true
 
-require "<%= underscored_slice_name %>/view"
-
-module <%= camelized_slice_name %>
+module <%= camelized_app_name %>
   module Views
 <%= module_controller_declaration %>
-<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_slice_name %>::View
+<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_app_name %>::View
 <%= module_controller_offset %>end
 <%= module_controller_end %>
   end

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

@@ -66,7 +66,8 @@ module Hanami
 
           attr_reader :inflector
 
-          def generate_for_slice(controller, action, url, http, _format, _skip_view, slice, context)
+          # rubocop:disable Metrics/AbcSize
+          def generate_for_slice(controller, action, url, http, format, skip_view, slice, context)
             slice_directory = fs.join("slices", slice)
             raise MissingSliceError.new(slice) unless fs.directory?(slice_directory)
 
@@ -79,16 +80,17 @@ module Hanami
             fs.mkdir(directory = fs.join(slice_directory, "actions", controller))
             fs.write(fs.join(directory, "#{action}.rb"), t("slice_action.erb", context))
 
-            # unless skip_view
-            #   fs.mkdir(directory = fs.join(slice_directory, "views", controller))
-            #   fs.write(fs.join(directory, "#{action}.rb"), t("view.erb", context))
-            #
-            #   fs.mkdir(directory = fs.join(slice_directory, "templates", controller))
-            #   fs.write(fs.join(directory, "#{action}.#{format}.erb"), t(template_format(format), context))
-            # end
+            unless skip_view
+              fs.mkdir(directory = fs.join(slice_directory, "views", controller))
+              fs.write(fs.join(directory, "#{action}.rb"), t("slice_view.erb", context))
+
+              fs.mkdir(directory = fs.join(slice_directory, "templates", controller))
+              fs.write(fs.join(directory, "#{action}.#{format}.erb"),
+                       t(template_with_format_ext("slice_template", format), context))
+            end
           end
 
-          def generate_for_app(controller, action, url, http, _format, _skip_view, context)
+          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",
@@ -97,7 +99,17 @@ module Hanami
 
             fs.mkdir(directory = fs.join("app", "actions", controller))
             fs.write(fs.join(directory, "#{action}.rb"), t("action.erb", context))
+
+            unless skip_view
+              fs.mkdir(directory = fs.join("app", "views", controller))
+              fs.write(fs.join(directory, "#{action}.rb"), t("view.erb", context))
+
+              fs.mkdir(directory = fs.join("app", "templates", controller))
+              fs.write(fs.join(directory, "#{action}.#{format}.erb"),
+                       t(template_with_format_ext("template", format), context))
+            end
           end
+          # rubocop:enable Metrics/AbcSize
 
           def slice_matcher(slice)
             /slice[[:space:]]*:#{slice}/
@@ -108,13 +120,16 @@ module Hanami
                            http)} "#{route_url(controller, action, url)}", to: "#{controller.join('.')}.#{action}")
           end
 
-          def template_format(format)
-            case format.to_sym
-            when :html
-              "template.html.erb"
-            else
-              "template.erb"
-            end
+          def template_with_format_ext(name, format)
+            ext =
+              case format.to_sym
+              when :html
+                ".html.erb"
+              else
+                ".erb"
+              end
+
+            "#{name}#{ext}"
           end
 
           def template(path, context)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./slice_context"
+require_relative "slice_context"
 require "dry/files/path"
 
 module Hanami

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

@@ -0,0 +1,10 @@
+# auto_register: false
+# frozen_string_literal: true
+
+module <%= camelized_slice_name %>
+  module Views
+    module Helpers
+      # Add your view helpers here
+    end
+  end
+end

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

@@ -0,0 +1 @@
+<%= yield %>

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

@@ -1,8 +1,6 @@
 # auto_register: false
 # frozen_string_literal: true
 
-require "<%= underscored_app_name %>/view"
-
 module <%= camelized_slice_name %>
   class View < <%= camelized_app_name %>::View
   end

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

@@ -19,7 +19,7 @@ module Hanami
 
           # @since 2.0.0
           # @api private
-          def call(app, slice, url, context: SliceContext.new(inflector, app, slice, url))
+          def call(app, slice, url, context: SliceContext.new(inflector, app, slice, url)) # rubocop:disable Metrics/AbcSize
             fs.inject_line_at_class_bottom(
               fs.join("config", "routes.rb"), "class Routes", t("routes.erb", context).chomp
             )
@@ -28,14 +28,17 @@ module Hanami
 
             # fs.write("#{directory}/config/slice.rb", t("slice.erb", context))
             fs.write(fs.join(directory, "action.rb"), t("action.erb", context))
-            # fs.write(fs.join(directory, "/view.rb"), t("view.erb", context))
+            fs.write(fs.join(directory, "view.rb"), t("view.erb", context))
+            fs.write(fs.join(directory, "views", "helpers.rb"), t("helpers.erb", context))
+            fs.write(fs.join(directory, "templates", "layouts", "app.html.erb"),
+                     File.read(File.join(__dir__, "slice", "layouts_app.html.erb")))
             # fs.write(fs.join(directory, "/entities.rb"), t("entities.erb", context))
             # fs.write(fs.join(directory, "/repository.rb"), t("repository.erb", context))
 
             fs.write(fs.join(directory, "actions/.keep"), t("keep.erb", context))
-            # fs.write(fs.join(directory, views/.keep"), t("keep.erb", context))
-            # fs.write(fs.join(directory, templates/.keep"), t("keep.erb", context))
-            # fs.write(fs.join(directory, templates/layouts/.keep"), t("keep.erb", context))
+            fs.write(fs.join(directory, "views/.keep"), t("keep.erb", context))
+            fs.write(fs.join(directory, "templates/.keep"), t("keep.erb", context))
+            fs.write(fs.join(directory, "templates/layouts/.keep"), t("keep.erb", context))
             # fs.write(fs.join(directory, entities/.keep"), t("keep.erb", context))
             # fs.write(fs.join(directory, repositories/.keep"), t("keep.erb", context))
           end

data/lib/hanami/cli/generators/app/view/app_template.html.erb

@@ -0,0 +1 @@
+<h1><%= camelized_app_name %>::Views::<%= camelized_namespace %>::<%= camelized_name %></h1>

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module <%= camelized_app_name %>
+  module Views
+<%= module_namespace_declaration %>
+<%= module_namespace_offset %>class <%= camelized_name %> < <%= camelized_app_name %>::View
+<%= module_namespace_offset %>end
+<%= module_namespace_end %>
+  end
+end

data/lib/hanami/cli/generators/app/view/slice_template.html.erb

@@ -0,0 +1 @@
+<h1><%= camelized_slice_name %>::Views::<%= camelized_namespace %>::<%= camelized_name %></h1>

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module <%= camelized_slice_name %>
+  module Views
+<%= module_namespace_declaration %>
+<%= module_namespace_offset %>class <%= camelized_name %> < <%= camelized_slice_name %>::View
+<%= module_namespace_offset %>end
+<%= module_namespace_end %>
+  end
+end

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require "erb"
+require "dry/files"
+require_relative "../../errors"
+
+module Hanami
+  module CLI
+    module Generators
+      module App
+        # @since 2.0.0
+        # @api private
+        class View
+          # @since 2.0.0
+          # @api private
+          def initialize(fs:, inflector:)
+            @fs = fs
+            @inflector = inflector
+          end
+
+          # @since 2.0.0
+          # @api private
+          def call(app, key, format, slice)
+            context = ViewContext.new(inflector, app, slice, key)
+
+            if slice
+              generate_for_slice(context, format, slice)
+            else
+              generate_for_app(context, format, slice)
+            end
+          end
+
+          private
+
+          attr_reader :fs
+
+          attr_reader :inflector
+
+          # rubocop:disable Metrics/AbcSize
+
+          def generate_for_slice(context, format, slice)
+            slice_directory = fs.join("slices", slice)
+            raise MissingSliceError.new(slice) unless fs.directory?(slice_directory)
+
+            fs.mkdir(directory = fs.join(slice_directory, "views", context.namespaces))
+            fs.write(fs.join(directory, "#{context.name}.rb"), t("slice_view.erb", context))
+
+            fs.mkdir(directory = fs.join(slice_directory, "templates", context.namespaces))
+            fs.write(fs.join(directory, "#{context.name}.#{format}.erb"),
+                     t(template_with_format_ext("slice_template", format), context))
+          end
+
+          def generate_for_app(context, format, _slice)
+            fs.mkdir(directory = fs.join("app", "views", context.namespaces))
+            fs.write(fs.join(directory, "#{context.name}.rb"), t("app_view.erb", context))
+
+            fs.mkdir(directory = fs.join("app", "templates", context.namespaces))
+            fs.write(fs.join(directory, "#{context.name}.#{format}.erb"),
+                     t(template_with_format_ext("app_template", format), context))
+          end
+
+          # rubocop:enable Metrics/AbcSize
+
+          def template_with_format_ext(name, format)
+            ext =
+              case format.to_sym
+              when :html
+                ".html.erb"
+              else
+                ".erb"
+              end
+
+            "#{name}#{ext}"
+          end
+
+          def template(path, context)
+            require "erb"
+
+            ERB.new(
+              File.read(__dir__ + "/view/#{path}")
+            ).result(context.ctx)
+          end
+
+          alias_method :t, :template
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require_relative "slice_context"
+require "dry/files/path"
+
+module Hanami
+  module CLI
+    module Generators
+      # @since 2.1.0
+      # @api private
+      module App
+        # @since 2.1.0
+        # @api private
+        class ViewContext < SliceContext
+          # TODO: move these constants somewhere that will let us reuse them
+          KEY_SEPARATOR = "."
+          private_constant :KEY_SEPARATOR
+
+          NAMESPACE_SEPARATOR = "::"
+          private_constant :NAMESPACE_SEPARATOR
+
+          INDENTATION = "  "
+          private_constant :INDENTATION
+
+          OFFSET = INDENTATION * 2
+          private_constant :OFFSET
+
+          # @since 2.1.0
+          # @api private
+          attr_reader :key
+
+          # @since 2.1.0
+          # @api private
+          def initialize(inflector, app, slice, key)
+            @key = key
+            super(inflector, app, slice, nil)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def namespaces
+            @namespaces ||= key.split(KEY_SEPARATOR)[..-2]
+          end
+
+          # @since 2.1.0
+          # @api private
+          def name
+            @name ||= key.split(KEY_SEPARATOR)[-1]
+          end
+
+          # @since 2.1.0
+          # @api private
+          def camelized_namespace
+            namespaces.map { inflector.camelize(_1) }.join(NAMESPACE_SEPARATOR)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def camelized_name
+            inflector.camelize(name)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def underscored_namespace
+            namespaces.map { inflector.underscore(_1) }
+          end
+
+          # @since 2.1.0
+          # @api private
+          def underscored_name
+            inflector.underscore(name)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def module_namespace_declaration
+            namespaces.each_with_index.map { |token, i|
+              "#{OFFSET}#{INDENTATION * i}module #{inflector.camelize(token)}"
+            }.join($/)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def module_namespace_end
+            namespaces.each_with_index.map { |_, i|
+              "#{OFFSET}#{INDENTATION * i}end"
+            }.reverse.join($/)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def module_namespace_offset
+            "#{OFFSET}#{INDENTATION * namespaces.count}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./version"
+require_relative "version"
 
 module Hanami
   module CLI

data/lib/hanami/cli/generators/gem/app/404.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>The page you were looking for doesn’t exist (404)</title>
+  </head>
+  <body>
+    <!-- This file lives in public/404.html -->
+    <h1>The page you were looking for doesn’t exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </body>
+</html>

data/lib/hanami/cli/generators/gem/app/500.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>We’re sorry, but something went wrong (500)</title>
+  </head>
+  <body>
+    <!-- This file lives in public/500.html -->
+    <h1>We’re sorry, but something went wrong.</h1>
+    <p>If you are the application owner, check the logs for more information.</p>
+  </body>
+</html>

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

@@ -6,6 +6,8 @@ gem "hanami", "<%= hanami_version %>"
 gem "hanami-router", "<%= hanami_version %>"
 gem "hanami-controller", "<%= hanami_version %>"
 gem "hanami-validations", "<%= hanami_version %>"
+gem "hanami-view", "<%= hanami_version %>"
+gem "hanami-webconsole", "<%= hanami_version %>"
 
 gem "dry-types", "~> 1.0", ">= 1.6.1"
 gem "puma"

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

@@ -0,0 +1,2 @@
+.env
+log/*

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

@@ -0,0 +1,10 @@
+# auto_register: false
+# frozen_string_literal: true
+
+module <%= camelized_app_name %>
+  module Views
+    module Helpers
+      # Add your view helpers here
+    end
+  end
+end

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

@@ -0,0 +1 @@
+<%= yield %>

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

@@ -6,10 +6,12 @@ threads min_threads_count, max_threads_count
 
 port        ENV.fetch("<%= Hanami::Port::ENV_VAR %>", <%= Hanami::Port::DEFAULT %>)
 environment ENV.fetch("HANAMI_ENV", "development")
-workers     ENV.fetch("HANAMI_WEB_CONCURRENCY", 2)
+workers     ENV.fetch("HANAMI_WEB_CONCURRENCY", 0)
 
-on_worker_boot do
-  Hanami.shutdown
+if ENV.fetch("HANAMI_WEB_CONCURRENCY", 0) > 0
+  on_worker_boot do
+    Hanami.shutdown
+  end
 end
 
 preload_app!

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

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

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

@@ -34,6 +34,7 @@ module Hanami
           attr_reader :inflector
 
           def generate_app(app, context) # rubocop:disable Metrics/AbcSize
+            fs.write(".gitignore", t("gitignore.erb", context))
             fs.write(".env", t("env.erb", context))
 
             fs.write("README.md", t("readme.erb", context))
@@ -51,6 +52,12 @@ module Hanami
 
             fs.write("app/actions/.keep", t("keep.erb", context))
             fs.write("app/action.rb", t("action.erb", context))
+            fs.write("app/view.rb", t("view.erb", context))
+            fs.write("app/views/helpers.rb", t("helpers.erb", context))
+            fs.write("app/templates/layouts/app.html.erb", File.read(File.join(__dir__, "app", "layouts_app.html.erb")))
+
+            fs.write("public/404.html", File.read(File.join(__dir__, "app", "404.html")))
+            fs.write("public/500.html", File.read(File.join(__dir__, "app", "500.html")))
           end
 
           def template(path, context)

data/lib/hanami/cli/naming.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "shellwords"
+
+module Hanami
+  module CLI
+    class Naming
+      def initialize(inflector:)
+        @inflector = inflector
+      end
+
+      def action_name(name)
+        inflector.underscore(escape(name)).gsub("/", ".")
+      end
+
+      private
+
+      attr_reader :inflector
+
+      def escape(name)
+        Shellwords.shellescape(name)
+      end
+    end
+  end
+end

data/lib/hanami/cli/url.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "uri"
-require_relative "./errors"
+require_relative "errors"
 
 module Hanami
   module CLI

data/lib/hanami/cli/version.rb

@@ -6,6 +6,6 @@ module Hanami
     #
     # @api public
     # @since 2.0.0
-    VERSION = "2.0.2"
+    VERSION = "2.1.0.beta1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-25 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,10 +168,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".action_hero.yml"
 - ".github/FUNDING.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".repobot.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".yardopts"
@@ -212,6 +212,7 @@ files:
 - lib/hanami/cli/commands/app/generate.rb
 - lib/hanami/cli/commands/app/generate/action.rb
 - lib/hanami/cli/commands/app/generate/slice.rb
+- lib/hanami/cli/commands/app/generate/view.rb
 - lib/hanami/cli/commands/app/install.rb
 - lib/hanami/cli/commands/app/middleware.rb
 - lib/hanami/cli/commands/app/routes.rb
@@ -225,6 +226,8 @@ files:
 - 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/slice_template.html.erb
+- lib/hanami/cli/generators/app/action/slice_view.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
@@ -232,20 +235,33 @@ files:
 - lib/hanami/cli/generators/app/slice.rb
 - lib/hanami/cli/generators/app/slice/action.erb
 - lib/hanami/cli/generators/app/slice/entities.erb
+- lib/hanami/cli/generators/app/slice/helpers.erb
 - lib/hanami/cli/generators/app/slice/keep.erb
+- lib/hanami/cli/generators/app/slice/layouts_app.html.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/app/view.rb
+- lib/hanami/cli/generators/app/view/app_template.html.erb
+- lib/hanami/cli/generators/app/view/app_view.erb
+- lib/hanami/cli/generators/app/view/slice_template.html.erb
+- lib/hanami/cli/generators/app/view/slice_view.erb
+- lib/hanami/cli/generators/app/view_context.rb
 - lib/hanami/cli/generators/context.rb
 - lib/hanami/cli/generators/gem/app.rb
+- lib/hanami/cli/generators/gem/app/404.html
+- lib/hanami/cli/generators/gem/app/500.html
 - lib/hanami/cli/generators/gem/app/action.erb
 - lib/hanami/cli/generators/gem/app/app.erb
 - lib/hanami/cli/generators/gem/app/config_ru.erb
 - lib/hanami/cli/generators/gem/app/env.erb
 - lib/hanami/cli/generators/gem/app/gemfile.erb
+- lib/hanami/cli/generators/gem/app/gitignore.erb
+- lib/hanami/cli/generators/gem/app/helpers.erb
 - lib/hanami/cli/generators/gem/app/keep.erb
+- lib/hanami/cli/generators/gem/app/layouts_app.html.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
@@ -253,8 +269,10 @@ files:
 - lib/hanami/cli/generators/gem/app/settings.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/version.rb
 - lib/hanami/cli/middleware_stack_inspector.rb
+- lib/hanami/cli/naming.rb
 - lib/hanami/cli/rake_tasks.rb
 - lib/hanami/cli/repl/core.rb
 - lib/hanami/cli/repl/irb.rb
@@ -286,11 +304,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Hanami CLI