rails_template_18f 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9452d60916a767ee1b00bb0a76e6582d4d1ed760b3bf0c4d68a07c8225ddfd4
-  data.tar.gz: 481c2ee7693849f2c21d382d78edd08a59370b8c2b440bef8502d22a039a2243
+  metadata.gz: 69b1bf665be20b3234b5a6cc358a35167cf3ab4dc7833ba1f8a3615970f2a617
+  data.tar.gz: ec93203edd447a12699c94d57583b7971f846e70f415ad91915860386f83e862
 SHA512:
-  metadata.gz: 8a5b1be47db25412b0ba04dd19a395401f86b6d5ee14b907c2de54e95bfae159a6407851bfcd83b07ac20ca9423de568580c5cfdec0c5d49bfd5e2f7f62e59df
-  data.tar.gz: 75ff52ec4661f95c4da617217d7eb7dc993192610d9209ab3f9a438504111281a8c779db3074c1d6506073b126d437c6aaebe328b11add1363797938f70d006e
+  metadata.gz: dec9d9bcd8c8111fbcfc826d995fd8197751e93c0c4463fd0d321d3a71b71a920f39340b60df4011cf0ab3ccbce9a6ec71258044cfc11bdae29f271fcde4d978
+  data.tar.gz: 22e0ce9181cef72c2081326175b314e865f752422e9d72a54e74f01fca39e23c70b23659ba5c7372ec4dc141a826f48a691d0f68690ba810ce7fe9e6eab6269b

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased]
 
+## [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
+
 ## [0.5.0] - 2022-03-04
 
 - use Brewfile for installing homebrew-based dependencies

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_template_18f (0.5.0)
+    rails_template_18f (0.5.3)
       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.2)
-      actionview (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    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.2)
-      activesupport (= 7.0.2.2)
+    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.2)
+    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.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.14.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.0.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.2)
-      actionpack (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    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.0)
+    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.0)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -95,24 +95,24 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.25.1)
+    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.15.1, < 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.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.2)
+    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.7.1)
-      rubocop (= 1.25.1)
-      rubocop-performance (= 1.13.2)
+    standard (1.12.0)
+      rubocop (= 1.29.0)
+      rubocop-performance (= 1.13.3)
     thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -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.0"
+  VERSION = "0.5.3"
 end

data/template.rb

@@ -192,6 +192,12 @@ if ENV["RT_DEV"] == "true"
 else
   gem "rails_template_18f", group: :development
 end
+after_bundle do
+  gsub_file "bin/dev", /foreman start -f (.*)$/, <<~'EOM'
+    # pass /dev/null for the environment file to prevent weird interactions between foreman and dotenv
+    foreman start -e /dev/null -f \1
+  EOM
+end
 
 copy_file "lib/tasks/scanning.rake"
 copy_file "env", ".env"
@@ -233,10 +239,11 @@ after_bundle do
     "build:css": "postcss ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css"
   },
   EOJSON
+  # 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 @csstools/postcss-sass"
   run "yarn add postcss-scss"
   insert_into_file "postcss.config.js", "  syntax: 'postcss-scss',\n", before: /^\s+plugins/
   gsub_file "postcss.config.js", "postcss-nesting", "@csstools/postcss-sass"
@@ -265,8 +272,6 @@ 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";
   EOCSS

data/templates/README.md.tt

@@ -31,9 +31,9 @@ guide for an introduction to the framework.
 
 Environment variables can be set in development using the [dotenv](https://github.com/bkeepers/dotenv) gem.
 
-Consistent but sensitive credentials should be added to `config/credentials.yml.env` by using `$ rails credentials:edit`
+Consistent but sensitive credentials should be added to `config/credentials.yml.enc` by using `$ rails credentials:edit`
 
-Production credentials should be added to `config/credentials/production.yml.env` by using `$ rails credentials:edit --environment production`
+Production credentials should be added to `config/credentials/production.yml.enc` by using `$ rails credentials:edit --environment production`
 
 Any changes to variables in `.env` that should not be checked into git should be set
 in `.env.local`.

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.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-06-06 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
@@ -264,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Generators for creating an 18F-flavored Rails app