appease ChefStyle: Style/TrailingCommaInHashLiteral

> Put a comma after the last item of a multiline hash.

OK

Signed-off-by: Robb Kidd <rkidd@chef.io>

src/supermarket/Vagrantfile

@@ -40,12 +40,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       postgres: {
         user: "vagrant",
         database: "supermarket_development",
-        auth_method: "trust"
+        auth_method: "trust",
       },
       supermarket: {
         host: "localhost",
-        port: VM_PORT
-      }
+        port: VM_PORT,
+      },
     }
 
     chef.run_list = [

src/supermarket/app/controllers/api/v1/cookbook_uploads_controller.rb

@@ -88,7 +88,7 @@ def destroy
       error(
         {
           error_code: t("api.error_codes.forbidden"),
-          error_messages: [t("api.error_messages.unauthorized_destroy_error")]
+          error_messages: [t("api.error_messages.unauthorized_destroy_error")],
         },
         403
       )
@@ -162,7 +162,7 @@ def destroy_version
   def upload_params
     {
       cookbook: params.require(:cookbook),
-      tarball: params.require(:tarball)
+      tarball: params.require(:tarball),
     }
   end
 
@@ -181,7 +181,7 @@ def authenticate_user!
       return error(
         {
           error_code: t("api.error_codes.authentication_failed"),
-          error_messages: [t("api.error_messages.invalid_username", username: username)]
+          error_messages: [t("api.error_messages.invalid_username", username: username)],
         },
         401
       )
@@ -191,7 +191,7 @@ def authenticate_user!
       return error(
         {
           error_code: t("api.error_codes.authentication_failed"),
-          error_messages: [t("api.error_messages.missing_public_key_error", current_host: request.base_url)]
+          error_messages: [t("api.error_messages.missing_public_key_error", current_host: request.base_url)],
         },
         401
       )
@@ -208,7 +208,7 @@ def authenticate_user!
       error(
         {
           error_code: t("api.error_codes.authentication_failed"),
-          error_messages: [t("api.error_messages.authentication_key_error")]
+          error_messages: [t("api.error_messages.authentication_key_error")],
         },
         401
       )

src/supermarket/app/controllers/api/v1/metrics_controller.rb

@@ -11,7 +11,7 @@ def show
       total_cookbooks: Cookbook.count,
       total_follows: CookbookFollower.count,
       total_users: User.count,
-      total_hits: { "/universe" => Universe.show_hits }
+      total_hits: { "/universe" => Universe.show_hits },
     }
   end
 end

src/supermarket/app/controllers/api/v1_controller.rb

@@ -12,7 +12,7 @@ def render_404
     error(
       {
         error_messages: [t("api.error_messages.not_found")],
-        error_code: t("api.error_codes.not_found")
+        error_code: t("api.error_codes.not_found"),
       },
       404
     )
@@ -27,7 +27,7 @@ def render_not_authorized(messages)
     error(
       {
         error_code: t("api.error_codes.unauthorized"),
-        error_messages: messages
+        error_messages: messages,
       },
       401
     )

src/supermarket/app/helpers/application_helper.rb

@@ -36,7 +36,7 @@ def flash_message_class_for(name)
     {
       "notice" => "success",
       "alert" => "alert",
-      "warning" => "warning"
+      "warning" => "warning",
     }.fetch(name)
   end
 end

src/supermarket/app/helpers/supported_platforms_helper.rb

@@ -29,7 +29,7 @@ def supported_platform_icon(platform)
       "suse" => "suse",
       "ubuntu" => "ubuntu",
       "windows" => "windows",
-      "zlinux" => "zlinux"
+      "zlinux" => "zlinux",
     }.fetch(platform.name.parameterize(separator: "_"), "generic")
   end
 end

src/supermarket/app/helpers/users_helper.rb

@@ -36,7 +36,7 @@ def pluralized_stats(count, thing)
 
   def gravatar_image(user, options = {})
     options = {
-      size: 48
+      size: 48,
     }.merge(options)
 
     size = options[:size]

src/supermarket/app/models/cookbook.rb

@@ -30,7 +30,7 @@ class Cookbook < ApplicationRecord
       "recently_updated" => "updated_at DESC",
       "recently_added" => "id DESC",
       "most_downloaded" => "(cookbooks.web_download_count + cookbooks.api_download_count) DESC, id ASC",
-      "most_followed" => "cookbook_followers_count DESC, id ASC"
+      "most_followed" => "cookbook_followers_count DESC, id ASC",
     }.fetch(ordering, "name ASC"))
   }
 
