hanami-cli 2.1.0.beta1 → 2.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '078a7a10f1196ed8635a9c27ee48ac10178cdcff50d2646138f61b55f79f86a7'
-  data.tar.gz: 870c056fc5da9f5952daf357ca2861f0e276510c6ca1e63a2f821af76ebdd09a
+  metadata.gz: 85a528645e9205c15ccdf4b81cc32a3fb0789a8a7f07c56554c1b8b0e66b9e91
+  data.tar.gz: 5937fd333d11a7f5131d0298dc609c8a92e233249bc0b2e9e8f28705977f20b4
 SHA512:
-  metadata.gz: d70ee9d87779f442c25517abfefde102460848e8a29ba9ef30ae28cc2b2593f73027dad42b99e5617820952a84fd22013a8de5d039fb2e6161a64fd2eef706a1
-  data.tar.gz: 815418cd1c416bea1f7a77c56dff20ed143b582795bbcd79904260509c8c62c7d62a7be76c11305d26dc793dd2c2a13fcba0532c365ad47278212159e40eff69
+  metadata.gz: df19a905d03fec4665ce80dd89730dee6337312e32e0e923e9424a387d66b8f9605e8392a5a73bd4627251b96c57b4a95f4df32062d8a53d42041d69841c10d6
+  data.tar.gz: e4931266c0517de1bb33bc0f862c73da58366d6d5707c0eacf48fd38b08b8d7ae767e8fd7c81f1f048b96ffda5977674e556e281c51ab1f2a4eb30c6ceaa7ade

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 Hanami Command Line Interface
 
+## v2.1.0.beta2 - 2023-10-04
+
+### Added
+
+- [Luca Guidi] `hanami new` generates `Procfile.dev`
+- [Luca Guidi] `hanami new` generates basic app assets, if `hanami-assets` is bundled by the app
+- [Luca Guidi] `hanami new` accepts `--head` to generate the app using Hanami HEAD version from GitHub
+- [Luca Guidi] `hanami generate slice` generates basic slice assets, if `hanami-assets` is bundled by the app
+- [Ryan Bigg] `hanami generate action` generates corresponding view, if `hanami-view` is bundled by the app
+- [Luca Guidi] `hanami assets compile` to compile assets at the deploy time
+- [Luca Guidi] `hanami assets watch` to watch and compile assets at the development time
+- [Luca Guidi] `hanami dev` to start the processes in `Procfile.dev`
+
+### Fixed
+
+- [Luca Guidi] `hanami new` generates a `Gemfile` with `hanami-webconsole` in `:development` group
+- [Luca Guidi] `hanami new` generates a `Gemfile` with versioned `hanami-webconsole`, `hanami-rspec`, and `hanami-reloader`
+
 ## v2.1.0.beta1 - 2023-06-29
 
 ### Added

data/Gemfile

@@ -10,9 +10,10 @@ unless ENV["CI"]
 end
 
 gem "hanami", github: "hanami/hanami", branch: "main"
-gem "hanami-utils", github: "hanami/utils", branch: "main"
-gem "hanami-router", github: "hanami/router", branch: "main"
+gem "hanami-assets", github: "hanami/assets", branch: "main"
 gem "hanami-controller", github: "hanami/controller", branch: "main"
+gem "hanami-router", github: "hanami/router", branch: "main"
+gem "hanami-utils", github: "hanami/utils", branch: "main"
 
 gem "rack"
 

data/hanami-cli.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler", "~> 2.1"
   spec.add_dependency "dry-cli", "~> 1.0", "< 2"
-  spec.add_dependency "dry-files", "~> 1.0", ">= 1.0.1", "< 2"
+  spec.add_dependency "dry-files", "~> 1.0", ">= 1.0.2", "< 2"
   spec.add_dependency "dry-inflector", "~> 1.0", "< 2"
   spec.add_dependency "rake", "~> 13.0"
   spec.add_dependency "zeitwerk", "~> 2.6"

data/lib/hanami/cli/bundler.rb

@@ -3,7 +3,7 @@
 require "bundler"
 require "open3"
 require "etc"
-require "dry/files"
+require_relative "files"
 require_relative "system_call"
 require_relative "errors"
 
@@ -45,12 +45,12 @@ module Hanami
 
       # Returns a new bundler.
       #
