mkbrut 0.2.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e824bb238690c5bedee83be7104bc4a8a4e82c5a46fbf4aa75253e16c83ef036
-  data.tar.gz: 495469a00fc5fee4adf35057cd03cb6f942551c60954d8639b780fe2896d5aff
+  metadata.gz: 847d6f7efc89998a82712ddf8cb57f606b718479fd06b28057c668b096794519
+  data.tar.gz: 1e603967946eccb5744c173c02b19f42ad8596d390d2dcf9bf68fd07693b045f
 SHA512:
-  metadata.gz: 6518144e68422c5673413ab1539a064721d3f230a6953b785dbb23056b03e8cc6ebdeb9ae02bd7b57aa8f21a854747396aa65b45e6b7d1c0269a79c639ccd7ab
-  data.tar.gz: d101e05f6d7afef6115be141f3307f8360bde7f1976ef1129ed3584cbd2fe6a502d721be27042afd7d296a3fd12a15974e79c5c3ff387d484bd8827a1a65b620
+  metadata.gz: 92a6f6c3f1309aa69c73a394bff444984ee605f3a5434e59ddeb767db91798e65350aeb474525a27618868ccefcc2b805f09ccd1c81fbd332ef06b979b936f30
+  data.tar.gz: c5c7f161f8a67c805892aa7c4fe393ad9b53d92cb2bad22d32edacf7bb2f152dc54546b6f1e1a624eab1bb59a50d93e9522527a09c61c7899406949bf66a2ed9

data/lib/mkbrut/segments/bare_bones.rb

@@ -50,18 +50,19 @@ end},
         code: %{
 #{ @erb_binding.prefix }_example(
   transform: "upper",
-  class: [ "ff-sans",
+  class: [ "pos-fixed",
+           "bottom-0",
+           "left-0",
+           "w-100",
+           "ff-sans",
            "lh-title",
            "tracked",
            "f-5",
            "f-6-ns",
-           "bg-green-100",
-           "red-900",
            "tc",
            "pa-3",
            "mt-3",
-           "db",
-  ]
+           "db", ]
 ) do
   "We Like the Web"
 end

data/lib/mkbrut/version.rb

@@ -1,3 +1,3 @@
 module MKBrut
-  VERSION = "0.2.7"
+  VERSION = "0.4.0"
 end

data/templates/Base/app/src/front_end/pages/home_page.rb

@@ -0,0 +1,62 @@
+class HomePage < AppPage
+  def page_template
+    # The duplication and excessive class sizes here are to
+    # make it easier for you to remove this when you start working
+    # on your app.  There are pros and cons to how this code
+    # is written, so don't take this is as a directive on how to
+    # build your app. You do you!
+    img(src: "/static/images/LogoPylon.png",
+        class: "dn db-ns pos-fixed top-0 left-0 h-100vh w-auto z-2")
+  
+    header(class: "flex flex-column items-center justify-center h-100vh") do
+      div(class: "flex flex-column flex-row-ns items-center justify-center gap-3") do
+        img(src: "/static/images/LogoTransit.png", class: "h-5")
+        div do
+          h1(class: "ff-sans ma-0 lh-title f-5 tc tl-ns flex flex-column flex-row-ns items-center gap-2") do
+            plain("Welcome to Brut")
+          end
+          h2(class: "ff-sans ma-0 lh-title f-3 fw-normal tc tl-ns") do
+            plain("v")
+            plain(Gem.loaded_specs["brut"].version.to_s)
+          end
+
+        end
+      end
+          nav(class: [ "ff-sans",
+                       "flex",
+                       "flex-column",
+                       "flex-row-ns",
+                       "items-center",
+                       "justify-start",
+                       "gap-3",
+                       "mt-3",
+          ]) do
+            a(href: "https://brutrb.com",
+              target: "_blank",
+              class: "f-3 red-300 tdu tdn-ns hover-tdu-ns"
+             ) do
+               code { "brutrb.com" }
+             end
+             span(role: "separator", class: "dn di-ns f-3 red-300") do
+                raw(safe "&#x2299;")
+             end
+             a(href: "https://brutrb.com/api/index.html",
+               target: "_blank",
+               class: "f-3 red-300 tdu tdn-ns hover-tdu-ns"
+              ) do
+                "API Docs"
+              end
+              span(role: "separator", class: "dn di-ns f-3 red-300") do
+                raw(safe "&#x2299;")
+              end
+              a(href: "http://localhost:6504",
+                target: "_blank",
+                class: "f-3 red-300 tdu tdn-ns hover-tdu-ns"
+               ) do
+                 "Local OpenTelemetry"
+               end
+          end
+    end
+    
+  end
+end