@@ -69,15 +69,15 @@ class Cookbook < ApplicationRecord
   pg_search_scope(
     :search,
     against: {
-      name: "A"
+      name: "A",
     },
     associated_against: {
       chef_account: { username: "B" },
-      cookbook_versions: { description: "C" }
+      cookbook_versions: { description: "C" },
     },
     using: {
       tsearch: { dictionary: "english", only: [:username, :description], prefix: true },
-      trigram: { only: [:name] }
+      trigram: { only: [:name] },
     },
     ranked_by: ":trigram + (0.5 * :tsearch)",
     order_within_rank: "cookbooks.name"
@@ -116,11 +116,11 @@ class Cookbook < ApplicationRecord
   validates :cookbook_versions, presence: true
   validates :source_url, url: {
     allow_blank: true,
-    allow_nil: true
+    allow_nil: true,
   }
   validates :issues_url, url: {
     allow_blank: true,
-    allow_nil: true
+    allow_nil: true,
   }
 
   #

src/supermarket/app/models/cookbook_version.rb

@@ -25,7 +25,7 @@ class CookbookVersion < ApplicationRecord
   validates :version, presence: true,
                       uniqueness: {
                         scope: :cookbook_id,
-                        case_sensitive: false
+                        case_sensitive: false,
                       },
                       chef_version: true
   validates_attachment(
@@ -41,7 +41,7 @@ class CookbookVersion < ApplicationRecord
                      "application/x-bzip", "application/x-zip-compressed",
                      "application/cap", "application/x-tar-gz",
                      "application/postscript", "application/x-targz"],
-      message: ->(_, info) { "can not be #{info[:value]}." }
+      message: ->(_, info) { "can not be #{info[:value]}." },
     }
   )
 

src/supermarket/app/models/tool.rb

@@ -22,7 +22,7 @@ class Tool < ApplicationRecord
   validates :slug, presence: true, uniqueness: { case_sensitive: false }, format: /\A[\w_-]+\z/i
   validates :source_url, url: {
     allow_blank: true,
-    allow_nil: true
+    allow_nil: true,
   }
 
   # Search
@@ -31,14 +31,14 @@ class Tool < ApplicationRecord
     :search,
     against: {
       name: "A",
-      description: "C"
+      description: "C",
     },
     associated_against: {
-      chef_account: { username: "B" }
+      chef_account: { username: "B" },
     },
     using: {
       tsearch: { dictionary: "english", only: [:username, :description], prefix: true },
-      trigram: { only: [:name] }
+      trigram: { only: [:name] },
     },
     ranked_by: ":trigram + (0.5 * :tsearch)",
     order_within_rank: "tools.name"
@@ -73,7 +73,7 @@ class Tool < ApplicationRecord
 
   scope :ordered_by, lambda { |ordering|
     reorder({
-      "recently_added" => "id DESC"
+      "recently_added" => "id DESC",
     }.fetch(ordering, "name ASC"))
   }
 

src/supermarket/app/models/universe.rb

@@ -59,7 +59,7 @@ def generate(opts = {})
         LOCATION_TYPE => CHEF,
         LOCATION_PATH => location_path,
         DOWNLOAD_URL => download_url(name, version, url_base),
-        DEPENDENCIES => {}
+        DEPENDENCIES => {},
       }
 
       if dependency && dependency_constraint

src/supermarket/app/models/user.rb

@@ -44,15 +44,15 @@ class User < ApplicationRecord
     against: {
       first_name: "A",
       last_name: "B",
-      email: "C"
+      email: "C",
     },
     associated_against: {
       chef_account: :username,
-      github_account: :username
+      github_account: :username,
     },
     using: {
       tsearch: { prefix: true, dictionary: "english" },
-      trigram: { threshold: 0.2 }
+      trigram: { threshold: 0.2 },
     }
   )
 

src/supermarket/app/workers/fieri_notify_worker.rb

@@ -24,8 +24,8 @@ def perform(cookbook_version_id)
       {
         "name" => cookbook_version.name,
         "version" => cookbook_version.version,
-        "artifact_url" => cookbook_version.cookbook_artifact_url
-      }
+        "artifact_url" => cookbook_version.cookbook_artifact_url,
+      },
     }
 
     req = Net::HTTP::Post.new(uri, "Content-Type" => "application/json")

src/supermarket/config/application.rb

@@ -77,7 +77,7 @@ class Application < Rails::Application
     self.default_url_options = {
       host: ENV["FQDN"],
       port: ENV["PORT"],
-      protocol: ENV["PROTOCOL"]
+      protocol: ENV["PROTOCOL"],
     }
 
     # Configure the email renderer for building links back to the site

src/supermarket/config/environments/development.rb

@@ -18,7 +18,7 @@
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      "Cache-Control" => "public, max-age=#{2.days.seconds.to_i}"
+      "Cache-Control" => "public, max-age=#{2.days.seconds.to_i}",
     }
   else
     config.action_controller.perform_caching = false

src/supermarket/config/environments/production.rb

