hanamismith 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 445647f6ddc43e3d30c619a1bac483ba08fba6ee0a6f4e8dd5d05b7b23671c31
-  data.tar.gz: 261de84aec6a7455421b76cdcdfe7d7c2a2bb1179264f24930a88c0f7700a5e1
+  metadata.gz: 90801b4ee6373b5b7210c0df5506653675e388f3f73c4f5e69f067ab70db04fe
+  data.tar.gz: 27b1370ebe99e5d935b9895ca6493fc5ae0bc0a1f2c3bcae3e066ab784df3995
 SHA512:
-  metadata.gz: 885901810474886fd5f676bffaf0fb71afb68a6d57d41e2c53501abdde05bc6b67486c28490e4853cfc19265cd9fe2a0605d2705f891c42dafcfd63e20d511ce
-  data.tar.gz: c650e51bb7ff77e0de34a4695150942ffea161083e356b808acc424b5ddb31a4b854644d992db371582520c40bcca0fefcbdaaf4b0ea70f54029934036c70ce6
+  metadata.gz: cfe7c64e56231bddef43ff0e34d9afbed0cf85be10f5be3631cd1a2a5a3d82fc5b9f2a00213ab0fabbc7120b0402e36d93460847818a27a8f73cda1f84b0b626
+  data.tar.gz: 10249587c6f918e8d354248051c392165da59b54f4bdb15a0e34b757e605053a4be6b5eb535986c4c76014f38832b7719c41140fc8f85b69b50378c70781f6d3

data/hanamismith.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "hanamismith"
-  spec.version = "1.4.0"
+  spec.version = "1.6.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/hanamismith"
@@ -25,13 +25,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = "~> 3.4"
   spec.add_dependency "cogger", "~> 1.0"
   spec.add_dependency "containable", "~> 1.1"
-  spec.add_dependency "dry-monads", "~> 1.6"
+  spec.add_dependency "dry-monads", "~> 1.8"
   spec.add_dependency "dry-schema", "~> 1.13"
   spec.add_dependency "etcher", "~> 3.0"
   spec.add_dependency "htmx", "~> 2.0"
   spec.add_dependency "infusible", "~> 4.0"
   spec.add_dependency "refinements", "~> 13.0"
-  spec.add_dependency "rubysmith", "~> 8.2"
+  spec.add_dependency "rubysmith", "~> 8.4"
   spec.add_dependency "runcom", "~> 12.0"
   spec.add_dependency "sod", "~> 1.0"
   spec.add_dependency "spek", "~> 4.0"

data/lib/hanamismith/builders/bundler.rb

@@ -47,11 +47,11 @@ module Hanamismith
 
       def insert_main
         with_template.insert_after "source", <<~CONTENT
-          gem "dry-monads", "~> 1.6"
           gem "dry-schema", "~> 1.13"
           gem "dry-types", "~> 1.7"
           gem "dry-validation", "~> 1.10"
           gem "htmx", "~> 2.1"
+          gem "overmind", "~> 2.5"
           gem "puma", "~> 6.6"
           gem "rack-attack", "~> 6.7"
         CONTENT

data/lib/hanamismith/builders/docker/compose.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "refinements/struct"
+
+module Hanamismith
+  module Builders
+    module Docker
+      # Builds Docker compose configuration.
+      class Compose < Rubysmith::Builders::Abstract
+        using Refinements::Struct
+
+        def call
+          return false unless settings.build_docker
+
+          builder.call(settings.merge(template_path: "%project_name%/compose.yml.erb")).render
+          true
+        end
+      end
+    end
+  end
+end

data/lib/hanamismith/builders/docker/file.rb

@@ -6,16 +6,13 @@ module Hanamismith
   module Builders
     module Docker
       # Builds Dockerfile configuration.
-      class File < Rubysmith::Builders::Docker::File
+      class File < Rubysmith::Builders::Abstract
         using Refinements::Struct
 
         def call
           return false unless settings.build_docker
 
-          super
-          builder.call(settings.merge(template_path: "%project_name%/Dockerfile.erb"))
-                 .render
-                 .insert_after(/RACK_ENV/, "ENV HANAMI_ENV=production\n")
+          builder.call(settings.merge(template_path: "%project_name%/Dockerfile.erb")).render
           true
         end
       end

