Skip to content
This repository was archived by the owner on May 25, 2021. It is now read-only.

Commit 32a0ea2

Browse files
committed
Fix testing for up to date tooling & apply new linting fixes.
1 parent df986af commit 32a0ea2

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

Diff for: LICENSE

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Copyright (c) 2018 Danny Roberts, All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4+
5+
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Diff for: Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ default : check kitchen
33
check : rubocop foodcritic
44

55
rubocop :
6-
/opt/chefdk/bin/rubocop .
6+
/opt/chefdk/embedded/bin/rubocop .
77

88
foodcritic :
9-
/opt/chefdk/bin/foodcritic -P -f any .
9+
/opt/chefdk/embedded/bin/foodcritic -P -f any .
1010

1111
travis : check
1212
kitchen verify
1313

1414
kitchen :
15-
/opt/chefdk/bin/kitchen test
15+
/opt/chefdk/embedded/bin/kitchen test
1616

1717
.PHONY:
1818
rubocop foodcritic kitchen

Diff for: libraries/helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def self.create_device_passphrase(passphrase, device)
1717

1818
def self.encrypted?(device)
1919
shell_out!("[ $(file --dereference --special-files #{device} | cut -d\' \' -f3) == \'encrypted\' ]") # rubocop:disable Metrics/LineLength
20-
rescue
20+
rescue StandardError
2121
false
2222
end
2323
end

Diff for: metadata.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
chef_version '>= 12.5' if respond_to?(:chef_version)
1010

11-
%w(centos oracle redhat scientific).each do |os|
11+
%w[centos oracle redhat scientific].each do |os|
1212
supports os, '>= 7.0'
1313
end
1414
supports 'ubuntu', '>= 12.04'

Diff for: recipes/default.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
%w(cryptsetup file).each { |pkg| package pkg }
1+
%w[cryptsetup file].each { |pkg| package pkg }

Diff for: resources/device.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
resource_name :dmcrypt_device
22

3-
property :name, String, required: true, name_property: true
43
property :device, String, required: false
54
property :passphrase, String, required: false
65
property :keyfile, String, required: false

0 commit comments

Comments
 (0)