rails_template_18f 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9272beadb19c4c9a6aa8f3da43cfbb06d7fbf23f75d0f4ec393dde3610f06157
-  data.tar.gz: a3906d6bddb262a5bc46f5ed40e0bf64110bd396ac8e765185dcc808abe6c91a
+  metadata.gz: d71812f11d19dc0ed9960407de8d0b3c0755c0d6bb2ba64981af55f0add88657
+  data.tar.gz: 63d920adcc4e1e8acd83805d0edcaf5235f75150226dcd1ee8dcbef303407ba6
 SHA512:
-  metadata.gz: 22926545b3fe7273d36c8fde0445d9865bab390cf2cc856c25bc33e50f1c1420944a30052a2e0ae8b730da4f17dee2c16165cc83a1e21eb1f0475afa0fd30b74
-  data.tar.gz: fe7f4f8df14d4f2eac2a5882daf368cdf68a8c9f53a54550fe8d13f1b7a18767c50334e142a2784b92964478fe0e3a3e88c5986271b30e78d8e0743690c8a09a
+  metadata.gz: bca37870efffd0200b5fbf1b9491a1497cd1cdae7423d93f9c0eda1ff2cde4779932ea8f23be29f632e0310483c31724273d64d36a78d94e67a94c1cd903eb1a
+  data.tar.gz: 6d09c8fc4870c7ca1851fdd4c439ec1b6dd73d8e9551ca2b3d0be2d5da1a2f28e0cd9655ba219f25c2674face10ea0b8d5eeaadba6fd47705b04d516ac777d67

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.6.0] - 2022-06-07
+
+- include USWDS 3.0 for new apps
+- use postcss-minify instead of the sass gem for CSS minimization
+
+## [0.5.3] - 2022-06-06
+
+- check that server started properly before running anything in `bin/with-server`
+- add helper script for setting cloud.gov egress rules
+
+## [0.5.2] - 2022-03-24
+
+- add extra branch test coverage to CloudGovConfig
+- replace forked version of @csstools/postcss-sass with released version
+- upgrade i18n-tasks gem to 1.0
+
 ## [0.5.1] - 2022-03-17
 
 - fix interaction between foreman and dotenv by disabling foreman's env loading

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_template_18f (0.5.1)
+    rails_template_18f (0.6.0)
       activesupport (~> 7.0.0)
       colorize (~> 0.8)
       railties (~> 7.0.0)