-      # @param fs [Dry::Files] the filesystem interaction object
+      # @param fs [Hanami::CLI::Files] the filesystem interaction object
       # @param system_call [SystemCall] convenience object for making system calls
       #
       # @since 2.0.0
       # @api public
-      def initialize(fs: Dry::Files.new, system_call: SystemCall.new)
+      def initialize(fs: Hanami::CLI::Files.new, system_call: SystemCall.new)
         @fs = fs
         @system_call = system_call
       end
@@ -71,7 +71,7 @@ module Hanami
       #
       # @return [SystemCall::Result] the result of the `bundle` command execution
       #
-      # @raise [StandardError] if the `bundle` command does not execute successfully
+      # @raise [Hanami::CLI::BundleInstallError] if the `bundle` command does not execute successfully
       #
       # @since 2.0.0
       # @api public
@@ -81,6 +81,20 @@ module Hanami
         end
       end
 
+      # Runs the given Hanami CLI command via `bundle exec hanami`
+      #
+      # @return [SystemCall::Result] the result of the command execution
+      #
+      # @raise [Hanami::CLI::HanamiExecError] if the does not execute successfully
+      #
+      # @since 2.1.0
+      # @api public
+      def hanami_exec(cmd, env: nil, &blk)
+        exec("hanami #{cmd}", env: env, &blk).tap do |result|
+          raise HanamiExecError.new(cmd, result.err) unless result.successful?
+        end
+      end
+
       # Executes the given command prefixed by `bundle exec`.
       #
       # @return [SystemCall::Result] the result of the command execution
@@ -127,7 +141,7 @@ module Hanami
 
       private
 
-      # @return [Dry::Files]
+      # @return [Hanami::CLI::Files]
       #
       # @since 2.0.0
       # @api public

data/lib/hanami/cli/command.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require "dry/cli"
-require "dry/files"
 require "dry/inflector"
+require_relative "files"
 
 module Hanami
   module CLI
@@ -19,12 +19,12 @@ module Hanami
       #
       # @param out [IO] I/O stream for standard command output
       # @param err [IO] I/O stream for comment errror output
-      # @param fs [Dry::Files] object for managing file system interactions
+      # @param fs [Hanami::CLI::Files] object for managing file system interactions
       # @param inflector [Dry::Inflector] inflector for any command-level inflections
       #
       # @since 2.0.0
       # @api public
-      def initialize(out: $stdout, err: $stderr, fs: Dry::Files.new, inflector: Dry::Inflector.new)
+      def initialize(out: $stdout, err: $stderr, fs: Hanami::CLI::Files.new, inflector: Dry::Inflector.new)
         super()
         @out = out
         @err = err
@@ -52,7 +52,7 @@ module Hanami
 
       # Returns the object for managing file system interactions.
       #
-      # @return [Dry::Files]
+      # @return [Hanami::CLI::Files]
       #
       # @since 2.0.0
       # @api public

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require "shellwords"
+require_relative "../command"
+require_relative "../../../system_call"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        module Assets
+          # @since 2.1.0
+          # @api private
+          class Command < App::Command
+            def initialize(config: app.config.assets, system_call: SystemCall.new, **)
+              super()
+              @system_call = system_call
+              @config = config
+            end
+
+            # @since 2.1.0
+            # @api private
+            def call(**)
+              cmd, *args = cmd_with_args
+
+              system_call.call(cmd, *args, env: env)
+            end
+
+            private
+
+            # @since 2.1.0
+            # @api private
+            attr_reader :config
+
+            # @since 2.1.0
+            # @api private
+            attr_reader :system_call
+
+            # @since 2.1.0
+            # @api private
+            def cmd_with_args
+              [
+                config.package_manager_executable,
+                config.package_manager_command,
+                config.executable
+              ]
+            end
+
+            # @since 2.1.0
+            # @api private
+            def env
+              ENV.to_h.merge(
+                "ESBUILD_ENTRY_POINTS" => entry_points,
+                "ESBUILD_OUTDIR" => destination
+              )
+            end
+
+            # @since 2.1.0
+            # @api private
+            def entry_points
+              config.entry_points.map do |entry_point|
+                escape(entry_point)
+              end.join(" ")
+            end
+
+            # @since 2.1.0
+            # @api private
+            def destination
+              escape(config.destination)
+            end
+
+            # @since 2.1.0
+            # @api private
+            def escape(str)
+              Shellwords.shellescape(str)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "command"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        module Assets
+          # @since 2.1.0
+          # @api private
+          class Compile < Assets::Command
+            desc "Compile assets for deployments"
+
+            # @since 2.1.0
+            # @api private
+            def cmd_with_args
+              result = super
+
+              if config.subresource_integrity.any?
+                result << "--"
+                result << "--sri=#{config.subresource_integrity.join(',')}"
+              end
+
+              result
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative "command"
+require_relative "../../../interactive_system_call"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        module Assets
+          # @since 2.1.0
+          # @api private
+          class Watch < Assets::Command
+            desc "Start assets watch mode"
+
+            def initialize(config: app.config.assets, system_call: InteractiveSystemCall.new, **)
+              super(config: config, system_call: system_call)
+            end
+
+            private
+
+            # @since 2.1.0
+            # @api private
+            def cmd_with_args
+              super +
+                [
+                  "--",
+                  "--watch"
+                ]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        # @since 2.1.0
+        # @api private
+        module Assets
+          require_relative "assets/compile"
+          require_relative "assets/watch"
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "dry/files"
 require "hanami/env"
 require_relative "db/utils/database"
