Skip to content

Commit

Permalink
fixing up style, updating test harness
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean OMeara committed Dec 20, 2013
1 parent c6d1cfd commit 8bcafd0
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
25 changes: 16 additions & 9 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
AllCops:
Excludes:
- vendor/**

AlignParameters:
Enabled: false
Documentation:
Enabled: false

Encoding:
Enabled: false
HashSyntax:
Enabled: false

LineLength:
Enabled: false
Max: 200

HashSyntax:
EnforcedStyle: hash_rockets

MethodLength:
Max: 30

CyclomaticComplexity:
Max: 16

ParameterLists:
Enabled: false

ClassLength:
Max: 117
1 change: 0 additions & 1 deletion libraries/provider_lvm_logical_volume.rb
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ def device_formatted?(device_name, fs_type)
blkid = shell_out("blkid -o value -s TYPE #{device_name}")
blkid.exitstatus == 0 && blkid.stdout.strip == fs_type.strip
end

end
end
end
2 changes: 1 addition & 1 deletion spec/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

describe 'lvm::default' do
let(:chef_run) do
ChefSpec::ChefRunner.new(:platform => 'ubuntu', :version => '12.04').converge('lvm::default')
ChefSpec::Runner.new(:platform => 'ubuntu', :version => '12.04').converge('lvm::default')
end

it 'installs lvm2' do
Expand Down
7 changes: 1 addition & 6 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
require 'berkshelf'
require 'chefspec'

Berkshelf.ui.mute do
berksfile = Berkshelf::Berksfile.from_file('Berksfile')
berksfile.install(path: 'vendor/cookbooks')
end
require 'chefspec/berkshelf'
1 change: 1 addition & 0 deletions test/fixtures/cookbooks/fake/libraries/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#

module LvmTest
# Helper definitions for lvmtest
module Helper
# Creates given loop devices
#
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/cookbooks/fake/recipes/create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
logical_volume 'logs' do
size '10M'
filesystem 'ext2'
mount_point location: '/mnt/logs', options: 'noatime,nodiratime'
mount_point :location => '/mnt/logs', :options => 'noatime,nodiratime'
stripes 2
end

Expand Down

0 comments on commit 8bcafd0

Please sign in to comment.