@@ -10,20 +10,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.2.3)
-      actionview (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionpack (7.0.3)
+      actionview (= 7.0.3)
+      activesupport (= 7.0.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionview (7.0.3)
+      activesupport (= 7.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.2.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -36,26 +36,26 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.5.0)
     erubi (1.10.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.15.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     minitest (5.15.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -63,16 +63,16 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    railties (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.4.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -83,10 +83,10 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.1)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -95,23 +95,23 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.26.0)
+    rubocop (1.29.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.17.0)
       parser (>= 3.1.1.0)
     rubocop-performance (1.13.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    standard (1.8.0)
-      rubocop (= 1.26.0)
+    standard (1.12.0)
+      rubocop (= 1.29.0)
       rubocop-performance (= 1.13.3)
     thor (1.2.1)
     tzinfo (2.0.4)
@@ -121,6 +121,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -132,4 +133,4 @@ DEPENDENCIES
   standard (~> 1.3)
 
 BUNDLED WITH
-   2.2.32
+   2.3.15

data/lib/generators/rails_template18f/cloud_gov_config/templates/spec/models/cloud_gov_config_spec.rb

@@ -37,7 +37,11 @@ RSpec.describe CloudGovConfig, type: :model do
       end
 
       it "returns nil for a missing path" do
-        expect(subject.dig(:s3, :credentials, :other)).to be_nil
+        expect(subject.dig(:s3, :missing)).to be_nil
+      end
+
+      it "returns nil for a missing service" do
+        expect(subject.dig(:rds, :credentials)).to be_nil
       end
     end
   end

data/lib/generators/rails_template18f/i18n/i18n_generator.rb

@@ -18,7 +18,7 @@ module RailsTemplate18f
       def install_gem
         return if gem_installed?("i18n-tasks")
         gem_group :development, :test do
-          gem "i18n-tasks", "~> 0.9"
+          gem "i18n-tasks", "~> 1.0"
         end
       end
 

data/lib/generators/rails_template18f/terraform/templates/terraform/set_space_egress.sh.tt

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+org="<%= cloud_gov_organization %>"
+
+usage="
+$0: Set egress rules for given space
+
+Usage:
+  $0 -h
+  $0 -s <SPACE NAME> [-o <ORG NAME>] [-p] [-t]
+
+Options:
+-h: show help and exit
+-s <SPACE NAME>: configure the space to act on. Required
+-o <ORG NAME>: configure the organization to act on. Default: $org
+-p: Add the public egress rules
+-t: Add the trusted egress rules
+
+Notes:
+* If -p or -t are not passed, the related security groups will be removed, if they were present
+"
+
+set -e
+
+space=""
+public=false
+trusted=false
+
+while getopts ":hs:o:pt" opt; do
+  case "$opt" in
+    s)
+      space=${OPTARG}
+      ;;
+    o)
+      org=${OPTARG}
+      ;;
+    p)
+      public=true
+      ;;
+    t)
+      trusted=true
+      ;;
+    h)
+      echo "$usage"
+      exit 0
+      ;;
+  esac
+done
+
+if [[ $space = "" ]]; then
+  echo "$usage"
+  exit 1
+fi
+
+if [[ $public = true ]]; then
+  cf bind-security-group public_networks_egress $org --space $space
+else
+  cf unbind-security-group public_networks_egress $org $space
+fi
+
+if [[ $trusted = true ]]; then
+  cf bind-security-group trusted_local_networks_egress $org --space $space
+else
+  cf unbind-security-group trusted_local_networks_egress $org $space
+fi
+
+echo "Done"

data/lib/generators/rails_template18f/terraform/terraform_generator.rb

@@ -15,6 +15,7 @@ module RailsTemplate18f
 
       def install
         directory "terraform", mode: :preserve
+        chmod "terraform/set_space_egress.sh", 0o755
         chmod "terraform/bootstrap/run.sh", 0o755
         chmod "terraform/bootstrap/teardown_creds.sh", 0o755
       end

data/lib/rails_template18f/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsTemplate18f
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/template.rb

@@ -226,34 +226,33 @@ end
 
 # setup USWDS and asset pipeline
 copy_file "browserslistrc", ".browserslistrc" if webpack?
-uncomment_lines "Gemfile", "sassc-rails" # use sassc-rails for asset minification in prod
 after_bundle do
-  js_startup = if webpack?
-    "webpack --config webpack.config.js"
-  else
-    "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds"
-  end
-  insert_into_file "package.json", <<-EOJSON, before: /^\s+"dependencies"/
-  "scripts": {
-    "build": "#{js_startup}",
-    "build:css": "postcss ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css"
-  },
-  EOJSON
+  run 'npm set-script build:css "postcss ./app/assets/stylesheets/application.postcss.scss -o ./app/assets/builds/application.css"'
+  # include verbose flag for dev postcss output
+  gsub_file "Procfile.dev", "yarn build:css --watch", "yarn build:css --verbose --watch"
   # Replace postcss-nesting with sass since USWDS uses sass
   run "yarn remove postcss-nesting"
-  # include fork of @csstools/postcss-sass until that library is updated for postcss 8
-  run "yarn add https://github.com/sinankeskin/postcss-sass"
-  run "yarn add postcss-scss"
+  run "yarn add @csstools/postcss-sass postcss-scss postcss-minify"
   insert_into_file "postcss.config.js", "  syntax: 'postcss-scss',\n", before: /^\s+plugins/
