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.

Sign up for GitHub

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

Pin to new Train version and update InSpec defaults #2827

Merged
merged 1 commit into from
Mar 15, 2018
Merged

Pin to new Train version and update InSpec defaults #2827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 inspec.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 2.3'

spec.add_dependency 'train', '~> 1.1'
spec.add_dependency 'train', '~> 1.2'
spec.add_dependency 'thor', '~> 0.19'
spec.add_dependency 'json', '>= 1.8', '< 3.0'
spec.add_dependency 'method_source', '~> 0.8'
Expand Down
1 change: 1 addition & 0 deletions lib/inspec/backend.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def self.create(config) # rubocop:disable Metrics/AbcSize
connection.disable_cache(:command)
else
Inspec::Log.debug 'Option backend_cache is disabled'
connection.disable_cache(:file)
connection.disable_cache(:command)
end

Expand Down
4 changes: 2 additions & 2 deletions lib/inspec/base_cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def self.exec_options
option :create_lockfile, type: :boolean,
desc: 'Write out a lockfile based on this execution (unless one already exists)'
option :backend_cache, type: :boolean,
desc: 'Allow caching for backend command output.'
desc: 'Allow caching for backend command output. (default: true)'
option :show_progress, type: :boolean,
desc: 'Show progress while executing tests.'
end
Expand All @@ -88,7 +88,7 @@ def self.default_options
'show_progress' => false,
'color' => true,
'create_lockfile' => true,
'backend_cache' => false,
'backend_cache' => true,
},
shell: {
'reporter' => ['cli'],
Expand Down
2 changes: 1 addition & 1 deletion test/unit/resources/platform_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
end

it 'verify platform families' do
expect = ["debian", "linux", "unix"]
expect = ["debian", "linux", "unix", "os"]
_(resource.families).must_equal expect
end

Expand Down