pdk 3.0.1 → 3.3.0

data/lib/pdk/module/metadata.rb

@@ -9,7 +9,7 @@ module PDK
         'RedHat based Linux' => [
           {
             'operatingsystem' => 'CentOS',
-            'operatingsystemrelease' => ['7']
+            'operatingsystemrelease' => ['7', '8', '9']
           },
           {
             'operatingsystem' => 'OracleLinux',
@@ -17,30 +17,38 @@ module PDK
           },
           {
             'operatingsystem' => 'RedHat',
-            'operatingsystemrelease' => ['8']
+            'operatingsystemrelease' => ['7', '8', '9']
           },
           {
             'operatingsystem' => 'Scientific',
             'operatingsystemrelease' => ['7']
+          },
+          {
+            'operatingsystem' => 'Rocky',
+            'operatingsystemrelease' => ['8']
+          },
+          {
+            'operatingsystem' => 'AlmaLinux',
+            'operatingsystemrelease' => ['8']
           }
         ],
         'Debian based Linux' => [
           {
             'operatingsystem' => 'Debian',
-            'operatingsystemrelease' => ['10']
+            'operatingsystemrelease' => ['10', '11', '12']
           },
           {
             'operatingsystem' => 'Ubuntu',
-            'operatingsystemrelease' => ['18.04']
+            'operatingsystemrelease' => ['18.04', '20.04', '22.04']
           }
         ],
         'Fedora' => {
           'operatingsystem' => 'Fedora',
-          'operatingsystemrelease' => ['29']
+          'operatingsystemrelease' => ['40']
         },
         'OSX' => {
           'operatingsystem' => 'Darwin',
-          'operatingsystemrelease' => ['16']
+          'operatingsystemrelease' => ['21', '22', '23']
         },
         'SLES' => {
           'operatingsystem' => 'SLES',
@@ -52,11 +60,11 @@ module PDK
         },
         'Windows' => {
           'operatingsystem' => 'windows',
-          'operatingsystemrelease' => ['2019', '10']
+          'operatingsystemrelease' => ['2019', '2022', '10', '11']
         },
         'AIX' => {
           'operatingsystem' => 'AIX',
-          'operatingsystemrelease' => ['6.1', '7.1', '7.2']
+          'operatingsystemrelease' => ['7.2', '7.3']
         }
       }.freeze
 
@@ -117,7 +125,7 @@ module PDK
       def to_json(*_args)
         require 'json'
 
-        JSON.pretty_generate(@data.dup.delete_if { |_key, value| value.nil? }) # rubocop:disable Style/CollectionCompact
+        JSON.pretty_generate(@data.dup.delete_if { |_key, value| value.nil? })
       end
 
       def write!(path)
@@ -162,7 +170,7 @@ module PDK
 
       # Do basic validation and parsing of the name parameter.
       def process_name(data)
-        validate_name(data['name'])
+        validate_name(data['name']) unless PDK.context.is_a?(PDK::Context::ControlRepo)
         author, modname = data['name'].split(%r{[-/]}, 2)
         data['name'] = [author, modname].join('-')
 

data/lib/pdk/module/release.rb

@@ -1,5 +1,6 @@
 require 'pdk'
 require 'uri'
+require 'puppet/modulebuilder'
 
 module PDK
   module Module
@@ -77,7 +78,7 @@ module PDK
           # Use the default as a last resort
           package_file = default_package_filename if package_file.nil?
         else
-          package_file = run_build(options)
+          package_file = run_build
         end
 
         run_publish(options.dup, package_file) unless skip_publish?
@@ -95,7 +96,7 @@ module PDK
       def default_package_filename
         return @default_tarball_filename unless @default_tarball_filename.nil?
 
-        builder = PDK::Module::Build.new(module_dir: module_path)
+        builder = Puppet::Modulebuilder::Builder.new(module_path, nil, PDK.logger)
         @default_tarball_filename = builder.package_file
       end
 
@@ -135,8 +136,11 @@ module PDK
       end
 
       # @return [String] Path to the built tarball
-      def run_build(opts)
-        PDK::Module::Build.invoke(opts.dup)
+      def run_build
+        module_dir = PDK::Util::Filesystem.expand_path(module_path || Dir.pwd)
+        target_dir = File.join(module_dir, 'pkg')
+        builder = Puppet::Modulebuilder::Builder.new(module_dir, target_dir, PDK.logger)
+        builder.build
       end
 
       def run_publish(_opts, tarball_path)