-  gsub_file "postcss.config.js", "postcss-nesting", "@csstools/postcss-sass"
-  run "yarn add uswds"
+  insert_into_file "package.json", <<-EOJSON, before: /^\s+\}$/
+  },
+  "resolutions": {
+    "@csstools/postcss-sass/@csstools/sass-import-resolve": "https://github.com/rahearn/sass-import-resolve"
+  EOJSON
+  gsub_file "postcss.config.js", "postcss-nesting'),", <<~EOJS.strip
+    @csstools/postcss-sass')({
+          includePaths: ['./node_modules/@uswds/uswds/packages'],
+        }),
+  EOJS
+  insert_into_file "postcss.config.js", "    process.env.NODE_ENV === 'production' ? require('postcss-minify') : null,\n", before: /^\s+\],/
+  run "yarn add @uswds/uswds"
   appjs_file = "app/javascript/application.js"
-  append_to_file appjs_file, "\nimport \"uswds\"\n"
+  append_to_file appjs_file, "\nimport \"@uswds/uswds\"\n"
   if hotwire?
     append_to_file appjs_file, <<~EOJS
 
       // make sure USWDS components are wired to their behavior after a Turbo navigation
-      import components from "uswds/src/js/components"
+      import components from "@uswds/uswds/src/js/components"
       let initialLoad = true;
       document.addEventListener("turbo:load", () => {
         if (initialLoad) {
@@ -271,11 +270,12 @@ after_bundle do
   end
   directory "app/assets"
   append_to_file "app/assets/stylesheets/application.postcss.css", <<~EOCSS
-    /* KNOWN ISSUE: only changes to application.postcss.css will trigger an automatic rebuild */
-    /* restart your server or run `yarn build:css` when changing other files */
-    @import "uswds-settings.scss";
-    @import "../../../node_modules/uswds/dist/scss/uswds.scss";
+    @forward "uswds-settings.scss";
+    @forward "uswds-components.scss";
   EOCSS
+  inside "app/assets/stylesheets" do
+    File.rename("application.postcss.css", "application.postcss.scss")
+  end
   gsub_file "app/views/layouts/application.html.erb", "<html>", '<html lang="<%= I18n.locale %>">'
   gsub_file "app/views/layouts/application.html.erb", /^\s+<%= yield %>/, <<-EOHTML
     <%= render "application/usa_banner" %>

data/templates/app/assets/images/uswds.js

@@ -1,5 +1,6 @@
 // Glue to find USWDS images with the `image_tag` helper
 
-//= link uswds/dist/img/us_flag_small.png
-//= link uswds/dist/img/icon-dot-gov.svg
-//= link uswds/dist/img/icon-https.svg
+//= link @uswds/uswds/dist/img/us_flag_small.png
+//= link @uswds/uswds/dist/img/icon-dot-gov.svg
+//= link @uswds/uswds/dist/img/icon-https.svg
+//= link @uswds/uswds/dist/img/usa-icons/close.svg

data/templates/app/assets/stylesheets/uswds-components.scss

@@ -0,0 +1,7 @@
+@forward "uswds-global";
+@forward "uswds-utilities";
+@forward "uswds-typography";
+@forward "usa-header";
+@forward "usa-banner";
+@forward "usa-section";
+// add additional packages here as you use them

data/templates/app/assets/stylesheets/uswds-settings.scss

@@ -1,7 +1,10 @@
-// Point the asset pipline to the correct locations
-$theme-font-path: "uswds/dist/fonts";
-$theme-image-path: "uswds/dist/img";
+@use "uswds-core" with (
+  // Point the asset pipline to the correct locations
+  $theme-font-path: "@uswds/uswds/dist/fonts",
+  $theme-image-path: "@uswds/uswds/dist/img",
 
-$theme-show-notifications: false;
+  $theme-show-notifications: false,
 
-// Put your USWDS Theme settings here
+  // Put your USWDS Theme settings here
+
+);

data/templates/app/views/application/_demo_site_banner.html.erb

@@ -1,3 +1,3 @@
-<div class="font-sans-lg padding-y-4 bg-secondary-darker text-white line-height-1 text-center">
+<div class="font-sans-lg padding-y-4 bg-secondary-darker text-white line-height-heading-1 text-center">
   <%= t('shared.header.demo_banner') %>
-</div>
+</div>

data/templates/app/views/application/_header.html.erb

@@ -11,7 +11,7 @@
     </div>
     <nav aria-label="<%= t('shared.header.primary') %>" class="usa-nav">
       <button class="usa-nav__close">
-        <%= image_tag "uswds/dist/img/usa-icons/close.svg", role: "img", alt: t('shared.header.close') %>
+        <%= image_tag "@uswds/uswds/dist/img/usa-icons/close.svg", role: "img", alt: t('shared.header.close') %>
       </button>
       <ul class="usa-nav__primary usa-accordion">
         <% I18n.available_locales.each do |l| %>

data/templates/app/views/application/_usa_banner.html.erb

@@ -5,7 +5,7 @@
     <header class="usa-banner__header">
       <div class="usa-banner__inner">
         <div class="grid-col-auto">
-          <%= image_tag "uswds/dist/img/us_flag_small.png", alt: t('shared.banner.us_flag'), class: "usa-banner__header-flag" %>
+          <%= image_tag "@uswds/uswds/dist/img/us_flag_small.png", alt: t('shared.banner.us_flag'), class: "usa-banner__header-flag" %>
         </div>
         <div class="grid-col-fill tablet:grid-col-auto">
           <p class="usa-banner__header-text">
@@ -30,14 +30,14 @@
       <% end %>
       <div class="grid-row grid-gap-lg">
         <div class="usa-banner__guidance tablet:grid-col-6">
-          <%= image_tag "uswds/dist/img/icon-dot-gov.svg", role: "img", "aria-hidden": true, class: "usa-banner__icon usa-media-block__img" %>
+          <%= image_tag "@uswds/uswds/dist/img/icon-dot-gov.svg", role: "img", "aria-hidden": true, class: "usa-banner__icon usa-media-block__img" %>
           <div class="usa-media-block__body">
             <strong><%= t('shared.banner.gov_heading') %></strong>
             <br> <%= t('shared.banner.gov_description_html') %>
           </div>
         </div>
         <div class="usa-banner__guidance tablet:grid-col-6">
-          <%= image_tag "uswds/dist/img/icon-https.svg", role: "img", "aria-hidden": true, class: "usa-banner__icon usa-media-block__img" %>
+          <%= image_tag "@uswds/uswds/dist/img/icon-https.svg", role: "img", "aria-hidden": true, class: "usa-banner__icon usa-media-block__img" %>
           <div class="usa-media-block__body">
             <p>
               <strong><%= t('shared.banner.secure_heading') %></strong>

data/templates/bin/with-server

@@ -22,13 +22,15 @@ bundle exec rails server &
 server_pid=$!
 
 dockerize -wait http://localhost:3000 -timeout 1m
-
-$@
 exit_status=$?
 
+if [[ $exit_status -eq 0 ]]; then
+  $@
+  exit_status=$?
+fi
 
 # shut down the server and cleanup after ourselves
-bundle exec rake assets:clobber
 kill $server_pid
+bundle exec rake assets:clobber
 
 exit $exit_status

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_template_18f
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -180,6 +180,7 @@ files:
 - lib/generators/rails_template18f/terraform/templates/terraform/production/main.tf.tt
 - lib/generators/rails_template18f/terraform/templates/terraform/production/providers.tf.tt
 - lib/generators/rails_template18f/terraform/templates/terraform/production/variables.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/set_space_egress.sh.tt
 - lib/generators/rails_template18f/terraform/templates/terraform/shared/clamav/main.tf.tt
 - lib/generators/rails_template18f/terraform/templates/terraform/shared/clamav/providers.tf
 - lib/generators/rails_template18f/terraform/templates/terraform/shared/clamav/variables.tf
@@ -213,6 +214,7 @@ files:
 - templates/Brewfile
 - templates/README.md.tt
 - templates/app/assets/images/uswds.js
+- templates/app/assets/stylesheets/uswds-components.scss
 - templates/app/assets/stylesheets/uswds-settings.scss
 - templates/app/views/application/_banner_lock_icon.html.erb
 - templates/app/views/application/_demo_site_banner.html.erb