owenbendavies · owenbendavies · May 26, 2016 · May 26, 2016
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,7 @@
 require: rubocop-rspec
 
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -0,0 +1,26 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-05-26 11:25:01 +0100 using RuboCop version 0.40.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 16
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/jobs/clean_s3_job_spec.rb'
+    - 'spec/jobs/daily_job_spec.rb'
+    - 'spec/jobs/validate_data_job_spec.rb'
+    - 'spec/models/image_spec.rb'
+    - 'spec/models/page_spec.rb'
+    - 'spec/models/site_spec.rb'
+    - 'spec/models/user_spec.rb'
+    - 'spec/uploaders/image_uploader_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: CustomTransform.
+RSpec/FilePath:
+  Exclude:
+    - 'spec/jobs/clean_s3_job_spec.rb'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -47,7 +47,7 @@ GEM
     arel (6.0.3)
     ast (2.2.0)
     autogrow-textarea-rails (3.1.0)
-    autoprefixer-rails (6.3.6)
+    autoprefixer-rails (6.3.6.1)
       execjs
     bcrypt (3.1.11)
     bh (1.3.6)
@@ -58,10 +58,10 @@ GEM
       sass (>= 3.3.4)
     brakeman (3.3.0)
     builder (3.2.2)
-    bullet (5.0.0)
+    bullet (5.1.0)
       activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.9.0)
-    byebug (8.2.5)
+      uniform_notifier (~> 1.10.0)
+    byebug (9.0.4)
     cane (3.0.0)
       parallel
     capybara (2.7.1)
@@ -99,12 +99,12 @@ GEM
     css_parser (1.4.1)
       addressable
     database_cleaner (1.5.3)
-    delayed_job (4.1.1)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.1.0)
-      activerecord (>= 3.0, < 5)
+    delayed_job (4.1.2)
+      activesupport (>= 3.0, < 5.1)
+    delayed_job_active_record (4.1.1)
+      activerecord (>= 3.0, < 5.1)
       delayed_job (>= 3.0, < 5)
-    devise (4.1.0)
+    devise (4.1.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 5.1)
@@ -124,7 +124,7 @@ GEM
       thread_safe
     erubis (2.7.0)
     excon (0.49.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.7.0)
@@ -185,7 +185,7 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.39.0)
+    fog-core (1.40.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -205,10 +205,9 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.0)
       fog-core (~> 1.27)
-    fog-openstack (0.1.5)
-      fog-core (>= 1.38)
+    fog-openstack (0.1.6)
+      fog-core (>= 1.39)
       fog-json (>= 1.0)
-      fog-xml (>= 0.1)
       ipaddress (>= 0.8)
     fog-powerdns (0.1.1)
       fog-core (~> 1.27)
@@ -252,7 +251,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (0.6.4)
+    fog-vsphere (0.7.0)
       fog-core
       rbvmomi (~> 1.8)
     fog-xenserver (0.2.3)
@@ -265,7 +264,7 @@ GEM
       sass (>= 3.2)
     font_assets (0.1.12)
       rack
-    foreman (0.81.0)
+    foreman (0.82.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
     get_process_mem (0.2.0)
@@ -340,16 +339,16 @@ GEM
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
+    mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     modware (0.1.2)
       its-it
       key_struct (~> 0.4)
-    multi_json (1.12.0)
+    multi_json (1.12.1)
     newrelic_rpm (3.15.2.317)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
@@ -373,8 +372,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.3.0)
-      byebug (~> 8.0)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
       pry (~> 0.10)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
@@ -452,15 +451,15 @@ GEM
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.4.1)
-      rubocop (= 0.39.0)
-    ruby-progressbar (1.8.0)
+    rubocop-rspec (1.5.0)
+      rubocop (>= 0.40.0)
+    ruby-progressbar (1.8.1)
     ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
     safe_yaml (1.0.4)
@@ -500,7 +499,7 @@ GEM
     scss-lint (0.38.0)
       rainbow (~> 2.0)
       sass (~> 3.4.1)
