puppet 3.5.1-x86-mingw32 → 3.6.0.rc1-x86-mingw32

data/lib/puppet/external/nagios/grammar.ry

@@ -37,6 +37,7 @@ vars: var
     ;
 
 var: PARAM VALUE returns { result = {val[0] => val[1]} }
+    | PARAM returns { result = {val[0] => "" } }
     ;
 
 returns: RETURN
@@ -144,6 +145,7 @@ def tokenize_parameter_value
     ;
 
   when (text = @ss.scan(/\n/))                  # newline
+    @in_parameter_value = false
     [:RETURN, text]
 
   when (text = @ss.scan(/.+$/))                 # Value of parameter

data/lib/puppet/external/nagios/parser.rb

@@ -8,7 +8,7 @@ require 'racc/parser.rb'
 module Nagios
   class Parser < Racc::Parser
 
-module_eval(<<'...end grammar.ry/module_eval...', 'grammar.ry', 49)
+module_eval(<<'...end grammar.ry/module_eval...', 'grammar.ry', 50)
 require 'strscan'
 
 class ::Nagios::Parser::SyntaxError < RuntimeError; end
@@ -107,6 +107,7 @@ def tokenize_parameter_value
     ;
 
   when (text = @ss.scan(/\n/))                  # newline
+    @in_parameter_value = false
     [:RETURN, text]
 
   when (text = @ss.scan(/.+$/))                 # Value of parameter
@@ -211,33 +212,33 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-     8,     3,     3,    14,    12,    18,    10,     4,     4,     9,
-    14,    12,     6,    19,    12 ]
+     8,     3,     3,    14,    12,    18,    10,     4,     4,    20,
+    12,    14,    12,     9,     6,    12 ]
 
 racc_action_check = [
-     5,     0,     5,    13,     9,    13,     8,     0,     5,     6,
-    11,    12,     3,    14,    19 ]
+     5,     0,     5,    13,     9,    13,     8,     0,     5,    14,
+    14,    11,    12,     6,     3,    20 ]
 
 racc_action_pointer = [
-    -1,   nil,   nil,     9,   nil,     0,     4,   nil,     6,    -4,
-   nil,     6,     3,    -1,     6,   nil,   nil,   nil,   nil,     6,
-   nil ]
+    -1,   nil,   nil,    11,   nil,     0,     8,   nil,     6,    -4,
+   nil,     7,     4,    -1,     2,   nil,   nil,   nil,   nil,   nil,
+     7,   nil ]
 
 racc_action_default = [
-   -11,    -1,    -3,   -11,    -4,   -11,   -11,    -2,   -11,   -11,
-    21,   -11,    -9,   -11,   -11,    -6,   -10,    -7,    -5,   -11,
-    -8 ]
+   -12,    -1,    -3,   -12,    -4,   -12,   -12,    -2,   -12,   -12,
+    22,   -12,   -10,   -12,   -12,    -6,   -11,    -7,    -5,    -9,
+   -12,    -8 ]
 
 racc_goto_table = [
-    11,     1,    15,    16,    17,    13,     7,     5,   nil,   nil,
-    20 ]
+    11,     1,    15,    16,    17,    19,     7,    13,     5,   nil,
+   nil,    21 ]
 
 racc_goto_check = [
-     4,     2,     6,     4,     6,     5,     2,     1,   nil,   nil,
-     4 ]
+     4,     2,     6,     4,     6,     4,     2,     5,     1,   nil,
+   nil,     4 ]
 
 racc_goto_pointer = [
-   nil,     7,     1,   nil,    -9,    -6,    -9 ]
+   nil,     8,     1,   nil,    -9,    -4,    -9 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     2,   nil,   nil,   nil ]
@@ -252,12 +253,13 @@ racc_reduce_table = [
   1, 14, :_reduce_none,
   2, 14, :_reduce_7,
   3, 15, :_reduce_8,
+  2, 15, :_reduce_9,
   1, 13, :_reduce_none,
   2, 13, :_reduce_none ]
 
-racc_reduce_n = 11
+racc_reduce_n = 12
 
-racc_shift_n = 21
+racc_shift_n = 22
 
 racc_token_table = {
   false => 0,
@@ -379,10 +381,17 @@ module_eval(<<'.,.,', 'grammar.ry', 38)
   end
 .,.,
 
-# reduce 9 omitted
+module_eval(<<'.,.,', 'grammar.ry', 39)
+  def _reduce_9(val, _values, result)
+     result = {val[0] => "" } 
+    result
+  end
+.,.,
 
 # reduce 10 omitted
 
+# reduce 11 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end

data/lib/puppet/face/config.rb

@@ -59,12 +59,25 @@ Puppet::Face.define(:config, '0.0.1') do
 
       args = Puppet.settings.to_a.collect(&:first) if args.empty? || args == ['all']
 
-      values = Puppet.settings.values(Puppet[:environment].to_sym, options[:section].to_sym)
-      if args.length == 1
-        puts values.interpolate(args[0].to_sym)
-      else
-        args.each do |setting_name|
-          puts "#{setting_name} = #{values.interpolate(setting_name.to_sym)}"
+      values_from_the_selected_section =
+        Puppet.settings.values(nil, options[:section].to_sym)
+
+      loader_settings = {
+        :environmentpath => values_from_the_selected_section.interpolate(:environmentpath),
+        :basemodulepath => values_from_the_selected_section.interpolate(:basemodulepath),
+      }
+
+      Puppet.override(Puppet.base_context(loader_settings),
+                     "New environment loaders generated from the requested section.") do
+        # And now we can lookup values that include those from environments configured from
+        # the requested section
+        values = Puppet.settings.values(Puppet[:environment].to_sym, options[:section].to_sym)
+        if args.length == 1
+          puts values.interpolate(args[0].to_sym)
+        else
+          args.each do |setting_name|
+            puts "#{setting_name} = #{values.interpolate(setting_name.to_sym)}"
+          end
         end
       end
       nil

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

@@ -15,27 +15,229 @@ Puppet::Face.define(:module, '1.0.0') do
       Generate a new module in the current directory:
 
       $ puppet module generate puppetlabs-ssh
-      notice: Generating module at /Users/kelseyhightower/puppetlabs-ssh
-      puppetlabs-ssh
-      puppetlabs-ssh/Modulefile
-      puppetlabs-ssh/README
+      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_range": ">= 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
-      Puppet::ModuleTool::Applications::Generator.run(name, 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
+        # Modulefile. 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_range => '>= 1.0.0' }
+          ]
+        )
+      rescue ArgumentError
+        msg = "Could not generate directory #{name.inspect}, you must specify a dash-separated username and module name."
+        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}."
+      result.join("\n")
+    end
+  end
+end
+
+module Puppet::ModuleTool::Generate
+  module_function
+
+  def generate(metadata, skip_interview = false)
+    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"
+    puts "following questions; if the question is not applicable to this module, feel free"
+    puts "to leave it blank."
+
+    begin
+      puts
+      puts "Puppet uses Semantic Versioning (semver.org) to version modules."
+      puts "What version is this module?  [#{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?  [#{metadata.author}]"
+    metadata.update 'author' => user_input(metadata.author)
+
+    puts
+    puts "What license does this module code fall under?  [#{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?#{ 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?#{ 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
 
