Fix a bunch of whitespace issues

alphagov · Aug 2, 2016 · 1549951 · 1549951
1 parent ed8e547
commit 1549951
Show file tree

Hide file tree

Showing 56 changed files with 61 additions and 70 deletions.
diff --git a/asset-manager/Capfile b/asset-manager/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/backdrop-write/config/deploy.rb b/backdrop-write/config/deploy.rb
@@ -8,7 +8,6 @@
 load "python"
 
 namespace :deploy do
-
   task :upload_environment_settings do
     config_folder = File.expand_path("secrets/settings/#{ENV['ORGANISATION']}", Dir.pwd)
     if File.exist?(config_folder)

diff --git a/bouncer/Capfile b/bouncer/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/bouncer/config/deploy.rb b/bouncer/config/deploy.rb
@@ -41,7 +41,7 @@
 after "deploy:symlink", "deploy:sync_legacy_assets"
 
 
-task :notify_errbit, :only => {:primary => true} do
+task :notify_errbit, :only => { :primary => true } do
   run "cd #{current_release} && #{rake} errbit:deploy REVISION=#{current_revision} TO=#{ENV['ORGANISATION']} REPO='#{repository}' USER=#{user}", :once => true
 end
 after "deploy:notify", "notify_errbit"
diff --git a/business-support-api/Capfile b/business-support-api/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/calculators/Capfile b/calculators/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/calendars/Capfile b/calendars/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/calendars/config/deploy.rb b/calendars/config/deploy.rb
@@ -1,6 +1,6 @@
 set :application, "calendars"
 set :capfile_dir, File.expand_path('../', File.dirname(__FILE__))
-set :server_class,       "calculators_frontend"
+set :server_class, "calculators_frontend"
 
 load 'defaults'
 load 'ruby'

diff --git a/collections/Capfile b/collections/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/contacts/Capfile b/contacts/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/contacts/config/deploy.rb b/contacts/config/deploy.rb
@@ -18,8 +18,8 @@
 set :assets_prefix, 'contacts-assets'
 
 set :server_class, {
-  frontend: {roles: [:frontend, :web, :app]},
-  backend: {roles: [:backend, :db, :web, :app]},
+  frontend: { roles: [:frontend, :web, :app] },
+  backend: { roles: [:backend, :db, :web, :app] },
 }
 
 require "whenever/capistrano"

diff --git a/content-store/Capfile b/content-store/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/designprinciples/Capfile b/designprinciples/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/email-alert-api/Capfile b/email-alert-api/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/email-campaign-api/Capfile b/email-campaign-api/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/email-campaign-frontend/Capfile b/email-campaign-frontend/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/errbit/Capfile b/errbit/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/event-store/config/deploy.rb b/event-store/config/deploy.rb
@@ -13,7 +13,6 @@
 load 'defaults'
 
 namespace :deploy do
-
   # This overrides the default update_code task
   desc "Copies the CI build artefact to the remote servers."
   task :update_code, :except => { :no_release => true } do

diff --git a/feedback/Capfile b/feedback/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/finder-frontend/Capfile b/finder-frontend/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/frontend/Capfile b/frontend/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/frontend/config/deploy.rb b/frontend/config/deploy.rb
@@ -32,15 +32,15 @@
       end
     end
   end
-  task :upload_private_initializers, :only => {:server_class => "backend"} do
+  task :upload_private_initializers, :only => { :server_class => "backend" } do
     config_folder = File.expand_path("secrets/to_upload/private_initializers/#{rails_env}", Dir.pwd)
     if File.exist?(config_folder)
       Dir.glob(File.join(config_folder, "*.rb")).each do |initializer|
         top.upload(initializer, File.join(release_path, "config/initializers/#{File.basename(initializer)}"))
       end
     end
   end
-  task :upload_unicorn_config, :only => {:server_class => "frontend"} do
+  task :upload_unicorn_config, :only => { :server_class => "frontend" } do
     config_file = File.expand_path("secrets/to_upload/unicorn.rb", Dir.pwd)
     if File.exist?(config_file)
       top.upload(config_file, File.join(release_path, "config/unicorn.rb"))