-    secure_headers (3.3.1)
+    secure_headers (3.3.2)
       useragent
     sexp_processor (4.7.0)
     shoulda-matchers (3.1.1)
@@ -540,9 +539,9 @@ GEM
     thor (0.19.1)
     thread (0.2.2)
     thread_safe (0.3.5)
-    tilt (2.0.3)
+    tilt (2.0.4)
     timecop (0.8.1)
-    tins (1.10.1)
+    tins (1.10.2)
     tinymce-rails (4.3.12)
       railties (>= 3.1.1)
     trollop (2.1.2)
@@ -553,14 +552,14 @@ GEM
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.0.5)
-    uniform_notifier (1.9.0)
+    uniform_notifier (1.10.0)
     useragent (0.16.7)
     validates_email_format_of (1.6.3)
       i18n
     valuable (0.9.12)
     warden (1.2.6)
       rack (>= 1.0)
-    webmock (2.0.1)
+    webmock (2.0.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -655,5 +654,8 @@ DEPENDENCIES
   will_paginate-bootstrap
   xml-sitemap
 
+RUBY VERSION
+   ruby 2.3.1p112
+
 BUNDLED WITH
-   1.11.2
+   1.12.4
diff --git a/public/assets/.sprockets-manifest-aecee3ed6b5d718a704d5b23d19cfd81.json b/public/assets/.sprockets-manifest-aecee3ed6b5d718a704d5b23d19cfd81.json
diff --git a/spec/support/all/zxcvbn_stub.rb b/spec/support/all/zxcvbn_stub.rb
@@ -1,7 +1,7 @@
 RSpec.configure do |config|
   config.before :each do |test|
     unless test.metadata[:secure_password]
-      score = double('score')
+      score = instance_double('score')
 
       allow(score).to receive(:score).and_return(4)
 

diff --git a/vendor/cache/autoprefixer-rails-6.3.6.1.gem b/vendor/cache/autoprefixer-rails-6.3.6.1.gem
diff --git a/vendor/cache/autoprefixer-rails-6.3.6.gem b/vendor/cache/autoprefixer-rails-6.3.6.gem
diff --git a/vendor/cache/bullet-5.0.0.gem b/vendor/cache/bullet-5.0.0.gem
diff --git a/vendor/cache/bullet-5.1.0.gem b/vendor/cache/bullet-5.1.0.gem
diff --git a/vendor/cache/byebug-8.2.5.gem b/vendor/cache/byebug-8.2.5.gem
diff --git a/vendor/cache/byebug-9.0.4.gem b/vendor/cache/byebug-9.0.4.gem
diff --git a/vendor/cache/delayed_job-4.1.1.gem b/vendor/cache/delayed_job-4.1.1.gem
diff --git a/vendor/cache/delayed_job-4.1.2.gem b/vendor/cache/delayed_job-4.1.2.gem
diff --git a/vendor/cache/delayed_job_active_record-4.1.0.gem b/vendor/cache/delayed_job_active_record-4.1.0.gem
diff --git a/vendor/cache/delayed_job_active_record-4.1.1.gem b/vendor/cache/delayed_job_active_record-4.1.1.gem
diff --git a/vendor/cache/devise-4.1.0.gem b/vendor/cache/devise-4.1.0.gem
diff --git a/vendor/cache/devise-4.1.1.gem b/vendor/cache/devise-4.1.1.gem
diff --git a/vendor/cache/execjs-2.6.0.gem b/vendor/cache/execjs-2.6.0.gem
diff --git a/vendor/cache/execjs-2.7.0.gem b/vendor/cache/execjs-2.7.0.gem
diff --git a/vendor/cache/fog-core-1.39.0.gem b/vendor/cache/fog-core-1.39.0.gem
diff --git a/vendor/cache/fog-core-1.40.0.gem b/vendor/cache/fog-core-1.40.0.gem
diff --git a/vendor/cache/fog-openstack-0.1.5.gem b/vendor/cache/fog-openstack-0.1.5.gem
diff --git a/vendor/cache/fog-openstack-0.1.6.gem b/vendor/cache/fog-openstack-0.1.6.gem
diff --git a/vendor/cache/fog-vsphere-0.6.4.gem b/vendor/cache/fog-vsphere-0.6.4.gem
diff --git a/vendor/cache/fog-vsphere-0.7.0.gem b/vendor/cache/fog-vsphere-0.7.0.gem
diff --git a/vendor/cache/foreman-0.81.0.gem b/vendor/cache/foreman-0.81.0.gem
diff --git a/vendor/cache/foreman-0.82.0.gem b/vendor/cache/foreman-0.82.0.gem
diff --git a/vendor/cache/mime-types-3.0.gem b/vendor/cache/mime-types-3.0.gem
diff --git a/vendor/cache/mime-types-3.1.gem b/vendor/cache/mime-types-3.1.gem
diff --git a/vendor/cache/mime-types-data-3.2016.0221.gem b/vendor/cache/mime-types-data-3.2016.0221.gem
diff --git a/vendor/cache/mime-types-data-3.2016.0521.gem b/vendor/cache/mime-types-data-3.2016.0521.gem
diff --git a/vendor/cache/minitest-5.8.4.gem b/vendor/cache/minitest-5.8.4.gem
diff --git a/vendor/cache/minitest-5.9.0.gem b/vendor/cache/minitest-5.9.0.gem
diff --git a/vendor/cache/multi_json-1.12.0.gem b/vendor/cache/multi_json-1.12.0.gem
diff --git a/vendor/cache/multi_json-1.12.1.gem b/vendor/cache/multi_json-1.12.1.gem
diff --git a/vendor/cache/pry-byebug-3.3.0.gem b/vendor/cache/pry-byebug-3.3.0.gem
diff --git a/vendor/cache/pry-byebug-3.4.0.gem b/vendor/cache/pry-byebug-3.4.0.gem
diff --git a/vendor/cache/rubocop-0.39.0.gem b/vendor/cache/rubocop-0.39.0.gem
diff --git a/vendor/cache/rubocop-0.40.0.gem b/vendor/cache/rubocop-0.40.0.gem
diff --git a/vendor/cache/rubocop-rspec-1.4.1.gem b/vendor/cache/rubocop-rspec-1.4.1.gem
diff --git a/vendor/cache/rubocop-rspec-1.5.0.gem b/vendor/cache/rubocop-rspec-1.5.0.gem
diff --git a/vendor/cache/ruby-progressbar-1.8.0.gem b/vendor/cache/ruby-progressbar-1.8.0.gem
diff --git a/vendor/cache/ruby-progressbar-1.8.1.gem b/vendor/cache/ruby-progressbar-1.8.1.gem
diff --git a/vendor/cache/secure_headers-3.3.1.gem b/vendor/cache/secure_headers-3.3.1.gem
diff --git a/vendor/cache/secure_headers-3.3.2.gem b/vendor/cache/secure_headers-3.3.2.gem
diff --git a/vendor/cache/tilt-2.0.3.gem b/vendor/cache/tilt-2.0.3.gem
diff --git a/vendor/cache/tilt-2.0.4.gem b/vendor/cache/tilt-2.0.4.gem
diff --git a/vendor/cache/tins-1.10.1.gem b/vendor/cache/tins-1.10.1.gem
diff --git a/vendor/cache/tins-1.10.2.gem b/vendor/cache/tins-1.10.2.gem
diff --git a/vendor/cache/uniform_notifier-1.10.0.gem b/vendor/cache/uniform_notifier-1.10.0.gem
diff --git a/vendor/cache/uniform_notifier-1.9.0.gem b/vendor/cache/uniform_notifier-1.9.0.gem
diff --git a/vendor/cache/webmock-2.0.1.gem b/vendor/cache/webmock-2.0.1.gem
diff --git a/vendor/cache/webmock-2.0.3.gem b/vendor/cache/webmock-2.0.3.gem