Skip to content

Commit

Permalink
rubocop
Browse files Browse the repository at this point in the history
  • Loading branch information
@faxm0dem
faxm0dem committed Apr 5, 2018
1 parent 02f6404 commit 683e938
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 104 deletions.
7 changes: 7 additions & 0 deletions .rubocop.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Metrics/LineLength:
Max: 120
Metrics/BlockLength:
Max: 80
AllCops:
Excludes:
- pkg/**/*
30 changes: 14 additions & 16 deletions lib/puppet/parser/functions/rrindex.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,41 @@
# rrindex.rb
#

def hash_val (string)
seed = 2184401929
def hash_val(string)
seed = 2_184_401_929
hash_val = 0
string.unpack("C*").map{
|c| hash_val = (hash_val * seed) + c
string.unpack('C*').map do |c|
hash_val = (hash_val * seed) + c
hash_val &= 0xffffffff
}
end
hash_val
end

#
module Puppet::Parser::Functions
newfunction(:rrindex, :type => :rvalue, :doc => <<-EOS
newfunction(:rrindex, type: :rvalue, doc: <<-EOS
Returns round robin index using a string as input.
Synopsis: rrindex(<string>,<index_max>)
Example: myindex = rrindex($::hostname,5)
EOS
) do |arguments|
) do |arguments|

if arguments.length != 2
raise(Puppet::Error, "rrindex(): must provide exactly two arguments: <string>,<maxindex>")
raise(Puppet::Error, 'rrindex(): must provide exactly two arguments: <string>,<maxindex>')
end

string = arguments[0]
index_max = arguments[1].to_i
unless string.kind_of?(String)

unless string.is_a?(String)
raise(Puppet::Error, "rrindex(): `#{string}` is not a String")
return nil
end
unless (index_max.kind_of?(Fixnum))
unless index_max.is_a?(Integer)
raise(Puppet::Error, "rrindex(): index_max `#{index_max}`) should be a FixNum ")
return nil
end
unless (index_max > 0)
unless index_max > 0
raise(Puppet::Error, "rrindex(): index_max `#{index_max}`) should be > 0 ")
return nil
end

hash_val(string) % index_max
Expand Down
5 changes: 2 additions & 3 deletions spec/acceptance/class_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require 'spec_helper_acceptance'

describe 'conserver class' do

context 'default parameters' do
# Using puppet_apply as a helper
it 'should work idempotently with no errors' do
Expand All @@ -10,8 +9,8 @@ class { 'conserver': }
EOS

# Run it twice and test for idempotency
apply_manifest(pp, :catch_failures => true)
apply_manifest(pp, :catch_changes => true)
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
end

describe package('conserver') do
Expand Down
18 changes: 10 additions & 8 deletions spec/classes/conserver_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,24 @@

os_fixtures = @os_fixtures

describe 'conserver', :type => 'class' do
describe 'conserver', type: 'class' do
os_fixtures.each do |osname, osfixtures|
context "On os `#{osname}`" do
let :facts do
osfixtures[:facts]
end
context "without overriding package name" do
let(:params) {{ }}
context 'without overriding package name' do
let(:params) { {} }
it { should contain_package(osfixtures[:params][:server_package_name]) }
it { should contain_package(osfixtures[:params][:client_package_name]) }
end
context "with overriding package name" do
let :params do {
:server_package_name => 'foo',
:client_package_name => 'bar',
} end
context 'with overriding package name' do
let :params do
{
server_package_name: 'foo',
client_package_name: 'bar'
}
end
it { should_not contain_package(osfixtures[:params][:server_package_name]) }
it { should_not contain_package(osfixtures[:params][:client_package_name]) }
it { should contain_package('foo') }
Expand Down
16 changes: 9 additions & 7 deletions spec/classes/init_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
context 'supported operating systems' do
os_fixtures.each do |osname, osfixtures|
describe "conserver class without any parameters on #{osname}" do
let(:params) {{ }}
let(:facts) {
let(:params) { {} }
let(:facts) do
osfixtures[:facts]
}
end