@@ -238,8 +242,7 @@ module PDK
       def pdk_compatible?
         return @pdk_compatible unless @pdk_compatible.nil?
 
-        builder = PDK::Module::Build.new(module_dir: module_path)
-        @pdk_compatible = builder.module_pdk_compatible?
+        @pdk_compatible = PDK::Util.module_pdk_compatible?(module_path)
       end
       # :nocov:
 

data/lib/pdk/module/update_manager.rb

@@ -11,6 +11,7 @@ module PDK
         @modified_files = Set.new
         @added_files = Set.new
         @removed_files = Set.new
+        @executable_files = Set.new
         @diff_cache = {}
       end
 
@@ -37,6 +38,13 @@ module PDK
         @removed_files << path
       end
 
+      # Store a pending file execute mode change.
+      #
+      # @param path [String] The path to the file to be made executable.
+      def make_file_executable(path)
+        @executable_files << path
+      end
+
       # Generate a summary of the changes that will be applied to the module.
       #
       # @raise (see #calculate_diffs)
@@ -49,7 +57,8 @@ module PDK
         {
           added: @added_files,
           removed: @removed_files.select { |f| PDK::Util::Filesystem.exist?(f) },
-          modified: @diff_cache.compact
+          modified: @diff_cache.compact,
+          'made executable': @executable_files
         }
       end
 
@@ -60,7 +69,8 @@ module PDK
       def changes?
         !changes[:added].empty? ||
           !changes[:removed].empty? ||
-          changes[:modified].any? { |_, value| !value.nil? }
+          changes[:modified].any? { |_, value| !value.nil? } ||
+          !changes[:'made executable'].empty?
       end
 
       # Check if the update manager will change the specified file upon sync.
@@ -72,13 +82,15 @@ module PDK
       def changed?(path)
         changes[:added].any? { |add| add[:path] == path } ||
           changes[:removed].include?(path) ||
-          changes[:modified].key?(path)
+          changes[:modified].key?(path) ||
+          changes[:'made executable'].include?(path)
       end
 
       def clear!
         @modified_files.clear
         @added_files.clear
         @removed_files.clear
+        @executable_files.clear
         nil
       end
 
@@ -100,6 +112,10 @@ module PDK
         files_to_write.each do |file|
           write_file(file[:path], file[:content])
         end
+
+        @executable_files.each do |file|
+          update_execute_bits(file)
+        end
       end
 
       # Remove a file from disk.
@@ -215,6 +231,16 @@ module PDK
 
         output.join($INPUT_RECORD_SEPARATOR)
       end
+
+      # Set the execute bits on a file
+      def update_execute_bits(path)
+        require 'pdk/util/filesystem'
+
+        PDK.logger.debug(format("making '%{path}' executable", path: path))
+        PDK::Util::Filesystem.make_executable(path)
+      rescue Errno::EACCES
+        raise PDK::CLI::ExitWithError, format("You do not have permission to make '%{path}' executable", path: path)
+      end
     end
   end
 end

data/lib/pdk/report/event.rb

@@ -53,7 +53,7 @@ module PDK
       # @raise [ArgumentError] (see #sanitise_data)
       def initialize(data)
         sanitise_data(data).each do |key, value|
-          instance_variable_set("@#{key}", value)
+          instance_variable_set(:"@#{key}", value)
         end
       end
 

data/lib/pdk/template/renderer/v1/legacy_template_dir.rb

@@ -43,7 +43,6 @@ module PDK
           # @api private
           def config_for(dest_path, sync_config_path = nil)
             require 'pdk/util'
-            require 'pdk/analytics'
 
             module_root = PDK::Util.module_root
             sync_config_path ||= File.join(module_root, '.sync.yml') unless module_root.nil?
@@ -56,22 +55,20 @@ module PDK
               @config = conf_defaults
               @config.deep_merge!(@sync_config, knockout_prefix: '---') unless @sync_config.nil?
             end
-            file_config = @config.fetch(:global, {})
+            file_config = @config.fetch('common', {}).clone
             file_config['module_metadata'] = @module_metadata
             file_config.merge!(@config.fetch(dest_path, {})) unless dest_path.nil?
             file_config.merge!(@config).tap do |c|
               if uri.default?
