From 936d19cbb3567835fffc4e03abd32370167d688e Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 29 Aug 2017 16:18:43 -0700
Subject: [PATCH] Bump some deps

---
 .rubocop.yml                                              | 4 ++--
 .travis.yml                                               | 2 +-
 Gemfile                                                   | 6 +++---
 middleman-cli/features/support/env.rb                     | 4 ++--
 middleman-core/features/support/env.rb                    | 4 ++--
 .../lib/middleman-core/step_definitions/server_steps.rb   | 2 +-
 middleman-core/middleman-core.gemspec                     | 8 ++++----
 middleman-core/spec/spec_helper.rb                        | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index c92b709f..36309729 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -42,7 +42,7 @@ CyclomaticComplexity:
 HandleExceptions:
   Enabled: false
 EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
 SignalException:
   Enabled: false
 RegexpLiteral:
@@ -50,7 +50,7 @@ RegexpLiteral:
 FormatString:
   Enabled: false
 CaseIndentation:
-  IndentWhenRelativeTo: end
+  EnforcedStyle: end
 TrivialAccessors:
   Enabled: false
 SingleLineBlockParams:
diff --git a/.travis.yml b/.travis.yml
index fe5acedf..bf1a5e7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,6 @@ env:
   global:
     - TEST=true
     - CODECLIMATE_REPO_TOKEN=81787f7b1c3bfa937edadcafbc94f807bf5af5c1142c7b793f2d9969a271de1f
-script: bundle exec rake test
+script: bundle exec rake test && bundle exec codeclimate-test-reporter
 notifications:
   slack: middleman:JW9OvXmn1m3XrSERe8866nBR
diff --git a/Gemfile b/Gemfile
index 80d0b3df..688cbf02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'byebug'
 gem 'aruba', '~> 0.7.4', require: false
 gem 'rspec', '~> 3.0', require: false
 gem 'cucumber', '~> 2.0', require: false
-gem 'addressable', '~> 2.4.0', require: false
+gem 'addressable', '~> 2.4', require: false
 
 # Pry tools
 gem 'pry'
@@ -18,7 +18,7 @@ gem 'pry-rescue'
 
 # Optional middleman dependencies, included for tests
 gem 'haml', '>= 4.0.5', require: false
-gem 'sassc', '~> 1.10.1', require: false
+gem 'sassc', '~> 1.10', require: false
 gem 'coffee-script', '~> 2.2', require: false
 gem 'kramdown', '~> 1.2', require: false
 gem 'slim', '>= 2.0', require: false
@@ -42,7 +42,7 @@ gem 'therubyracer', '~> 0.12.3', platforms: :ruby
 gem 'rubocop', '~> 0.24', require: false
 gem 'simplecov', '~> 0.10', require: false
 gem 'coveralls', '~> 0.8', require: false
-gem 'codeclimate-test-reporter', '~> 0.3', require: false, group: :test
+gem 'codeclimate-test-reporter', '~> 1.0', require: false, group: :test
 
 # Middleman itself
 gem 'middleman-cli', path: 'middleman-cli'
diff --git a/middleman-cli/features/support/env.rb b/middleman-cli/features/support/env.rb
index 8044deab..65eb7047 100644
--- a/middleman-cli/features/support/env.rb
+++ b/middleman-cli/features/support/env.rb
@@ -11,8 +11,8 @@ Capybara.javascript_driver = :poltergeist
 require 'coveralls'
 Coveralls.wear!
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-cli')
diff --git a/middleman-core/features/support/env.rb b/middleman-core/features/support/env.rb
index 77cfbb06..7f2fb7cd 100644
--- a/middleman-core/features/support/env.rb
+++ b/middleman-core/features/support/env.rb
@@ -11,8 +11,8 @@ Capybara.javascript_driver = :poltergeist
 require 'coveralls'
 Coveralls.wear!
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')
diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb
index 5f32e691..f2567946 100644
--- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb
+++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb
@@ -54,7 +54,7 @@ Given /^the Server is running$/ do
 
     app.after_configuration_eval do
       activation_commands.each do |p|
-        config_context.instance_exec(&p)
+        app.config_context.instance_exec(&p)
       end
     end
   end
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 983ae20a..2bef411c 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -31,14 +31,14 @@ Gem::Specification.new do |s|
   # Helpers
   s.add_dependency('activesupport', ['>= 4.2', '< 5.2'])
   s.add_dependency('padrino-helpers', ['~> 0.13.0'])
-  s.add_dependency("addressable", ["~> 2.3"])
+  s.add_dependency('addressable', ['~> 2.3'])
   s.add_dependency('memoist', ['~> 0.14'])
 
   # Watcher
-  s.add_dependency('listen', ['~> 3.0.0'])
+  s.add_dependency('listen', ['~> 3.0'])
 
   # Tests
-  s.add_development_dependency("capybara", ["~> 2.5.0"])
+  s.add_development_dependency('capybara', ['~> 2.5.0'])
 
   # i18n
   s.add_dependency('i18n', ['~> 0.7.0'])
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   s.add_dependency('execjs', ['~> 2.0'])
 
   # Testing
-  s.add_dependency('contracts', ['~> 0.13.0'])
+  s.add_dependency('contracts', ['~> 0.13'])
 
   # Hash stuff
   s.add_dependency('hashie', ['~> 3.4'])
diff --git a/middleman-core/spec/spec_helper.rb b/middleman-core/spec/spec_helper.rb
index c7b3d141..3ec78cdc 100644
--- a/middleman-core/spec/spec_helper.rb
+++ b/middleman-core/spec/spec_helper.rb
@@ -4,8 +4,8 @@ SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..'))
 require 'coveralls'
 Coveralls.wear!
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require 'aruba/api'
 RSpec.configure do |config|