data/lib/hanamismith/builders/environments/all.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "refinements/struct"
+require "securerandom"
+
+module Hanamismith
+  module Builders
+    module Environments
+      # Builds test environment skeleton.
+      class All < Rubysmith::Builders::Abstract
+        using Refinements::Struct
+
+        def initialize(generator: SecureRandom, **)
+          @generator = generator
+          super(**)
+        end
+
+        def call
+          builder.call(settings.merge(template_path: "%project_name%/env.erb"))
+                 .render
+                 .replace("<password>", generator.hex(15))
+                 .rename(".env")
+
+          true
+        end
+
+        private
+
+        attr_reader :generator
+      end
+    end
+  end
+end

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

@@ -59,7 +59,8 @@ module Hanamismith
           Rubysmith::Builders::Docker::Build,
           Rubysmith::Builders::Docker::Console,
           Rubysmith::Builders::Docker::Entrypoint,
-          Rubysmith::Builders::Docker::File,
+          Builders::Docker::Compose,
+          Builders::Docker::File,
           Rubysmith::Builders::Docker::Ignore,
           Rubysmith::Extensions::Bundler,
           Rubysmith::Extensions::Pragmater,
@@ -67,6 +68,7 @@ module Hanamismith
           Rubysmith::Extensions::Rubocop,
           Extensions::NPM,
           Extensions::Asset,
+          Builders::Environments::All,
           Builders::Environments::Development,
           Builders::Environments::Test,
           Builders::Git::Commit
@@ -99,6 +101,7 @@ module Hanamismith
         on Rubysmith::CLI::Actions::License, settings: Container[:settings]
         on Rubysmith::CLI::Actions::Maximum, settings: Container[:settings]
         on Rubysmith::CLI::Actions::Minimum, settings: Container[:settings]
+        on Rubysmith::CLI::Actions::Monads, settings: Container[:settings]
         on Rubysmith::CLI::Actions::Rake, settings: Container[:settings]
         on Rubysmith::CLI::Actions::Readme, settings: Container[:settings]
         on Rubysmith::CLI::Actions::Reek, settings: Container[:settings]

data/lib/hanamismith/templates/%project_name%/Dockerfile.erb

@@ -0,0 +1,76 @@
+# syntax = docker/dockerfile:1.4
+
+ARG RUBY_VERSION=<%= RUBY_VERSION %>
+
+FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
+
+LABEL description="<%= [settings.organization_label, "Application"].compact.join " " %>"
+LABEL maintainer="<%= settings.author_name %> <<%= settings.author_email %>>"
+
+ENV RACK_ENV=production
+ENV HANAMI_ENV=production
+ENV HANAMI_SERVE_ASSETS=true
+ENV BUNDLE_DEPLOYMENT=1
+ENV BUNDLE_PATH=/usr/local/bundle
+ENV BUNDLE_WITHOUT="development:quality:test:tools"
+
+WORKDIR /app
+
+RUN <<STEPS
+  apt-get update -qq \
+  && apt-get install --no-install-recommends -y \
+  curl \
+  libjemalloc2 \
+  nodejs \
+  npm \
+  postgresql-client \
+  tmux \
+  && rm -rf /var/lib/apt/lists /var/cache/apt/archives
+STEPS
+
+FROM base AS build
+
+RUN <<STEPS
+  apt-get update -qq \
+  && apt-get install --no-install-recommends -y build-essential \
+  libpq-dev \
+  libyaml-dev \
+  pkg-config \
+  && rm -rf /var/lib/apt/lists /var/cache/apt/archives
+STEPS
+
+COPY .ruby-version Gemfile Gemfile.lock .node-version package.json package-lock.json ./
+
+RUN <<STEPS
+  bundle install
+  npm install
+  rm -rf "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
+<% if settings.build_bootsnap %>
+  bundle exec bootsnap precompile --gemfile
+<% end %>
+STEPS
+
+COPY . .
+<% if settings.build_bootsnap %>
+RUN bundle exec bootsnap precompile app/ lib/ slices/
+<% end %>
+FROM base
+COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
+COPY --from=build /app /app
+
+RUN <<STEPS
+  mkdir -p /app/log
+  mkdir -p /app/tmp
+STEPS
+
+RUN groupadd --system --gid 1000 app && \
+    useradd app --uid 1000 --gid 1000 --create-home --shell /bin/bash && \
+    chown -R app:app . public log tmp
+
+USER 1000:1000
+
+ENTRYPOINT ["/app/bin/docker/entrypoint"]
+
+EXPOSE 2300
+
+CMD ["bundle", "exec", "overmind", "start", "--port-step", "10", "--can-die", "migrate,assets"]

