pdk 2.3.0 → 2.4.0

data/lib/pdk/generate/task.rb

@@ -1,68 +1,68 @@
-require 'pdk'
-
-module PDK
-  module Generate
-    class Task < PuppetObject
-      def friendly_name
-        'Task'
-      end
-
-      def template_files
-        return {} if spec_only?
-        {
-          'task.erb' => File.join('tasks', task_name + '.sh'),
-        }
-      end
-
-      def template_data
-        {
-          name: object_name,
-        }
-      end
-
-      # Checks that the task has not already been defined with a different
-      # extension.
-      #
-      # @raise [PDK::CLI::ExitWithError] if files with the same name as the
-      # task exist in the <module>/tasks/ directory
-      def check_preconditions
-        super
-
-        error = _("A task named '%{name}' already exists in this module; defined in %{file}")
-        allowed_extensions = %w[.md .conf]
-
-        PDK::Util::Filesystem.glob(File.join(context.root_path, 'tasks', task_name + '.*')).each do |file|
-          next if allowed_extensions.include?(File.extname(file))
-
-          raise PDK::CLI::ExitWithError, error % { name: task_name, file: file }
-        end
-      end
-
-      def non_template_files
-        task_metadata_file = File.join('tasks', task_name + '.json')
-        { task_metadata_file => JSON.pretty_generate(task_metadata) }
-      end
-
-      private
-
-      # Calculates the file name of the task files ('init' if the task has the
-      # same name as the module, otherwise use the specified task name).
-      #
-      # @return [String] the base name of the file(s) for the task.
-      #
-      # @api private
-      def task_name
-        (object_name == module_name) ? 'init' : object_name
-      end
-
-      def task_metadata
-        {
-          puppet_task_version: 1,
-          supports_noop:       false,
-          description:         options.fetch(:description, 'A short description of this task'),
-          parameters:          {},
-        }
-      end
-    end
-  end
-end
+require 'pdk'
+
+module PDK
+  module Generate
+    class Task < PuppetObject
+      def friendly_name
+        'Task'
+      end
+
+      def template_files
+        return {} if spec_only?
+        {
+          'task.erb' => File.join('tasks', task_name + '.sh'),
+        }
+      end
+
+      def template_data
+        {
+          name: object_name,
+        }
+      end
+
+      # Checks that the task has not already been defined with a different
+      # extension.
+      #
+      # @raise [PDK::CLI::ExitWithError] if files with the same name as the
+      # task exist in the <module>/tasks/ directory
+      def check_preconditions
+        super
+
+        error = _("A task named '%{name}' already exists in this module; defined in %{file}")
+        allowed_extensions = %w[.md .conf]
+
+        PDK::Util::Filesystem.glob(File.join(context.root_path, 'tasks', task_name + '.*')).each do |file|
+          next if allowed_extensions.include?(File.extname(file))
+
+          raise PDK::CLI::ExitWithError, error % { name: task_name, file: file }
+        end
+      end
+
+      def non_template_files
+        task_metadata_file = File.join('tasks', task_name + '.json')
+        { task_metadata_file => JSON.pretty_generate(task_metadata) }
+      end
+
+      private
+
+      # Calculates the file name of the task files ('init' if the task has the
+      # same name as the module, otherwise use the specified task name).
+      #
+      # @return [String] the base name of the file(s) for the task.
+      #
+      # @api private
+      def task_name
+        (object_name == module_name) ? 'init' : object_name
+      end
+
+      def task_metadata
+        {
+          puppet_task_version: 1,
+          supports_noop:       false,
+          description:         options.fetch(:description, 'A short description of this task'),
+          parameters:          {},
+        }
+      end
+    end
+  end
+end

data/lib/pdk/generate/transport.rb

@@ -1,33 +1,33 @@
-require 'pdk'
-
-module PDK
-  module Generate
-    class Transport < PuppetObject
-      def friendly_name
-        'Resource API Transport'.freeze
-      end
-
-      def template_files
-        # Note : Due to how the V1 templates work, the names of the source template files may be mismatched to
-        # their destination, e.g. transport_type.erb is really a transport schema
-        files = {
-          'transport_spec.erb'      => File.join('spec', 'unit', 'puppet', 'transport', object_name) + '_spec.rb',
-          'transport_type_spec.erb' => File.join('spec', 'unit', 'puppet', 'transport', 'schema', object_name) + '_spec.rb',
-        }
-        return files if spec_only?
-        files.merge(
-          'transport.erb' => File.join('lib', 'puppet', 'transport', object_name) + '.rb',
-          'transport_device.erb'    => File.join('lib', 'puppet', 'util', 'network_device', object_name, 'device.rb'),
-          'transport_type.erb'      => File.join('lib', 'puppet', 'transport', 'schema', object_name) + '.rb',
-        )
-      end
-
-      def template_data
-        {
-          name: object_name,
-          transport_class: class_name_from_object_name(object_name),
-        }
-      end
-    end
-  end
-end
+require 'pdk'
+
+module PDK
+  module Generate
+    class Transport < PuppetObject
+      def friendly_name
+        'Resource API Transport'.freeze
+      end
+
+      def template_files
+        # Note : Due to how the V1 templates work, the names of the source template files may be mismatched to
+        # their destination, e.g. transport_type.erb is really a transport schema
+        files = {
+          'transport_spec.erb'      => File.join('spec', 'unit', 'puppet', 'transport', object_name) + '_spec.rb',
+          'transport_type_spec.erb' => File.join('spec', 'unit', 'puppet', 'transport', 'schema', object_name) + '_spec.rb',
+        }
+        return files if spec_only?
+        files.merge(
+          'transport.erb' => File.join('lib', 'puppet', 'transport', object_name) + '.rb',
+          'transport_device.erb'    => File.join('lib', 'puppet', 'util', 'network_device', object_name, 'device.rb'),
+          'transport_type.erb'      => File.join('lib', 'puppet', 'transport', 'schema', object_name) + '.rb',
+        )
+      end
+
+      def template_data
+        {
+          name: object_name,
+          transport_class: class_name_from_object_name(object_name),
+        }
+      end
+    end
+  end
+end