+require_relative "../../files"
 
 module Hanami
   module CLI
@@ -75,7 +75,7 @@ module Hanami
             klass.new(
               out: out,
               inflector: app.inflector,
-              fs: Dry::Files
+              fs: Hanami::CLI::Files,
             ).call(*args)
           end
 

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require_relative "../../interactive_system_call"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        # @since 2.1.0
+        # @api private
+        class Dev < App::Command
+          # @since 2.1.0
+          # @api private
+          desc "Start the application in development mode"
+
+          # @since 2.1.0
+          # @api private
+          option :procfile, type: :string, desc: "Path to Procfile", aliases: ["-f"]
+
+          # @since 2.1.0
+          # @api private
+          example [
+            "-f /path/to/Procfile",
+          ]
+
+          # @since 2.1.0
+          # @api private
+          def initialize(interactive_system_call: InteractiveSystemCall.new, **)
+            @interactive_system_call = interactive_system_call
+            super()
+          end
+
+          # @since 2.1.0
+          # @api private
+          def call(procfile: nil, **)
+            bin, args = executable(procfile: procfile)
+            interactive_system_call.call(bin, *args)
+          end
+
+          private
+
+          # @since 2.1.0
+          # @api private
+          attr_reader :interactive_system_call
+
+          # @since 2.1.0
+          # @api private
+          def executable(procfile: nil)
+            # TODO: support other implementations of Foreman
+            # See: https://github.com/ddollar/foreman#ports
+            ["foreman", ["start", "-f", procfile || "Procfile.dev"]]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -60,7 +60,8 @@ module Hanami
 
             # @since 2.0.0
             # @api private
-            def call(name:, url: nil, http: nil, format: DEFAULT_FORMAT, skip_view: DEFAULT_SKIP_VIEW, slice: nil, **)
+            def call(name:, url: nil, http: nil, format: DEFAULT_FORMAT, skip_view: DEFAULT_SKIP_VIEW, slice: nil,
+                     context: nil, **)
               slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
               name = naming.action_name(name)
               *controller, action = name.split(ACTION_SEPARATOR)
@@ -69,7 +70,7 @@ module Hanami
                 raise InvalidActionNameError.new(name)
               end
 
-              generator.call(app.namespace, controller, action, url, http, format, skip_view, slice)
+              generator.call(app.namespace, controller, action, url, http, format, skip_view, slice, context: context)
             end
 
             # rubocop:enable Metrics/ParameterLists

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../system_call"
+
 module Hanami
   module CLI
     module Commands
@@ -18,9 +20,50 @@ module Hanami
         # @since 2.0.0
         # @api private
         class Install < Command
+          # @since 2.1.0
+          # @api private
+          DEFAULT_HEAD = false
+          private_constant :DEFAULT_HEAD
+
+          # @since 2.1.0
+          # @api private
           desc "Install Hanami third-party plugins"
 