data/lib/hanamismith/templates/%project_name%/Procfile.erb

@@ -1,2 +1,3 @@
 web: bundle exec puma --config ./config/puma.rb
 assets: bundle exec hanami assets compile
+migrate: bundle exec hanami db migrate

data/lib/hanamismith/templates/%project_name%/app/templates/layouts/app.html.erb.erb

@@ -11,6 +11,7 @@
     <meta name="author" content="Hanamismith">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="view-transition" content="same-origin">
 
     <link title="<%= settings.project_label %>: Favicon"
           rel="icon"

data/lib/hanamismith/templates/%project_name%/compose.yml.erb

@@ -0,0 +1,43 @@
+name: "<%= settings.project_name %>"
+
+services:
+  web:
+    init: true
+    environment:
+      DATABASE_URL: postgres://${PG_USER}:${PG_PASSWORD}@database:5432/${PG_DATABASE}
+    build:
+      context: .
+    ports:
+      - "2300:2300"
+    restart: unless-stopped
+    depends_on:
+      database:
+        condition: service_healthy
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+          cpus: "1.0"
+
+  database:
+    image: postgres:17.4
+    restart: unless-stopped
+    volumes:
+      - database-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: ${PG_USER}
+      POSTGRES_DB: ${PG_DATABASE}
+      POSTGRES_PASSWORD: ${PG_PASSWORD}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${PG_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+          cpus: "1.0"
+
+volumes:
+  database-data:

data/lib/hanamismith/templates/%project_name%/config/app.rb.erb

@@ -7,6 +7,12 @@ require "hanami"
     Dry::Schema.load_extensions :monads
     Dry::Validation.load_extensions :monads
 
+    prepare_container do |container|
+      container.config.component_dirs.dir "app" do |dir|
+        dir.memoize = -> component { component.key.start_with? "repositories." }
+      end
+    end
+
     config.actions.content_security_policy.then do |csp|
       csp[:manifest_src] = "'self'"
       csp[:script_src] += " 'unsafe-eval' 'unsafe-inline' https://unpkg.com/"
@@ -18,7 +24,7 @@ require "hanami"
 
       config.logger = config.logger.instance.add_backend(
         colorize: false,
-        stream: Hanami.app.root.join("log/development.log")
+        stream: root.join("log/development.log")
       )
     end
   end

data/lib/hanamismith/templates/%project_name%/env.erb

@@ -0,0 +1,3 @@
+PG_DATABASE=<%= settings.project_name %>
+PG_PASSWORD=<password>
+PG_USER=<%= settings.project_name %>

data/lib/hanamismith/templates/%project_name%/spec/hanami_helper.rb.erb

@@ -26,10 +26,13 @@ Pathname.require_tree SPEC_ROOT.join("support/factories")
 
 RSpec.configure do |config|
   config.include Capybara::DSL, Capybara::RSpecMatchers, :web
-  config.include Dry::Monads[:result]
   config.include Rack::Test::Methods, type: :request
 
-  config.include_context "with Hanami application", type: :request
+  config.define_derived_metadata(file_path: %r(/spec/features/)) { it[:type] = :feature }
+  config.define_derived_metadata(file_path: %r(/spec/requests/)) { it[:type] = :request }
+
+  config.include_context "with application", type: :request
+  config.include_context "with application", type: :feature
 
   databases = proc do
     Hanami.app.slices.with_nested.prepend(Hanami.app).each.with_object Set.new do |slice, dbs|

data/lib/hanamismith/templates/%project_name%/spec/support/shared_contexts/application.rb.erb

@@ -1,3 +1,3 @@
-RSpec.shared_context "with Hanami application" do
+RSpec.shared_context "with application" do
   let(:app) { Hanami.app }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanamismith
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -9,9 +9,9 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEeDCCAuCgAwIBAgIBATANBgkqhkiG9w0BAQsFADBBMQ8wDQYDVQQDDAZicm9v
+  MIIENjCCAp6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADBBMQ8wDQYDVQQDDAZicm9v
   a2UxGjAYBgoJkiaJk/IsZAEZFgphbGNoZW1pc3RzMRIwEAYKCZImiZPyLGQBGRYC
-  aW8wHhcNMjMwMzIyMTYxNDQxWhcNMjUwMzIxMTYxNDQxWjBBMQ8wDQYDVQQDDAZi
+  aW8wHhcNMjUwMzIyMTQ1NDE3WhcNMjYwMzIyMTQ1NDE3WjBBMQ8wDQYDVQQDDAZi
   cm9va2UxGjAYBgoJkiaJk/IsZAEZFgphbGNoZW1pc3RzMRIwEAYKCZImiZPyLGQB
   GRYCaW8wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCro8tj5/E1Hg88
   f4qfiwPVd2zJQHvdYt4GHVvuHRRgx4HGhJuNp+4BId08RBn7V6V1MW6MY3kezRBs
@@ -21,20 +21,19 @@ cert_chain:
   QzzPxZBiRB1sgtbt1gUbVI262ZDq1gR+HxPFmp+Cgt7ZLIJZAtesQvtcMzseXpfn
   hpmm0Sw22KGhRAy/mqHBRhDl5HqS1SJp2Ko3lcnpXeFResp0HNlt8NSu13vhC08j
   GUHU9MyIXbFOsnp3K3ADrAVjPWop8EZkmUR3MV/CUm00w2cZHCSGiXl1KMpiVKvk
-  Ywr1gd2ZME4QLSo+EXUtLxDUa/W3xnBS8dBOuMMz02FPWYr3PN8CAwEAAaN7MHkw
+  Ywr1gd2ZME4QLSo+EXUtLxDUa/W3xnBS8dBOuMMz02FPWYr3PN8CAwEAAaM5MDcw
   CQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFAFgmv0tYMZnItuPycSM
-  F5wykJEVMB8GA1UdEQQYMBaBFGJyb29rZUBhbGNoZW1pc3RzLmlvMB8GA1UdEgQY
-  MBaBFGJyb29rZUBhbGNoZW1pc3RzLmlvMA0GCSqGSIb3DQEBCwUAA4IBgQAX+EGY
-  9RLYGxF1VLZz+G1ACQc4uyrCB6kXwI06kzUa5dF9tPXqTX9ffnz3/W8ck2IQhKzu
-  MKO2FVijzbDWTsZeZGglS4E+4Jxpau1lU9HhOIcKolv6LeC6UdALTFudY+GLb8Xw
-  REXgaJkjzzhkUSILmEnRwEbY08dVSl7ZAaxVI679vfI2yapLlIwpbBgmQTiTvPr3
-  qyyLUno9flYEOv9fmGHunSrM+gE0/0niGTXa5GgXBXYGS2he4LQGgSBfGp/cTwMU
-  rDKJRcusZ12lNBeDfgqACz/BBJF8FLodgk6rGMRZz7+ZmjjHEmpG5bQpR6Q2BuWL
-  XMtYk/QzaWuhiR7pWjiF8jbdd7RO6or0ohq7iFkokz/5xrtQ/vPzU2RQ3Qc6YaKw
-  3n5C8/6Zh9DYTkpcwPSuIfAga6wf4nXc9m6JAw8AuMLaiWN/r/2s4zJsUHYERJEu
-  gZGm4JqtuSg8pYjPeIJxS960owq+SfuC+jxqmRA54BisFCv/0VOJi7tiJVY=
+  F5wykJEVMA0GCSqGSIb3DQEBCwUAA4IBgQBlzRfyAYx/fCFjizS0Npxw4+4T3aYL
+  hbXoDqQRWjxuhFZcXUymhz3r8/Ltyri9lSof8grzB+8/+mrMVms7Gwt5qolk6zdn
+  FkySGy/jmpN12ldOHFbBEnyVBZNBvOBVb8zkkw8PhiHdBdXOUm4Jy39yJvBLfjcC
+  iM1aeWPmgPy1GbvZU+leRGZLt6dRIR9oCDXcWLRjha8xLMoz6Yn9fJBYexBA3iEz
+  h5S7pn4AX/JhVRiSyl8pAy4jEKydpyQrliH3gHkpNmUS/XDczP+9xX1bAB4BvqL2
+  NCxMcQ+hiJNqCKpPgHxaOOHZfIxV33logIuPEQ8NryHAwZ9ZWnwtYDE8kQGGKskI
+  Kkm6QT474hZl7MpwiJjWgW313CR7jUEekQahX1QxCxHPI7LSrKpno0plH3uWIOQp
+  KUlkb9uyACBgyRO52ZHiDVI8YvtU5O/j9pSes9/3XgvBeC1onx4qWp+uRX7eVsYS
+  GiijocTc3enZVrXERetaXj8/9XWs3fB3HWY=
   -----END CERTIFICATE-----
-date: 2025-03-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger
@@ -70,14 +69,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '8.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '8.4'
 - !ruby/object:Gem::Dependency
   name: runcom
   requirement: !ruby/object:Gem::Requirement
@@ -224,8 +223,8 @@ executables:
 - hanamismith
 extensions: []
 extra_rdoc_files:
-- README.adoc
 - LICENSE.adoc
+- README.adoc
 files:
 - LICENSE.adoc
 - README.adoc
@@ -239,8 +238,10 @@ files:
 - lib/hanamismith/builders/circle_ci.rb
 - lib/hanamismith/builders/console.rb
 - lib/hanamismith/builders/core.rb
+- lib/hanamismith/builders/docker/compose.rb
 - lib/hanamismith/builders/docker/file.rb
 - lib/hanamismith/builders/documentation/readme.rb
+- lib/hanamismith/builders/environments/all.rb
 - lib/hanamismith/builders/environments/development.rb
 - lib/hanamismith/builders/environments/test.rb
 - lib/hanamismith/builders/git/commit.rb
@@ -273,6 +274,7 @@ files:
 - lib/hanamismith/extensions/npm.rb
 - lib/hanamismith/templates/%project_name%/.circleci/config.yml.erb
 - lib/hanamismith/templates/%project_name%/.github/workflows/ci.yml.erb
+- lib/hanamismith/templates/%project_name%/Dockerfile.erb
 - lib/hanamismith/templates/%project_name%/Guardfile.erb
 - lib/hanamismith/templates/%project_name%/Procfile.dev.erb
 - lib/hanamismith/templates/%project_name%/Procfile.erb
@@ -287,6 +289,7 @@ files:
 - lib/hanamismith/templates/%project_name%/app/templates/layouts/app.html.erb.erb
 - lib/hanamismith/templates/%project_name%/app/view.rb.erb
 - lib/hanamismith/templates/%project_name%/bin/hanami.erb
+- lib/hanamismith/templates/%project_name%/compose.yml.erb
 - lib/hanamismith/templates/%project_name%/config.ru.erb
 - lib/hanamismith/templates/%project_name%/config/app.rb.erb
 - lib/hanamismith/templates/%project_name%/config/assets.js.erb
@@ -299,6 +302,7 @@ files:
 - lib/hanamismith/templates/%project_name%/config/slices/health.rb.erb
 - lib/hanamismith/templates/%project_name%/config/slices/home.rb.erb
 - lib/hanamismith/templates/%project_name%/env.development.erb
+- lib/hanamismith/templates/%project_name%/env.erb
 - lib/hanamismith/templates/%project_name%/env.test.erb
 - lib/hanamismith/templates/%project_name%/lib/%project_path%/refines/actions/response.rb.erb
 - lib/hanamismith/templates/%project_name%/lib/%project_path%/types.rb.erb
@@ -349,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A command line interface for smithing Hanami projects.
 test_files: []