hanami-reloader 2.0.0.rc1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8edd2f5e24d44986eaad1226403622c8d65090b642731aaecd247409b69d5ba8
-  data.tar.gz: 28bbe58ab2d7961422ff2211ae02abae51d70b766e030b3e10b22e8fca66b825
+  metadata.gz: 7ee77969c454bf08e4d38f7ab35853a4070258bedf353711361b06f044f3b390
+  data.tar.gz: 82cf5930e7928fc94659d362951bd613f4333433ce2f00c15e686ef00f05f41f
 SHA512:
-  metadata.gz: 194ebe22506c22847f3de482cdd5b0a77a6f3a0cdff13195f871b58d3a399667d044e87c3699bf2bb7d1bd2ac120ec6d9073245344cf3c892d4f466f2ca67f09
-  data.tar.gz: 2d6cdcdc62f2ec674f6f6cd289a2c3f93ffdcbdd5b0268f9ab757aed078bbf45f7e84c5afa980e76b65ab129fa085b1b69282d1c263df45f02d67eaa03e4553e
+  metadata.gz: 8227c5a281ec65f2fbfdd3c308619f4fdc9c0d71adc45439251bfa91b56555d49c09d787abf8e5c99c563e9f7ef7291c5da7417c1e002fa4e2d41f60264ee409
+  data.tar.gz: 65dc87448f9a92154a019256477c8c92e4a44bab398137816a663fb528d715065a35b110746f418b0d4a8903696a3e7952eb85ef9a42b217153f2f27f69e93fa

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 Code reloading for Hanami 2
 
+## v2.0.1 - 2022-12-06
+
+### Fixed
+
+- [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
+
+- [Tim Riley] Use Zeitwerk to autoload the gem
+- [Luca Guidi] Generate new apps by requiring `guard-puma` `~> 0.8`
+- [Tim Riley] Run bundle install after modifying `Gemfile`
+
+### Fixed
+
+- [Luca Guidi] Ensure to use the given HTTP port
+
 ## v2.0.0.rc1 - 2022-11-08
 
 ### Changed

data/hanami-reloader.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |spec|
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
   spec.metadata["rubygems_mfa_required"] = "true"
 
-  spec.add_dependency "hanami-cli", "~> 2.0.rc"
+  spec.add_dependency "hanami-cli", "~> 2.0"
+  spec.add_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler", ">= 1.6", "< 3"
   spec.add_development_dependency "rake",    "~> 13.0"

data/lib/hanami/reloader/commands.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require "hanami/cli"
-require "hanami/cli/command"
-require "hanami/cli/commands"
-require "hanami/cli/commands/app/server"
+require "hanami/port"
 
 module Hanami
   module Reloader
@@ -27,6 +24,11 @@ module Hanami
       class Install < Hanami::CLI::Command
         desc "Generate configuration for code reloading"
 
+        def initialize(fs: Dry::Files.new, bundler: CLI::Bundler.new(fs: fs), **args)
+          super(fs: fs, **args)
+          @bundler = bundler
+        end
+
         def call(*, **)
           generate_configuration(Guardfile.default_path)
           bundle_gems
@@ -34,12 +36,14 @@ module Hanami
 
         private
 
+        attr_reader :bundler
+
         def generate_configuration(path)
           fs.write path, <<~CODE
             # frozen_string_literal: true
 
             group :#{Guardfile.group} do
-              guard "puma", port: ENV["HANAMI_PORT"] || 2300 do
+              guard "puma", port: ENV.fetch("#{Hanami::Port::ENV_VAR}", #{Hanami::Port::DEFAULT}) do
                 watch(%r{config/*})
                 watch(%r{lib/*})
                 watch(%r{app/*})
@@ -52,6 +56,7 @@ module Hanami
         def bundle_gems
           fs.touch("Gemfile")
           gemfile = fs.read("Gemfile")
+
           return if gemfile.include?("guard-puma")
 
           if gemfile.include?("group :development do")
@@ -62,15 +67,25 @@ module Hanami
             fs.append "Gemfile", <<~CODE
 
               group :development do
-                gem "guard-puma"
+                gem "guard-puma", "~> 0.8"
               end
             CODE
           end
+
+          bundler.install!
         end
       end
 
       # Override `hanami server` command
       class Server < Hanami::CLI::Commands::App::Server
+        # @since 2.0.0
+        # @api private
+        DEFAULT_GUARD_PUMA_OPTIONS = ["-n", "f", "-i", "-g", Guardfile.group, "-G"].freeze
+
+        # @since 2.0.0
+        # @api private
+        OPTIONS_SEPARATOR = " "
+
         option :guardfile,      type: :string,  desc: "Path to Guardfile", default: Guardfile.default_path.to_s
         option :code_reloading, type: :boolean, desc: "Code reloading",    default: true
 
@@ -84,18 +99,25 @@ module Hanami
           code_reloading = args.fetch(:code_reloading)
 
           if code_reloading
-            path = Guardfile.path(args.fetch(:guardfile))
-            exec "bundle exec guard -n f -i -g #{Guardfile.group} -G #{path}"
+            guard_puma_env_vars!(**args)
+            exec "bundle exec guard #{guard_puma_options(**args)}"
           else
             super
           end
         end
+
+        private
+
+        def guard_puma_env_vars!(**args)
+          Hanami::Port.call!(args.fetch(:port))
+        end
+
+        def guard_puma_options(**args)
+          options = DEFAULT_GUARD_PUMA_OPTIONS.dup
+          options.push(Guardfile.path(args.fetch(:guardfile)))
+          options.join(OPTIONS_SEPARATOR)
+        end
       end
     end
   end
 end
-
-if Hanami::CLI.within_hanami_app?
-  Hanami::CLI.after "install", Hanami::Reloader::Commands::Install
-  Hanami::CLI.register "server", Hanami::Reloader::Commands::Server
-end

data/lib/hanami/reloader/version.rb

@@ -2,6 +2,6 @@
 
 module Hanami
   module Reloader
-    VERSION = "2.0.0.rc1"
+    VERSION = "2.0.1"
   end
 end

data/lib/hanami/reloader.rb

@@ -1,9 +1,32 @@
 # frozen_string_literal: true
 
+require "hanami/cli"
+require "zeitwerk"
+
 module Hanami
   # Hanami reloader
   module Reloader
+    # @since 2.0.0
+    # @api private
+    def self.gem_loader
+      @gem_loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "hanami-reloader"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/hanami-reloader.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/hanami-reloader.rb",
+          "#{root}/hanami/controller/version.rb"
+        )
+      end
+    end
+
+    gem_loader.setup
     require_relative "reloader/version"
-    require_relative "reloader/commands"
+
+    if Hanami::CLI.within_hanami_app?
+      Hanami::CLI.after "install", Commands::Install
+      Hanami::CLI.register "server", Commands::Server
+    end
   end
 end

data/lib/hanami-reloader.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "hanami/reloader"
+require_relative "hanami/reloader"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-reloader
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-cli
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.rc
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.rc
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,9 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.3
 signing_key: