hanami-cli 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1351e33232b164c6e82ac6148e95eac2562e43dcd36f1a1d11aad61307f32da
-  data.tar.gz: 647213baac46e31addb957a6ce4d3f8b11e28e64ddb02d3cfe1569ce49015ed6
+  metadata.gz: 9a8ba92360e5b27191165618f257f8d4cbfc49ce90941e981e120ff2f2578ed7
+  data.tar.gz: b8196ca8b7718b90b7f39abbc296984ffb67d63560f1e8d37a968faf8ba96426
 SHA512:
-  metadata.gz: cb27cd6155cd93c1783402e32992104d32a41da98397ef57c0dc1b0b72edf0cb76c9203d48dc925c352f9742a16c274cf0679dc9e431c12d83ad69508478786d
-  data.tar.gz: 04cc7a076b6a66d30729ebaa28b9108cb41bd7515cd538d5a81a350b22850ff3fbefd27a0a9044130ed50bfa8dc34562ab6e32e57834924cc7c3e51a13468708
+  metadata.gz: 8e401bb3b64e4a56f6f582719e85b9812c8c8f005dc5db8bb00684deb1b8f82aa0adef8731192bc446d9e392232d4255d339d471628042160d6dbae78ef15978
+  data.tar.gz: 2de16396a1520e2d16ff85fcc42ecb80e25fc328574b0c767fa6d847d63eba767835d8c7de8354e138683a8e6222201b9a7e0f2c466a51f42281ddd204b6a716

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Hanami Command Line Interface
 
+## v2.0.1 - 2022-12-06
+
+### Fixed
+
+- [Luca Guidi] Ensure to load `.env` files during CLI commands execution
+- [Luca Guidi] Ensure `hanami server` to respect HTTP port used in `.env` or the value given as CLI argument (`--port`)
+
 ## v2.0.0 - 2022-11-22
 
 ### Added

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/files"
+require "hanami/env"
 require_relative "db/utils/database"
 
 module Hanami
@@ -34,6 +35,7 @@ module Hanami
               hanami_env = env ? env.to_s : ENV.fetch("HANAMI_ENV", "development")
 
               ENV["HANAMI_ENV"] = hanami_env
+              Hanami::Env.load
 
               super(*args, **opts)
             end
@@ -114,7 +116,7 @@ module Hanami
           #
           # @api private
           def database
-            @database ||= Commands::DB::Utils::Database[app]
+            @database ||= Commands::App::DB::Utils::Database[app]
           end
 
           # This is NOT AVAILABLE as of the 2.0.0 release.

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rack"
+require "hanami/port"
 require_relative "../app"
 require_relative "../../server"
 
@@ -28,11 +29,6 @@ module Hanami
         # @since 2.0.0
         # @api private
         class Server < Command
-          # @since 2.0.0
-          # @api private
-          DEFAULT_PORT = 2300
-          private_constant :DEFAULT_PORT
-
           # @since 2.0.0
           # @api private
           DEFAULT_CONFIG_PATH = "config.ru"
@@ -42,7 +38,7 @@ module Hanami
 
           option :host, default: nil, required: false,
                         desc: "The host address to bind to (falls back to the rack handler)"
-          option :port, default: DEFAULT_PORT, required: false,
+          option :port, default: Hanami::Port::DEFAULT, required: false,
                         desc: "The port to run the server on (falls back to the rack handler)"
           option :config, default: DEFAULT_CONFIG_PATH, required: false, desc: "Rack configuration file"
           option :debug, default: false, required: false, desc: "Turn on/off debug output", type: :boolean
@@ -57,8 +53,8 @@ module Hanami
 
           # @since 2.0.0
           # @api private
-          def call(port: DEFAULT_PORT, **kwargs)
-            server.call(port: port, **kwargs)
+          def call(port: Hanami::Port::DEFAULT, **kwargs)
+            server.call(port: Hanami::Port[port], **kwargs)
           end
 
           private

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

@@ -4,7 +4,7 @@ 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)
+port        ENV.fetch("<%= Hanami::Port::ENV_VAR %>", <%= Hanami::Port::DEFAULT %>)
 environment ENV.fetch("HANAMI_ENV", "development")
 workers     ENV.fetch("HANAMI_WEB_CONCURRENCY", 2)
 

data/lib/hanami/cli/version.rb

@@ -6,6 +6,6 @@ module Hanami
     #
     # @api public
     # @since 2.0.0
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   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.0.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Hanami CLI