configure s3_bucket name in one place, rescue exceptions in qr_code task

app/models/office_location.rb

@@ -7,7 +7,7 @@ class OfficeLocation < ApplicationRecord
 
   # Set a "PYR_S3_BUCKET" environment variable to your own S3 Bucket
   # if you want to use your own generated QR Codes.
-  S3_BUCKET = ENV.fetch('PYR_S3_BUCKET') { 'phone-your-rep-images' }.freeze
+  S3_BUCKET = Rails.configuration.s3_bucket
 
   belongs_to :rep, foreign_key: :official_id, primary_key: :official_id
   has_many   :issues

config/application.rb

@@ -43,5 +43,8 @@ class Application < Rails::Application
 
     # Use Rack::Attack to deter malicious attacks by throttling requests by IP.
     config.middleware.use Rack::Attack
+
+    # Set the S3 Bucket name for QR codes
+    config.s3_bucket = ENV.fetch('PYR_S3_BUCKET') { 'phone-your-rep-images' }
   end
 end

lib/tasks/qr_codes.rake

@@ -5,7 +5,7 @@ namespace :pyr do
     # Set the "PYR_S3_BUCKET" environment variable on your machine or
     # at the command line (e.g. `rake some_task PYR_S3_BUCKET=your-own-bucket`)
     # if you wish to generate and upload your own images.
-    S3_BUCKET = ENV['PYR_S3_BUCKET']
+    S3_BUCKET = Rails.configuration.s3_bucket
 
     desc 'Generate QR code images for all office locations'
     task :generate, [:rep_set] do |_t, args|
@@ -81,9 +81,13 @@ namespace :pyr do
           FileUtils.mv(filename, "../../../../../../../../qr_codes/#{args[:rep_set]}/#{filename}")
         end
       end
-      Dir.chdir('../qr_codes') do
-        sh "git add #{args[:rep_set]}/*.png && git commit -m "\
-          "'update QR codes #{Time.now}' && git push"
+      begin
+        Dir.chdir('../qr_codes') do
+          sh "git add #{args[:rep_set]}/*.png && git commit -m "\
+            "'update QR codes #{Time.now}' && git push"
+        end
+      rescue RuntimeError => e
+        Rails.logger.error e
       end
     end