Fix ruby validation errors (01daeff5) · Commits · Projets publics / puppet-freeradius

lib/facter/freeradius_version.rb

+12 −13

Original line number	Diff line number	Diff line
		# Grab the FreeRADIUS version from the output of radiusd -v

		module Facter::Util::FreeradiusVersion
		class << self
		def version_string
		# Set path to binary for our platform
		dist = Facter.value(:osfamily)
		case dist
		when /RedHat/
		binary = 'radiusd'
		when /Debian/
		binary = 'freeradius'
		binary = case dist
		when %r{RedHat}
		'radiusd'
		when %r{Debian}
		'freeradius'
		else
		binary = 'radiusd'
		'radiusd'
		end

		Facter::Core::Execution.exec("#{binary} -v")
		@@ -23,8 +22,8 @@ end
		Facter.add(:freeradius_version) do
		setcode do
		version_string = Facter::Util::FreeradiusVersion.version_string
		if !version_string.nil?
		version = version_string.split(/\n/)[0].match(/FreeRADIUS Version (\d+\.\d+\.\d+)/)[1].to_s
		unless version_string.nil?
		version = version_string.split(%r{\n})[0].match(%r{FreeRADIUS Version (\d+\.\d+\.\d+)})[1].to_s
		end
		version
		end
		@@ -34,8 +33,8 @@ end
		Facter.add(:freeradius_maj_version) do
		setcode do
		version_string = Facter::Util::FreeradiusVersion.version_string
		if !version_string.nil?
		majver = version_string.split(/\n/)[0].match(/FreeRADIUS Version (\d+)\.\d+\.\d+/)[1].to_s
		unless version_string.nil?
		majver = version_string.split(%r{\n})[0].match(%r{FreeRADIUS Version (\d+)\.\d+\.\d+})[1].to_s
		end
		majver
		end

spec/classes/freeradius_spec.rb

