hanamismith 0.28.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2cf76c21bc88730cfcba43ea6fe8404ece3b1c52cf71b57694c5f37462a984b
-  data.tar.gz: f3fba4dbfc82c1a1df81cf1858e6010313d4a1ceb6276bd9243b7c96bfef080e
+  metadata.gz: 06a15cf0e7ce87c12021ea0e36980c9a40445ad7d385e23a1f66f693502edbfa
+  data.tar.gz: 114272b7ba96e4d810d500079f188598b2848d7fc7ed091fd22e493a955464a9
 SHA512:
-  metadata.gz: 5c4d9da6a263777ab9679ea2b9037da6b2a79f0bbde17fd6a6c3db9a1451ef88221fd80d155c1e734dc83704546000ab02d8dbdfe4492497570ab0a332c3793c
-  data.tar.gz: 3bff75cac0a10a98d13dfe20b935f138783c29330831338b4a3156235cdb157ca72057a40ace93ad72569be71b391168e51052988011ec3b6c2c9a023d2875b4
+  metadata.gz: eb36acd7cb4f4974adf2414e892c7239d79ccd1bd85cff13edda0d8ef86074a9336924662e0effea110666fb80cfadb18e16764fdfc28c9d30321453c648b89b
+  data.tar.gz: d868c6ab2f9d7e5b664cdcd3773a869559cc46e514b0822526797a16989d2ee2f406ce85c5489ccc68ccad4e848ea5d2ff3456f6d4eb2365242c0bbc4e552d95

data/hanamismith.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "hanamismith"
-  spec.version = "0.28.1"
+  spec.version = "0.30.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/hanamismith"
@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "etcher", "~> 1.0"
   spec.add_dependency "htmx", "~> 1.0"
   spec.add_dependency "infusible", "~> 3.0"
-  spec.add_dependency "refinements", "~> 12.0"
-  spec.add_dependency "rubysmith", "~> 6.2"
+  spec.add_dependency "refinements", "~> 12.1"
+  spec.add_dependency "rubysmith", "~> 6.3"
   spec.add_dependency "runcom", "~> 11.0"
   spec.add_dependency "sod", "~> 0.4"
   spec.add_dependency "spek", "~> 3.0"

data/lib/hanamismith/builders/bundler.rb

@@ -5,7 +5,6 @@ require "refinements/struct"
 module Hanamismith
   module Builders
     # Builds project skeleton with Gemfile configuration.
-    # rubocop:todo Metrics/ClassLength
     class Bundler < Rubysmith::Builders::Bundler
       using Refinements::Struct
 
@@ -29,38 +28,14 @@ module Hanamismith
       # rubocop:todo Metrics/MethodLength
       def insert_main_dependencies
         with_template.insert_after("source", %(gem "dry-types", "~> 1.7"))
-                     .insert_after(
-                       "source",
-                       %(gem "hanami", github: "hanami/hanami", branch: "main"\n)
-                     )
-                     .insert_after(
-                       "source",
-                       %(gem "hanami-assets", github: "hanami/assets", branch: "main"\n)
-                     )
-                     .insert_after(
-                       "source",
-                       %(gem "hanami-cli", github: "hanami/cli", branch: "main"\n)
-                     )
-                     .insert_after(
-                       "source",
-                       %(gem "hanami-controller", github: "hanami/controller", branch: "main"\n)
-                     )
-                     .insert_after(
-                       "source",
-                       %(gem "hanami-router", github: "hanami/router", branch: "main"\n)
-                     )
-                     .insert_after(
-                       "source",
-                       %(gem "hanami-utils", github: "hanami/utils", branch: "main"\n)
-                     )
-                     .insert_after(
-                       "source",
-                       %(gem "hanami-validations", github: "hanami/validations", branch: "main"\n)
-                     )
-                     .insert_after(
-                       "source",
-                       %(gem "hanami-view", github: "hanami/view", branch: "main"\n)
-                     )
+                     .insert_after("source", %(gem "hanami", "~> 2.1"\n))
+                     .insert_after("source", %(gem "hanami-assets", "~> 2.1"\n))
+                     .insert_after("source", %(gem "hanami-cli", "~> 2.1"\n))
+                     .insert_after("source", %(gem "hanami-controller", "~> 2.1"\n))
+                     .insert_after("source", %(gem "hanami-router", "~> 2.1"\n))
+                     .insert_after("source", %(gem "hanami-utils", "~> 2.1"\n))
+                     .insert_after("source", %(gem "hanami-validations", "~> 2.1"\n))
+                     .insert_after("source", %(gem "hanami-view", "~> 2.1"\n))
                      .insert_after("source", %(gem "htmx", "~> 1.0"\n))
                      .insert_after("source", %(gem "puma", "~> 6.4"\n))
                      .insert_after("source", %(gem "rack-attack", "~> 6.7"\n))
