hanami-cli 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 511daafabba67025eb83dd27f06c62a9809ab89c8901445e5c00f15bbf8fd8ca
-  data.tar.gz: 7d303b0c72fb47c2cf0ba107af0e6899d83b14b580565f4b30c43f4bc87ab4f9
+  metadata.gz: 2652fcd9f660db53b10864142c4a96a0acf3991330b5a5d1b3f0270b5dcbc8ff
+  data.tar.gz: 983957c43ad1d96d7e77db6924346a6021928229eca699d0aafc28c7fcc41cd8
 SHA512:
-  metadata.gz: 716e634d4c572a09cd9954484d9dafc6affaafc13d03ec1e79703436b3efd305d1823dc4d35e92207b5388ebc33aef9f9ba603089cf73b3aec904957fe760bd6
-  data.tar.gz: e7d545d1cd6bfabcc5b4305b755c319c06a4e688e74a4639765c8f0026aac6b039d3459d670014a096ebd726b4a3192f694e273285341698b52a02b0762ae4a4
+  metadata.gz: 9ad2064d1634dfae55848d8e318a7e6b4a0022c56e50b7ed83634e0bc29b5bcd18ba8a8adad14d764125e219827955cbbeef2dc8cc7b788da5543e7f263f5c56
+  data.tar.gz: e911ef639b84a76e24a7b30ed7d778a0f4deb43fee8bd406cc52d44188f1ddc0de16622db87f406f42f6551c8fccc67e8fbe9ae4c6b7b8947610df06dfd21d32

data/.rubocop.yml

@@ -22,6 +22,8 @@ Style/BlockDelimiters:
   Enabled: false
 Style/CommentedKeyword:
   Enabled: false
+Style/EmptyHeredoc:
+  Enabled: false
 Style/LambdaCall:
   Enabled: false
 Style/TrailingCommaInArguments:

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 Hanami Command Line Interface
 
+## v2.0.0.beta3 - 2022-09-21
+
+### Added
+
+- [Luca Guidi] New applications to support Puma server out of the box. Add the `puma` gem to `Gemfile` and generate `config/puma.rb`.
+- [Luca Guidi] New applications to support code reloading for `hanami server` via `hanami-reloader`. This gem is added to app's `Gemfile`.
+- [Marc Busqué] Introduce code reloading for `hanami console` via `#reload` method to be invoked within the console context.
+
+### Fixed
+
+- [Luca Guidi] Respect plural when generating code via `hanami new` and `hanami generate`. Example: `hanami new code_insights` => `CodeInsights` instead of `CodeInsight`
+- [Luca Guidi] Ensure `hanami generate action` to not crash when invoked with non-RESTful action names. Example: `hanami generate action talent.apply`
+
+### Changed
+
+- [Piotr Solnica] `hanami generate action` to add routes to `config/routes.rb` without the `define` block context. See https://github.com/hanami/hanami/pull/1208
+
 ## v2.0.0.beta2 - 2022-08-16
 
 ### Added

data/Gemfile

@@ -8,7 +8,6 @@ unless ENV["CI"]
   gem "yard",   require: false
 end
 
-gem "dry-files", require: false, github: "dry-rb/dry-files", branch: :main
 gem "hanami", require: false, github: "hanami/hanami", branch: :main
 gem "hanami-router", github: "hanami/router", branch: :main
 

data/hanami-cli.gemspec

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

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

@@ -8,15 +8,17 @@ module Hanami
     module Commands
       module App
         class Command < Hanami::CLI::Command
+          ACTION_SEPARATOR = "."
+
           module Environment
-            def call(**opts)
+            def call(*args, **opts)
               env = opts[:env]
 
               hanami_env = env ? env.to_s : ENV.fetch("HANAMI_ENV", "development")
 
               ENV["HANAMI_ENV"] = hanami_env
 
-              super(**opts)
+              super(*args, **opts)
             end
           end
 

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

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

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

@@ -50,9 +50,6 @@ module Hanami
 
             private
 
-            ACTION_SEPARATOR = "."
-            private_constant :ACTION_SEPARATOR
-
             attr_reader :generator
           end
         end

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

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

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

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

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

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

data/lib/hanami/cli/commands.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "hanami"
-
 module Hanami
   module CLI
     # Returns true if the CLI is being called from inside an Hanami app.
@@ -12,7 +10,8 @@ module Hanami
     # @api public
     # @since 2.0.0
     def self.within_hanami_app?
-      !!Hanami.app_path
+      File.exist?("config/app.rb") ||
+        File.exist?("app.rb")
     end
 
     module Commands

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
   module Actions
 <%= module_controller_declaration %>