diff --git a/government-frontend/Capfile b/government-frontend/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/hmrc-manuals-api/Capfile b/hmrc-manuals-api/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/imminence/Capfile b/imminence/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/info-frontend/Capfile b/info-frontend/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/licencefinder/Capfile b/licencefinder/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/licencefinder/config/deploy.rb b/licencefinder/config/deploy.rb
@@ -1,6 +1,6 @@
 set :application, "licencefinder"
 set :capfile_dir, File.expand_path('../', File.dirname(__FILE__))
-set :server_class,       "calculators_frontend"
+set :server_class, "calculators_frontend"
 set :repo_name, "licence-finder"
 
 load 'defaults'
@@ -9,7 +9,7 @@
 
 set :assets_prefix, "licencefinder"
 set :rails_env, 'production'
-set :bundle_without,  [:development, :test, :webkit]
+set :bundle_without, [:development, :test, :webkit]
 
 set :copy_exclude, [
   '.git/*',

diff --git a/local-links-manager/Capfile b/local-links-manager/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/manuals-frontend/Capfile b/manuals-frontend/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/multipage-frontend/Capfile b/multipage-frontend/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/panopticon/Capfile b/panopticon/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/performanceplatform-admin/config/deploy.rb b/performanceplatform-admin/config/deploy.rb
@@ -8,7 +8,6 @@
 load "python"
 
 namespace :deploy do
-
   task :compile_scss do
     run_python_command('tools/compile_sass.py')
   end

diff --git a/publisher/Capfile b/publisher/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/recipes/defaults.rb b/recipes/defaults.rb
@@ -124,47 +124,47 @@
       end
     end
 
-    task :errbit, :only => {:primary => true} do
+    task :errbit, :only => { :primary => true } do
       run "cd #{current_release} && #{rake} airbrake:deploy REVISION=#{current_revision} TO=#{organisation} REPO='#{repository}' USER=#{user}", :once => true
     end
 
-    task :github, :only => {:primary => true} do
+    task :github, :only => { :primary => true } do
       run_locally "cd #{strategy.local_cache_path}; git push -f #{repository} HEAD:refs/heads/deployed-to-#{ENV['ORGANISATION']}"
     end
   end
 
   namespace :panopticon do
-    task :register, :only => {:primary => true, :draft => false} do
+    task :register, :only => { :primary => true, :draft => false } do
       rails_env = fetch(:rails_env, "production")
       rake = fetch(:rake)
       run "cd #{current_release}; #{rake} RAILS_ENV=#{rails_env} panopticon:register", :once => true
     end
   end
 
   namespace :publishing_api do
-    task :publish, :only => {:primary => true, :draft => false} do
+    task :publish, :only => { :primary => true, :draft => false } do
       rails_env = fetch(:rails_env, "production")
       rake = fetch(:rake)
       run "cd #{current_release}; #{rake} RAILS_ENV=#{rails_env} publishing_api:publish", :once => true
     end
 
-    task :publish_special_routes, :only => {:primary => true, :draft => false} do
+    task :publish_special_routes, :only => { :primary => true, :draft => false } do
       rails_env = fetch(:rails_env, "production")
       rake = fetch(:rake)
       run "cd #{current_release}; #{rake} RAILS_ENV=#{rails_env} publishing_api:publish_special_routes", :once => true
     end
   end
 
   namespace :email do
-    task :register_subscriptions, :only => {:primary => true} do
+    task :register_subscriptions, :only => { :primary => true } do
       rails_env = fetch(:rails_env, "production")
       rake = fetch(:rake)
       run "cd #{current_release}; #{rake} RAILS_ENV=#{rails_env} email_subscriptions:register_subscriptions", :once => true
     end
   end
 
   namespace :rummager do
-    task :index, :only => {:primary => true} do
+    task :index, :only => { :primary => true } do
       rails_env = fetch(:rails_env, "production")
       rake = fetch(:rake)
       run "cd #{current_release}; #{rake} RAILS_ENV=#{rails_env} rummager:index", :once => true

diff --git a/recipes/govuk_admin_template.rb b/recipes/govuk_admin_template.rb
@@ -1,6 +1,5 @@
 
 namespace :govuk_admin_template do
-
   task :configure do
     case ENV['ORGANISATION']
     when "production"

diff --git a/recipes/nodejs.rb b/recipes/nodejs.rb
@@ -51,7 +51,6 @@
       top.upload(f, File.join(release_path, File.basename(f)))
     end
   end
-
 end
 
 before "deploy:finalize_update", "deploy:install_deps"

diff --git a/recipes/python.rb b/recipes/python.rb
@@ -78,7 +78,6 @@
   task :upgrade_pip do
     run "cd #{release_path} && #{shared_path}/venv/bin/pip install --upgrade pip==7.1.0"
   end
-
 end
 
 after "deploy:setup", "deploy:create_virtualenv"

diff --git a/recipes/ruby.rb b/recipes/ruby.rb
@@ -6,7 +6,7 @@
   "PATH" => "/usr/lib/rbenv/shims:$PATH"
 }
 