@@ -77,7 +77,7 @@
         port: ENV["SMTP_PORT"],
         user_name: ENV["SMTP_USER_NAME"],
         password: ENV["SMTP_PASSWORD"],
-        authentication: "plain"
+        authentication: "plain",
       }
     else
       config.action_mailer.delivery_method = :sendmail

src/supermarket/config/environments/test.rb

@@ -15,7 +15,7 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    "Cache-Control" => "public, max-age=#{1.hour.seconds.to_i}"
+    "Cache-Control" => "public, max-age=#{1.hour.seconds.to_i}",
   }
 
   # Show full error reports and disable caching.

src/supermarket/config/initializers/datadog_tracer.rb

@@ -8,6 +8,6 @@
       auto_instrument: true,
       auto_instrument_redis: true,
       default_service: ENV["DATADOG_APP_NAME"] || "rails_app",
-      env: ENV["DATADOG_ENVIRONMENT"] || nil
+      env: ENV["DATADOG_ENVIRONMENT"] || nil,
     }
 end

src/supermarket/config/initializers/omniauth.rb

@@ -25,8 +25,8 @@
   client_options = {
     ssl: {
       verify: ENV["CHEF_OAUTH2_VERIFY_SSL"].present? &&
-              ENV["CHEF_OAUTH2_VERIFY_SSL"] != "false"
-    }
+              ENV["CHEF_OAUTH2_VERIFY_SSL"] != "false",
+    },
   }
 
   if ENV["CHEF_OAUTH2_URL"].present?

src/supermarket/config/initializers/paperclip.rb

@@ -20,20 +20,20 @@
     options = {
       storage: "s3",
       s3_credentials: {
-        bucket: ENV["S3_BUCKET"]
+        bucket: ENV["S3_BUCKET"],
       },
       path: path,
       bucket: ENV["S3_BUCKET"],
       s3_protocol: ENV["PROTOCOL"],
-      s3_region: ENV["S3_REGION"]
+      s3_region: ENV["S3_REGION"],
     }
 
     # If static creds are present in config - use them
     if Supermarket::S3ConfigAudit.use_s3_with_static_creds?(ENV)
       options = options.merge(
         s3_credentials: {
           access_key_id: ENV["S3_ACCESS_KEY_ID"],
-          secret_access_key: ENV["S3_SECRET_ACCESS_KEY"]
+          secret_access_key: ENV["S3_SECRET_ACCESS_KEY"],
         }
       )
     end

src/supermarket/config/initializers/sidekiq.rb

@@ -10,11 +10,11 @@
   Sidekiq::Cron::Job.load_from_hash(
     "Daily refresh of the sitemap" => {
       class: "SitemapRefreshWorker",
-      cron: "@daily"
+      cron: "@daily",
     },
     "Schedule refresh of expiring tokens" => {
       class: "OauthTokenRefreshScheduleWorker",
-      cron: "*/5 * * * *"
+      cron: "*/5 * * * *",
     }
   )
 end

src/supermarket/spec/api/cookbook_destroy_spec.rb

@@ -14,7 +14,7 @@
       "average_rating" => nil,
       "category" => "Other",
       "latest_version" => "http://www.example.com/api/v1/cookbooks/redis-test/versions/1.0.0",
-      "up_for_adoption" => nil
+      "up_for_adoption" => nil,
     }
   end
 

src/supermarket/spec/api/cookbook_search_spec.rb

@@ -8,7 +8,7 @@
       "cookbook_name" => "redis-test",
       "cookbook_description" => "Installs/Configures redis-test",
       "cookbook" => "http://www.example.com/api/v1/cookbooks/redis-test",
-      "cookbook_maintainer" => user.username
+      "cookbook_maintainer" => user.username,
     }
   end
 
@@ -17,7 +17,7 @@
       "cookbook_name" => "redisio-test",
       "cookbook_description" => "Installs/Configures redisio-test",
       "cookbook" => "http://www.example.com/api/v1/cookbooks/redisio-test",
-      "cookbook_maintainer" => user.username
+      "cookbook_maintainer" => user.username,
     }
   end
 
@@ -36,7 +36,7 @@
     search_response = {
       "items" => [redis_test_signature, redisio_test_signature],
       "total" => 2,
-      "start" => 0
+      "start" => 0,
     }
 
     get "/api/v1/search?q=redis"
@@ -48,7 +48,7 @@
     search_response = {
       "items" => [redisio_test_signature],
       "total" => 1,
-      "start" => 1
+      "start" => 1,
     }
 
     get "/api/v1/search?q=redis&start=1&items=1"

src/supermarket/spec/api/cookbook_show_spec.rb

@@ -20,7 +20,7 @@
           ],
         "description" => "Installs/Configures redis-test",
         "average_rating" => nil,
-        "deprecated" => false
+        "deprecated" => false,
       }
     end