data/lib/pdk/generate.rb

@@ -1,24 +1,24 @@
-require 'pdk'
-
-module PDK
-  module Generate
-    autoload :DefinedType, 'pdk/generate/defined_type'
-    autoload :Module, 'pdk/generate/module'
-    autoload :Provider, 'pdk/generate/provider'
-    autoload :PuppetClass, 'pdk/generate/puppet_class'
-    autoload :PuppetObject, 'pdk/generate/puppet_object'
-    autoload :Task, 'pdk/generate/task'
-    autoload :Transport, 'pdk/generate/transport'
-
-    def generators
-      @generators ||= [
-        PDK::Generate::DefinedType,
-        PDK::Generate::Provider,
-        PDK::Generate::PuppetClass,
-        PDK::Generate::Task,
-        PDK::Generate::Transport,
-      ].freeze
-    end
-    module_function :generators
-  end
-end
+require 'pdk'
+
+module PDK
+  module Generate
+    autoload :DefinedType, 'pdk/generate/defined_type'
+    autoload :Module, 'pdk/generate/module'
+    autoload :Provider, 'pdk/generate/provider'
+    autoload :PuppetClass, 'pdk/generate/puppet_class'
+    autoload :PuppetObject, 'pdk/generate/puppet_object'
+    autoload :Task, 'pdk/generate/task'
+    autoload :Transport, 'pdk/generate/transport'
+
+    def generators
+      @generators ||= [
+        PDK::Generate::DefinedType,
+        PDK::Generate::Provider,
+        PDK::Generate::PuppetClass,
+        PDK::Generate::Task,
+        PDK::Generate::Transport,
+      ].freeze
+    end
+    module_function :generators
+  end
+end

data/lib/pdk/i18n.rb

@@ -1,4 +1,4 @@
-require 'gettext-setup'
-
-GettextSetup.initialize(File.absolute_path('../../locales', File.dirname(__FILE__)))
-GettextSetup.negotiate_locale!(GettextSetup.candidate_locales)
+require 'gettext-setup'
+
+GettextSetup.initialize(File.absolute_path('../../locales', File.dirname(__FILE__)))
+GettextSetup.negotiate_locale!(GettextSetup.candidate_locales)

data/lib/pdk/logger.rb

@@ -1,45 +1,45 @@
-require 'logger'
-require 'pdk'
-
-module PDK
-  class Logger < ::Logger
-    WRAP_COLUMN_LIMIT = 78
-
-    def initialize
-      super(STDERR)
-      @sent_messages = {}
-
-      # TODO: Decide on output format.
-      self.formatter = proc do |severity, _datetime, _progname, msg|
-        prefix = "pdk (#{severity}): "
-        if msg.is_a?(Hash)
-          if msg.fetch(:wrap, false)
-            wrap_pattern = %r{(.{1,#{WRAP_COLUMN_LIMIT - prefix.length}})(\s+|\Z)}
-            "#{prefix}#{msg[:text].gsub(wrap_pattern, "\\1\n#{' ' * prefix.length}")}\n"
-          else
-            "#{prefix}#{msg[:text]}\n"
-          end
-        else
-          "#{prefix}#{msg}\n"
-        end
-      end
-
-      self.level = ::Logger::INFO
-    end
-
-    def warn_once(*args)
-      hash = args.inspect.hash
-      return if (@sent_messages[::Logger::WARN] ||= {}).key?(hash)
-      @sent_messages[::Logger::WARN][hash] = true
-      warn(*args)
-    end
-
-    def enable_debug_output
-      self.level = ::Logger::DEBUG
-    end
-
-    def debug?
-      level == ::Logger::DEBUG
-    end
-  end
-end
+require 'logger'
+require 'pdk'
+
+module PDK
+  class Logger < ::Logger
+    WRAP_COLUMN_LIMIT = 78
+
+    def initialize
+      super(STDERR)
+      @sent_messages = {}
+
+      # TODO: Decide on output format.
+      self.formatter = proc do |severity, _datetime, _progname, msg|
+        prefix = "pdk (#{severity}): "
+        if msg.is_a?(Hash)
+          if msg.fetch(:wrap, false)
+            wrap_pattern = %r{(.{1,#{WRAP_COLUMN_LIMIT - prefix.length}})(\s+|\Z)}
+            "#{prefix}#{msg[:text].gsub(wrap_pattern, "\\1\n#{' ' * prefix.length}")}\n"
+          else
+            "#{prefix}#{msg[:text]}\n"
+          end
+        else
+          "#{prefix}#{msg}\n"
+        end
+      end
+
+      self.level = ::Logger::INFO
+    end
+
+    def warn_once(*args)
+      hash = args.inspect.hash
+      return if (@sent_messages[::Logger::WARN] ||= {}).key?(hash)
+      @sent_messages[::Logger::WARN][hash] = true
+      warn(*args)
+    end
+
+    def enable_debug_output
+      self.level = ::Logger::DEBUG
+    end
+
+    def debug?
+      level == ::Logger::DEBUG
+    end
+  end
+end