-set :bundle_cmd,  'bundle'
+set :bundle_cmd, 'bundle'
 set(:source_db_config_file, 'secrets/to_upload/database.yml') unless fetch(:source_db_config_file, false)
 set(:db_config_file, 'config/database.yml') unless fetch(:db_config_file, false)
 set(:rack_env,  :production)
@@ -72,11 +72,11 @@
     run "ln -sf /etc/govuk/actionmailer_ses_smtp_config.rb #{release_path}/config/initializers/mailer.rb"
   end
 
-  task :create_mongoid_indexes, :only => {:primary => true} do
+  task :create_mongoid_indexes, :only => { :primary => true } do
     run "cd #{current_release}; #{rake} db:mongoid:create_indexes"
   end
 
-  task :seed_db, :only => {:primary => true} do
+  task :seed_db, :only => { :primary => true } do
     rails_env = fetch(:rails_env, "production")
     run "cd #{current_release}; #{rake} RAILS_ENV=#{rails_env} db:seed"
   end

diff --git a/recipes/set_servers.rb b/recipes/set_servers.rb
@@ -1,5 +1,4 @@
 namespace :deploy do
-
   # deploy:set_servers
   #
   # This uses the 'server_class' cap parameter, if set, to determine the
@@ -16,7 +15,7 @@
       next
     end
 
-    DEFAULT_CONFIG = {roles: [:web, :app, :db]}.freeze
+    DEFAULT_CONFIG = { roles: [:web, :app, :db] }.freeze
 
     classes = if cls.respond_to? :join
                 # Array of strings or symbols, e.g
@@ -61,7 +60,6 @@
       logger.info "set_servers: deploying to #{c} => #{nodes_to_deploy.join(', ')}"
     end
   end
-
 end
 
 on :start, 'deploy:set_servers'
diff --git a/recommended-links/Capfile b/recommended-links/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'
diff --git a/recommended-links/config/deploy.rb b/recommended-links/config/deploy.rb
@@ -17,7 +17,7 @@
 ]
 
 namespace :deploy do
-  task :restart, :roles => :app, :except => {:no_release => true} do
+  task :restart, :roles => :app, :except => { :no_release => true } do
   end
 
   namespace :rummager do

diff --git a/router/config/deploy.rb b/router/config/deploy.rb
@@ -13,7 +13,6 @@
 load 'defaults'
 
 namespace :deploy do
-
   # This overrides the default update_code task
   desc "Copies the CI build artefact to the remote servers."
   task :update_code, :except => { :no_release => true } do

diff --git a/service-manual-frontend/Capfile b/service-manual-frontend/Capfile
@@ -3,4 +3,4 @@ load 'deploy'
 $:.unshift(File.expand_path('../../lib', __FILE__))
 load_paths << File.expand_path('../../recipes', __FILE__)
 
-load    'config/deploy'
+load 'config/deploy'