data/templates/Base/docker-compose.dx.yml

@@ -39,7 +39,7 @@ services:
         target: "/var/run/docker.sock"
     # This is what is started up when you run `dx/start`. It just
     # waits forever keeping the container running.
-    entrypoint: /home/appuser/show-help-in-app-container-then-wait.sh
+    command: /home/appuser/show-help-in-app-container-then-wait.sh
     # The working directory for any command, this is the same as your
     # project root.
     working_dir: ${PWD}
@@ -52,6 +52,11 @@ services:
     # This exposes ports from this running container to your localhost.
     # In this case, we expose 6502, where the app runs, and 6503, where
     # the test server runs.
+    #
+    # To change this, the port before the colon is where the app
+    # will be available on your localhost. The port AFTER the colon is where
+    # the app runs in the container.  So: change the port before the colon, and
+    # don't change the one after.
     ports:
       - "6502:6502"
       - "6503:6503"

data/templates/Base/dx/exec

@@ -9,17 +9,21 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${0}" )" > /dev/null 2>&1 && pwd )
 require_command "docker"
 load_docker_compose_env
 
-usage_description="Execute a command inside the app's container."
-usage_args="[-s service] command"
+usage_description="Execute a command inside the app's container. Any command other than 'bash' will be run with bash -lc. Use -B to just run the command directly."
+usage_args="[-s service] [-B] command"
 usage_pre="exec.pre"
 usage_on_help "${usage_description}" "${usage_args}" "${usage_pre}" "" "${@}"
 
 SERVICE="${SERVICE_NAME:-${DEFAULT_SERVICE}}"
-while getopts "s:" opt "${@}"; do
+INCLUDE_PREFIX_FOR_NON_BASH=true
+while getopts "s:B" opt "${@}"; do
   case ${opt} in
     s )
       SERVICE="${OPTARG}"
       ;;
+    B )
+      INCLUDE_PREFIX_FOR_NON_BASH=false
+      ;;
     \? )
       log "🛑" "Unknown option: ${opt}"
       usage "${description}" "${usage_args}" "${usage_pre}"
@@ -42,7 +46,15 @@ if ! exec_hook_if_exists "exec.pre"; then
   exit 1
 fi
 
-log "🚂" "Running '${*}' inside container with service name '${SERVICE}'"
+if [ "$#" -eq 1 ] && [ "$1" = "bash" ]; then
+  COMMAND=(bash)
+elif [ "$INCLUDE_PREFIX_FOR_NON_BASH" = "true" ]; then
+  COMMAND=(bash -lc "$*")
+else
+  COMMAND=("$@")
+fi
+
+log "🚂" "Running '${COMMAND[@]}' inside container with service name '${SERVICE}'"
 
 docker \
   compose \
@@ -51,6 +63,6 @@ docker \
     --env-file "${ENV_FILE}" \
   exec \
     "${SERVICE}" \
-    "${@}"
+    "${COMMAND[@]}"
 
 # vim: ft=bash

data/templates/segments/Heroku/deploy/docker-entrypoint

