hanami-cli 2.2.1 → 2.3.0.beta2

data/lib/hanami/cli/ruby_file_generator.rb

@@ -26,7 +26,7 @@ module Hanami
       INDENT = "  "
 
       def self.class(class_name, **args)
-        new(class_name: class_name, **args).to_s
+        new(class_name: class_name, **args).call
       end
 
       def self.module(*names, **args)
@@ -36,24 +36,33 @@ module Hanami
                          names
                        end
 
-        new(modules: module_names, class_name: nil, parent_class: nil, **args).to_s
+        new(
+          modules: module_names,
+          class_name: nil,
+          parent_class_name: nil,
+          **args,
+        ).call
       end
 
       def initialize(
         class_name: nil,
-        parent_class: nil,
+        parent_class_name: nil,
         modules: [],
         header: [],
         body: []
       )
         @class_name = class_name
-        @parent_class = parent_class
+        @parent_class_name = parent_class_name
         @modules = modules
         @header = header.any? ? (header + [""]) : []
         @body = body
+
+        if parent_class_name && !class_name
+          raise ArgumentError, "class_name is required when parent_class_name is specified"
+        end
       end
 
-      def to_s
+      def call
         definition = lines(modules).map { |line| "#{line}\n" }.join
         source_code = [header, definition].flatten.join("\n")
         ensure_parseable!(source_code)
@@ -64,7 +73,7 @@ module Hanami
 
       attr_reader(
         :class_name,
-        :parent_class,
+        :parent_class_name,
         :modules,
         :header,
         :body
@@ -98,8 +107,8 @@ module Hanami
       end
 
       def class_definition
-        if parent_class
-          "class #{class_name} < #{parent_class}"
+        if parent_class_name
+          "class #{class_name} < #{parent_class_name}"
         else
           "class #{class_name}"
         end

data/lib/hanami/cli/server.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+begin
+  require "rackup"
+rescue LoadError
+  # Rack 2 doesn't have rackup gem, use Rack::Server instead
+end
+
 module Hanami
   module CLI
     # @since 2.0.0
@@ -24,9 +30,17 @@ module Hanami
         warn: :warn
       }.freeze
 
+      def self.rack_server_class
+        if defined?(Rackup::Server)
+          Rackup::Server
+        else
+          Rack::Server
+        end
+      end
+
       # @since 2.0.0
       # @api private
-      def initialize(rack_server: Rack::Server)
+      def initialize(rack_server: self.class.rack_server_class)
         @rack_server = rack_server
       end
 

data/lib/hanami/cli/version.rb

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

data/lib/hanami/console/context.rb

@@ -50,6 +50,11 @@ module Hanami
         define_method(:respond_to_missing?) do |name, include_private|
           super(name, include_private) || hanami_app.respond_to?(name, include_private)
         end
+
+        # User-provided extension modules
+        app.config.console.extensions.each do |mod|
+          include mod
+        end
       end
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +89,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +131,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +230,7 @@ files:
 - lib/hanami/cli/commands/app/db/drop.rb
 - lib/hanami/cli/commands/app/db/migrate.rb
 - lib/hanami/cli/commands/app/db/prepare.rb
+- lib/hanami/cli/commands/app/db/rollback.rb
 - lib/hanami/cli/commands/app/db/seed.rb
 - lib/hanami/cli/commands/app/db/structure/dump.rb
 - lib/hanami/cli/commands/app/db/structure/load.rb
@@ -227,6 +255,7 @@ files:
 - lib/hanami/cli/commands/app/install.rb
 - lib/hanami/cli/commands/app/middleware.rb
 - lib/hanami/cli/commands/app/routes.rb
+- lib/hanami/cli/commands/app/run.rb
 - lib/hanami/cli/commands/app/server.rb
 - lib/hanami/cli/commands/app/version.rb
 - lib/hanami/cli/commands/gem.rb
@@ -235,51 +264,19 @@ files:
 - lib/hanami/cli/errors.rb
 - lib/hanami/cli/files.rb
 - 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/component.rb