-                file_value = if c['unmanaged']
-                               'unmanaged'
-                             elsif c['delete']
-                               'deleted'
-                             elsif @sync_config&.key?(dest_path)
-                               'customized'
-                             else
-                               'default'
-                             end
-
-                PDK.analytics.event('TemplateDir', 'file', label: dest_path, value: file_value)
+                if c['unmanaged']
+                  'unmanaged'
+                elsif c['delete']
+                  'deleted'
+                elsif @sync_config&.key?(dest_path)
+                  'customized'
+                else
+                  'default'
+                end
               end
             end
           end

data/lib/pdk/template/renderer/v1/renderer.rb

@@ -95,7 +95,9 @@ module PDK
                 end
               end
 
-              yield dest_path, dest_content, dest_status
+              dest_executable = config['manage_execute_permissions'] && PDK::Util::Filesystem.stat(File.join(template_loc, template_file)).executable?
+
+              yield dest_path, dest_content, dest_status, dest_executable
             end
           end
           # :nocov:

data/lib/pdk/template.rb

@@ -44,9 +44,6 @@ module PDK
         template_dir = TemplateDir.instance(uri, fetcher.path, context)
         template_dir.metadata = fetcher.metadata
 
-        template_type = uri.default? ? 'default' : 'custom'
-        PDK.analytics.event('TemplateDir', 'initialize', label: template_type)
-
         yield template_dir
       end
       nil

data/lib/pdk/tests/unit.rb

@@ -246,10 +246,10 @@ module PDK
         raise PDK::CLI::FatalError, format('Failed to find valid JSON in output from rspec: %{output}', output: output[:stdout]) unless rspec_json
 
         if rspec_json['examples'].empty?
-          rspec_message = rspec_json['messages'][0]
-          return [] if rspec_message == 'No examples found.'
+          return [] if rspec_json['messages'][0] == 'No examples found.'
+          return [] if rspec_json['messages'].include?("\nAll examples were filtered out")
 
-          raise PDK::CLI::FatalError, format('Unable to enumerate examples. rspec reported: %{message}', message: rspec_message)
+          raise PDK::CLI::FatalError, format('Unable to enumerate examples. rspec reported: %{message}', message: rspec_json['messages'])
         else
           examples = []
           rspec_json['examples'].each do |example|

data/lib/pdk/util/filesystem.rb

@@ -27,6 +27,11 @@ module PDK
       end
       module_function :read_file
 
+      def make_executable(file)
+        FileUtils.chmod('a+x', file)
+      end
+      module_function :make_executable
+
       # :nocov:
       # These methods just wrap core Ruby functionality and
       # can be ignored for code coverage
@@ -133,6 +138,11 @@ module PDK
         end
       end
       module_function :mv
+
+      def executable?(*args)
+        File.executable?(*args)
+      end
+      module_function :executable?
       # :nocov:
     end
   end

data/lib/pdk/util.rb

@@ -32,6 +32,7 @@ module PDK
     def exit_process(exit_code)
       exit exit_code
     end
+    module_function :exit_process
     # :nocov:
 
     # Searches upwards from current working directory for the given target file.

data/lib/pdk/version.rb

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '3.0.1'.freeze
-  TEMPLATE_REF = '3.0.1'.freeze
+  VERSION = '3.3.0'.freeze
+  TEMPLATE_REF = '3.3.0'.freeze
 end

data/lib/pdk.rb

@@ -1,5 +1,4 @@
 module PDK
-  autoload :Analytics, 'pdk/analytics'
   autoload :AnswerFile, 'pdk/answer_file'
   autoload :Bolt, 'pdk/bolt'
   autoload :Config, 'pdk/config'
@@ -58,17 +57,4 @@ module PDK
 
     requested_feature_flags.include?(flagname)
   end
-
-  def self.analytics
-    @analytics ||= PDK::Analytics.build_client(
-      logger: PDK.logger,
-      disabled: PDK::Util::Env['PDK_DISABLE_ANALYTICS'] || PDK.config.get_within_scopes('analytics.disabled', ['user', 'system']),
-      user_id: PDK.config.get_within_scopes('analytics.user-id', ['user', 'system']),
-      app_id: "UA-139917834-#{PDK::Util.development_mode? ? '2' : '1'}",
-      client: :google_analytics,
-      app_name: 'pdk',
-      app_version: PDK::VERSION,
-      app_installer: PDK::Util.package_install? ? 'package' : 'gem'
-    )
-  end
 end