puppet 5.5.22-x64-mingw32 → 6.0.0-x64-mingw32

data/lib/puppet/face/module/build.rb

@@ -1,67 +1,12 @@
 Puppet::Face.define(:module, '1.0.0') do
   action(:build) do
     summary _("Build a module release package.")
-    description <<-EOT
-      Prepares a local module for release on the Puppet Forge by building a
-      ready-to-upload archive file.
-      Note: Module build uses MD5 checksums, which are prohibited on FIPS enabled systems.
-
-      This action uses the metadata.json file in the module directory to set metadata
-      used by the Forge. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for more
-      about writing metadata.json files.
-
-      After being built, the release archive file can be found in the module's
-      `pkg` directory.
-    EOT
-
-    returns _("Pathname object representing the path to the release archive.")
-
-    examples <<-EOT
-      Build a module release:
-
-      $ puppet module build puppetlabs-apache
-      notice: Building /Users/kelseyhightower/puppetlabs-apache for release
-      Module built: /Users/kelseyhightower/puppetlabs-apache/pkg/puppetlabs-apache-0.0.1.tar.gz
-
-      Build the module in the current working directory:
-
-      $ cd /Users/kelseyhightower/puppetlabs-apache
-      $ puppet module build
-      notice: Building /Users/kelseyhightower/puppetlabs-apache for release
-      Module built: /Users/kelseyhightower/puppetlabs-apache/pkg/puppetlabs-apache-0.0.1.tar.gz
-    EOT
-
-    arguments _("[<path>]")
+    #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+    description _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
 
     when_invoked do |*args|