-- lib/hanami/cli/generators/app/component/component.erb
-- lib/hanami/cli/generators/app/component/slice_component.erb
-- lib/hanami/cli/generators/app/component_context.rb
 - lib/hanami/cli/generators/app/migration.rb
 - lib/hanami/cli/generators/app/operation.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/relation.rb
 - lib/hanami/cli/generators/app/repo.rb
-- lib/hanami/cli/generators/app/ruby_file_writer.rb
+- lib/hanami/cli/generators/app/ruby_class_file.rb
+- lib/hanami/cli/generators/app/ruby_file.rb
+- lib/hanami/cli/generators/app/ruby_module_file.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/favicon.ico
-- lib/hanami/cli/generators/app/slice/helpers.erb
-- lib/hanami/cli/generators/app/slice/keep.erb
-- lib/hanami/cli/generators/app/slice/operation.erb
-- lib/hanami/cli/generators/app/slice/relation.erb
-- lib/hanami/cli/generators/app/slice/repo.erb
-- lib/hanami/cli/generators/app/slice/routes.erb
-- lib/hanami/cli/generators/app/slice/struct.erb
-- lib/hanami/cli/generators/app/slice/view.erb
-- lib/hanami/cli/generators/app/slice_context.rb
 - lib/hanami/cli/generators/app/struct.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/constants.rb
 - lib/hanami/cli/generators/context.rb
 - lib/hanami/cli/generators/gem/app.rb
@@ -339,7 +336,6 @@ metadata:
   source_code_uri: https://github.com/hanami/cli
   changelog_uri: https://github.com/hanami/cli/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -347,15 +343,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Hanami CLI
 test_files: []

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

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module <%= camelized_app_name %>
-  module Actions
-<%= module_controller_declaration %>
-<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_app_name %>::Action
-<%- 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 %>
-  end
-end

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

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module <%= camelized_slice_name %>
-  module Actions
-<%= module_controller_declaration %>
-<%= module_controller_offset %>class <%= camelized_action_name %> < <%= camelized_slice_name %>::Action
-<%- 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 %>
-  end
-end

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

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

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

@@ -1,10 +0,0 @@
-# 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 +0,0 @@
-<h1><%= camelized_app_name %>::Views::<%= camelized_controller_name %>::<%= camelized_action_name %></h1>

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

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

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

@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/files/path"
-require_relative "slice_context"
-require_relative "../constants"
-
-module Hanami
-  module CLI
-    module Generators
-      # @since 2.0.0
-      # @api private
-      module App
-        # @since 2.0.0
-        # @api private
-        class ActionContext < SliceContext
-          # @since 2.0.0
-          # @api private
-          def initialize(inflector, app, slice, controller, action)
-            @controller = controller
-            @action = action
-            super(inflector, app, slice, nil)
-          end
-
-          # @since 2.0.0
-          # @api private
-          def camelized_controller_name
-            controller.map do |token|
-              inflector.camelize(token)
-            end.join(NAMESPACE_SEPARATOR)
-          end
-
-          # @since 2.0.0
-          # @api private
-          def camelized_action_name
-            inflector.camelize(action)
-          end
-
-          # @since 2.0.0
-          # @api private
-          def underscored_controller_name
-            controller.map do |token|
-              inflector.underscore(token)
-            end
-          end
-
-          # @since 2.0.0
-          # @api private
-          def underscored_action_name
-            inflector.underscore(action)
-          end
-
-          # @since 2.0.0
-          # @api private
-          def module_controller_declaration
-            controller.each_with_index.map do |token, i|
-              "#{NESTED_OFFSET}#{INDENTATION * i}module #{inflector.camelize(token)}"
-            end.join($/)
-          end
-
-          # @since 2.0.0
-          # @api private
-          def module_controller_end
-            controller.each_with_index.map do |_, i|
-              "#{NESTED_OFFSET}#{INDENTATION * i}end"
-            end.reverse.join($/)
-          end
-
-          # @since 2.0.0
-          # @api private
-          def module_controller_offset
-            "#{NESTED_OFFSET}#{INDENTATION * controller.count}"
-          end
-
-          # @since 2.0.0
-          # @api private
-          def template_path
-            Dry::Files::Path["slices", underscored_slice_name, "templates", *underscored_controller_name,
-                             "#{underscored_action_name}.html.erb"]
-          end
-
-          private
-
-          attr_reader :controller
-
-          attr_reader :action
-        end
-      end
-    end
-  end
-end

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

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

