Merge pull request #273 from puppetlabs/CONT-362-Syntax_update

(CONT-362) Syntax update

Author: david22swan

.puppet-lint.rc

@@ -1,8 +1 @@
 --relative
---no-parameter_types-check
---no-parameter_documentation-check
---no-top_scope_facts-check
---no-legacy_facts-check
---no-relative_classname_inclusion-check
---no-unquoted_string_in_selector-check
---no-unquoted_string_in_case-check

.sync.yml

@@ -28,12 +28,3 @@ spec/spec_helper.rb:
   unmanaged: false
 .travis.yml:
   delete: true
-Rakefile:
-  extra_disabled_lint_checks:
-    - parameter_types
-    - parameter_documentation
-    - top_scope_facts
-    - legacy_facts
-    - relative_classname_inclusion
-    - unquoted_string_in_selector
-    - unquoted_string_in_case

Rakefile

@@ -42,14 +42,6 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
-PuppetLint.configuration.send('disable_parameter_types')
-PuppetLint.configuration.send('disable_parameter_documentation')
-PuppetLint.configuration.send('disable_top_scope_facts')
-PuppetLint.configuration.send('disable_legacy_facts')
-PuppetLint.configuration.send('disable_relative_classname_inclusion')
-PuppetLint.configuration.send('disable_unquoted_string_in_selector')
-PuppetLint.configuration.send('disable_unquoted_string_in_case')
-
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|

examples/compliance_example.pp

@@ -15,12 +15,12 @@
 #   include registry::compliance_example
 #
 # (MARKUP: http://links.puppetlabs.com/puppet_manifest_documentation)
-class { '::registry': }
+class { 'registry': }
 
 $key_path = 'HKLM\Software\Vendor\Puppet Labs\Examples\Compliance'
 
-case $::registry_compliance_example_mode {
-  audit: {
+case $registry_compliance_example_mode {
+  'audit': {
     $mode = 'audit'
   }
   default: {
@@ -40,29 +40,29 @@
 # Resource Defaults
 Registry_key {
   ensure => $mode ? {
-    setup   => present,
+    'setup'   => present,
     default => undef,
   },
   purge_values => $mode ? {
-    setup   => true,
+    'setup'   => true,
     default => false,
   },
 }
 Registry_value {
   ensure => $mode ? {
-    setup   => present,
+    'setup'   => present,
     default => undef,
   },
   type   => $mode ? {
-    setup   => string,
+    'setup'   => string,
     default => undef,
   },
   data   => $mode ? {
-    setup   => 'Puppet Default Data',
+    'setup'   => 'Puppet Default Data',
     default => undef,
   },
   audit  => $mode ? {
-    setup   => undef,
+    'setup'   => undef,
     default => all,
   },
 }

examples/purge_example.pp

@@ -31,12 +31,12 @@
 #   include registry::purge_example
 #
 # (MARKUP: http://links.puppetlabs.com/puppet_manifest_documentation)
-class { '::registry': }
+class { 'registry': }
 
 $key_path = 'HKLM\Software\Vendor\Puppet Labs\Examples\KeyPurge'
 
-case $::purge_example_mode {
-  setup: {
+case $purge_example_mode {
+  'setup': {
     registry_key { $key_path:
       ensure       => present,
       purge_values => false,
@@ -86,7 +86,7 @@
       data   => '01AB CDEF',
     }
   }
-  purge: {
+  'purge': {
     registry_key { $key_path:
       ensure       => present,
       purge_values => true,

examples/registry_examples.pp

@@ -13,7 +13,7 @@
 #     include registry_example
 #
 # (MARKUP: http://links.puppetlabs.com/puppet_manifest_documentation)
-class { '::registry': }
+class { 'registry': }
 
 registry_key { 'HKLM\Software\Vendor':
   ensure => present,

manifests/service.pp

@@ -7,18 +7,22 @@
 #
 #   [1] http://support.microsoft.com/kb/137890
 #
-# @param ensure[ present, absent ]
+# @param ensure 
+#   Ensures the presence or absence of a registry key. Valid values: 'present', 'absent', 'UNSET'.
+#
 # @param display_name
-#   The Display Name of the service.  Defaults to the title of
-#   the resource.
+#   The Display Name of the service.  Defaults to the title of the resource.
+#
 # @param description
-#   A description of the service
+#   A description of the service. String value set to 'UNSET' by default.
+#
 # @param command
-#   The command to execute
+#   The command to execute. Set to 'UNSET' by default.
+#
 # @param start
 #   The starting mode of the service.  (Note, the native service
 #   resource can also be used to manage this setting.)
-#   [ automatic, manual, disabled ]
+#   Valid values: 'automatic', 'manual', 'disabled'
 #
 #
 # Manages the values in the key HKLM\System\CurrentControlSet\Services\$name\
@@ -28,22 +32,21 @@
 #     ensure       => present,
 #     display_name => 'Puppet Agent',
 #     description  => 'Periodically fetches and applies
-#                   configurations from a Puppet Server.',
+#                      configurations from a Puppet Server.',
 #     command      => 'C:\PuppetLabs\Puppet\service\daemon.bat',
 #   }
 #
 define registry::service (
-  $ensure       = 'UNSET',
-  $display_name = 'UNSET',
-  $description  = 'UNSET',
-  $command      = 'UNSET',
-  $start        = 'UNSET'
+  Enum['present', 'absent', 'UNSET'] $ensure              = 'UNSET',
+  String[1] $display_name                                 = 'UNSET',
+  String[1] $description                                  = 'UNSET',
+  String[1] $command                                      = 'UNSET',
+  Enum['automatic', 'manual', 'disabled', 'UNSET'] $start = 'UNSET'
 ) {
   $ensure_real = $ensure ? {
     'UNSET'  => present,
-    undef   => present,
-    present => present,
-    absent  => absent,
+    'present' => present,
+    'absent'  => absent,
   }
 
   $display_name_real = $display_name ? {
@@ -64,9 +67,9 @@
 
   # Map descriptive names to flags.
   $start_real = $start ? {
-    automatic => 2,
-    manual    => 3,
-    disabled  => 4,
+    'automatic' => 2,
+    'manual'    => 3,
+    'disabled'  => 4,
   }
 
   # Variable to hold the base key path.

manifests/value.pp

@@ -47,8 +47,8 @@
   ]] $data                  = undef,
 ) {
   # ensure windows os
-  if $::operatingsystem != 'windows' {
-    fail("Unsupported OS ${::operatingsystem}")
+  if $facts['os']['name'] != 'windows' {
+    fail("Unsupported OS ${facts['os']['name']}")
   }
 
   $value_real = $value ? {

spec/acceptance/registry_management_spec.rb

@@ -16,7 +16,7 @@
       # use a different case here, to exercise the case-conversion codepaths
       registry_key { 'HKLM\\Software\\VENDOR': ensure => present }
 
-      registry_key { '#{keypath}': ensure => present }
+      registry_key { '#{keypath}': ensure => 'present' }
       registry_key { '#{keypath}\\SubKey1': ensure => present }
 
       registry_key   { '#{keypath}\\SubKeyToPurge': ensure => present }

spec/defines/value_spec.rb

@@ -147,7 +147,7 @@
     end
     let(:facts) do
       {
-        'operatingsystem' => 'bar',
+        os: { name: 'bar' },
       }
     end