hanami-cli 2.3.0.beta1 → 2.3.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c770a27b290fd7bb7fcdd8db847ebd27723088374f8799b59d6e707e59404da0
-  data.tar.gz: 35aeda59b2833925c79d5ca3f604c410bb5512ec608c9f9527d7d8cbd1818c47
+  metadata.gz: 4a260c1daad682ef7898890f677c8768f548512fdb591b2af60414ecaccc38fb
+  data.tar.gz: 58e9910a76e011243775ca794fc8dcd1769a1e31224136c5c8636a13a4e62f9d
 SHA512:
-  metadata.gz: e8a06cf2ca8224b1216c62d62356af0dc3ab4620b762fef531f0dec5b2c792816afe7f5a9a828170621a94f58370f04047ce0c86922e2730465417df9793169c
-  data.tar.gz: fb87833f3c11436dd3f313d9a3900d89395f6a8edef49a14a5e7b5c981081ec0bf859c11892d43502a005afd427bff7e8331faa733d1ec016875cef7fe59ad18
+  metadata.gz: 8f871a3391a7c985202dd517dc4775dfef0d4c7aa9c498e11d60ac235c12833b3de59ee0a5356ab48069753e95f166f3d41d1a3c3acb3b5b9acc5ec9c8d68376
+  data.tar.gz: 4649a2c721659508d58b5a90c1ec7d955d321d50277f254a2db187222539c96086bd5bdce91ab55f0a1ba5b5244e08a76ddd767be6aec2f3c223b532928bf225

data/.github/workflows/ci.yml

@@ -27,7 +27,6 @@ jobs:
           - "3.4"
           - "3.3"
           - "3.2"
-          - "3.1"
         rack:
           - "~> 2.0"
           - "~> 3.0"

data/CHANGELOG.md

@@ -4,6 +4,23 @@ Hanami Command Line Interface
 
 ## Unreleased
 
