pdk 2.4.0 → 2.5.0

data/README.md

@@ -1,163 +1,163 @@
-# pdk [![Build Status](https://travis-ci.org/puppetlabs/pdk.svg?branch=main)](https://travis-ci.org/puppetlabs/pdk) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/x70e2fqllbaootpd?svg=true)](https://ci.appveyor.com/project/puppetlabs/pdk) [![Coverage Status](https://coveralls.io/repos/github/puppetlabs/pdk/badge.svg?branch=main)](https://coveralls.io/github/puppetlabs/pdk?branch=main)
-
-* [Installation](#installation)
-* [Basic usage](#basic-usage)
-* [Experimental features](#experimental-features)
-* [Module compatibility](#module-compatibility)
-* [Contributing](#contributing)
-* [Contact Information](#contact-information)
-
-The Puppet Development Kit (PDK) includes key Puppet code development and testing tools for Linux, Windows, and OS X workstations, so you can install one package with the tools you need to create and validate new modules.
-
-PDK includes testing tools, a complete module skeleton, and command line tools to help you create, validate, and run tests on Puppet modules. PDK also includes all dependencies needed for its use.
-
-PDK includes the following tools:
-
-Tool   | Description
-----------------|-------------------------
-metadata-json-lint | Validates and lints `metadata.json` files in modules against  Puppet's module metadatastyle guidelines.
-pdk | Command line tool for generating and testing modules
-puppet-lint | Checks your Puppet code against the recommendations in the Puppet Language style guide.
-puppet-syntax | Checks for correct syntax in Puppet manifests, templates, and Hiera YAML.
-puppetlabs_spec_helper | Provides classes, methods, and Rake tasks to help with spec testing Puppet code.
-rspec-puppet | Tests the behavior of Puppet when it compiles your manifests into a catalog of Puppet resources.
-rspec-puppet-facts | Adds support for running rspec-puppet tests against the facts for your supported operating systems.
-puppet-debugger | Provides a REPL based debugger console.
-
-
-## Installation
-
-Download and install the newest package matching your platform from the [download](https://puppet.com/download-puppet-development-kit) page. If you are using Windows, remember to close any open PowerShell windows.
-
-For complete installation information, see the [PDK documentation](https://puppet.com/docs/pdk/latest/pdk_install.html).
-
-## Basic usage
-
-PDK can generate modules and classes, validate module metadata, style, and syntax, and run unit tests. This README contains very basic usage information---for complete usage information, see the [PDK documentation](https://puppet.com/docs/pdk/latest/pdk_install.html).
-
-### Generate a module
-
-Generates the basic components of a module and set up an infrastructure for testing it with PDK.
-
-1. Run the `pdk new module` command, specifying the name of the new module:
-
-```
-pdk new module my_module
-```
-
-This command asks a series of metadata questions and then generates the basic components of a new module.
-
-### Generate a class
-
-To generate a class in your module, use the `pdk new class` command, specifying the name of your new class. To generate the main class of the module, which is defined in an `init.pp` file, give the class the same name as the module.
-
-1. From the command line, in your module's directory, run:
-```
-pdk new class class_name
-```
-
-PDK creates the new class manifest and a test file (as `class_name_spec.rb`) in your module's `/spec/classes` directory.
-
-### Generate a defined type
-
-To generate a defined type in your module, use the `pdk new defined_type` command, specifying the name of your new defined type.
-
-1. From the command line, in your module's directory, run:
-```
-pdk new defined_type defined_type_name
-```
-
-PDK creates the new defined\_type manifest and a test file (as `defined_type_name_spec.rb`) in your module's `/spec/defines` directory.
-
-### Generate a task
-
-To generate a task in your module, use the `pdk new task` command, specifying the name of your new task.
-
-1. From the command line, in your module's directory, run:
-```
-pdk new task task_name
-```
-
-PDK creates the new task file and metadata.
-
-### Validating a module
-
-PDK can validate the well-formedness of the module and style and syntax of its files.
-
-1. In the module's directory, run:
-
-```
-pdk validate
-```
-
-This command validates the metadata, Puppet code syntax and style, and Ruby syntax and style for the entire module.
-
-### Run unit tests
-
-PDK's [default template](https://github.com/puppetlabs/pdk-templates) sets up [rspec](http://rspec.info/) for Ruby-level unit testing, and [rspec-puppet](https://github.com/rodjek/rspec-puppet/) for catalog-level unit testing.
-
-In the module's directory, run unit tests with:
-
-```
-pdk test unit
-```
-
-This command runs all available unit tests.
-
-## Experimental features
-
-### `pdk console` command
-The pdk console command executes a session of the puppet debugger when inside a module and allows for exploration of puppet code.  See the official [puppet debugger site](https://www.puppet-debugger.com) for more info and the official docs [site here.](https://docs.puppet-debugger.com)
-
-To use, execute `pdk console` from inside your module directory.  You can also supply the `--puppet-version` or `--pe-version` or `--puppet-dev` to swap out the puppet version when using the console.
-
-Example (from within a module):
-
-* `pdk console --puppet-version=5`
-* `pdk console --pe-version=2018.1`
-
-The `pdk console` command will also pass through any puppet debugger arguments you wish to use.
-
-Example:
-
-* `pdk console  --no-facterdb`
-* `pdk console --play https://gist.github.com/logicminds/4f6bcfd723c92aad1f01f6a800319fa4`
-* `pdk console -e "md5('sdfasdfasdf')" --run-once --quiet`
-
-Use `pdk console -h` for a further explanation of pass through arguments.
-
-If you receive the following error you do not have the puppet-debugger gem installed.
-
-```
-pdk console -h
-Error: Unknown Puppet subcommand 'debugger'
-See 'puppet help' for help on available puppet subcommands
-```
-
-To fix this you will need to add the following entry to your .sync.yml file and run pdk update:
-
-```
-Gemfile:
-  required:
-    ":development":
-      - gem: puppet-debugger
-        version: "~> 0.14"
-```  
-
-**NOTE**: The puppet-debugger gem has been added to the [puppet-module-* gems](https://github.com/puppetlabs/puppet-module-gems/pull/117), so once you get the gem update you no longer need the .sync.yml entry.
-
-### `pdk bundle` command
-
-This command executes arbitrary commands in a bundler context within the module you're currently working on. Arguments to this command are passed straight through to bundler. This command is experimental  and can lead to errors that can't be resolved by PDK itself.
-
-## Module Compatibility
-
-**PDK Version Compatibility:** Modules created with PDK validate against and run on all Puppet and Ruby version combinations currently under maintenance (see https://docs.puppet.com/puppet/latest/about_agent.html and https://puppet.com/misc/puppet-enterprise-lifecycle)
-
-## Contributing
-
-PDK encourages community contributions. See the [CONTRIBUTING.md](CONTRIBUTING.md) file for development notes.
-
-## Contact Information
-
-To contact us with questions: [pdk-maintainers@puppet.com](mailto:pdk-maintainers@puppet.com)
+# pdk [![Build Status](https://travis-ci.org/puppetlabs/pdk.svg?branch=main)](https://travis-ci.org/puppetlabs/pdk) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/x70e2fqllbaootpd?svg=true)](https://ci.appveyor.com/project/puppetlabs/pdk) [![Coverage Status](https://coveralls.io/repos/github/puppetlabs/pdk/badge.svg?branch=main)](https://coveralls.io/github/puppetlabs/pdk?branch=main)
+
+* [Installation](#installation)
+* [Basic usage](#basic-usage)
+* [Experimental features](#experimental-features)
+* [Module compatibility](#module-compatibility)
+* [Contributing](#contributing)
+* [Contact Information](#contact-information)
+
+The Puppet Development Kit (PDK) includes key Puppet code development and testing tools for Linux, Windows, and OS X workstations, so you can install one package with the tools you need to create and validate new modules.
+
+PDK includes testing tools, a complete module skeleton, and command line tools to help you create, validate, and run tests on Puppet modules. PDK also includes all dependencies needed for its use.
+
+PDK includes the following tools:
+
+Tool   | Description
+----------------|-------------------------
+metadata-json-lint | Validates and lints `metadata.json` files in modules against  Puppet's module metadatastyle guidelines.
+pdk | Command line tool for generating and testing modules
+puppet-lint | Checks your Puppet code against the recommendations in the Puppet Language style guide.
+puppet-syntax | Checks for correct syntax in Puppet manifests, templates, and Hiera YAML.
+puppetlabs_spec_helper | Provides classes, methods, and Rake tasks to help with spec testing Puppet code.
+rspec-puppet | Tests the behavior of Puppet when it compiles your manifests into a catalog of Puppet resources.
+rspec-puppet-facts | Adds support for running rspec-puppet tests against the facts for your supported operating systems.
+puppet-debugger | Provides a REPL based debugger console.
+
+
+## Installation
+
+Download and install the newest package matching your platform from the [download](https://puppet.com/download-puppet-development-kit) page. If you are using Windows, remember to close any open PowerShell windows.
+
+For complete installation information, see the [PDK documentation](https://puppet.com/docs/pdk/latest/pdk_install.html).
+
+## Basic usage
+
+PDK can generate modules and classes, validate module metadata, style, and syntax, and run unit tests. This README contains very basic usage information---for complete usage information, see the [PDK documentation](https://puppet.com/docs/pdk/latest/pdk_install.html).
+
+### Generate a module
+
+Generates the basic components of a module and set up an infrastructure for testing it with PDK.
+
+1. Run the `pdk new module` command, specifying the name of the new module:
+
+```
+pdk new module my_module
+```
+
+This command asks a series of metadata questions and then generates the basic components of a new module.
+
+### Generate a class
+
+To generate a class in your module, use the `pdk new class` command, specifying the name of your new class. To generate the main class of the module, which is defined in an `init.pp` file, give the class the same name as the module.
+
+1. From the command line, in your module's directory, run:
+```
+pdk new class class_name
+```
+
+PDK creates the new class manifest and a test file (as `class_name_spec.rb`) in your module's `/spec/classes` directory.
+
+### Generate a defined type
+
+To generate a defined type in your module, use the `pdk new defined_type` command, specifying the name of your new defined type.
+
+1. From the command line, in your module's directory, run:
+```
+pdk new defined_type defined_type_name
+```
+
+PDK creates the new defined\_type manifest and a test file (as `defined_type_name_spec.rb`) in your module's `/spec/defines` directory.
+
+### Generate a task
+
+To generate a task in your module, use the `pdk new task` command, specifying the name of your new task.
+
+1. From the command line, in your module's directory, run:
+```
+pdk new task task_name
+```
+
+PDK creates the new task file and metadata.
+
+### Validating a module
+
+PDK can validate the well-formedness of the module and style and syntax of its files.
+
+1. In the module's directory, run:
+
+```
+pdk validate
+```
+
+This command validates the metadata, Puppet code syntax and style, and Ruby syntax and style for the entire module.
+
+### Run unit tests
+
+PDK's [default template](https://github.com/puppetlabs/pdk-templates) sets up [rspec](http://rspec.info/) for Ruby-level unit testing, and [rspec-puppet](https://github.com/rodjek/rspec-puppet/) for catalog-level unit testing.
+
+In the module's directory, run unit tests with:
+
+```
+pdk test unit
+```
+
+This command runs all available unit tests.
+
+## Experimental features
+
+### `pdk console` command
+The pdk console command executes a session of the puppet debugger when inside a module and allows for exploration of puppet code.  See the official [puppet debugger site](https://www.puppet-debugger.com) for more info and the official docs [site here.](https://docs.puppet-debugger.com)
+
+To use, execute `pdk console` from inside your module directory.  You can also supply the `--puppet-version` or `--pe-version` or `--puppet-dev` to swap out the puppet version when using the console.
+
+Example (from within a module):
+
+* `pdk console --puppet-version=5`
+* `pdk console --pe-version=2018.1`
+
+The `pdk console` command will also pass through any puppet debugger arguments you wish to use.
+
+Example:
+
+* `pdk console  --no-facterdb`
+* `pdk console --play https://gist.github.com/logicminds/4f6bcfd723c92aad1f01f6a800319fa4`
+* `pdk console -e "md5('sdfasdfasdf')" --run-once --quiet`
+
+Use `pdk console -h` for a further explanation of pass through arguments.
+
+If you receive the following error you do not have the puppet-debugger gem installed.
+
+```
+pdk console -h
+Error: Unknown Puppet subcommand 'debugger'
+See 'puppet help' for help on available puppet subcommands
+```
+
+To fix this you will need to add the following entry to your .sync.yml file and run pdk update:
+
+```
+Gemfile:
+  required:
+    ":development":
+      - gem: puppet-debugger
+        version: "~> 0.14"
+```  
+
+**NOTE**: The puppet-debugger gem has been added to the [puppet-module-* gems](https://github.com/puppetlabs/puppet-module-gems/pull/117), so once you get the gem update you no longer need the .sync.yml entry.
+
+### `pdk bundle` command
+
+This command executes arbitrary commands in a bundler context within the module you're currently working on. Arguments to this command are passed straight through to bundler. This command is experimental  and can lead to errors that can't be resolved by PDK itself.
+
+## Module Compatibility
+
+**PDK Version Compatibility:** Modules created with PDK validate against and run on all Puppet and Ruby version combinations currently under maintenance (see https://docs.puppet.com/puppet/latest/about_agent.html and https://puppet.com/misc/puppet-enterprise-lifecycle)
+
+## Contributing
+
+PDK encourages community contributions. See the [CONTRIBUTING.md](CONTRIBUTING.md) file for development notes.
+
+## Contact Information
+
+To contact us with questions: [pdk-maintainers@puppet.com](mailto:pdk-maintainers@puppet.com)

data/exe/pdk

@@ -1,10 +1,10 @@
-#!/usr/bin/env ruby
-
-require 'pdk/cli'
-
-begin
-  PDK::CLI.run(ARGV)
-rescue Interrupt
-  warn "\nAborted!"
-  exit 1
-end
+#!/usr/bin/env ruby
+
+require 'pdk/cli'
+
+begin
+  PDK::CLI.run(ARGV)
+rescue Interrupt
+  warn "\nAborted!"
+  exit 1
+end

data/lib/pdk/analytics/client/google_analytics.rb

@@ -1,143 +1,143 @@
-require 'pdk'
-
-module PDK
-  module Analytics
-    module Client
-      class GoogleAnalytics
-        PROTOCOL_VERSION  = 1
-        TRACKING_URL      = 'https://google-analytics.com/collect'.freeze
-        CUSTOM_DIMENSIONS = {
-          operating_system: :cd1,
-          output_format:    :cd2,
-          ruby_version:     :cd3,
-          cli_options:      :cd4,
-          env_vars:         :cd5,
-        }.freeze
-
-        attr_reader :user_id
-        attr_reader :logger
-        attr_reader :app_name
-        attr_reader :app_id
-        attr_reader :app_version
-        attr_reader :app_installer
-
-        def initialize(opts)
-          # lazy-load expensive gem code
-          require 'concurrent/configuration'
-          require 'concurrent/future'
-          require 'httpclient'
-          require 'locale'
-          require 'pdk/analytics/util'
-
-          @http = HTTPClient.new
-          @user_id = opts[:user_id]
-          @executor = Concurrent.global_io_executor
-          @os = PDK::Analytics::Util.fetch_os_async
-          @logger = opts[:logger]
-          @app_name = opts[:app_name]
-          @app_id = opts[:app_id]
-          @app_version = opts[:app_version]
-          @app_installer = opts[:app_installer]
-        end
-
-        def screen_view(screen, **kwargs)
-          custom_dimensions = walk_keys(kwargs) do |k|
-            CUSTOM_DIMENSIONS[k] || raise(_("Unknown analytics key '%{key}'") % { key: k })
-          end
-
-          screen_view_params = {
-            # Type
-            t:  'screenview',
-            # Screen Name
-            cd: screen,
-          }.merge(custom_dimensions)
-
-          submit(base_params.merge(screen_view_params))
-        end
-
-        def event(category, action, label: nil, value: nil, **kwargs)
-          custom_dimensions = walk_keys(kwargs) do |k|
-            CUSTOM_DIMENSIONS[k] || raise(_("Unknown analytics key '%{key}'") % { key: k })
-          end
-
-          event_params = {
-            # Type
-            t:  'event',
-            # Event Category
-            ec: category,
-            # Event Action
-            ea: action,
-          }.merge(custom_dimensions)
-
-          # Event Label
-          event_params[:el] = label if label
-          # Event Value
-          event_params[:ev] = value if value
-
-          submit(base_params.merge(event_params))
-        end
-
-        def submit(params)
-          # Handle analytics submission in the background to avoid blocking the
-          # app or polluting the log with errors
-          Concurrent::Future.execute(executor: @executor) do
-            require 'json'
-
-            logger.debug "Submitting analytics: #{JSON.pretty_generate(params)}"
-            @http.post(TRACKING_URL, params)
-            logger.debug 'Completed analytics submission'
-          end
-        end
-
-        # These parameters have terrible names. See this page for complete documentation:
-        # https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters
-        def base_params
-          {
-            v:    PROTOCOL_VERSION,
-            # Client ID
-            cid:  user_id,
-            # Tracking ID
-            tid:  app_id,
-            # Application Name
-            an:   app_name,
-            # Application Version
-            av:   app_version,
-            # Application Installer ID
-            aiid: app_installer,
-            # Anonymize IPs
-            aip:  true,
-            # User locale
-            ul:   Locale.current.to_rfc,
-            # Custom Dimension 1 (Operating System)
-            cd1:  @os.value,
-          }
-        end
-
-        # If the user is running a very fast command, there may not be time for
-        # analytics submission to complete before the command is finished. In
-        # that case, we give a little buffer for any stragglers to finish up.
-        # 250ms strikes a balance between accomodating slower networks while not
-        # introducing a noticeable "hang".
-        def finish
-          @executor.shutdown
-          @executor.wait_for_termination(0.25)
-        end
-
-        private
-
-        def walk_keys(data, &block)
-          if data.is_a?(Hash)
-            data.each_with_object({}) do |(k, v), acc|
-              v = walk_keys(v, &block)
-              acc[yield(k)] = v
-            end
-          elsif data.is_a?(Array)
-            data.map { |v| walk_keys(v, &block) }
-          else
-            data
-          end
-        end
-      end
-    end
-  end
-end
+require 'pdk'
+
+module PDK
+  module Analytics
+    module Client
+      class GoogleAnalytics
+        PROTOCOL_VERSION  = 1
+        TRACKING_URL      = 'https://google-analytics.com/collect'.freeze
+        CUSTOM_DIMENSIONS = {
+          operating_system: :cd1,
+          output_format:    :cd2,
+          ruby_version:     :cd3,
+          cli_options:      :cd4,
+          env_vars:         :cd5,
+        }.freeze
+
+        attr_reader :user_id
+        attr_reader :logger
+        attr_reader :app_name
+        attr_reader :app_id
+        attr_reader :app_version
+        attr_reader :app_installer
+
+        def initialize(opts)
+          # lazy-load expensive gem code
+          require 'concurrent/configuration'
+          require 'concurrent/future'
+          require 'httpclient'
+          require 'locale'
+          require 'pdk/analytics/util'
+
+          @http = HTTPClient.new
+          @user_id = opts[:user_id]
+          @executor = Concurrent.global_io_executor
+          @os = PDK::Analytics::Util.fetch_os_async
+          @logger = opts[:logger]
+          @app_name = opts[:app_name]
+          @app_id = opts[:app_id]
+          @app_version = opts[:app_version]
+          @app_installer = opts[:app_installer]
+        end
+
+        def screen_view(screen, **kwargs)
+          custom_dimensions = walk_keys(kwargs) do |k|
+            CUSTOM_DIMENSIONS[k] || raise(_("Unknown analytics key '%{key}'") % { key: k })
+          end
+
+          screen_view_params = {
+            # Type
+            t:  'screenview',
+            # Screen Name
+            cd: screen,
+          }.merge(custom_dimensions)
+
+          submit(base_params.merge(screen_view_params))
+        end
+
+        def event(category, action, label: nil, value: nil, **kwargs)
+          custom_dimensions = walk_keys(kwargs) do |k|
+            CUSTOM_DIMENSIONS[k] || raise(_("Unknown analytics key '%{key}'") % { key: k })
+          end
+
+          event_params = {
+            # Type
+            t:  'event',
+            # Event Category
+            ec: category,
+            # Event Action
+            ea: action,
+          }.merge(custom_dimensions)
+
+          # Event Label
+          event_params[:el] = label if label
+          # Event Value
+          event_params[:ev] = value if value
+
+          submit(base_params.merge(event_params))
+        end
+
+        def submit(params)
+          # Handle analytics submission in the background to avoid blocking the
+          # app or polluting the log with errors
+          Concurrent::Future.execute(executor: @executor) do
+            require 'json'
+
+            logger.debug "Submitting analytics: #{JSON.pretty_generate(params)}"
+            @http.post(TRACKING_URL, params)
+            logger.debug 'Completed analytics submission'
+          end
+        end
+
+        # These parameters have terrible names. See this page for complete documentation:
+        # https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters
+        def base_params
+          {
+            v:    PROTOCOL_VERSION,
+            # Client ID
+            cid:  user_id,
+            # Tracking ID
+            tid:  app_id,
+            # Application Name
+            an:   app_name,
+            # Application Version
+            av:   app_version,
+            # Application Installer ID
+            aiid: app_installer,
+            # Anonymize IPs
+            aip:  true,
+            # User locale
+            ul:   Locale.current.to_rfc,
+            # Custom Dimension 1 (Operating System)
+            cd1:  @os.value,
+          }
+        end
+
+        # If the user is running a very fast command, there may not be time for
+        # analytics submission to complete before the command is finished. In
+        # that case, we give a little buffer for any stragglers to finish up.
+        # 250ms strikes a balance between accomodating slower networks while not
+        # introducing a noticeable "hang".
+        def finish
+          @executor.shutdown
+          @executor.wait_for_termination(0.25)
+        end
+
+        private
+
+        def walk_keys(data, &block)
+          if data.is_a?(Hash)
+            data.each_with_object({}) do |(k, v), acc|
+              v = walk_keys(v, &block)
+              acc[yield(k)] = v
+            end
+          elsif data.is_a?(Array)
+            data.map { |v| walk_keys(v, &block) }
+          else
+            data
+          end
+        end
+      end
+    end
+  end
+end