data/lib/hanami/cli/generators/app/component/slice_component.erb

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

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

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../constants"
-
-module Hanami
-  module CLI
-    module Generators
-      module App
-        class ComponentContext < SliceContext
-          # @api private
-          # @since 2.2.0
-          attr_reader :key
-
-          # @api private
-          # @since 2.2.0
-          def initialize(inflector, app, slice, key)
-            @key = key
-            super(inflector, app, slice, nil)
-          end
-
-          # @api private
-          # @since 2.2.0
-          def namespaces
-            @namespaces ||= key.split(MATCHER_PATTERN)[..-2].map { inflector.underscore(_1) }
-          end
-
-          # @api private
-          # @since 2.2.0
-          def name
-            @name ||= key.split(MATCHER_PATTERN)[-1]
-          end
-
-          # @api private
-          # @since 2.2.0
-          def camelized_namespace
-            namespaces.map { inflector.camelize(_1) }.join(NAMESPACE_SEPARATOR)
-          end
-
-          # @api private
-          # @since 2.2.0
-          def camelized_name
-            inflector.camelize(name)
-          end
-
-          # @api private
-          # @since 2.2.0
-          def underscored_namespace
-            namespaces.map { inflector.underscore(_1) }
-          end
-
-          # @api private
-          # @since 2.2.0
-          def underscored_name
-            inflector.underscore(name)
-          end
-
-          # @api private
-          # @since 2.2.0
-          def module_namespace_declaration
-            namespaces.each_with_index.map { |token, i|
-              "#{OFFSET}#{INDENTATION * i}module #{inflector.camelize(token)}"
-            }.join($/)
-          end
-
-          # @api private
-          # @since 2.2.0
-          def module_namespace_end
-            namespaces.each_with_index.map { |_, i|
-              "#{OFFSET}#{INDENTATION * i}end"
-            }.reverse.join($/)
-          end
-
-          # @api private
-          # @since 2.2.0
-          def module_namespace_offset
-            "#{OFFSET}#{INDENTATION * namespaces.count}"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hanami/cli/generators/app/part/app_base_part.erb

@@ -1,9 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-module <%= camelized_app_name %>
-  module Views
-    class Part < Hanami::View::Part
-    end
-  end
-end

data/lib/hanami/cli/generators/app/part/app_part.erb

@@ -1,13 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-module <%= camelized_app_name %>
-  module Views
-    module Parts
-<%= module_namespace_declaration -%>
-  <%= module_namespace_offset %>class <%= camelized_name %> < <%= camelized_app_name %>::Views::Part
-  <%= module_namespace_offset %>end
-<%= module_namespace_end -%>
-    end
-  end
-end

data/lib/hanami/cli/generators/app/part/slice_base_part.erb

@@ -1,9 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-module <%= camelized_slice_name %>
-  module Views
-    class Part < <%= camelized_app_name %>::Views::Part
-    end
-  end
-end

data/lib/hanami/cli/generators/app/part/slice_part.erb

@@ -1,13 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-module <%= camelized_slice_name %>
-  module Views
-    module Parts
-<%= module_namespace_declaration -%>
-  <%= module_namespace_offset %>class <%= camelized_name %> < <%= camelized_slice_name %>::Views::Part
-  <%= module_namespace_offset %>end
-<%= module_namespace_end -%>
-    end
-  end
-end

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

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/files/path"
-require_relative "slice_context"
-require_relative "../constants"
-
-module Hanami
-  module CLI
-    module Generators
-      # @since 2.1.0
-      # @api private
-      module App
-        # @since 2.1.0
-        # @api private
-        class PartContext < SliceContext
-          # @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_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|
-              "#{NESTED_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|
-              "#{NESTED_OFFSET}#{INDENTATION * i}end"
-            }.reverse.join($/)
-          end
-
-          # @since 2.1.0
-          # @api private
-          def module_namespace_offset
-            "#{NESTED_OFFSET}#{INDENTATION * namespaces.count}"
-          end
-        end
-      end
-    end
-  end
-end