hanami-cli 2.1.0.rc1 → 2.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '054178514bf7e420e00cd8da8a148cd4d479609668c180507fadbcd7a086f15d'
-  data.tar.gz: 3ef8c388ad8c8734179ce042d3eb966dea6df881b72e7615f0b104a1890106a5
+  metadata.gz: aa0dbea6bc97ed3a7d08b703e7fd9091def9a8326196d36c071fb8e3e9be654b
+  data.tar.gz: dc27646ce5d395932bd2fbddef1678cb5445959494270b8d5f149462a8648e90
 SHA512:
-  metadata.gz: c8e1abc0ded22d56ee2acd5dec6d9f7079c0331d187b1d4ff4b26858faf50ff870016e1adfa6b785673d39b6d0dcf097dca7c1b0526da442e1939ce0952f3799
-  data.tar.gz: 8ecc3ceefc10856cbd2f60ec24bd1ecde442764610dbb7d179f064080ac434fa4829374efb05513c67420ab8b76b0280ad594fd566824fdfba0e8d14afc209fb
+  metadata.gz: ac1ab34a920c7fea44106a75c8c7e8d1bb0e475ff1e48ce2ef9b87912e9da6c83aa847ddf56661db13a01551fd58e098245b6d8ac277ca7143c69681d97d5ece
+  data.tar.gz: 706d1bb79523ba8a7efd9281267de12a0f275be0b60374c619b132371e0339335e6a4112b7a53ed5951e57293799aea1b4a89ac5bf6f9ee718daec4e1c44ee45

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 Hanami Command Line Interface
 
+## v2.1.0.rc2 - 2023-11-08
+
+### Added
+
+- [Tim Riley] Add `--skip-tests` for `hanami generate` commands. This CLI option will skip tests generation.
+
+### Changed
+
+- [Tim Riley] Set `"type": "module"` in package.json, enabling ES modules by default
+- [Tim Riley] Rename `config/assets.mjs` to `config/assets.js` (use a plain `.js` file extension)
+
+### Fixed
+
+- [Tim Riley] Use correct helper names in generated app layout
+- [Luca Guidi] Ensure to generate apps with correct pre-release version of `hanami-assets` NPM package
+- [Sean Collins] Print to stderr NPM installation errors when running `hanami install`
+- [Sean Collins] Ensure to install missing gems after `hanami install` is ran
+
 ## v2.1.0.rc1 - 2023-11-01
 
 ### Added

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

@@ -42,20 +42,6 @@ module Hanami
               [config.package_manager_run_command, "assets"]
             end
 
-            # @since 2.1.0
-            # @api private
-            def entry_points
-              config.entry_points.map do |entry_point|
-                escape(entry_point)
-              end.join(" ")
-            end
-
-            # @since 2.1.0
-            # @api private
-            def destination
-              escape(config.destination)
-            end
-
             # @since 2.1.0
             # @api private
             def escape(str)

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

@@ -19,7 +19,7 @@ module Hanami
 
               if config.subresource_integrity.any?
                 result << "--"
-                result << "--sri=#{config.subresource_integrity.join(',')}"
+                result << "--sri=#{escape(config.subresource_integrity.join(','))}"
               end
 
               result

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

@@ -22,12 +22,25 @@ module Hanami
             DEFAULT_SKIP_VIEW = false
             private_constant :DEFAULT_SKIP_VIEW
 
+            DEFAULT_SKIP_TESTS = false
+            private_constant :DEFAULT_SKIP_TESTS
+
             argument :name, required: true, desc: "Action name"
             option :url, required: false, type: :string, desc: "Action URL"
             option :http, required: false, type: :string, desc: "Action HTTP method"
             # option :format, required: false, type: :string, default: DEFAULT_FORMAT, desc: "Template format"
-            option :skip_view, required: false, type: :boolean, default: DEFAULT_SKIP_VIEW,
-                               desc: "Skip view and template generation"
+            option \
+              :skip_view,
+              required: false,
+              type: :boolean,
+              default: DEFAULT_SKIP_VIEW,
+              desc: "Skip view and template generation"
+            option \
+              :skip_tests,
+              required: false,
+              type: :boolean,
+              default: DEFAULT_SKIP_TESTS,
+              desc: "Skip test generation"
             option :slice, required: false, desc: "Slice name"
 
             # rubocop:disable Layout/LineLength
@@ -60,8 +73,16 @@ module Hanami
 
             # @since 2.0.0
             # @api private
-            def call(name:, url: nil, http: nil, format: DEFAULT_FORMAT, skip_view: DEFAULT_SKIP_VIEW, slice: nil,
-                     context: nil, **)
+            def call(
+              name:,
+              url: nil,
+              http: nil,
+              format: DEFAULT_FORMAT,
+              skip_view: DEFAULT_SKIP_VIEW,
+              skip_tests: DEFAULT_SKIP_TESTS, # rubocop:disable Lint/UnusedMethodArgument
+              slice: nil,
+              context: nil, **
+            )
               slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
               name = naming.action_name(name)
               *controller, action = name.split(ACTION_SEPARATOR)

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

@@ -12,8 +12,17 @@ module Hanami
           # @since 2.1.0
           # @api private
           class Part < App::Command
+            DEFAULT_SKIP_TESTS = false
+            private_constant :DEFAULT_SKIP_TESTS
+
             argument :name, required: true, desc: "Part name"
             option :slice, required: false, desc: "Slice name"