-<%= module_controller_offset %>class <%= classified_action_name %> < <%= classified_app_name %>::Action
+<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_app_name %>::Action
 <%= module_controller_offset %>  def handle(*, response)
 <%= module_controller_offset %>    response.body = self.class.name
 <%= module_controller_offset %>  end

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

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

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

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

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

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

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

@@ -42,16 +42,19 @@ module Hanami
           private_constant :ROUTE_RESTFUL_HTTP_METHODS
 
           ROUTE_RESTFUL_URL_SUFFIXES = {
-            "index" => "",
-            "new" => "/new",
-            "create" => "",
-            "edit" => "/:id/edit",
-            "update" => "/:id",
-            "show" => "/:id",
-            "destroy" => "/:id"
+            "index" => [],
+            "new" => ["new"],
+            "create" => [],
+            "edit" => [":id", "edit"],
+            "update" => [":id"],
+            "show" => [":id"],
+            "destroy" => [":id"]
           }.freeze
           private_constant :ROUTE_RESTFUL_URL_SUFFIXES
 
+          PATH_SEPARATOR = "/"
+          private_constant :PATH_SEPARATOR
+
           attr_reader :fs
 
           attr_reader :inflector
@@ -81,9 +84,9 @@ module Hanami
           end
 
           def generate_for_app(controller, action, url, http, _format, _skip_view, context)
-            fs.inject_line_at_block_bottom(
+            fs.inject_line_at_class_bottom(
               fs.join("config", "routes.rb"),
-              /define/,
+              "class Routes",
               route(controller, action, url, http)
             )
 
@@ -120,7 +123,10 @@ module Hanami
           alias_method :t, :template
 
           def route_url(controller, action, url)
-            CLI::URL.call(url || ("/#{controller.join('/')}" + ROUTE_RESTFUL_URL_SUFFIXES.fetch(action)))
+            action = ROUTE_RESTFUL_URL_SUFFIXES.fetch(action) { [action] }
+            url ||= "#{PATH_SEPARATOR}#{(controller + action).join(PATH_SEPARATOR)}"
+
+            CLI::URL.call(url)
           end
 
           def route_http(action, http)

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

@@ -14,14 +14,14 @@ module Hanami
             super(inflector, app, slice, nil)
           end
 
-          def classified_controller_name
+          def camelized_controller_name
             controller.map do |token|
               inflector.camelize(token)
             end.join(NAMESPACE_SEPARATOR)
           end
 
-          def classified_action_name
-            inflector.classify(action)
+          def camelized_action_name
+            inflector.camelize(action)
           end
 
           def underscored_controller_name

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

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

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

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

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

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

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

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

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

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

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

@@ -15,7 +15,9 @@ module Hanami
           end
 
           def call(app, slice, slice_url_prefix, context: SliceContext.new(inflector, app, slice, slice_url_prefix))
-            fs.inject_line_at_block_bottom(fs.join("config", "routes.rb"), /define/, t("routes.erb", context).chomp)
+            fs.inject_line_at_class_bottom(
+              fs.join("config", "routes.rb"), "class Routes", t("routes.erb", context).chomp
+            )
 
             fs.mkdir(directory = "slices/#{slice}")
 

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

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

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

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

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

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

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

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

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

@@ -15,6 +15,10 @@ group :development, :test do
   gem "dotenv"
 end
 
+group :cli, :development do
+  gem "hanami-reloader"
+end
+
 group :cli, :development, :test do
   gem "hanami-rspec"
 end

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
 
 require "<%= underscored_app_name %>/types"
 
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
   class Settings < Hanami::Settings
     # Define your app settings here, for example:
     #

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

@@ -2,7 +2,7 @@
 
 require "dry/types"
 
-module <%= classified_app_name %>
+module <%= camelized_app_name %>
   Types = Dry.Types
 
   module Types

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

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

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

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

data/lib/hanami/cli/version.rb

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

data/lib/hanami/console/context.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +212,7 @@ files:
 - lib/hanami/cli/generators/gem/app/env.erb
 - lib/hanami/cli/generators/gem/app/gemfile.erb
 - lib/hanami/cli/generators/gem/app/keep.erb
+- lib/hanami/cli/generators/gem/app/puma.erb
 - lib/hanami/cli/generators/gem/app/rakefile.erb
 - lib/hanami/cli/generators/gem/app/readme.erb
 - lib/hanami/cli/generators/gem/app/routes.erb
@@ -255,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Hanami CLI