hanami-cli 2.0.3 → 2.1.0.beta2

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
@@ -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/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/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,23 +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 %>"
+<%= 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/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/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

@@ -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

@@ -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))
@@ -52,13 +53,26 @@ 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("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")))
           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
 

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/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.3"
+    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.0.3
+  version: 2.1.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-01 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,9 +213,11 @@ 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
+- 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,28 +231,48 @@ 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/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/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/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/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
@@ -254,7 +280,9 @@ 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
@@ -288,11 +316,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.5
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Hanami CLI