-    when_rendering :console do |return_value|
-      return_value.map {|f| f.to_s }.join("\n")
+  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.dashed_name
+    raise ArgumentError, "#{@dest} already exists." if @dest.exist?
+    return @dest
+  end
+
+  def duplicate_skeleton(metadata)
+    dest = destination(metadata)
+
+    puts
+    Puppet.notice "Generating module at #{dest}..."
+    FileUtils.cp_r skeleton_path, dest
+
+    populate_erb_templates(metadata, dest)
+    return dest
+  end
+
+  def populate_erb_templates(metadata, destination)
+    Puppet.notice "Populating ERB templates..."
+
+    templates = destination + '**/*.erb'
+    Dir[templates.to_s].each do |erb|
+      path = Pathname.new(erb)
+      content = ERB.new(path.read).result(binding)
+
+      target = path.parent + path.basename('.erb')
+      target.open('w') { |f| f.write(content) }
+      path.unlink
     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

@@ -10,8 +10,8 @@ Puppet::Face.define(:module, '1.0.0') do
       Installs a module from the Puppet Forge or from a release archive file.
 
       The specified module will be installed into the directory
-      specified with the `--target-dir` option, which defaults to
-      #{Puppet.settings[:modulepath].split(File::PATH_SEPARATOR).first}.
+      specified with the `--target-dir` option, which defaults to the first
+      directory in the modulepath.
     EOT
 
     returns "Pathname object representing the path to the installed module."
@@ -21,7 +21,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo
       Preparing to install into /etc/puppet/modules ...
-      Downloading from http://forge.puppetlabs.com ...
+      Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -30,7 +30,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo --environment development
       Preparing to install into /etc/puppet/environments/development/modules ...
-      Downloading from http://forge.puppetlabs.com ...
+      Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppet/environments/development/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -39,7 +39,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo -v 0.0.4
       Preparing to install into /etc/puppet/modules ...
-      Downloading from http://forge.puppetlabs.com ...
+      Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -48,7 +48,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppet/modules
       Preparing to install into /usr/share/puppet/modules ...
-      Downloading from http://forge.puppetlabs.com ...
+      Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /usr/share/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -57,7 +57,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppet/modules --modulepath /etc/puppet/modules
       Preparing to install into /usr/share/puppet/modules ...
-      Downloading from http://forge.puppetlabs.com ...
+      Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /usr/share/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -66,7 +66,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz
       Preparing to install into /etc/puppet/modules ...
-      Downloading from http://forge.puppetlabs.com ...
+      Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -106,7 +106,7 @@ Puppet::Face.define(:module, '1.0.0') do
     option "--ignore-dependencies" do
       summary "Do not attempt to install dependencies"
       description <<-EOT
-        Do not attempt to install dependencies.
+        Do not attempt to install dependencies.  (Implied by --force.)
       EOT
     end
 
@@ -122,20 +122,21 @@ Puppet::Face.define(:module, '1.0.0') do
       Puppet::ModuleTool.set_option_defaults options
       Puppet.notice "Preparing to install into #{options[:target_dir]} ..."
 
-      forge = Puppet::Forge.new("PMT", self.version)
       install_dir = Puppet::ModuleTool::InstallDirectory.new(Pathname.new(options[:target_dir]))
-      installer = Puppet::ModuleTool::Applications::Installer.new(name, forge, install_dir, options)
-
-      installer.run
+      Puppet::ModuleTool::Applications::Installer.run(name, install_dir, options)
     end
 
     when_rendering :console do |return_value, name, options|
-      if return_value[:result] == :failure
+      if return_value[:result] == :noop
+        Puppet.notice "Module #{name} #{return_value[:version]} is already installed."
+        exit 0
+      elsif return_value[:result] == :failure
         Puppet.err(return_value[:error][:multiline])
         exit 1
       else
-        tree = Puppet::ModuleTool.build_tree(return_value[:installed_modules], return_value[:install_dir])
-        return_value[:install_dir] + "\n" +
+        tree = Puppet::ModuleTool.build_tree(return_value[:graph], return_value[:install_dir])
+
+        "#{return_value[:install_dir]}\n" +
         Puppet::ModuleTool.format_tree(tree)
       end
     end