diff --git a/examples/has_interface_with.pp b/examples/has_interface_with.pp index a578dd2..8906a66 100644 --- a/examples/has_interface_with.pp +++ b/examples/has_interface_with.pp @@ -1,9 +1,9 @@ -include ::stdlib +include stdlib info('has_interface_with(\'lo\'):', has_interface_with('lo')) info('has_interface_with(\'loX\'):', has_interface_with('loX')) info('has_interface_with(\'ipaddress\', \'127.0.0.1\'):', has_interface_with('ipaddress', '127.0.0.1')) info('has_interface_with(\'ipaddress\', \'127.0.0.100\'):', has_interface_with('ipaddress', '127.0.0.100')) info('has_interface_with(\'network\', \'127.0.0.0\'):', has_interface_with('network', '127.0.0.0')) info('has_interface_with(\'network\', \'128.0.0.0\'):', has_interface_with('network', '128.0.0.0')) info('has_interface_with(\'netmask\', \'255.0.0.0\'):', has_interface_with('netmask', '255.0.0.0')) info('has_interface_with(\'netmask\', \'256.0.0.0\'):', has_interface_with('netmask', '256.0.0.0')) diff --git a/examples/has_ip_address.pp b/examples/has_ip_address.pp index 594143d..8429a88 100644 --- a/examples/has_ip_address.pp +++ b/examples/has_ip_address.pp @@ -1,3 +1,3 @@ -include ::stdlib +include stdlib info('has_ip_address(\'192.168.1.256\'):', has_ip_address('192.168.1.256')) info('has_ip_address(\'127.0.0.1\'):', has_ip_address('127.0.0.1')) diff --git a/examples/has_ip_network.pp b/examples/has_ip_network.pp index 1f1130d..669a291 100644 --- a/examples/has_ip_network.pp +++ b/examples/has_ip_network.pp @@ -1,3 +1,3 @@ -include ::stdlib +include stdlib info('has_ip_network(\'127.0.0.0\'):', has_ip_network('127.0.0.0')) info('has_ip_network(\'128.0.0.0\'):', has_ip_network('128.0.0.0')) diff --git a/examples/init.pp b/examples/init.pp index ad27972..9675d83 100644 --- a/examples/init.pp +++ b/examples/init.pp @@ -1 +1 @@ -include ::stdlib +include stdlib diff --git a/manifests/init.pp b/manifests/init.pp index 01776d0..664a3ce 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,12 +1,12 @@ # @summary # This module manages stdlib. # # Most of stdlib's features are automatically loaded by Puppet, but this class should be # declared in order to use the standardized run stages. # # Declares all other classes in the stdlib module. Currently, this consists # of stdlib::stages. # class stdlib { - include ::stdlib::stages + include stdlib::stages } diff --git a/manifests/stages.pp b/manifests/stages.pp index 63297fb..0ebf596 100644 --- a/manifests/stages.pp +++ b/manifests/stages.pp @@ -1,34 +1,32 @@ # @summary # This class manages a standard set of run stages for Puppet. It is managed by # the stdlib class, and should not be declared independently. # # Declares various run-stages for deploying infrastructure, # language runtimes, and application layers. # # The high level stages are (in order): # * setup # * main # * runtime # * setup_infra # * deploy_infra # * setup_app # * deploy_app # * deploy # # @example # node default { # include ::stdlib # class { java: stage => 'runtime' } # } # class stdlib::stages { - stage { 'setup': before => Stage['main'] } stage { 'runtime': require => Stage['main'] } -> stage { 'setup_infra': } -> stage { 'deploy_infra': } -> stage { 'setup_app': } -> stage { 'deploy_app': } -> stage { 'deploy': } - } diff --git a/spec/fixtures/test/manifests/base32.pp b/spec/fixtures/test/manifests/base32.pp index 5918633..3c01b73 100644 --- a/spec/fixtures/test/manifests/base32.pp +++ b/spec/fixtures/test/manifests/base32.pp @@ -1,6 +1,6 @@ # Class to test the Stdlib::Base32 type alias class test::base32 ( - Stdlib::Base32 $value, - ) { + Stdlib::Base32 $value, +) { notice('Success') } diff --git a/spec/fixtures/test/manifests/base64.pp b/spec/fixtures/test/manifests/base64.pp index d9e98d9..1870c82 100644 --- a/spec/fixtures/test/manifests/base64.pp +++ b/spec/fixtures/test/manifests/base64.pp @@ -1,6 +1,6 @@ # Class to test the Stdlib::Base64 type alias class test::base64 ( - Stdlib::Base64 $value, - ) { + Stdlib::Base64 $value, +) { notice('Success') } diff --git a/spec/fixtures/test/manifests/deftype.pp b/spec/fixtures/test/manifests/deftype.pp index 362d155..dd58aab 100644 --- a/spec/fixtures/test/manifests/deftype.pp +++ b/spec/fixtures/test/manifests/deftype.pp @@ -1,4 +1,4 @@ # Class to test deftype -define test::deftype( $param = 'foo' ) { +define test::deftype ( $param = 'foo' ) { notify { "deftype: ${title}": } } diff --git a/spec/fixtures/test/manifests/ensure_resources.pp b/spec/fixtures/test/manifests/ensure_resources.pp index 5f444c0..60e7a40 100644 --- a/spec/fixtures/test/manifests/ensure_resources.pp +++ b/spec/fixtures/test/manifests/ensure_resources.pp @@ -1,4 +1,4 @@ # A helper class to test the ensure_resources function -class test::ensure_resources( $resource_type, $title_hash, $attributes_hash ) { +class test::ensure_resources ( $resource_type, $title_hash, $attributes_hash ) { ensure_resources($resource_type, $title_hash, $attributes_hash) } diff --git a/types/filemode.pp b/types/filemode.pp index 4aa7c88..0cbd494 100644 --- a/types/filemode.pp +++ b/types/filemode.pp @@ -1,2 +1,4 @@ # See `man chmod.1` for the regular expression for symbolic mode +# lint:ignore:140chars type Stdlib::Filemode = Pattern[/\A(([0-7]{1,4})|(([ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+)(,([ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+))*))\z/] +# lint:endignore diff --git a/types/ip/address/v4/cidr.pp b/types/ip/address/v4/cidr.pp index 3695c3f..f8befdf 100644 --- a/types/ip/address/v4/cidr.pp +++ b/types/ip/address/v4/cidr.pp @@ -1 +1,3 @@ +# lint:ignore:140chars type Stdlib::IP::Address::V4::CIDR = Pattern[/\A([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\/([0-9]|[12][0-9]|3[0-2])\z/] +# lint:endignore diff --git a/types/ip/address/v4/nosubnet.pp b/types/ip/address/v4/nosubnet.pp index ba0cf31..daa798f 100644 --- a/types/ip/address/v4/nosubnet.pp +++ b/types/ip/address/v4/nosubnet.pp @@ -1 +1,3 @@ +# lint:ignore:140chars type Stdlib::IP::Address::V4::Nosubnet = Pattern[/\A([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/] +# lint:endignore diff --git a/types/ip/address/v6/alternative.pp b/types/ip/address/v6/alternative.pp index 3185d5e..5900fe4 100644 --- a/types/ip/address/v6/alternative.pp +++ b/types/ip/address/v6/alternative.pp @@ -1,9 +1,11 @@ +# lint:ignore:140chars type Stdlib::IP::Address::V6::Alternative = Pattern[ /\A([[:xdigit:]]{1,4}:){6}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/, /\A([[:xdigit:]]{1,4}:){5}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/, /\A([[:xdigit:]]{1,4}:){4}(:[[:xdigit:]]{1,4}){0,1}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/, /\A([[:xdigit:]]{1,4}:){3}(:[[:xdigit:]]{1,4}){0,2}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/, /\A([[:xdigit:]]{1,4}:){2}(:[[:xdigit:]]{1,4}){0,3}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/, /\A([[:xdigit:]]{1,4}:){1}(:[[:xdigit:]]{1,4}){0,4}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/, /\A:(:[[:xdigit:]]{1,4}){0,5}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/, ] +# lint:endignore diff --git a/types/ip/address/v6/cidr.pp b/types/ip/address/v6/cidr.pp index 7077bb1..9fce3ba 100644 --- a/types/ip/address/v6/cidr.pp +++ b/types/ip/address/v6/cidr.pp @@ -1,3 +1,3 @@ - +# lint:ignore:140chars type Stdlib::IP::Address::V6::CIDR = Pattern[/\A((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])?\z/] - +# lint:endignore diff --git a/types/ip/address/v6/nosubnet/alternative.pp b/types/ip/address/v6/nosubnet/alternative.pp index 48b0ef9..376da0a 100644 --- a/types/ip/address/v6/nosubnet/alternative.pp +++ b/types/ip/address/v6/nosubnet/alternative.pp @@ -1,9 +1,11 @@ +# lint:ignore:140chars type Stdlib::IP::Address::V6::Nosubnet::Alternative = Pattern[ /\A([[:xdigit:]]{1,4}:){6}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/, /\A([[:xdigit:]]{1,4}:){5}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/, /\A([[:xdigit:]]{1,4}:){4}(:[[:xdigit:]]{1,4}){0,1}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/, /\A([[:xdigit:]]{1,4}:){3}(:[[:xdigit:]]{1,4}){0,2}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/, /\A([[:xdigit:]]{1,4}:){2}(:[[:xdigit:]]{1,4}){0,3}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/, /\A([[:xdigit:]]{1,4}:){1}(:[[:xdigit:]]{1,4}){0,4}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/, /\A:(:[[:xdigit:]]{1,4}){0,5}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/, ] +# lint:endignore diff --git a/types/mac.pp b/types/mac.pp index d11879c..3c2947a 100644 --- a/types/mac.pp +++ b/types/mac.pp @@ -1,5 +1,5 @@ # A type for a MAC address type Stdlib::MAC = Pattern[ /\A([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})\z/, - /\A([0-9A-Fa-f]{2}[:-]){19}([0-9A-Fa-f]{2})\z/ + /\A([0-9A-Fa-f]{2}[:-]){19}([0-9A-Fa-f]{2})\z/, ] diff --git a/types/objectstore/gsuri.pp b/types/objectstore/gsuri.pp index 338b207..2d05eff 100644 --- a/types/objectstore/gsuri.pp +++ b/types/objectstore/gsuri.pp @@ -1,2 +1 @@ type Stdlib::ObjectStore::GSUri = Pattern[/\Ags:\/\/.*\z/] - diff --git a/types/syslogfacility.pp b/types/syslogfacility.pp index 417673b..020c3e0 100644 --- a/types/syslogfacility.pp +++ b/types/syslogfacility.pp @@ -1,26 +1,26 @@ type Stdlib::Syslogfacility = Enum[ 'kern', 'user', 'mail', 'daemon', 'auth', 'syslog', 'lpr', 'news', 'uucp', 'cron', 'authpriv', 'ftp', 'ntp', 'security', 'console', 'solaris-cron', 'local0', 'local1', 'local2', 'local3', 'local4', 'local5', 'local6', - 'local7' + 'local7', ]