Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gems and ruby version to 2.4.1 #25

Merged
merged 4 commits into from
Nov 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AllCops:
- vendor/**/*
- "*/puppet/Puppetfile"
- "*/puppet/.tmp/**/*"
TargetRubyVersion: 1.9
TargetRubyVersion: 2.4
Documentation:
Enabled: false
AlignParameters:
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 6 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions Rakefile
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env rake
# frozen_string_literal: true

require 'rake/testtask'
require 'rubocop/rake_task'
Expand Down
4 changes: 3 additions & 1 deletion controls/apache_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# encoding: utf-8
# frozen_string_literal: true

#
# Copyright 2016, Patrick Muench
#
Expand Down Expand Up @@ -226,6 +227,7 @@
loaded_sites.each do |id|
virtual_host = file(File.join(sites_enabled_path, id)).content.gsub(/#.*$/, '').scan(%r{<virtualhost.*443(.*?)<\/virtualhost>}im).flatten
next if virtual_host.empty?

describe virtual_host do
it { should include(/^\s*?SSLHonorCipherOrder\s+?On/i) }
end
Expand Down