-          def call(*)
+          # @since 2.1.0
+          # @api private
+          option :head, type: :boolean, desc: "Install head deps", default: DEFAULT_HEAD
+
+          # @since 2.1.0
+          # @api private
+          def initialize(system_call: SystemCall.new, **)
+            @system_call = system_call
+            super()
+          end
+
+          # @since 2.0.0
+          # @api private
+          def call(head: DEFAULT_HEAD, **)
+            install_hanami_assets!(head: head)
+          end
+
+          private
+
+          # @since 2.1.0
+          # @api private
+          attr_reader :system_call
+
+          # @since 2.1.0
+          # @api private
+          def install_hanami_assets!(head:)
+            return unless Hanami.bundled?("hanami-assets")
+
+            system_call.call("npm", ["init", "-y"])
+
+            if head
+              system_call.call("npm", %w[install https://github.com/hanami/assets-js])
+            else
+              system_call.call("npm", %w[install hanami-assets])
+            end
           end
         end
       end

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

@@ -14,11 +14,19 @@ module Hanami
           base.module_eval do
             register "version", Commands::App::Version, aliases: ["v", "-v", "--version"]
             register "install", Commands::App::Install
+            register "dev", Commands::App::Dev
             register "console", Commands::App::Console, aliases: ["c"]
             register "server", Commands::App::Server, aliases: ["s"]
             register "routes", Commands::App::Routes
             register "middleware", Commands::App::Middleware
 
+            if Hanami.bundled?("hanami-assets")
+              register "assets" do |prefix|
+                prefix.register "compile", Assets::Compile
+                prefix.register "watch", Assets::Watch
+              end
+            end
+
             register "generate", aliases: ["g"] do |prefix|
               prefix.register "slice", Generate::Slice
               prefix.register "action", Generate::Action

data/lib/hanami/cli/commands/gem/new.rb

@@ -10,21 +10,53 @@ module Hanami
         # @since 2.0.0
         # @api private
         class New < Command
+          # @since 2.0.0
+          # @api private
           SKIP_INSTALL_DEFAULT = false
           private_constant :SKIP_INSTALL_DEFAULT
 
+          # @since 2.1.0
+          # @api private
+          HEAD_DEFAULT = false
+          private_constant :HEAD_DEFAULT
+
+          # @since 2.1.0
+          # @api private
+          SKIP_ASSETS_DEFAULT = false
+          private_constant :SKIP_ASSETS_DEFAULT
+
           desc "Generate a new Hanami app"
 
+          # @since 2.0.0
+          # @api private
           argument :app, required: true, desc: "App name"
 
+          # @since 2.0.0
+          # @api private
           option :skip_install, type: :boolean, required: false,
                                 default: SKIP_INSTALL_DEFAULT,
                                 desc: "Skip app installation (Bundler, third-party Hanami plugins)"
 
+          # @since 2.1.0
+          # @api private
+          option :head, type: :boolean, required: false,
+                        default: HEAD_DEFAULT,
+                        desc: "Use Hanami HEAD version (from GitHub `main` branches)"
+
+          # @since 2.1.0
+          # @api private
+          option :skip_assets, type: :boolean, required: false,
+                               default: SKIP_ASSETS_DEFAULT,
+                               desc: "Skip assets"
+
+          # rubocop:disable Layout/LineLength
           example [
-            "bookshelf                # Generate a new Hanami app in `bookshelf/' directory, using `Bookshelf' namespace", # rubocop:disable Layout/LineLength
-            "bookshelf --skip-install # Generate a new Hanami app, but it skips Hanami installation"
+            "bookshelf                # Generate a new Hanami app in `bookshelf/' directory, using `Bookshelf' namespace",
+            "bookshelf --head         # Generate a new Hanami app, using Hanami HEAD version from GitHub `main' branches",
+            "bookshelf --skip-install # Generate a new Hanami app, but it skips Hanami installation",
+            "bookshelf --skip-assets  # Generate a new Hanami app without assets"
           ]
+          # rubocop:enable Layout/LineLength
 
           # @since 2.0.0
           # @api private
@@ -42,21 +74,22 @@ module Hanami
 
           # @since 2.0.0
           # @api private
-          def call(app:, skip_install: SKIP_INSTALL_DEFAULT, **)
+          def call(app:, head: HEAD_DEFAULT, skip_install: SKIP_INSTALL_DEFAULT, skip_assets: SKIP_ASSETS_DEFAULT, **)
             app = inflector.underscore(app)
 
             raise PathAlreadyExistsError.new(app) if fs.exist?(app)
 
             fs.mkdir(app)
             fs.chdir(app) do
-              generator.call(app) do
+              context = Generators::Context.new(inflector, app, head: head, skip_assets: skip_assets)
+              generator.call(app, context: context) do
                 if skip_install
                   out.puts "Skipping installation, please enter `#{app}' directory and run `bundle exec hanami install'"
                 else
                   out.puts "Running Bundler install..."
                   bundler.install!
                   out.puts "Running Hanami install..."
-                  run_install_commmand!
+                  run_install_commmand!(head: head)
                 end
               end
             end
@@ -67,8 +100,9 @@ module Hanami
           attr_reader :bundler
           attr_reader :generator
 
-          def run_install_commmand!
-            bundler.exec("hanami install").tap do |result|
+          def run_install_commmand!(head:)
+            head_flag = head ? " --head" : ""
+            bundler.exec("hanami install#{head_flag}").tap do |result|
               raise HanamiInstallError.new(result.err) unless result.successful?
             end
           end

data/lib/hanami/cli/errors.rb

@@ -2,60 +2,90 @@
 
 module Hanami
   module CLI
+    # @since 0.1.0
+    # @api public
     class Error < StandardError
     end
 
+    # @since 2.0.0
+    # @api public
     class NotImplementedError < Error
     end
 
+    # @since 2.0.0
+    # @api public
     class BundleInstallError < Error
       def initialize(message)
         super("`bundle install' failed\n\n\n#{message.inspect}")
       end
     end
 
+    # @since 2.0.0
+    # @api public
     class HanamiInstallError < Error
       def initialize(message)
         super("`hanami install' failed\n\n\n#{message.inspect}")
       end
     end
 
+    # @since 2.1.0
+    # @api public
+    class HanamiExecError < Error
+      def initialize(cmd, message)
+        super("`bundle exec hanami #{cmd}' failed\n\n\n#{message.inspect}")
+      end
+    end
+
+    # @since 2.0.0
+    # @api public
     class PathAlreadyExistsError < Error
       def initialize(path)
         super("Cannot create new Hanami app in an existing path: `#{path}'")
       end
     end
 
+    # @since 2.0.0
+    # @api public
     class MissingSliceError < Error
       def initialize(slice)
         super("slice `#{slice}' is missing, please generate with `hanami generate slice #{slice}'")
       end
     end
 
+    # @since 2.0.0
+    # @api public
     class InvalidURLError < Error
       def initialize(url)
         super("invalid URL: `#{url}'")
       end
     end
 
+    # @since 2.0.0
+    # @api public
     class InvalidURLPrefixError < Error
       def initialize(url)
         super("invalid URL prefix: `#{url}'")
       end
     end
 
+    # @since 2.0.0
+    # @api public
     class InvalidActionNameError < Error
       def initialize(name)
         super("cannot parse controller and action name: `#{name}'\n\texample: `hanami generate action users.show'")
       end
     end
 
+    # @since 2.0.0
+    # @api public
     class UnknownHTTPMethodError < Error
       def initialize(name)
         super("unknown HTTP method: `#{name}'")
       end
     end
 
+    # @since 2.0.0
+    # @api public
     class UnsupportedDatabaseSchemeError < Error
       def initialize(scheme)
         super("`#{scheme}' is not a supported db scheme")

data/lib/hanami/cli/files.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "dry/files"
+
 module Hanami
   module CLI
     # @since 2.0.0
@@ -29,7 +31,7 @@ module Hanami
       def mkdir(path)
         unless exist?(path)
           super
-          created("#{path}/")
+          created(_path(path))
         end
       end
 
@@ -53,7 +55,11 @@ module Hanami
       end
 
       def within_folder(path)
-        out.puts "-> Within #{path}/"
+        out.puts "-> Within #{_path(path)}"
+      end
+
+      def _path(path)
+        path + ::File::SEPARATOR
       end
     end
   end

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

@@ -4,8 +4,12 @@ module <%= camelized_app_name %>
   module Actions
 <%= module_controller_declaration %>
 <%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_app_name %>::Action
-<%= module_controller_offset %>  def handle(*, response)
+<%- if bundled_views? -%>
+<%= module_controller_offset %>  def handle(request, response)
+<%- else -%>
+<%= module_controller_offset %>  def handle(request, response)
 <%= module_controller_offset %>    response.body = self.class.name
+<%- end -%>
 <%= module_controller_offset %>  end
 <%= module_controller_offset %>end
 <%= module_controller_end %>

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

@@ -4,8 +4,12 @@ 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)
+<%- if bundled_views?  -%>
+<%= module_controller_offset %>  def handle(request, response)
+<%- else -%>
+<%= module_controller_offset %>  def handle(request, response)
 <%= module_controller_offset %>    response.body = self.class.name
+<%- end -%>
 <%= module_controller_offset %>  end
 <%= module_controller_offset %>end
 <%= module_controller_end %>

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

@@ -19,11 +19,10 @@ module Hanami
             @inflector = inflector
           end
 
-          # rubocop:disable Layout/LineLength
-
           # @since 2.0.0
           # @api private
-          def call(app, controller, action, url, http, format, skip_view, slice, context: ActionContext.new(inflector, app, slice, controller, action))
+          def call(app, controller, action, url, http, format, skip_view, 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)
             else
@@ -31,8 +30,6 @@ module Hanami
             end
           end
 
-          # rubocop:enable Layout/LineLength
-
           private
 
           ROUTE_HTTP_METHODS = %w[get post delete put patch trace options link unlink].freeze
@@ -136,7 +133,7 @@ module Hanami
             require "erb"
 
             ERB.new(
-              File.read(__dir__ + "/action/#{path}")
+              File.read(__dir__ + "/action/#{path}"), trim_mode: "-",
             ).result(context.ctx)
           end
 

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

@@ -0,0 +1,5 @@
+body {
+  background-color: #fff;
+  color: #000;
+  font-family: sans-serif;
+}

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

@@ -0,0 +1 @@
+import "../css/app.css";

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

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%= humanized_app_name %> - <%= humanized_slice_name %></title>
+    <%- if bundled_assets? -%>
+    <%%= favicon %>
+    <%= stylesheet_erb_tag %>
+    <%- end -%>
+  </head>
+  <body>
+    <%%= yield %>
+    <%- if bundled_assets? -%>
+    <%= javascript_erb_tag %>
+    <%- end -%>
+  </body>
+</html>

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

@@ -30,8 +30,13 @@ module Hanami
             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, "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, "templates", "layouts", "app.html.erb"), t("app_layout.erb", context))
+
+            if context.bundled_assets?
+              fs.write(fs.join(directory, "assets", "js", "app.js"), t("app_js.erb", context))
+              fs.write(fs.join(directory, "assets", "css", "app.css"), t("app_css.erb", context))
+            end
+
             # fs.write(fs.join(directory, "/entities.rb"), t("entities.erb", context))
             # fs.write(fs.join(directory, "/repository.rb"), t("repository.erb", context))
 
@@ -53,7 +58,8 @@ module Hanami
             require "erb"
 
             ERB.new(
-              File.read(__dir__ + "/slice/#{path}")
+              File.read(__dir__ + "/slice/#{path}"),
+              trim_mode: "-"
             ).result(context.ctx)
           end
 

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

@@ -29,6 +29,24 @@ module Hanami
             inflector.underscore(slice)
           end
 
+          # @since 2.1.0
+          # @api private
+          def humanized_slice_name
+            inflector.humanize(slice)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def stylesheet_erb_tag
+            %(<%= css "#{slice}/app" %>)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def javascript_erb_tag
+            %(<%= js "#{slice}/app" %>)
+          end
+
           private
 
           attr_reader :slice

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

@@ -12,9 +12,10 @@ module Hanami
       class Context
         # @since 2.0.0
         # @api private
-        def initialize(inflector, app)
+        def initialize(inflector, app, **options)
           @inflector = inflector
           @app = app
+          @options = options
         end
 
         # @since 2.0.0
@@ -23,10 +24,20 @@ module Hanami
           binding
         end
 
+        def hanami_gem(name)
+          gem_name = name == "hanami" ? "hanami" : "hanami-#{name}"
+
+          %(gem "#{gem_name}", #{hanami_version(name)})
+        end
+
         # @since 2.0.0
         # @api private
-        def hanami_version
-          Version.gem_requirement
+        def hanami_version(gem_name)
+          if hanami_head?
+            %(github: "hanami/#{gem_name}", branch: "main")
+          else
+            %("#{Version.gem_requirement}")
+          end
         end
 
         # @since 2.0.0
@@ -41,11 +52,49 @@ module Hanami
           inflector.underscore(app)
         end
 
+        # @since 2.1.0
+        # @api private
+        def humanized_app_name
+          inflector.humanize(app)
+        end
+
+        # @since 2.1.0
+        # @api private
+        def hanami_head?
+          options.fetch(:head)
+        end
+
+        # @since 2.1.0
+        # @api private
+        def generate_assets?
+          !options.fetch(:skip_assets, false)
+        end
+
+        # @since 2.1.0
+        # @api private
+        def bundled_views?
+          Hanami.bundled?("hanami-view")
+        end
+
+        # @since 2.1.0
+        # @api private
+        def bundled_assets?
+          Hanami.bundled?("hanami-assets")
+        end
+
         private
 
+        # @since 2.0.0
+        # @api private
         attr_reader :inflector
 
+        # @since 2.0.0
+        # @api private
         attr_reader :app
+
+        # @since 2.1.0
+        # @api private
+        attr_reader :options
       end
     end
   end

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

@@ -0,0 +1,5 @@
+body {
+  background-color: #fff;
+  color: #000;
+  font-family: sans-serif;
+}

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

@@ -0,0 +1 @@
+import "../css/app.css";

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

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%= humanized_app_name %></title>
+    <%- if generate_assets? -%>
+    <%%= favicon %>
+    <%%= css "app" %>
+    <%- end -%>
+  </head>
+  <body>
+    <%%= yield %>
+    <%- if generate_assets? -%>
+    <%%= js "app" %>
+    <%- end -%>
+  </body>
+</html>

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

@@ -2,25 +2,31 @@
 
 source "https://rubygems.org"
 
-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 %>"
+<%= hanami_gem("hanami") %>
+<%= hanami_gem("router") %>
+<%= hanami_gem("controller") %>
+<%= hanami_gem("validations") %>
+<%= hanami_gem("view") %>
+<%- if generate_assets? -%>
+<%= hanami_gem("assets") %>
+<%- end -%>
 
 gem "dry-types", "~> 1.0", ">= 1.6.1"
 gem "puma"
 gem "rake"
 
+group :development do
+  <%= hanami_gem("webconsole") %>
+end
+
 group :development, :test do
   gem "dotenv"
 end
 
 group :cli, :development do
-  gem "hanami-reloader"
+  <%= hanami_gem("reloader") %>
 end
 
 group :cli, :development, :test do
-  gem "hanami-rspec"
+  <%= hanami_gem("rspec") %>
 end

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

@@ -1,2 +1,6 @@
 .env
 log/*
+<%- if generate_assets? -%>
+public/
+node_modules/
+<%- end -%>

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

@@ -0,0 +1,4 @@
+web: bundle exec hanami server
+<%- if generate_assets? -%>
+assets: bundle exec hanami assets watch
+<%- end -%>

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

@@ -40,6 +40,7 @@ module Hanami
             fs.write("README.md", t("readme.erb", context))
             fs.write("Gemfile", t("gemfile.erb", context))
             fs.write("Rakefile", t("rakefile.erb", context))
+            fs.write("Procfile.dev", t("procfile.erb", context))
             fs.write("config.ru", t("config_ru.erb", context))
 
             fs.write("config/app.rb", t("app.erb", context))
@@ -54,7 +55,13 @@ module Hanami
             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("app/templates/layouts/app.html.erb", t("app_layout.erb", context))
+
+            if context.generate_assets?
+              fs.write("app/assets/js/app.js", t("app_js.erb", context))
+              fs.write("app/assets/css/app.css", t("app_css.erb", context))
+              fs.write("app/assets/images/favicon.ico", File.read(File.join(__dir__, "app", "favicon.ico")))
+            end
 
             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")))
@@ -64,7 +71,8 @@ module Hanami
             require "erb"
 
             ERB.new(
-              File.read(File.join(__dir__, "app", path))
+              File.read(File.join(__dir__, "app", path)),
+              trim_mode: "-"
             ).result(context.ctx)
           end
 

data/lib/hanami/cli/interactive_system_call.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module Hanami
+  module CLI
+    # @api private
+    # @since 2.1.0
+    class InteractiveSystemCall
+      # @api private
+      # @since 2.1.0
+      def initialize(out: $stdout, err: $stderr)
+        @out = out
+        @err = err
+        super()
+      end
+
+      # @api private
+      # @since 2.1.0
+      def call(cmd, *args, env: {})
+        ::Bundler.with_unbundled_env do
+          threads = []
+          exit_status = 0
+
+          # rubocop:disable Lint/SuppressedException
+          Open3.popen3(env, command(cmd, *args)) do |_stdin, stdout, stderr, wait_thr|
+            threads << Thread.new do
+              stdout.each_line do |line|
+                out.puts(line)
+              end
+            rescue IOError # FIXME: Check if this is legit
+            end
+
+            threads << Thread.new do
+              stderr.each_line do |line|
+                err.puts(line)
+              end
+            rescue IOError # FIXME: Check if this is legit
+            end
+
+            threads.each(&:join)
+
+            exit_status = wait_thr.value
+          end
+          # rubocop:enable Lint/SuppressedException
+
+          exit(exit_status.exitstatus)
+        end
+      end
+
+      private
+
+      # @api private
+      # @since 2.1.0
+      attr_reader :out, :err
+
+      # @since 2.1.0
+      # @api public
+      def command(cmd, *args)
+        [cmd, args].flatten(1).compact.join(" ")
+      end
+    end
+  end
+end

data/lib/hanami/cli/system_call.rb

@@ -85,13 +85,13 @@ module Hanami
       #
       # @since 2.0.0
       # @api public
-      def call(cmd, env: {})
+      def call(cmd, *args, env: {})
         exitstatus = nil
         out = nil
         err = nil
 
         ::Bundler.with_unbundled_env do
-          Open3.popen3(env, cmd) do |stdin, stdout, stderr, wait_thr|
+          Open3.popen3(env, command(cmd, *args)) do |stdin, stdout, stderr, wait_thr|
             yield stdin, stdout, stderr, wait_thr if block_given?
 
             stdin.close
@@ -104,6 +104,12 @@ module Hanami
 
         Result.new(exit_code: exitstatus, out: out, err: err)
       end
+
+      # @since 2.1.0
+      # @api public
+      def command(cmd, *args)
+        [cmd, args].flatten(1).compact.join(" ")
+      end
     end
   end
 end

data/lib/hanami/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -66,7 +66,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -191,6 +191,10 @@ files:
 - lib/hanami/cli/command.rb
 - lib/hanami/cli/commands.rb
 - lib/hanami/cli/commands/app.rb
+- lib/hanami/cli/commands/app/assets.rb
+- lib/hanami/cli/commands/app/assets/command.rb
+- lib/hanami/cli/commands/app/assets/compile.rb
+- lib/hanami/cli/commands/app/assets/watch.rb
 - lib/hanami/cli/commands/app/command.rb
 - lib/hanami/cli/commands/app/console.rb
 - lib/hanami/cli/commands/app/db/create.rb
@@ -209,6 +213,7 @@ files:
 - lib/hanami/cli/commands/app/db/utils/postgres.rb
 - lib/hanami/cli/commands/app/db/utils/sqlite.rb
 - lib/hanami/cli/commands/app/db/version.rb
+- lib/hanami/cli/commands/app/dev.rb
 - lib/hanami/cli/commands/app/generate.rb
 - lib/hanami/cli/commands/app/generate/action.rb
 - lib/hanami/cli/commands/app/generate/slice.rb
@@ -234,10 +239,12 @@ files:
 - lib/hanami/cli/generators/app/action_context.rb
 - lib/hanami/cli/generators/app/slice.rb
 - lib/hanami/cli/generators/app/slice/action.erb
+- lib/hanami/cli/generators/app/slice/app_css.erb
+- lib/hanami/cli/generators/app/slice/app_js.erb
+- lib/hanami/cli/generators/app/slice/app_layout.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
@@ -255,13 +262,17 @@ files:
 - 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/app_css.erb
+- lib/hanami/cli/generators/gem/app/app_js.erb
+- lib/hanami/cli/generators/gem/app/app_layout.erb
 - lib/hanami/cli/generators/gem/app/config_ru.erb
 - lib/hanami/cli/generators/gem/app/env.erb
+- lib/hanami/cli/generators/gem/app/favicon.ico
 - 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/procfile.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
@@ -271,6 +282,7 @@ files:
 - 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/interactive_system_call.rb
 - lib/hanami/cli/middleware_stack_inspector.rb
 - lib/hanami/cli/naming.rb
 - lib/hanami/cli/rake_tasks.rb

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

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

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

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