mkbrut 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232eed36ec0bbda9d4e20f06396c788220e39ec645fccb29eafd8af32529f8d9
-  data.tar.gz: 87039bccf6f8ffd4a7f37499f1b9a6a5072c45d172a60b9a4f918048851a7282
+  metadata.gz: 635f737ab220cbf181b23c3852d8d1683a6b1d0cc2d2cefe496105d3495966e5
+  data.tar.gz: 21ee357eb30e0b5626c43af73d0b438b4dfd9378dcaa908289931b17ac4dcbdf
 SHA512:
-  metadata.gz: 49a861539c7f6c9858b15529e824f066ecd63ea67cf089f4719c4d102dab10d8018182ae15a9454441c49b76e2ef902d9f347d1282b38aba664b3dd381bd83c8
-  data.tar.gz: 70d7a71119c9ec72105e84803e7124b1ec7c7105b40bb2bd6975466ff1fb7834f8569867729523dfd64b069a46421951d5370979bfb8c1a0b6e59eb58e821bf6
+  metadata.gz: df92f5935742d37a62ff9688ba37c6ea28f4c85aa23933ab64aeb6502bdd57e8f1fb481e28c8841702b05e4d2f13d3d0cae754615b8776279709b5ea0c706307
+  data.tar.gz: 1691f7280eab746527652a60d032119c138e1e241637c1bb74d2062ae09a4af59437dbb4cc237ce1f48aca69772f7de63444e0d9aeb625d37fefe9fe71eb0cb2

data/lib/mkbrut/version.rb

@@ -1,3 +1,3 @@
 module MKBrut
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/templates/Base/Procfile.development

@@ -1,4 +1,5 @@
-web:     PORT=6502 bin/run
-css:               bin/watch-and-build-assets css
-js:                bin/watch-and-build-assets js
-images:            bin/watch-and-build-assets images
+web:             PORT=6502 bin/run
+css:                       bin/watch-and-build-assets css
+js:                        bin/watch-and-build-assets js
+images:                    bin/watch-and-build-assets images
+startup_message: PORT=6502 bin/startup-message

data/templates/Base/app/src/front_end/css/index.css

@@ -1,3 +1,2 @@
 @import "brut-css/dist/brut.css";
 @import "svgs.css";
-@import "fonts.css";

data/templates/Base/bin/startup-message

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+require "pathname"
+require "yaml"
+require "optparse"
+
+option_parser = OptionParser.new do |opts|
+  opts.banner = "Usage: bin/startup-message\n\n    Outputs a message about where the dev server is running\n\nENVIRONMENT VARIABLES\n\n    PORT - the port configured for bin/run"
+end
+option_parser.parse!
+
+docker_compose_file = Pathname.new(__FILE__).dirname / ".." / "docker-compose.dx.yml"
+
+port_config = nil
+error       = nil
+
+if docker_compose_file.exist?
+  docker_compose = YAML.load_file(docker_compose_file)
+
+  docker_port = begin
+                  ENV.fetch("PORT")
+                rescue KeyError
+                  $stderr.puts "ERROR: The PORT environment variable is not set."
+                  $stderr.puts "       Please set it to the port your app is running on."
+                  exit 1
+                end
+
+  ports_config = docker_compose.dig("services", "app", "ports")
+  error = nil
+  if ports_config
+    port_config = ports_config.detect { |port_mapping|
+      host_port, container_port = port_mapping.split(":")
+      container_port.to_s == docker_port
+    }
+    if !port_config
+      error = "#{docker_compose_file} does not expose the port #{docker_port} for the 'app' service."
+    end
+  else
+    error = "#{docker_compose_file} does not contain a 'ports' section for the 'app' service."
+  end
+else
+  error = "#{docker_compose_file} does not exist. This is assumed to be in placefor your dev environment"
+end
+if !error
+  sleep 2 # allow all other initial output from bin/dev to happen first
+
+  host_port = port_config.split(":")[0]
+
+  url = "http://localhost:#{host_port}"
+
+  $stdout.puts "Your app is now running at"
+  $stdout.puts
+  $stdout.puts "  #{url}"
+  $stdout.puts
+  $stdout.flush # ensure this output happens immediately
+else
+  $stderr.puts "WARN: #{$0} could not figure out what port the app is exposed on"
+  $stderr.puts
+  $stderr.puts "      #{error}"
+  $stderr.puts
+  $stderr.puts "      This won't stop your app from running, but it does mean"
+  $stderr.puts "      there is some issue with your dev environment"
+  $stderr.flush # ensure this error output happens immediately
+end
+sleep

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkbrut
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Dave Copeland
@@ -135,6 +135,7 @@ files:
 - templates/Base/bin/run
 - templates/Base/bin/scaffold
 - templates/Base/bin/setup
+- templates/Base/bin/startup-message
 - templates/Base/bin/test
 - templates/Base/bin/test-server
 - templates/Base/bin/watch-and-build-assets