rails_template_18f 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c87267d368d3e90a500c0fc1bf23312a3f6edf437ba991a9a4c7b994fff4282d
-  data.tar.gz: ec24cf97ec587cf730bb2f63ff4cf0fd5b13ae64364b175041b0b0afd42a4321
+  metadata.gz: ccf6b140f15f85229d716db5c0b51db5b88b41172000f89a613bdc09975c61f7
+  data.tar.gz: 6a3a14efb4cb1373236a53260cf06b161375346d37097563ef65197862e538a8
 SHA512:
-  metadata.gz: c2c05519936ff836d7c99dd16a5363755a6e86731c5d41454adbc0f6a7ada083fd1b636d0f5da3db446225866f095b42c2278100c85d3c10a3a2182100fcf550
-  data.tar.gz: b2e6da4f298a5c0054997c2c44244e4956044af83af81792937adf7d52716a68b3f8ebf8332f598943b9bad9a37bebf3c6dd4da0eb196ac119cc32455db00e57
+  metadata.gz: 8fb2a0c4a4adf9fa72ea8078a6b1001671f2e562ece7b3d74b64ffa39c113b96c280f64a3eacc0233b67c8bc2b6ec160b2867c78e49363100d1cdc7055352516
+  data.tar.gz: 48e96e771a2fb4dd8ca03719f923ae2749b6b212577c88c8e72a3e2788d71b1a6a6bda768611509aa2001e129a7a29c833ad99a93433bf954c46552671d40c2b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.4.1] - 2022-02-25
+
+- update gem dependencies
+- fix issues when included gem hadn't been previously installed
+
 ## [0.4.0] - 2022-02-24
 
 - helper script to run rails app:update

data/Gemfile

@@ -7,6 +7,4 @@ gemspec
 
 gem "rake", "~> 13.0"
 
-gem "colorize", "~> 0.8"
-
 gem "byebug"

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rails_template_18f (0.4.0)
+    rails_template_18f (0.4.1)
       activesupport (~> 7.0.0)
+      colorize (~> 0.8)
       railties (~> 7.0.0)
       thor (~> 1.0)
 
@@ -125,7 +126,6 @@ PLATFORMS
 DEPENDENCIES
   ammeter (~> 1.1)
   byebug
-  colorize (~> 0.8)
   rails_template_18f!
   rake (~> 13.0)
   rspec (~> 3.11)

data/lib/generators/rails_template18f/active_storage/active_storage_generator.rb

@@ -13,8 +13,8 @@ module RailsTemplate18f
       DESC
 
       def configure_active_storage
-        generate "rails_template18f:cloud_gov_config"
-        rails_command "active_storage:install"
+        generate "rails_template18f:cloud_gov_config", inline: true
+        rails_command "active_storage:install", inline: true
         comment_lines "config/environments/production.rb", /active_storage\.service/
         insert_into_file "config/environments/production.rb", "\n  config.active_storage.service = :amazon", after: /active_storage\.service.*$/
         environment "config.active_storage.service = :local", env: "ci"
@@ -30,15 +30,22 @@ module RailsTemplate18f
       end
 
       def install_gems
-        gem "faraday", "~> 2.2"
-        gem "faraday-multipart", "~> 1.0"
-        gem_group :production do
-          gem "aws-sdk-s3", "~> 1.112"
+        faraday_installed = gem_installed?("faraday")
+        middleware_installed = gem_installed?("faraday-multipart")
+        sdk_installed = gem_installed?("aws-sdk-s3")
+        return if faraday_installed && middleware_installed && sdk_installed
+        gem "faraday", "~> 2.2" unless faraday_installed
+        gem "faraday-multipart", "~> 1.0" unless middleware_installed
+        unless sdk_installed
+          gem_group :production do
+            gem "aws-sdk-s3", "~> 1.112"
+          end
         end
+        bundle_install
       end
 
       def create_scanned_upload_model_and_job
-        generate :migration, "CreateFileUploads", "file:attachment", "record:references{polymorphic}", "scan_status:string"
+        generate :migration, "CreateFileUploads", "file:attachment", "record:references{polymorphic}", "scan_status:string", inline: true
         migration_file = Dir.glob(File.expand_path(File.join("db", "migrate", "[0-9]*_*.rb"), destination_root)).grep(/\d+_create_file_uploads.rb$/).first
         unless migration_file.nil?
           gsub_file migration_file, ":scan_status", ":scan_status, null: false, default: \"uploaded\""

data/lib/generators/rails_template18f/circleci/circleci_generator.rb

@@ -14,7 +14,10 @@ module RailsTemplate18f
       DESC
 
       def install_needed_gems
-        gem "rspec_junit_formatter", "~> 0.5", group: :test
+        gem_name = "rspec_junit_formatter"
+        return if gem_installed? gem_name
+        gem gem_name, "~> 0.5", group: :test
+        bundle_install
       end
 
       def install_pipeline

