Merge pull request #71 from 3ofcoins/feature/update-deps-04-2018

Spring cleaning

.rubocop.yml

@@ -0,0 +1,49 @@
+# Rubocop thinks we're using Kernel#open, while we're using OpenURI#open's implementation
+Security/Open:
+  Enabled: false
+
+Style/RegexpLiteral:
+  AllowInnerSlashes: true
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/GlobalVars:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 22
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Max: 9
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Max: 20
+
+Metrics/PerceivedComplexity:
+  Max: 10
+
+Naming/FileName:
+  Enabled: false
+
+# The two following cops have to be disabled due to false positives
+Performance/RedundantMatch:
+  Enabled: false
+
+Performance/RegexpMatch:
+  Enabled: false
+
+AllCops:
+  TargetRubyVersion: 2.4.3

.travis.yml

@@ -1,9 +1,5 @@
-script: bundle exec cucumber && bundle exec cucumber -p validate
+script: bundle exec rubocop && bundle exec cucumber && bundle exec cucumber -p validate
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.2.1
-  - 2.3.0
-  - 2.3.1
-  - 2.4.0
+  - 2.4.3
   - 2.5.0

Dockerfile

@@ -1,13 +1,9 @@
 # -*- conf -*-
-FROM ubuntu:16.04
+FROM ruby:2.5
 
-COPY config/docker_apt_preferences /etc/apt/preferences.d/brightbox-ruby-ng
 RUN set -e -x ; \
-    echo 'deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu trusty main' > /etc/apt/sources.list.d/brightbox-ruby-ng.list ; \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv C3173AA6 ; \
     apt-get update ; \
-    apt-get install --yes ruby2.2 ruby2.2-dev git build-essential libssl-dev libicu-dev cmake pkg-config python-virtualenv; \
-    gem install bundler --no-rdoc --no-ri ; \
+    apt-get install --yes cmake python-virtualenv ; \
     rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 
 COPY . /opt/chef-browser

Gemfile

@@ -1,30 +1,34 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem "sinatra"
+gem "coderay"
+gem "deep_merge"
 gem "erubis", "~> 2.7.0"
-gem "ridley", "~> 5.0.0"
-gem "tinyconfig", "~> 0.1"
-gem "oj", platforms: :ruby         # to be used by multijson
+gem "github-linguist", "~> 6.0.1"
+gem "github-markup"
 gem "jrjackson", platforms: :jruby # to be used by multijson
-gem "puma"
-gem "rubysl", "~> 2.0", platforms: :rbx
-gem "racc", platforms: :rbx
-gem "deep_merge"
 gem "kramdown"
-gem "github-markup"
-gem "coderay"
+gem "oj", platforms: :ruby         # to be used by multijson
+gem "puma"
 gem "pygments.rb"
-gem "github-linguist", "~> 3.0"
-gem 'rugged', '= 0.21.1b2'      # github-linguist specifies (~> 0.21.1b2), but 0.21.4 breaks
+gem "racc", platforms: :rbx
+gem "ridley", "~> 5.1.1"
+gem "rubysl", "~> 2.0", platforms: :rbx
+gem 'rugged'
+gem "sinatra"
+gem "tinyconfig", "~> 0.1"
 
 group :development do
   gem "capybara"
-  gem "chef-zero"
+  gem "chef-zero", "~> 14.0.0"
   gem "cucumber"
-  gem "rack-test"
-  gem "wrong", "= 0.7.1"
+  gem "ffi"
   gem "pry"
+  gem "rack-test"
+  gem "rubocop", "~> 0.54.0"
   gem "rubysl-test-unit", "~> 2.0", platforms: :rbx
+  gem "wrong", "= 0.7.1"
 end
 
 group :test do