+## v2.3.0.beta2 - 2025-10-17
+
+### Added
+
+- Add `hanami run` command, to run your own code. For example, `hanami run path/to/script.rb` or `hanami run 'puts Hanami.app["repos.user_repo"].all.count'`. (@afomera in #338)
+
+### Changed
+
+- Add `--skip-tests` flag to `generate action` command. (@kyleplump in #335)
+- In new apps, updated generated types module to `Dry.Types(default: :strict)`. (@minaslater in #323)
+- When generators add routes, add those routes to per-slice routes files (`config/routes.rb` within slice directories) if they exist. (@stephannv in #342)
+- Drop support for Ruby 3.1
+
+### Fixed
+
+- Handle mixed case names given to `generate` subcommands. (@cllns in #327)
+
 ## v2.3.0.beta1 - 2025-10-03
 
 ### Added

data/hanami-cli.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.metadata["rubygems_mfa_required"] = "true"
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.2"
 
   spec.add_dependency "bundler", "~> 2.1"
   spec.add_dependency "dry-cli", "~> 1.0", ">= 1.1.0"

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

@@ -41,7 +41,6 @@ module Hanami
               default: DEFAULT_SKIP_VIEW,
               desc: "Skip view and template generation"
 
-            # TODO: Implement this
             option \
               :skip_tests,
               required: false,
@@ -90,7 +89,7 @@ module Hanami
               http_method: nil,
               skip_view: DEFAULT_SKIP_VIEW,
               skip_route: DEFAULT_SKIP_ROUTE,
-              skip_tests: DEFAULT_SKIP_TESTS # rubocop:disable Lint/UnusedMethodArgument
+              skip_tests: DEFAULT_SKIP_TESTS
             )
               name = Naming.new(inflector:).action_name(name)
 
@@ -103,6 +102,7 @@ module Hanami
                 skip_route:,
                 http_method:,
                 skip_view: skip_view || !Hanami.bundled?("hanami-view"),
+                skip_tests:
               )
             end
             # rubocop:enable Lint/ParameterLists

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

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require "hanami"
+require_relative "../../errors"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        # Run a given code or file in the context of the application
+        #
+        # This command is useful for running scripts that need to load the application environment.
+        # You can pass a Ruby file to be executed, or you can run an interactive Ruby shell (IRB)
+        # with the application environment loaded.
+        #
+        # Examples:
+        #
+        # $ bundle exec hanami run path/to/script.rb
+        # $ bundle exec hanami run 'puts Hanami.app["repos.user_repo"].all.count'
+        #
+        # @since 2.0.0
+        # @api private
+        class Run < Hanami::CLI::Command
+          RunError = Class.new(StandardError)
+
+          desc "Run code in the context of the application"
+
+          example [
+            "path/to/script.rb                     # Run a Ruby script in the context of the application",
+            "'puts Hanami.app[\"repos.user_repo\"].all.count' # Run inline Ruby code in the context of the application",
+          ]
+
+          argument :code_or_path, required: true, desc: "Path to a Ruby file or inline Ruby code to be executed"
+
+          def initialize(command_exit: method(:exit), **opts)
+            super(**opts)
+            @command_exit = command_exit
+          end
+
+          # rubocop:disable Metrics/AbcSize
+          def call(code_or_path:, **)
+            require "hanami/prepare"
+
+            if File.exist?(code_or_path)
+              validate_file_path!(code_or_path)
+              Kernel.load code_or_path
+            else
+              validate_inline_code!(code_or_path)
+              begin
+                eval(code_or_path, binding, __FILE__, __LINE__) # rubocop:disable Security/Eval
+              rescue SyntaxError => e
+                err.puts "Syntax error in code: #{e.message}"
+                raise RunError, "Syntax error in code: #{e.message}"
+              rescue NameError => e
+                err.puts "Name error in code: #{e.message}"
+                raise RunError, "Name error in code: #{e.message}"
+              rescue StandardError => e
+                err.puts "Error executing code: #{e.class}: #{e.message}"
+                raise RunError, "Error executing code: #{e.class}: #{e.message}"
+              end
+            end
+          rescue RunError
+            @command_exit.call(1)
+          end
+          # rubocop:enable Metrics/AbcSize
+
+          private
+
+          def validate_file_path!(file_path)
+            errors = []
+
+            # Ensure the file is a Ruby file
+            unless file_path.end_with?(".rb")
+              errors << "Error: Only Ruby files (.rb) are allowed"
+            end
+
+            # Resolve the absolute path and ensure it's within the app directory
+            resolved_path = File.expand_path(file_path)
+            app_root = File.expand_path(Dir.pwd)
+
+            unless resolved_path.start_with?(app_root)
+              errors << "Error: File must be within the application directory"
+            end
+
+            # Check file size (prevent loading extremely large files)
+            file_size = File.size(file_path)
+            if file_size > 10 * 1024 * 1024 # 10MB limit
+              errors << "Error: File too large (maximum 10MB allowed)"
+            end
+
+            unless errors.empty?
+              errors.each { |error| err.puts error }
+              raise RunError, errors.join("\n")
+            end
+          end
+
+          def validate_inline_code!(code)
+            # Basic validation for inline code
+            if code.length > 10_000 # 10KB limit for inline code
+              err.puts "Error: Inline code too long (maximum 10,000 characters allowed)"
+              raise RunError, "Error: Inline code too long (maximum 10,000 characters allowed)"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -18,6 +18,7 @@ module Hanami
             register "console", Commands::App::Console, aliases: ["c"]
             register "server", Commands::App::Server, aliases: ["s"]
             register "routes", Commands::App::Routes
+            register "run", Commands::App::Run
             register "middleware", Commands::App::Middleware
 
             if Hanami.bundled?("hanami-assets")

data/lib/hanami/cli/errors.rb

@@ -47,7 +47,7 @@ module Hanami
     # @api public
     class FileAlreadyExistsError < Error
       ERROR_MESSAGE = <<~ERROR.chomp
-        The file `%{file_path}` could not be generated because it already exists.
+        The file `%<file_path>s` could not be generated because it already exists.
       ERROR
 
       def initialize(file_path)

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

@@ -27,7 +27,7 @@ module Hanami
 
           # @since 2.0.0
           # @api private
-          def call(key:, namespace:, base_path:, url_path:, http_method:, skip_view:, skip_route:)
+          def call(key:, namespace:, base_path:, url_path:, http_method:, skip_view:, skip_route:, skip_tests:)
             insert_route(key:, namespace:, url_path:, http_method:) unless skip_route
 
             generate_action(key:, namespace:, base_path:, include_placeholder_body: skip_view)
@@ -83,8 +83,14 @@ module Hanami
             if namespace == Hanami.app.namespace
               fs.inject_line_at_class_bottom(routes_location, "class Routes", route)
             else
-              slice_matcher = /slice[[:space:]]*:#{namespace}/
-              fs.inject_line_at_block_bottom(routes_location, slice_matcher, route)
+              slice_routes = fs.join("slices", namespace, "config", "routes.rb")
+
+              if fs.exist?(slice_routes)
+                fs.inject_line_at_class_bottom(slice_routes, "class Routes", route)
+              else
+                slice_matcher = /slice[[:space:]]*:#{namespace}/
+                fs.inject_line_at_block_bottom(routes_location, slice_matcher, route)
+              end
             end
           end
 
@@ -95,7 +101,7 @@ module Hanami
               fs: fs,
               inflector: inflector,
               namespace: namespace,
-              key: inflector.underscore(key),
+              key: key,
               base_path: base_path,
               parent_class_name: "#{inflector.camelize(namespace)}::Action",
               extra_namespace: "Actions",

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

@@ -24,7 +24,7 @@ module Hanami
             RubyClassFile.new(
               fs: fs,
               inflector: inflector,
-              key: inflector.underscore(key),
+              key: key,
               namespace: namespace,
               base_path: base_path,
             ).create

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

@@ -20,7 +20,7 @@ module Hanami
           # @since 2.2.0
           # @api private
           def call(key:, namespace:, base_path:, gateway:)
-            schema_name = key.split(KEY_SEPARATOR).last
+            schema_name = inflector.underscore(key.split(KEY_SEPARATOR).last)
             body_content = ["schema :#{schema_name}, infer: true"]
 
             body_content.prepend("gateway :#{gateway}") if gateway

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

@@ -17,11 +17,11 @@ module Hanami
             extra_namespace: nil,
             auto_register: nil,
             body: [],
-            **opts
+            **_opts
           )
             @fs = fs
             @inflector = inflector
-            @key = key
+            @key_segments = key.split(KEY_SEPARATOR).map { |segment| inflector.underscore(segment) }
             @namespace = namespace
             @base_path = base_path
             @extra_namespace = extra_namespace&.downcase
@@ -42,13 +42,13 @@ module Hanami
           # @api private
           def fully_qualified_name
             inflector.camelize(
-              [namespace, extra_namespace, *key_parts].join("/"),
+              [namespace, extra_namespace, *key_segments].join("/"),
             )
           end
 
           # @api private
           def path
-            fs.join(directory, "#{key_parts.last}.rb")
+            fs.join(directory, "#{key_segments.last}.rb")
           end
 
           private
@@ -57,7 +57,7 @@ module Hanami
           attr_reader(
             :fs,
             :inflector,
-            :key,
+            :key_segments,
             :base_path,
             :namespace,
             :extra_namespace,
@@ -79,7 +79,7 @@ module Hanami
 
           # @api private
           def local_namespaces
-            Array(extra_namespace) + key_parts[..-2]
+            Array(extra_namespace) + key_segments[..-2]
           end
 
           # @api private
@@ -100,7 +100,7 @@ module Hanami
 
           # @api private
           def constant_name
-            normalize(key_parts.last)
+            normalize(key_segments.last)
           end
 
           # @api private
@@ -116,11 +116,6 @@ module Hanami
           def normalize(name)
             inflector.camelize(name).gsub(/[^\p{Alnum}]/, "")
           end
-
-          # @api private
-          def key_parts
-            key.split(KEY_SEPARATOR)
-          end
         end
       end
     end

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

@@ -44,7 +44,7 @@ module Hanami
               fs: fs,
               inflector: inflector,
               namespace: namespace,
-              key: inflector.underscore(key),
+              key: key,
               base_path: base_path,
               parent_class_name: "#{inflector.camelize(namespace)}::View",
               extra_namespace: "Views",

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

@@ -22,7 +22,7 @@ module Hanami
 
       # @since 2.2.0
       # @api private
-      KEY_SEPARATOR = %r{[.\/]}
+      KEY_SEPARATOR = %r{::|[.\/]}
       private_constant :KEY_SEPARATOR
 
       # @since 2.2.0

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

@@ -3,7 +3,7 @@
 require "dry/types"
 
 module <%= camelized_app_name %>
-  Types = Dry.Types
+  Types = Dry.Types(default: :strict)
 
   module Types
     # Define your custom types here

data/lib/hanami/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.3.0.beta1
+  version: 2.3.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
@@ -255,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
@@ -342,7 +343,7 @@ 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:
   - - ">="