data/lib/generators/rails_template18f/cloud_gov_config/cloud_gov_config_generator.rb

@@ -13,10 +13,11 @@ module RailsTemplate18f
       DESC
 
       def install_climate_control
-        return if file_content("Gemfile").match?(/gem "climate_control"/)
+        return if gem_installed?("climate_control")
         gem_group :test do
           gem "climate_control", "~> 1.0"
         end
+        bundle_install
       end
 
       def install_model_and_test

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rails/generators"
-require "bundler"
 
 module RailsTemplate18f
   module Generators
@@ -16,17 +15,17 @@ module RailsTemplate18f
           Always installs configuration for English
       DESC
 
-      def install_helper_gem_and_tasks
-        return if file_content("Gemfile").match?(/gem "i18n-tasks"/)
+      def install_gem
+        return if gem_installed?("i18n-tasks")
         gem_group :development, :test do
           gem "i18n-tasks", "~> 0.9"
         end
-        Bundler.with_original_env do
-          in_root do
-            run "bundle install"
-            run "cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/"
-            run "cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/"
-          end
+      end
+
+      def install_helper_tasks
+        bundle_install do
+          run "cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/"
+          run "cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/"
         end
         insert_into_file "config/i18n-tasks.yml", "\n#{indent("- app/assets/builds", 4)}", after: "exclude:"
         uncomment_lines "config/i18n-tasks.yml", "ignore_missing:"

data/lib/generators/rails_template18f/i18n_js/i18n_js_generator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rails/generators"
-require "bundler"
 
 module RailsTemplate18f
   module Generators
@@ -16,15 +15,15 @@ module RailsTemplate18f
       DESC
 
       def install_gem_and_tasks
-        return if file_content("Gemfile").match?(/gem "i18n-js"/)
+        return if gem_installed?("i18n-js")
         gem "i18n-js", "~> 3.9"
-        Bundler.with_original_env do
-          in_root do
-            run "bundle install"
-            run "yarn add i18n-js"
-            generate "i18n:js:config"
-          end
+        bundle_install do
+          run "yarn add i18n-js"
+          generate "i18n:js:config"
         end
+      end
+
+      def configure_translation_yaml
         append_to_file "config/i18n-js.yml", <<~EOYAML
           # remove `only` to include all translations
           translations:

data/lib/generators/rails_template18f/newrelic/newrelic_generator.rb

@@ -23,7 +23,9 @@ module RailsTemplate18f
       end
 
       def install_gem
+        return if gem_installed?("newrelic_rpm")
         gem "newrelic_rpm", "~> 8.4"
+        bundle_install
       end
 
       def install_config

data/lib/generators/rails_template18f/sidekiq/sidekiq_generator.rb

@@ -13,7 +13,9 @@ module RailsTemplate18f
       DESC
 
       def install_gem
+        return if gem_installed?("sidekiq")
         gem "sidekiq", "~> 6.4"
+        bundle_install
       end
 
       def configure_server_runner
@@ -38,7 +40,7 @@ module RailsTemplate18f
       end
 
       def configure_active_job
-        generate "rails_template18f:cloud_gov_config"
+        generate "rails_template18f:cloud_gov_config", inline: true
         copy_file "config/initializers/redis.rb"
         application "config.active_job.queue_adapter = :sidekiq"
       end

data/lib/rails_template18f/generators/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bundler"
+
 module RailsTemplate18f
   module Generators
     module Base
@@ -20,6 +22,19 @@ module RailsTemplate18f
 
       private
 
+      def bundle_install
+        Bundler.with_original_env do
+          in_root do
+            run "bundle install"
+            yield if block_given?
+          end
+        end
+      end
+
+      def gem_installed?(gem_name)
+        file_content("Gemfile").match?(/gem "#{gem_name}"/)
+      end
+
       def file_content(filename)
         file_path = File.expand_path(filename, destination_root)
         if File.exist? file_path

data/lib/rails_template18f/version.rb

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

data/rails-template-18f.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "railties", "~> 7.0.0"
   spec.add_dependency "activesupport", "~> 7.0.0"
   spec.add_dependency "thor", "~> 1.0"
+  spec.add_dependency "colorize", "~> 0.8"
 
   spec.add_development_dependency "rspec", "~> 3.11"
   spec.add_development_dependency "ammeter", "~> 1.1"

data/template.rb

@@ -191,7 +191,9 @@ copy_file "env", ".env"
 copy_file "githooks/pre-commit", ".githooks/pre-commit", mode: :preserve
 
 unless skip_git?
-  rails_command "credentials:diff --enroll"
+  after_bundle do
+    rails_command "credentials:diff --enroll"
+  end
   append_to_file ".gitignore", <<~EOM
 
     # Ignore local dotenv overrides

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_template_18f
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +263,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