@@ -71,7 +46,7 @@ module Hanamismith
         with_template.insert_after("source", %(gem "pg", "~> 1.5"\n))
                      .insert_after("source", %(gem "rom", "~> 5.3"\n))
                      .insert_after("source", %(gem "rom-sql", "~> 3.6"\n))
-                     .insert_after("source", %(\ngem "sequel", "~> 5.76"\n))
+                     .insert_after("source", %(\ngem "sequel", "~> 5.77"\n))
       end
 
       # rubocop:todo Metrics/MethodLength
@@ -79,16 +54,16 @@ module Hanamismith
         with_template.insert_after(/group :quality/, %(  gem "rubocop-sequel", "~> 0.3"\n))
                      .insert_after(
                        /group :development do/,
-                       %(  gem "hanami-webconsole", github: "hanami/webconsole", branch: "main"\n)
+                       %(  gem "hanami-webconsole", "~> 2.1"\n)
                      )
-                     .insert_after(/group :development do/, %(  gem "localhost", "~> 1.1"\n))
+                     .insert_after(/group :development do/, %(  gem "localhost", "~> 1.2"\n))
                      .insert_after(/group :development do/, %(  gem "rerun", "~> 0.14"\n))
-                     .insert_after(/group :test/, %(  gem "capybara", "~> 3.39"\n))
-                     .insert_after(/group :test/, %(  gem "cuprite", "~> 0.14"\n))
+                     .insert_after(/group :test/, %(  gem "capybara", "~> 3.40"\n))
+                     .insert_after(/group :test/, %(  gem "cuprite", "~> 0.15"\n))
                      .insert_after(/group :test/, %(  gem "database_cleaner-sequel", "~> 2.0"\n))
                      .insert_after(/group :test/, %(  gem "launchy", "~> 2.5"\n))
                      .insert_after(/group :test/, %(  gem "rack-test", "~> 2.1"\n))
-                     .insert_after(/group :test/, %(  gem "rom-factory", "~> 0.11"\n))
+                     .insert_after(/group :test/, %(  gem "rom-factory", "~> 0.12"\n))
       end
       # rubocop:enable Metrics/MethodLength
 
@@ -97,8 +72,8 @@ module Hanamismith
 
         with_template.insert_before(/group :tools do/, <<~CONTENT)
           group :development do
-            gem "hanami-webconsole", github: "hanami/webconsole", branch: "main"
-            gem "localhost", "~> 1.1"
+            gem "hanami-webconsole", "~> 2.1"
+            gem "localhost", "~> 1.2"
             gem "rerun", "~> 0.14"
           end
 
@@ -111,13 +86,13 @@ module Hanamismith
 
         with_template.insert_before(/group :tools do/, <<~CONTENT)
           group :test do
-            gem "capybara", "~> 3.39"
-            gem "cuprite", "~> 0.14"
+            gem "capybara", "~> 3.40"
+            gem "cuprite", "~> 0.15"
             gem "database_cleaner-sequel", "~> 2.0"
-            gem "hanami-rspec", "~> 2.0"
+            gem "hanami-rspec", "~> 2.1"
             gem "launchy", "~> 2.5"
             gem "rack-test", "~> 2.1"
-            gem "rom-factory", "~> 0.11"
+            gem "rom-factory", "~> 0.12"
           end
 
         CONTENT
@@ -128,7 +103,7 @@ module Hanamismith
         with_template.insert_before(/group :development/, <<~CONTENT)
 
           group :development, :test do
-            gem "dotenv", "~> 2.8"
+            gem "dotenv", "~> 3.0"
           end
 
         CONTENT
@@ -141,5 +116,4 @@ module Hanamismith
       end
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/lib/hanamismith/builders/caliber.rb

@@ -12,7 +12,8 @@ module Hanamismith
         return configuration unless configuration.build_caliber
 
         super
-        builder.call(configuration.merge(template_path: "%project_name%/.rubocop.yml.erb"))
+        path = "%project_name%/.config/rubocop/config.yml.erb"
+        builder.call(configuration.merge(template_path: path))
                .append("\nrequire: rubocop-sequel\n")
 
         configuration

data/lib/hanamismith/builders/setup.rb

@@ -23,12 +23,11 @@ module Hanamismith
                .append(<<~CONTENT)
                  npm install
 
-                 hanami db create
-                 hanami db migrate
-                 hanami db seed
+                 bin/hanami db create
+                 bin/hanami db migrate
 