+            option \
+              :skip_tests,
+              required: false,
+              type: :boolean,
+              default: DEFAULT_SKIP_TESTS,
+              desc: "Skip test generation"
 
             example [
               %(book               (MyApp::Views::Parts::Book)),
@@ -36,7 +45,7 @@ module Hanami
 
             # @since 2.0.0
             # @api private
-            def call(name:, slice: nil, **)
+            def call(name:, slice: nil, skip_tests: DEFAULT_SKIP_TESTS, **) # rubocop:disable Lint/UnusedMethodArgument
               slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
 
               generator.call(app.namespace, name, slice)

data/lib/hanami/cli/commands/gem/new.rb

@@ -99,11 +99,16 @@ module Hanami
 
                   unless skip_assets
                     out.puts "Running npm install..."
-                    system_call.call("npm", ["install"])
+                    system_call.call("npm", ["install"]).tap do |result|
+                      unless result.successful?
+                        puts "NPM ERROR:"
+                        puts(result.err.lines.map { |line| line.prepend("    ") })
+                      end
+                    end
                   end
 
                   out.puts "Running Hanami install..."
-                  run_install_commmand!(head: head)
+                  run_install_command!(head: head)
                 end
               end
             end
@@ -116,10 +121,14 @@ module Hanami
           attr_reader :generator
           attr_reader :system_call
 
-          def run_install_commmand!(head:)
+          def run_install_command!(head:)
             head_flag = head ? " --head" : ""
             bundler.exec("hanami install#{head_flag}").tap do |result|
-              raise HanamiInstallError.new(result.err) unless result.successful?
+              if result.successful?
+                bundler.exec("check").successful? || bundler.exec("install")
+              else
+                raise HanamiInstallError.new(result.err)
+              end
             end
           end
         end

data/lib/hanami/cli/generators/app/slice/app_layout.erb

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= humanized_app_name %> - <%= humanized_slice_name %></title>
     <%- if bundled_assets? -%>
-    <%%= favicon %>
+    <%%= favicon_tag %>
     <%= stylesheet_erb_tag %>
     <%- end -%>
   </head>

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

@@ -38,13 +38,13 @@ module Hanami
           # @since 2.1.0
           # @api private
           def stylesheet_erb_tag
-            %(<%= css "#{slice}/app" %>)
+            %(<%= stylesheet_tag "#{slice}/app" %>)
           end
 
           # @since 2.1.0
           # @api private
           def javascript_erb_tag
-            %(<%= js "#{slice}/app" %>)
+            %(<%= javascript_tag "#{slice}/app" %>)
           end
 
           private

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

@@ -5,14 +5,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= humanized_app_name %></title>
     <%- if generate_assets? -%>
-    <%%= favicon %>
-    <%%= css "app" %>
+    <%%= favicon_tag %>
+    <%%= stylesheet_tag "app" %>
     <%- end -%>
   </head>
   <body>
     <%%= yield %>
     <%- if generate_assets? -%>
-    <%%= js "app" %>
+    <%%= javascript_tag "app" %>
     <%- end -%>
   </body>
 </html>

data/lib/hanami/cli/generators/gem/app/package.json.erb

@@ -1,8 +1,9 @@
 {
   "name": "<%= underscored_app_name %>",
   "private": true,
+  "type": "module",
   "scripts": {
-    "assets": "node config/assets.mjs"
+    "assets": "node config/assets.js"
   },
   "dependencies": {
     <%= hanami_assets_npm_package %>

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

@@ -62,7 +62,7 @@ module Hanami
 
             if context.generate_assets?
               fs.write("package.json", t("package.json.erb", context))
-              fs.write("config/assets.mjs", file("assets.mjs"))
+              fs.write("config/assets.js", file("assets.js"))
               fs.write("app/assets/js/app.js", t("app_js.erb", context))
               fs.write("app/assets/css/app.css", t("app_css.erb", context))
               fs.write("app/assets/images/favicon.ico", file("favicon.ico"))

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

@@ -9,7 +9,7 @@ module Hanami
         # @since 2.0.0
         # @api private
         def self.version
-          return Hanami::VERSION if defined?(Hanami::VERSION)
+          return Hanami::VERSION if Hanami.const_defined?(:VERSION)
 
           Hanami::CLI::VERSION
         end
@@ -32,7 +32,7 @@ module Hanami
           if prerelease?
             result = result
               .sub(/\.(alpha|beta|rc)/, '-\1')
-              .sub(/(alpha|beta|rc)(.+)\.(.+)$/, '\1.\2')
+              .sub(/(alpha|beta|rc)(\d+)(?:\.\d+)?\Z/, '\1.\2')
           end
 
           "^#{result}"
@@ -41,7 +41,7 @@ module Hanami
         # @since 2.0.0
         # @api private
         def self.prerelease?
-          version =~ /alpha|beta|rc/
+          version.match?(/alpha|beta|rc/)
         end
 
         # @example

data/lib/hanami/cli/version.rb

@@ -6,6 +6,6 @@ module Hanami
     #
     # @api public
     # @since 2.0.0
-    VERSION = "2.1.0.rc1"
+    VERSION = "2.1.0.rc2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 2.1.0.rc2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -272,7 +272,7 @@ files:
 - lib/hanami/cli/generators/gem/app/app_css.erb
 - lib/hanami/cli/generators/gem/app/app_js.erb
 - lib/hanami/cli/generators/gem/app/app_layout.erb
-- lib/hanami/cli/generators/gem/app/assets.mjs
+- lib/hanami/cli/generators/gem/app/assets.js
 - lib/hanami/cli/generators/gem/app/config_ru.erb
 - lib/hanami/cli/generators/gem/app/dev
 - lib/hanami/cli/generators/gem/app/env.erb
@@ -330,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Hanami CLI