+28 −30

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ describe 'freeradius' do
		'/etc/raddb/clients.d',
		'/etc/raddb/listen.d',
		'/etc/raddb/sites-enabled',
		'/etc/raddb/instantiate'
		'/etc/raddb/instantiate',
		].each do \|file\|
		is_expected.to contain_file(file)
		.with(
		@@ -93,7 +93,7 @@ describe 'freeradius' do
		.with(
		'content' => 'policy {',
		'order' => '10',
		'target' => '/etc/raddb/policy.conf'
		'target' => '/etc/raddb/policy.conf',
		)
		end

		@@ -102,7 +102,7 @@ describe 'freeradius' do
		.with(
		'content' => '}',
		'order' => '99',
		'target' => '/etc/raddb/policy.conf'
		'target' => '/etc/raddb/policy.conf',
		)
		end

		@@ -123,7 +123,7 @@ describe 'freeradius' do
		.with(
		'content' => '# Proxy config\n',
		'order' => '05',
		'target' => '/etc/raddb/proxy.conf'
		'target' => '/etc/raddb/proxy.conf',
		)
		end

		@@ -143,7 +143,7 @@ describe 'freeradius' do
		is_expected.to contain_concat__fragment('attr-default')
		.with(
		'order' => '10',
		'target' => '/etc/raddb/mods-available/attr_filter'
		'target' => '/etc/raddb/mods-available/attr_filter',
		)
		end

		@@ -163,7 +163,7 @@ describe 'freeradius' do
		.with(
		'order' => '10',
		'source' => 'puppet:///modules/freeradius/dictionary.header',
		'target' => '/etc/raddb/dictionary'
		'target' => '/etc/raddb/dictionary',
		)
		end

		@@ -172,7 +172,7 @@ describe 'freeradius' do
		.with(
		'order' => '90',
		'source' => 'puppet:///modules/freeradius/dictionary.footer',
		'target' => '/etc/raddb/dictionary'
		'target' => '/etc/raddb/dictionary',
		)
		end

		@@ -180,7 +180,7 @@ describe 'freeradius' do
		is_expected.to contain_package('freeradius')
		.with(
		'ensure' => 'installed',
		'name' => 'freeradius'
		'name' => 'freeradius',
		)
		end

		@@ -233,23 +233,23 @@ describe 'freeradius' do

		it do
		is_expected.to contain_freeradius__module('always')
		.with( )
		.with_preserve(true)
		end

		it do
		is_expected.to contain_freeradius__module('detail')
		.with( )
		.with_preserve(true)
		end

		it do
		is_expected.to contain_freeradius__module('detail.log')
		.with( )
		.with_preserve(true)
		end

		it do
		[
		'/var/log/radius',
		'/var/log/radius/radacct'
		'/var/log/radius/radacct',
		].each do \|file\|
		is_expected.to contain_file(file)
		.with(
		@@ -264,7 +264,7 @@ describe 'freeradius' do
		.with(
		'group' => 'radiusd',
		'owner' => 'radiusd',
		'seltype' => 'radiusd_log_t'
		'seltype' => 'radiusd_log_t',
		)
		.that_requires('Package[freeradius]')
		.that_requires('User[radiusd]')
		@@ -281,7 +281,7 @@ describe 'freeradius' do
		'postrotate' => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',
		'rotate' => '7',
		'rotate_every' => 'day',
		'sharedscripts' => 'true'
		'sharedscripts' => 'true',
		)
		end

		@@ -295,7 +295,7 @@ describe 'freeradius' do
		'postrotate' => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',
		'rotate' => '1',
		'rotate_every' => 'week',
		'sharedscripts' => 'true'
		'sharedscripts' => 'true',
		)
		end

		@@ -309,18 +309,16 @@ describe 'freeradius' do
		'postrotate' => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',
		'rotate' => '26',
		'rotate_every' => 'week',
		'sharedscripts' => 'true'
		'sharedscripts' => 'true',
		)
		end

		it do
		[
		'/etc/raddb/certs/dh',
		'/etc/raddb/certs/random'
		'/etc/raddb/certs/random',
		].each do \|file\|
		is_expected.to contain_file(file)
		.with(
		)
		.that_requires('Exec[dh]')
		.that_requires('Exec[random]')
		end
		@@ -353,7 +351,7 @@ describe 'freeradius' do
		'logoutput' => 'on_failure',
		'path' => ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'],
		'refreshonly' => 'true',
		'returns' => '0'
		'returns' => '0',
		)
		end

		@@ -385,7 +383,7 @@ describe 'freeradius' do
		it do
		is_expected.to contain_package('freeradius-mysql')
		.with(
		'ensure' => 'installed'
		'ensure' => 'installed',
		)
		end
		end
		@@ -400,7 +398,7 @@ describe 'freeradius' do
		it do
		is_expected.to contain_package('freeradius-postgresql')
		.with(
		'ensure' => 'installed'
		'ensure' => 'installed',
		)
		end
		end
		@@ -415,7 +413,7 @@ describe 'freeradius' do
		it do
		is_expected.to contain_package('freeradius-perl')
		.with(
		'ensure' => 'installed'
		'ensure' => 'installed',
		)
		end
		end
		@@ -430,7 +428,7 @@ describe 'freeradius' do
		it do
		is_expected.to contain_package('freeradius-utils')
		.with(
		'ensure' => 'installed'
		'ensure' => 'installed',
		)
		end
		end
		@@ -445,7 +443,7 @@ describe 'freeradius' do
		it do
		is_expected.to contain_package('freeradius-ldap')
		.with(
		'ensure' => 'installed'
		'ensure' => 'installed',
		)
		end
		end
		@@ -460,7 +458,7 @@ describe 'freeradius' do
		it do
		is_expected.to contain_package('freeradius-dhcp')
		.with(
		'ensure' => 'installed'
		'ensure' => 'installed',
		)
		end
		end
		@@ -475,7 +473,7 @@ describe 'freeradius' do
		it do
		is_expected.to contain_package('freeradius-krb5')
		.with(
		'ensure' => 'installed'
		'ensure' => 'installed',
		)
		end
		end
		@@ -491,7 +489,7 @@ describe 'freeradius' do
		is_expected.to contain_package('wpa_supplicant')
		.with(
		'ensure' => 'installed',
		'name' => 'wpa_supplicant'
		'name' => 'wpa_supplicant',
		)
		end
		end

spec/defines/attr_spec.rb

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ describe 'freeradius::attr' do

		let(:params) do
		{
		:source => 'puppet:///modules/test/path/to/file',
		source: 'puppet:///modules/test/path/to/file',
		}
		end

spec/defines/client_spec.rb

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,9 +7,9 @@ describe 'freeradius::client' do

		let(:params) do
		{
		:shortname => 'test_short',
		:secret => 'secret_value',
		:ip => '1.2.3.4',
		shortname: 'test_short',
		secret: 'secret_value',
		ip: '1.2.3.4',
		}
		end

spec/defines/config_spec.rb

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ describe 'freeradius::config' do

		let(:params) do
		{
		:content => 'test content',
		content: 'test content',
		}
		end