-                 HANAMI_ENV=test hanami db create
-                 HANAMI_ENV=test hanami db migrate
+                 HANAMI_ENV=test bin/hanami db create
+                 HANAMI_ENV=test bin/hanami db migrate
                CONTENT
       end
     end

data/lib/hanamismith/builders/slices/home.rb

@@ -100,6 +100,11 @@ module Hanamismith
           path = "%project_name%/slices/home/actions/show.rb.erb"
           builder.call(configuration.merge(template_path: path)).render
         end
+
+        def add_request_spec
+          path = "%project_name%/spec/features/home_spec.rb.erb"
+          builder.call(configuration.merge(template_path: path)).render
+        end
       end
     end
   end

data/lib/hanamismith/cli/commands/build.rb

@@ -60,6 +60,7 @@ module Hanamismith
           Rubysmith::Extensions::Tocer,
           Rubysmith::Extensions::Rubocop,
           Extensions::NPM,
+          Extensions::Asset,
           Builders::Environments::Development,
           Builders::Environments::Test,
           Builders::Git::Commit

data/lib/hanamismith/extensions/asset.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "refinements/pathname"
+
+module Hanamismith
+  module Extensions
+    # Ensures assets are compiled.
+    class Asset
+      include Import[:kernel, :logger]
+
+      using Refinements::Pathname
+
+      def self.call(...) = new(...).call
+
+      def initialize(configuration, **)
+        super(**)
+        @configuration = configuration
+      end
+
+      def call
+        logger.error { "Unable to compile assets. Try: `hanami assets compile`." } unless run
+        configuration
+      end
+
+      private
+
+      attr_reader :configuration
+
+      def run
+        success = false
+        configuration.project_root.change_dir { success = compile_app && compile_home }
+        success
+      end
+
+      def compile_app
+        kernel.system "node config/assets.js -- --path=app --dest=public/assets > /dev/null 2>&1"
+      end
+
+      def compile_home
+        kernel.system(
+          "node config/assets.js -- --path=slices/home --dest=public/assets/_home > /dev/null 2>&1"
+        )
+      end
+    end
+  end
+end

data/lib/hanamismith/extensions/npm.rb

@@ -2,7 +2,6 @@
 
 require "refinements/io"
 require "refinements/pathname"
-require "rubocop"
 
 module Hanamismith
   module Extensions

data/lib/hanamismith/templates/%project_name%/package.json.erb

@@ -7,10 +7,7 @@
   "private": true,
   "type": "module",
   "keywords": ["ruby", "hanami"],
-  "scripts": {
-    "assets": "node config/assets.js"
-  },
   "dependencies": {
-    "hanami-assets": "github:hanami/assets-js#main"
+    "hanami-assets": "^2.1.0"
   }
 }

data/lib/hanamismith/templates/%project_name%/spec/features/home_spec.rb.erb

@@ -0,0 +1,6 @@
+RSpec.describe "Home", :web do
+  it "renders home page" do
+    visit "/"
+    expect(page).to have_content("<%= configuration.project_label %>")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanamismith
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -35,7 +35,7 @@ cert_chain:
   3n5C8/6Zh9DYTkpcwPSuIfAga6wf4nXc9m6JAw8AuMLaiWN/r/2s4zJsUHYERJEu
   gZGm4JqtuSg8pYjPeIJxS960owq+SfuC+jxqmRA54BisFCv/0VOJi7tiJVY=
   -----END CERTIFICATE-----
-date: 2024-02-17 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger
@@ -141,28 +141,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.1'
 - !ruby/object:Gem::Dependency
   name: rubysmith
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: runcom
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +273,7 @@ files:
 - lib/hanamismith/cli/commands/build.rb
 - lib/hanamismith/cli/shell.rb
 - lib/hanamismith/container.rb
+- lib/hanamismith/extensions/asset.rb
 - lib/hanamismith/extensions/npm.rb
 - lib/hanamismith/import.rb
 - lib/hanamismith/templates/%project_name%/.circleci/config.yml.erb
@@ -319,6 +320,7 @@ files:
 - lib/hanamismith/templates/%project_name%/slices/home/view.rb.erb
 - lib/hanamismith/templates/%project_name%/slices/home/views/context.rb.erb
 - lib/hanamismith/templates/%project_name%/slices/home/views/show.rb.erb
+- lib/hanamismith/templates/%project_name%/spec/features/home_spec.rb.erb
 - lib/hanamismith/templates/%project_name%/spec/hanami_helper.rb.erb
 - lib/hanamismith/templates/%project_name%/spec/lib/%project_path%/refines/actions/response_spec.rb.erb
 - lib/hanamismith/templates/%project_name%/spec/slices/health/actions/show_spec.rb.erb