diff --git a/.rubocop.yml b/.rubocop.yml index 27c17f3..7fc900a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ AllCops: - vendor/**/* - "*/puppet/Puppetfile" - "*/puppet/.tmp/**/*" - TargetRubyVersion: 1.9 + TargetRubyVersion: 2.4 Documentation: Enabled: false AlignParameters: diff --git a/.travis.yml b/.travis.yml index 9cb2cc7..d4b0336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ ---- +sudo: false language: ruby cache: bundler + rvm: - - 2.3.3 + - 2.4.1 bundler_args: --without integration script: bundle exec rake diff --git a/Gemfile b/Gemfile index 72bc984..5974c5c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,13 @@ +# frozen_string_literal: true + source 'https://rubygems.org' -gem 'highline', '~> 1.6.0' -gem 'inspec', '~> 1' +gem 'highline', '~> 1.7.0' +gem 'inspec', '~> 3.0.0' gem 'rack', '1.6.4' gem 'rake' -gem 'rubocop', '~> 0.46.0' +gem 'rubocop', '~> 0.60.0' group :tools do - gem 'github_changelog_generator', '~> 1.12.0' + gem 'github_changelog_generator', '~> 1.14.0' end diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 index 6196cd9..0863a60 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,5 @@ #!/usr/bin/env rake +# frozen_string_literal: true require 'rake/testtask' require 'rubocop/rake_task' diff --git a/controls/apache_spec.rb b/controls/apache_spec.rb index 368e713..fcf36ce 100644 --- a/controls/apache_spec.rb +++ b/controls/apache_spec.rb @@ -1,4 +1,5 @@ -# encoding: utf-8 +# frozen_string_literal: true + # # Copyright 2016, Patrick Muench # @@ -226,6 +227,7 @@ loaded_sites.each do |id| virtual_host = file(File.join(sites_enabled_path, id)).content.gsub(/#.*$/, '').scan(%r{}im).flatten next if virtual_host.empty? + describe virtual_host do it { should include(/^\s*?SSLHonorCipherOrder\s+?On/i) } end