it { should compile.with_all_deps }

Expand All @@ -29,10 +29,12 @@

context 'unsupported operating system' do
describe 'conserver class without any parameters on Solaris/Nexenta' do
let(:facts) {{
:osfamily => 'Solaris',
:operatingsystem => 'Nexenta',
}}
let(:facts) do
{
osfamily: 'Solaris',
operatingsystem: 'Nexenta'
}
end

it { expect { should contain_package('conserver') }.to raise_error(Puppet::Error) }
end
Expand Down
152 changes: 85 additions & 67 deletions spec/spec_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,71 +39,89 @@
}

@os_fixtures = {
'RedHat6' => @common_fixtures.merge(facts: {
os: {
family: 'RedHat',
name: 'Scientific',
release: { major: '6', full: '6.9', minor: '9' }
},
},
params: {
server_service_name: 'conserver',
server_package_name: 'conserver',
has_systemd: false,
client_package_name: 'conserver-client'}),
'RedHat7' => @common_fixtures.merge(facts: {
os: {
family: 'RedHat',
release: { major: 7 }
},
},
params: {
has_systemd: false,
server_service_name: 'conserver',
server_package_name: 'conserver',
client_package_name: 'conserver-client'}),
'Debian7' => @common_fixtures.merge(facts: {
os: {
family: 'Debian',
release: { major: 7 }
},
},
params: {
has_systemd: false,
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'}),
'Debian8' => @common_fixtures.merge(facts: {
os: {
family: 'Debian',
release: { major: 8 }
},
},
params: {
has_systemd: true,
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'}),
'Debian9' => @common_fixtures.merge(facts: {
os: {
family: 'Debian',
release: { major: 9 }
},
},
params: {
has_systemd: true,
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'}),
'Ubuntu12.04' => @common_fixtures.merge(facts: {
os: {
family: 'Debian',
release: { major: 8 }
},
},
params: {
has_systemd: true,
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'})
'RedHat6' => @common_fixtures.merge(
facts: {
os: {
family: 'RedHat',
name: 'Scientific',
release: { major: '6', full: '6.9', minor: '9' }
}
},
params: {
server_service_name: 'conserver',
server_package_name: 'conserver',
has_systemd: false,
client_package_name: 'conserver-client'
}
),
'RedHat7' => @common_fixtures.merge(
facts: {
os: {
family: 'RedHat',
release: { major: 7 }
}
},
params: {
has_systemd: false,
server_service_name: 'conserver',
server_package_name: 'conserver',
client_package_name: 'conserver-client'
}
),
'Debian7' => @common_fixtures.merge(
facts: {
os: {
family: 'Debian',
release: { major: 7 }
}
},
params: {
has_systemd: false,
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'
}
),
'Debian8' => @common_fixtures.merge(
facts: {
os: {
family: 'Debian',
release: { major: 8 }
}
},
params: {
has_systemd: true,
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'
}
),
'Debian9' => @common_fixtures.merge(
facts: {
os: {
family: 'Debian',
release: { major: 9 }
}
},
params: {
has_systemd: true,
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'
}
),
'Ubuntu12.04' => @common_fixtures.merge(
facts: {
os: {
family: 'Debian',
release: { major: 8 }
}
},
params: {
has_systemd: true,
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'
}
)
}
6 changes: 3 additions & 3 deletions spec/spec_helper_acceptance.rb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'beaker-rspec/spec_helper'
require 'beaker-rspec/helpers/serverspec'

hosts.each do |host|
hosts.each do |_host|
# Install Puppet
install_puppet
end
Expand All @@ -16,9 +16,9 @@
# Configure all nodes in nodeset
c.before :suite do
# Install module and dependencies
puppet_module_install(:source => proj_root, :module_name => 'conserver')
puppet_module_install(source: proj_root, module_name: 'conserver')
hosts.each do |host|
on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module', 'install', 'puppetlabs-stdlib'), acceptable_exit_codes: [0, 1]
end
end
end

0 comments on commit 683e938

Please sign in to comment.