@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+# This is the Docker entrypoint, mean this script is used to execute
+# the command given to the RUN directive.
+#
+# The reason this exists is to load jemalloc. If you don't want to use
+# jemalloc, you can delete this script, as well as the ENTRYPOINT directive
+# in deploy/Dockerfile.
+
+# Enable jemalloc for reduced memory usage and latency.
+if [ -z "${LD_PRELOAD+x}" ] && [ -f /usr/lib/*/libjemalloc.so.2 ]; then
+  export LD_PRELOAD="$(echo /usr/lib/*/libjemalloc.so.2)"
+fi
+
+exec "${@}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkbrut
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Dave Copeland
@@ -109,6 +109,8 @@ files:
 - templates/Base/app/src/front_end/fonts/monaspace-xenon.ttf
 - templates/Base/app/src/front_end/forms/app_form.rb
 - templates/Base/app/src/front_end/handlers/app_handler.rb
+- templates/Base/app/src/front_end/images/LogoPylon.png
+- templates/Base/app/src/front_end/images/LogoTransit.png
 - templates/Base/app/src/front_end/images/apple-touch-icon-120x120.png
 - templates/Base/app/src/front_end/images/apple-touch-icon-152x152.png
 - templates/Base/app/src/front_end/images/apple-touch-icon-167x167.png
@@ -119,7 +121,7 @@ files:
 - templates/Base/app/src/front_end/js/index.js
 - templates/Base/app/src/front_end/layouts/default_layout.rb.erb
 - templates/Base/app/src/front_end/pages/app_page.rb
-- templates/Base/app/src/front_end/pages/home_page.rb.erb
+- templates/Base/app/src/front_end/pages/home_page.rb
 - templates/Base/app/src/front_end/support/app_session.rb
 - templates/Base/app/src/front_end/svgs/README.md
 - templates/Base/app/src/front_end/svgs/comment-button.svg
@@ -181,6 +183,7 @@ files:
 - templates/segments/Demo/specs/front_end/pages/new_guestbook_message_page.spec.rb
 - templates/segments/Heroku/bin/deploy
 - templates/segments/Heroku/deploy/Dockerfile
+- templates/segments/Heroku/deploy/docker-entrypoint
 - templates/segments/Heroku/deploy/heroku_config.rb
 homepage: https://brutrb.com
 licenses: []

data/templates/Base/app/src/front_end/pages/home_page.rb.erb

@@ -1,54 +0,0 @@
-class HomePage < AppPage
-  def page_template
-    # The duplication and excessive class sizes here are to
-    # make it easier for you to remove this when you start working
-    # on your app.  There are pros and cons to how this code
-    # is written, so don't take this is as a directive on how to
-    # build your app. You do you!
-    div(class: "flex flex-column items-center justify-center h-80vh") do
-      img(src: "/static/images/icon.png", class: "h-50")
-      h1(class: "ff-sans ma-0 lh-title f-5") do
-        "Welcome to Brut"
-      end
-      h2(class: "ff-sans ma-0 lh-title f-4 fw-normal") do
-        plain("Version ")
-        plain(Gem.loaded_specs["brut"].version.to_s)
-      end
-
-      nav(class: [ "ff-sans",
-                   "flex",
-                   "flex-column",
-                   "flex-row-ns",
-                   "items-center",
-                   "justify-between",
-                   "gap-3",
-                   "mt-3",
-                   "ph-3"
-      ]) do
-        a(href: "https://brutrb.com",
-          target: "_blank",
-          class: "f-3 red-300 tdu tdn-ns hover-tdu-ns") do
-          code { "brutrb.com" }
-        end
-        span(role: "separator",
-             class: "dn di-ns f-3 red-300") do
-          raw(safe "&#10019;")
-        end
-        a(href: "https://brutrb.com/api/index.html",
-          target: "_blank",
-          class: "f-3 red-300 tdu tdn-ns hover-tdu-ns") do
-          "API Docs"
-        end
-        span(role: "separator",
-             class: "dn di-ns f-3 red-300") do
-          raw(safe "&#10019;")
-        end
-        a(href: "http://localhost:6504",
-          target: "_blank",
-          class: "f-3 red-300 tdu tdn-ns hover-tdu-ns") do
-          "Local OpenTelemetry"
-        end
-      end
-    end
-  end
-end