hanami-cli 2.0.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a1351e33232b164c6e82ac6148e95eac2562e43dcd36f1a1d11aad61307f32da
4
- data.tar.gz: 647213baac46e31addb957a6ce4d3f8b11e28e64ddb02d3cfe1569ce49015ed6
3
+ metadata.gz: 9a8ba92360e5b27191165618f257f8d4cbfc49ce90941e981e120ff2f2578ed7
4
+ data.tar.gz: b8196ca8b7718b90b7f39abbc296984ffb67d63560f1e8d37a968faf8ba96426
5
5
  SHA512:
6
- metadata.gz: cb27cd6155cd93c1783402e32992104d32a41da98397ef57c0dc1b0b72edf0cb76c9203d48dc925c352f9742a16c274cf0679dc9e431c12d83ad69508478786d
7
- data.tar.gz: 04cc7a076b6a66d30729ebaa28b9108cb41bd7515cd538d5a81a350b22850ff3fbefd27a0a9044130ed50bfa8dc34562ab6e32e57834924cc7c3e51a13468708
6
+ metadata.gz: 8e401bb3b64e4a56f6f582719e85b9812c8c8f005dc5db8bb00684deb1b8f82aa0adef8731192bc446d9e392232d4255d339d471628042160d6dbae78ef15978
7
+ data.tar.gz: 2de16396a1520e2d16ff85fcc42ecb80e25fc328574b0c767fa6d847d63eba767835d8c7de8354e138683a8e6222201b9a7e0f2c466a51f42281ddd204b6a716
data/CHANGELOG.md CHANGED
@@ -2,6 +2,13 @@
2
2
 
3
3
  Hanami Command Line Interface
4
4
 
5
+ ## v2.0.1 - 2022-12-06
6
+
7
+ ### Fixed
8
+
9
+ - [Luca Guidi] Ensure to load `.env` files during CLI commands execution
10
+ - [Luca Guidi] Ensure `hanami server` to respect HTTP port used in `.env` or the value given as CLI argument (`--port`)
11
+
5
12
  ## v2.0.0 - 2022-11-22
6
13
 
7
14
  ### Added
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "dry/files"
4
+ require "hanami/env"
4
5
  require_relative "db/utils/database"
5
6
 
6
7
  module Hanami
@@ -34,6 +35,7 @@ module Hanami
34
35
  hanami_env = env ? env.to_s : ENV.fetch("HANAMI_ENV", "development")
35
36
 
36
37
  ENV["HANAMI_ENV"] = hanami_env
38
+ Hanami::Env.load
37
39
 
38
40
  super(*args, **opts)
39
41
  end
@@ -114,7 +116,7 @@ module Hanami
114
116
  #
115
117
  # @api private
116
118
  def database
117
- @database ||= Commands::DB::Utils::Database[app]
119
+ @database ||= Commands::App::DB::Utils::Database[app]
118
120
  end
119
121
 
120
122
  # This is NOT AVAILABLE as of the 2.0.0 release.
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "rack"
4
+ require "hanami/port"
4
5
  require_relative "../app"
5
6
  require_relative "../../server"
6
7
 
@@ -28,11 +29,6 @@ module Hanami
28
29
  # @since 2.0.0
29
30
  # @api private
30
31
  class Server < Command
31
- # @since 2.0.0
32
- # @api private
33
- DEFAULT_PORT = 2300
34
- private_constant :DEFAULT_PORT
35
-
36
32
  # @since 2.0.0
37
33
  # @api private
38
34
  DEFAULT_CONFIG_PATH = "config.ru"
@@ -42,7 +38,7 @@ module Hanami
42
38
 
43
39
  option :host, default: nil, required: false,
44
40
  desc: "The host address to bind to (falls back to the rack handler)"
45
- option :port, default: DEFAULT_PORT, required: false,
41
+ option :port, default: Hanami::Port::DEFAULT, required: false,
46
42
  desc: "The port to run the server on (falls back to the rack handler)"
47
43
  option :config, default: DEFAULT_CONFIG_PATH, required: false, desc: "Rack configuration file"
48
44
  option :debug, default: false, required: false, desc: "Turn on/off debug output", type: :boolean
@@ -57,8 +53,8 @@ module Hanami
57
53
 
58
54
  # @since 2.0.0
59
55
  # @api private
60
- def call(port: DEFAULT_PORT, **kwargs)
61
- server.call(port: port, **kwargs)
56
+ def call(port: Hanami::Port::DEFAULT, **kwargs)
57
+ server.call(port: Hanami::Port[port], **kwargs)
62
58
  end
63
59
 
64
60
  private
@@ -4,7 +4,7 @@ max_threads_count = ENV.fetch("HANAMI_MAX_THREADS", 5)
4
4
  min_threads_count = ENV.fetch("HANAMI_MIN_THREADS") { max_threads_count }
5
5
  threads min_threads_count, max_threads_count
6
6
 
7
- port ENV.fetch("HANAMI_PORT", 2300)
7
+ port ENV.fetch("<%= Hanami::Port::ENV_VAR %>", <%= Hanami::Port::DEFAULT %>)
8
8
  environment ENV.fetch("HANAMI_ENV", "development")
9
9
  workers ENV.fetch("HANAMI_WEB_CONCURRENCY", 2)
10
10
 
@@ -6,6 +6,6 @@ module Hanami
6
6
  #
7
7
  # @api public
8
8
  # @since 2.0.0
9
- VERSION = "2.0.0"
9
+ VERSION = "2.0.1"
10
10
  end
11
11
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hanami-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Luca Guidi
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-11-22 00:00:00.000000000 Z
11
+ date: 2022-12-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
290
290
  - !ruby/object:Gem::Version
291
291
  version: '0'
292
292
  requirements: []
293
- rubygems_version: 3.3.7
293
+ rubygems_version: 3.3.3
294
294
  signing_key:
295
295
  specification_version: 4
296
296
  summary: Hanami CLI