hanami-cli 2.0.0 → 2.1.0

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/package.json.erb

@@ -0,0 +1,8 @@
+{
+  "name": "<%= underscored_app_name %>",
+  "private": true,
+  "type": "module",
+  "dependencies": {
+    <%= hanami_assets_npm_package %>
+  }
+}

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/puma.erb

@@ -1,15 +1,47 @@
 # frozen_string_literal: true
 
+#
+# Environment and port
+#
+port ENV.fetch("<%= Hanami::Port::ENV_VAR %>", <%= Hanami::Port::DEFAULT %>)
+environment ENV.fetch("HANAMI_ENV", "development")
+
+#
+# Threads within each Puma/Ruby process (aka worker)
+#
+
+# Configure the minimum and maximum number of threads to use to answer requests.
 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)
+#
+# Workers (aka Puma/Ruby processes)
+#
 
-on_worker_boot do
-  Hanami.shutdown
-end
+puma_concurrency = Integer(ENV.fetch("HANAMI_WEB_CONCURRENCY", 0))
+puma_cluster_mode = puma_concurrency > 1
+
+# How many worker (Puma/Ruby) processes to run.
+# Typically this is set to the number of available cores.
+workers puma_concurrency
+
+#
+# Cluster mode (aka multiple workers)
+#
 
-preload_app!
+if puma_cluster_mode
+  # Preload the application before starting the workers. Only in cluster mode.
+  preload_app!
+
+  # Code to run immediately before master process forks workers (once on boot).
+  #
+  # These hooks can block if necessary to wait for background operations unknown
+  # to puma to finish before the process terminates. This can be used to close
+  # any connections to remote servers (database, redis, …) that were opened when
+  # preloading the code.
+  before_fork do
+    Hanami.shutdown
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module <%= camelized_app_name %>
   class Routes < Hanami::Routes
-    root { "Hello from Hanami" }
+    # Add your routes here. See https://guides.hanamirb.org/routing/overview/ for details.
   end
 end

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,13 +34,18 @@ 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))
             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("bin/dev", file("dev"))
+            fs.chmod("bin/dev", 0o755)
+
             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))
@@ -51,17 +56,36 @@ 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", t("app_layout.erb", context))
+
+            if context.generate_assets?
+              fs.write("package.json", t("package.json.erb", context))
+              fs.write("config/assets.js", file("assets.js"))
+              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("favicon.ico"))
+            end
+
+            fs.write("public/404.html", file("404.html"))
+            fs.write("public/500.html", file("500.html"))
           end
 
           def template(path, context)
             require "erb"
 
             ERB.new(
-              File.read(File.join(__dir__, "app", path))
+              File.read(File.join(__dir__, "app", path)),
+              trim_mode: "-"
             ).result(context.ctx)
           end
 
           alias_method :t, :template
+
+          def file(path)
+            File.read(File.join(__dir__, "app", path))
+          end
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Hanami
         # @since 2.0.0
         # @api private
         def self.version
-          return Hanami::VERSION if defined?(Hanami::VERSION)
+          return Hanami::VERSION if Hanami.const_defined?(:VERSION)
 
           Hanami::CLI::VERSION
         end
@@ -26,10 +26,22 @@ module Hanami
           "~> #{result}"
         end
 
+        def self.npm_package_requirement
+          result = version
+          # Change "2.1.0.beta2.1" to "2.1.0-beta.2" (the only format tolerable by `npm install`)
+          if prerelease?
+            result = result
+              .sub(/\.(alpha|beta|rc)/, '-\1')
+              .sub(/(alpha|beta|rc)(\d+)(?:\.\d+)?\Z/, '\1.\2')
+          end
+
+          "^#{result}"
+        end
+
         # @since 2.0.0
         # @api private
         def self.prerelease?
-          version =~ /alpha|beta|rc/
+          version.match?(/alpha|beta|rc/)
         end
 
         # @example

data/lib/hanami/cli/interactive_system_call.rb

@@ -0,0 +1,65 @@
+# 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, exit_after: true)
+        @out = out
+        @err = err
+        @exit_after = exit_after
+        super()
+      end
+
+      # @api private
+      # @since 2.1.0
+      def call(cmd, *args, env: {}, out_prefix: "")
+        ::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("#{out_prefix}#{line}")
+              end
+            rescue IOError # FIXME: Check if this is legit
+            end
+
+            threads << Thread.new do
+              stderr.each_line do |line|
+                err.puts("#{out_prefix}#{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) if @exit_after
+        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/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/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/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.0"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2024-02-27 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'
@@ -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"
@@ -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,9 +213,12 @@ 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/part.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,27 +232,58 @@ 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
 - lib/hanami/cli/generators/app/action_context.rb
+- lib/hanami/cli/generators/app/part.rb
+- lib/hanami/cli/generators/app/part/app_base_part.erb
+- lib/hanami/cli/generators/app/part/app_part.erb
+- lib/hanami/cli/generators/app/part/slice_base_part.erb
+- lib/hanami/cli/generators/app/part/slice_part.erb
+- lib/hanami/cli/generators/app/part_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/favicon.ico
+- lib/hanami/cli/generators/app/slice/helpers.erb
 - 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/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/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/assets.js
 - lib/hanami/cli/generators/gem/app/config_ru.erb
+- lib/hanami/cli/generators/gem/app/dev
 - 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/package.json.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
@@ -253,8 +291,11 @@ 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/interactive_system_call.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
@@ -290,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Hanami CLI