-      options = args.pop
-      if options.nil? or args.length > 1 then
-        raise ArgumentError, _("puppet module build only accepts 0 or 1 arguments")
-      end
-
-      module_path = args.first
-      if module_path.nil?
-        pwd = Dir.pwd
-        module_path = Puppet::ModuleTool.find_module_root(pwd)
-        if module_path.nil?
-          raise _("Unable to find metadata.json in module root %{pwd} or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format.") % { pwd: pwd }
-        end
-      else
-        unless Puppet::ModuleTool.is_module_root?(module_path)
-          raise _("Unable to find metadata.json in module root %{module_path} or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format.") % { module_path: module_path }
-        end
-      end
-
-      #TRANSLATORS 'puppet module build' is the name of the puppet command and 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
-      Puppet.deprecation_warning _("`puppet module build` is deprecated and will be removed in a future release. This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
-
-      Puppet::ModuleTool.set_option_defaults options
-      Puppet::ModuleTool::Applications::Builder.run(module_path, options)
-    end
-
-    when_rendering :console do |return_value|
-      # Get the string representation of the Pathname object.
-      _("Module built: %{path}") % { path: return_value.expand_path.to_s }
+      #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+      raise _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
     end
 
     deprecate

data/lib/puppet/face/module/generate.rb

@@ -1,256 +1,14 @@
 Puppet::Face.define(:module, '1.0.0') do
   action(:generate) do
     summary _("Generate boilerplate for a new module.")
-    description <<-EOT
-      Generates boilerplate for a new module by creating the directory
-      structure and files recommended for the Puppet community's best practices.
+    #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+    description _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
 
-      A module may need additional directories beyond this boilerplate
-      if it provides plugins, files, or templates.
-    EOT
-
-    returns _("Array of Pathname objects representing paths of generated files.")
-
-    examples <<-EOT
-      Generate a new module in the current directory:
-
-      $ puppet module generate puppetlabs-ssh
-      We need to create a metadata.json file for this module.  Please answer the
-      following questions; if the question is not applicable to this module, feel free
-      to leave it blank.
-
-      Puppet uses Semantic Versioning (semver.org) to version modules.
-      What version is this module?  [0.1.0]
-      -->
-
-      Who wrote this module?  [puppetlabs]
-      -->
-
-      What license does this module code fall under?  [Apache-2.0]
-      -->
-
-      How would you describe this module in a single sentence?
-      -->
-
-      Where is this module's source code repository?
-      -->
-
-      Where can others go to learn more about this module?
-      -->
-
-      Where can others go to file issues about this module?
-      -->
-
-      ----------------------------------------
-      {
-        "name": "puppetlabs-ssh",
-        "version": "0.1.0",
-        "author": "puppetlabs",
-        "summary": null,
-        "license": "Apache-2.0",
-        "source": "",
-        "project_page": null,
-        "issues_url": null,
-        "dependencies": [
-          {
-            "name": "puppetlabs-stdlib",
-            "version_requirement": ">= 1.0.0"
-          }
-        ]
-      }
-      ----------------------------------------
-
-      About to generate this metadata; continue? [n/Y]
-      -->
-
-      Notice: Generating module at /Users/username/Projects/puppet/puppetlabs-ssh...
-      Notice: Populating ERB templates...
-      Finished; module generated in puppetlabs-ssh.
-      puppetlabs-ssh/manifests
-      puppetlabs-ssh/manifests/init.pp
-      puppetlabs-ssh/metadata.json
-      puppetlabs-ssh/README.md
-      puppetlabs-ssh/spec
-      puppetlabs-ssh/spec/spec_helper.rb
-      puppetlabs-ssh/tests
-      puppetlabs-ssh/tests/init.pp
-    EOT
-
-    option "--skip-interview" do
-      summary _("Bypass the interactive metadata interview")
-      description <<-EOT
-        Do not attempt to perform a metadata interview.  Primarily useful for automatic
-        execution of `puppet module generate`.
-      EOT
-    end
-
-    arguments _("<name>")
-
-    when_invoked do |name, options|
-      # Since we only want to interview if it's being rendered to the console
-      # (i.e. when invoked with `puppet module generate`), we can't do any work
-      # here in the when_invoked block. The result of this block is then
-      # passed to each renderer, which will handle it appropriately; by
-      # returning a simple message like this, every renderer will simply output
-      # the string.
-      # Our `when_rendering :console` handler will ignore this value and
-      # actually generate the module.
-      #
-      # All this is necessary because it is not possible at this point in time
-      # to know what the destination of the output is.
-      _("This format is not supported by this action.")
-    end
-
-    when_rendering :console do |_, name, options|
-      Puppet::ModuleTool.set_option_defaults options
-
-      begin
-        # A default dependency for all newly generated modules is being
-        # introduced as a substitute for the comments we used to include in the
-        # previous module data specifications. While introducing a default
-        # dependency is less than perfectly desirable, the cost is low, and the
-        # syntax is obtuse enough to justify its inclusion.
-        metadata = Puppet::ModuleTool::Metadata.new.update(
-          'name' => name,
-          'version' => '0.1.0',
-          'dependencies' => [
-            { 'name' => 'puppetlabs-stdlib', 'version_requirement' => '>= 1.0.0' }
-          ]
-        )
-      rescue ArgumentError
-        msg = _("Could not generate directory %{name}, you must specify a dash-separated username and module name.") % { name: name.inspect }
-        raise ArgumentError, msg, $!.backtrace
-      end
-
-      dest = Puppet::ModuleTool::Generate.destination(metadata)
-      result = Puppet::ModuleTool::Generate.generate(metadata, options[:skip_interview])
-
-      path = dest.relative_path_from(Pathname.pwd)
-      puts _("Finished; module generated in %{path}.") % { path: path }
-      result.join("\n")
+    when_invoked do |*args|
+      #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+      raise _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
     end
 
     deprecate
   end
 end
-
-module Puppet::ModuleTool::Generate
-  module_function
-
-  def generate(metadata, skip_interview = false)
-    #TRANSLATORS 'puppet module generate' is the name of the puppet command and 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated. 
-    Puppet.deprecation_warning _("`puppet module generate` is deprecated and will be removed in a future release. This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
-
-    interview(metadata) unless skip_interview
-    destination = duplicate_skeleton(metadata)
-    all_files = destination.basename + '**/*'
-
-    return Dir[all_files.to_s]
-  end
-
-  def interview(metadata)
-    puts _("We need to create a metadata.json file for this module.  Please answer the
-    following questions; if the question is not applicable to this module, feel free
-    to leave it blank.")
-
-    begin
-      puts
-      puts _("Puppet uses Semantic Versioning (semver.org) to version modules.")
-      puts _("What version is this module?  [%{version}]") % { version: metadata.version }
-      metadata.update 'version' => user_input(metadata.version)
-    rescue
-      Puppet.err _("We're sorry, we could not parse that as a Semantic Version.")
-      retry
-    end
-
-    puts
-    puts _("Who wrote this module?  [%{author}]") % { author: metadata.author }
-    metadata.update 'author' => user_input(metadata.author)
-
-    puts
-    puts _("What license does this module code fall under?  [%{license}]") % { license: metadata.license }
-    metadata.update 'license' => user_input(metadata.license)
-
-    puts
-    puts _("How would you describe this module in a single sentence?")
-    metadata.update 'summary' => user_input(metadata.summary)
-
-    puts
-    puts _("Where is this module's source code repository?")
-    metadata.update 'source' => user_input(metadata.source)
-
-    puts
-    puts _("Where can others go to learn more about this module?%{project_page}") % { project_page: metadata.project_page && "  [#{metadata.project_page}]" }
-    metadata.update 'project_page' => user_input(metadata.project_page)
-
-    puts
-    puts _("Where can others go to file issues about this module?%{issues}") % { issues: metadata.issues_url && "  [#{metadata.issues_url}]" }
-    metadata.update 'issues_url' => user_input(metadata.issues_url)
-
-    puts
-    puts '-' * 40
-    puts metadata.to_json
-    puts '-' * 40
-    puts
-    puts _("About to generate this metadata; continue? [n/Y]")
-
-    if user_input('Y') !~ /^y(es)?$/i
-      puts _("Aborting...")
-      exit 0
-    end
-  end
-
-  def user_input(default=nil)
-    print '--> '
-    input = STDIN.gets.chomp.strip
-    input = default if input == ''
-    return input
-  end
-
-  def destination(metadata)
-    return @dest if defined? @dest
-    @dest = Pathname.pwd + metadata.name
-    raise ArgumentError, _("%{destination} already exists.") % { destination: @dest } if @dest.exist?
-    return @dest
-  end
-
-  def duplicate_skeleton(metadata)
-    dest = destination(metadata)
-
-    puts
-    Puppet.notice _("Generating module at %{dest}...") % { dest: dest }
-    FileUtils.cp_r skeleton_path, dest
-
-    populate_templates(metadata, dest)
-    return dest
-  end
-
-  def populate_templates(metadata, destination)
-    Puppet.notice _("Populating templates...")
-
-    formatters = {
-      :erb      => proc { |data, ctx| ERB.new(data).result(ctx) },
-      :template => proc { |data, _| data },
-    }
-
-    formatters.each do |type, block|
-      templates = destination + "**/*.#{type}"
-
-      Dir.glob(templates.to_s, File::FNM_DOTMATCH).each do |erb|
-        path = Pathname.new(erb)
-        content = block[path.read, binding]
-
-        target = path.parent + path.basename(".#{type}")
-        target.open('w:UTF-8') { |f| f.write(content) }
-        path.unlink
-      end
-    end
-  end
-
-  def skeleton_path
-    return @path if defined? @path
-    path = Pathname(Puppet.settings[:module_skeleton_dir])
-    path = Pathname(__FILE__).dirname + '../../module_tool/skeleton/templates/generator' unless path.directory?
-    @path = path
-  end
-end

data/lib/puppet/face/module/install.rb

@@ -120,10 +120,6 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
       Puppet::ModuleTool.set_option_defaults options
       Puppet.notice _("Preparing to install into %{dir} ...") % { dir: options[:target_dir] }

data/lib/puppet/face/module/list.rb

@@ -17,10 +17,6 @@ Puppet::Face.define(:module, '1.0.0') do
       summary _("Whether to show dependencies as a tree view")
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     examples <<-'EOT'
       List installed modules:
 
@@ -77,7 +73,6 @@ Puppet::Face.define(:module, '1.0.0') do
 
       output = ''
 
-      environment.modules_strict_semver = !!options[:strict_semver]
       warn_unmet_dependencies(environment)
 
       environment.modulepath.each do |path|
@@ -128,10 +123,10 @@ Puppet::Face.define(:module, '1.0.0') do
       unmet_grouped.each do |type, deps|
         unless deps.empty?
           unmet_grouped[type].sort_by { |dep| dep[:name] }.each do |dep|
-            dep_name           = dep[:name].tr('/', '-')
+            dep_name           = dep[:name].gsub('/', '-')
             installed_version  = dep[:mod_details][:installed_version]
             version_constraint = dep[:version_constraint]
-            parent_name        = dep[:parent][:name].tr('/', '-')
+            parent_name        = dep[:parent][:name].gsub('/', '-')
             parent_version     = dep[:parent][:version]
 
             msg = _("'%{parent_name}' (%{parent_version}) requires '%{dependency_name}' (%{dependency_version})") % { parent_name: parent_name, parent_version: parent_version, dependency_name: dep_name, dependency_version: version_constraint }
@@ -151,7 +146,7 @@ Puppet::Face.define(:module, '1.0.0') do
     error_display_order.each do |type|
       unless @unmet_deps[type].empty?
         @unmet_deps[type].keys.sort.each do |dep|
-          name    = dep.tr('/', '-')
+          name    = dep.gsub('/', '-')
           errors  = @unmet_deps[type][dep][:errors]
           version = @unmet_deps[type][dep][:version]
 
@@ -219,7 +214,7 @@ Puppet::Face.define(:module, '1.0.0') do
           dep[:reason] == :missing
         end
         missing_deps.map do |mis_mod|
-          str = "#{colorize(:bg_red, _('UNMET DEPENDENCY'))} #{mis_mod[:name].tr('/', '-')} "
+          str = "#{colorize(:bg_red, _('UNMET DEPENDENCY'))} #{mis_mod[:name].gsub('/', '-')} "
           str << "(#{colorize(:cyan, mis_mod[:version_constraint])})"
           node[:dependencies] << { :text => str }
         end
@@ -244,7 +239,7 @@ Puppet::Face.define(:module, '1.0.0') do
   #
   def list_build_node(mod, parent, params)
     str = ''
-    str << (mod.forge_name ? mod.forge_name.tr('/', '-') : mod.name)
+    str << (mod.forge_name ? mod.forge_name.gsub('/', '-') : mod.name)
     str << ' (' + colorize(:cyan, mod.version ? "v#{mod.version}" : '???') + ')'
 
     unless File.dirname(mod.path) == params[:path]

data/lib/puppet/face/module/search.rb

@@ -23,7 +23,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
     when_invoked do |term, options|
       Puppet::ModuleTool.set_option_defaults options
-      Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new(options[:module_repository] || Puppet[:module_repository], options[:strict_semver]), options).run
+      Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new(options[:module_repository] || Puppet[:module_repository]), options).run
     end
 
     when_rendering :console do |results, term, options|
@@ -81,7 +81,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       highlight = proc do |s|
         s = s.gsub(term, colorize(:green, term))
-        s = s.gsub(term.tr('/', '-'), colorize(:green, term.tr('/', '-'))) if term =~ /\//
+        s = s.gsub(term.gsub('/', '-'), colorize(:green, term.gsub('/', '-'))) if term =~ /\//
         s = s.gsub(' DEPRECATED', colorize(:red, ' DEPRECATED'))
         s
       end

data/lib/puppet/face/module/uninstall.rb

@@ -56,12 +56,8 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
-      name = name.tr('/', '-')
+      name = name.gsub('/', '-')
 
       Puppet::ModuleTool.set_option_defaults options
       message = if options[:version]

data/lib/puppet/face/module/upgrade.rb

@@ -62,12 +62,8 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
-      name = name.tr('/', '-')
+      name = name.gsub('/', '-')
       Puppet.notice _("Preparing to upgrade '%{name}' ...") % { name: name }
       Puppet::ModuleTool.set_option_defaults options
       Puppet::ModuleTool::Applications::Upgrader.new(name, options).run