Merge pull request #6097 from Magisus/master

Merge 5.0.x -> master

Author: joshcooper

lib/puppet/face/module/search.rb

@@ -23,7 +23,7 @@
 
     when_invoked do |term, options|
       Puppet::ModuleTool.set_option_defaults options
-      Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new, options).run
+      Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new(options[:module_repository] || Puppet[:module_repository], options[:strict_semver]), options).run
     end
 
     when_rendering :console do |results, term, options|

lib/puppet/forge.rb

@@ -19,9 +19,10 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
   attr_reader :host, :repository
 
-  def initialize(host = Puppet[:module_repository])
+  def initialize(host = Puppet[:module_repository], strict_semver = true)
     @host = host
     @repository = Puppet::Forge::Repository.new(host, USER_AGENT)
+    @strict_semver = strict_semver
   end
 
   # Return a list of module metadata hashes that match the search query.
@@ -216,7 +217,7 @@ def process(list)
     l = list.map do |release|
       metadata = release['metadata']
       begin
-        ModuleRelease.new(self, release)
+        ModuleRelease.new(self, release, @strict_semver)
       rescue ArgumentError => e
         Puppet.warning _("Cannot consider release %{name}-%{version}: %{error}") % { name: metadata['name'], version: metadata['version'], error: e }
         false

lib/puppet/module.rb

@@ -1,5 +1,6 @@
 require 'puppet/util/logging'
 require 'json'
+require 'semantic_puppet/gem_version'
 
 # Support for modules
 class Puppet::Module
@@ -52,6 +53,32 @@ def self.is_module_namespaced_name?(name)
     return false
   end
 
+  # @api private
+  def self.parse_range(range, strict)
+    @parse_range_method ||= SemanticPuppet::VersionRange.method(:parse)
+    if @parse_range_method.arity == 1
+      @semver_gem_version ||= SemanticPuppet::Version.parse(SemanticPuppet::VERSION)
+
+      # Give user a heads-up if the desired strict setting cannot be honored
+      if strict
+        if @semver_gem_version.major < 1
+          Puppet.warn_once('strict_version_ranges', 'version_range_cannot_be_strict',
+            _('VersionRanges will never be strict when using non-vendored SemanticPuppet gem, version %{version}') % { version: @semver_gem_version},
+            :default, :default, :notice)
+        end
+      else
+        if @semver_gem_version.major >= 1
+          Puppet.warn_once('strict_version_ranges', 'version_range_always_strict',
+            _('VersionRanges will always be strict when using non-vendored SemanticPuppet gem, version %{version}') % { version: @semver_gem_version},
+            :default, :default, :notice)
+        end
+      end
+      @parse_range_method.call(range)
+    else
+      @parse_range_method.call(range, strict)
+    end
+  end
+
   attr_reader :name, :environment, :path, :metadata
   attr_writer :environment
 
@@ -68,6 +95,17 @@ def initialize(name, path, environment, strict_semver = true)
     load_metadata
 
     @absolute_path_to_manifests = Puppet::FileSystem::PathPattern.absolute(manifests)
+
+    # i18n initialization for modules
+    if Puppet::GETTEXT_AVAILABLE
+      begin
+        initialize_i18n
+      rescue Exception => e
+        Puppet.warning _("GettextSetup initialization for %{module_name} failed with: %{error_message}") % { module_name: name, error_message: e.message }
+      end
+    else
+      Puppet.warning _("GettextSetup is not available, skipping GettextSetup initialization for %{module_name}.") % { module_name: name }
+    end
   end
 
   # @deprecated The puppetversion module metadata field is no longer used.
@@ -328,7 +366,7 @@ def unmet_dependencies
 
       if version_string
         begin
-          required_version_semver_range = SemanticPuppet::VersionRange.parse(version_string, @strict_semver)
+          required_version_semver_range = self.class.parse_range(version_string, @strict_semver)
           actual_version_semver = SemanticPuppet::Version.parse(dep_mod.version)
         rescue ArgumentError
           error_details[:reason] = :non_semantic_version
@@ -358,8 +396,27 @@ def strict_semver?
     @strict_semver
   end
 
+  def initialize_i18n
+    module_name = @forge_name.gsub("/","-") if @forge_name
+    return if module_name.nil? || i18n_initialized?(module_name)
+
+    locales_path = File.absolute_path('locales', path)
+
+    begin
+      GettextSetup.initialize(locales_path)
+      Puppet.debug "#{module_name} initialized for i18n: #{GettextSetup.translation_repositories[module_name]}"
+    rescue
+      config_path = File.absolute_path('config.yaml', locales_path)
+      Puppet.debug "Could not find locales configuration file for #{module_name} at #{config_path}. Skipping i18n initialization."
+    end
+  end
+
   private
 
+  def i18n_initialized?(module_name)
+    GettextSetup.translation_repositories.has_key? module_name
+  end
+
   def wanted_manifests_from(pattern)
     begin
       extended = File.extname(pattern).empty? ? "#{pattern}.pp" : pattern

lib/puppet/module_tool.rb

@@ -132,7 +132,7 @@ def self.set_option_defaults(options)
       options[:target_dir] = face_environment.full_modulepath.first
 
       # Default false to retain backward compatibility with SemanticPuppet 0.1.4
-      options[:strict_semver] = false
+      options[:strict_semver] = false unless options.include?(:strict_semver)
     end
 
     # Given a hash of options, we should discover or create a
@@ -174,7 +174,7 @@ def self.parse_module_dependency(where, dep, strict_semver = true)
       range = dep['version_requirement'] || '>= 0.0.0'
 
       begin
-        parsed_range = SemanticPuppet::VersionRange.parse(range, strict_semver)
+        parsed_range = Module.parse_range(range, strict_semver)
       rescue ArgumentError => e
         Puppet.debug "Error in #{where} parsing dependency #{dep_name} (#{e.message}); using empty range."
         parsed_range = SemanticPuppet::VersionRange::EMPTY_RANGE

lib/puppet/module_tool/applications/installer.rb

@@ -60,7 +60,7 @@ def run
         begin
           if installed_module = installed_modules[name]
             unless forced?
-              if SemanticPuppet::VersionRange.parse(version, @strict_semver).include? installed_module.version
+              if Puppet::Module.parse_range(version, @strict_semver).include? installed_module.version
                 results[:result] = :noop
                 results[:version] = installed_module.version
                 return results
@@ -104,15 +104,15 @@ def run
               # locking it to upgrades within the same major version.
               installed_range = ">=#{version} #{version.major}.x"
               graph.add_constraint('installed', mod, installed_range) do |node|
-                SemanticPuppet::VersionRange.parse(installed_range, @strict_semver).include? node.version
+                Puppet::Module.parse_range(installed_range, @strict_semver).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
                 dep_name = dep['name'].tr('/', '-')
 
                 range = dep['version_requirement']
                 graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
-                  SemanticPuppet::VersionRange.parse(range, @strict_semver).include? node.version
+                  Puppet::Module.parse_range(range, @strict_semver).include? node.version
                 end
               end
             end
@@ -186,7 +186,7 @@ def run
       private
 
       def module_repository
-        @repo ||= Puppet::Forge.new
+        @repo ||= Puppet::Forge.new(Puppet[:module_repository], @strict_semver)
       end
 
       def local_tarball_source
@@ -206,7 +206,7 @@ def installed_modules
       end
 
       def build_single_module_graph(name, version)
-        range = SemanticPuppet::VersionRange.parse(version, @strict_semver)
+        range = Puppet::Module.parse_range(version, @strict_semver)
         graph = SemanticPuppet::Dependency::Graph.new(name => range)
         releases = SemanticPuppet::Dependency.fetch_releases(name)
         releases.each { |release| release.dependencies.clear }

lib/puppet/module_tool/applications/uninstaller.rb

@@ -58,7 +58,7 @@ def find_installed_module
               :path    => mod.modulepath,
             }
             if @options[:version] && mod.version
-              next unless SemanticPuppet::VersionRange.parse(@options[:version], @strict_semver).include?(SemanticPuppet::Version.parse(mod.version))
+              next unless Puppet::Module.parse_range(@options[:version], @strict_semver).include?(SemanticPuppet::Version.parse(mod.version))
             end
             @installed << mod
           elsif mod_name =~ /#{@name}/

lib/puppet/module_tool/applications/upgrader.rb

@@ -91,7 +91,7 @@ def installed_release.priority
           if available_versions.empty?
             raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
           elsif results[:requested_version] != :latest
-            requested = SemanticPuppet::VersionRange.parse(results[:requested_version], @strict_semver)
+            requested = Puppet::Module.parse_range(results[:requested_version], @strict_semver)
             unless available_versions.any? {|m| requested.include? m.version}
               raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
             end
@@ -120,15 +120,15 @@ def installed_release.priority
               # module, locking it to upgrades within the same major version.
               installed_range = ">=#{version} #{version.major}.x"
               graph.add_constraint('installed', installed_module, installed_range) do |node|
-                SemanticPuppet::VersionRange.parse(installed_range, @strict_semver).include? node.version
+                Puppet::Module.parse_range(installed_range, @strict_semver).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
                 dep_name = dep['name'].tr('/', '-')
 
                 range = dep['version_requirement']
                 graph.add_constraint("#{installed_module} constraint", dep_name, range) do |node|
-                  SemanticPuppet::VersionRange.parse(range, @strict_semver).include? node.version
+                  Puppet::Module.parse_range(range, @strict_semver).include? node.version
                 end
               end
             end
@@ -216,7 +216,7 @@ def installed_release.priority
 
       private
       def module_repository
-        @repo ||= Puppet::Forge.new
+        @repo ||= Puppet::Forge.new(Puppet[:module_repository], @strict_semver)
       end
 
       def installed_modules_source
@@ -228,7 +228,7 @@ def installed_modules
       end
 
       def build_single_module_graph(name, version)
-        range = SemanticPuppet::VersionRange.parse(version, @strict_semver)
+        range = Puppet::Module.parse_range(version, @strict_semver)
         graph = SemanticPuppet::Dependency::Graph.new(name => range)
         releases = SemanticPuppet::Dependency.fetch_releases(name)
         releases.each { |release| release.dependencies.clear }

lib/puppet/module_tool/shared_behaviors.rb

@@ -76,10 +76,10 @@ def resolve_constraints(dependencies, source = [{:name => :you}], seen = {}, act
       }
 
       if forced?
-        range = SemanticPuppet::VersionRange.parse(@version, @strict_semver) rescue SemanticPuppet::VersionRange.parse('>= 0.0.0', @strict_semver)
+        range = Puppet::Module.parse_range(@version, @strict_semver) rescue Puppet::Module.parse_range('>= 0.0.0', @strict_semver)
       else
         range = (@conditions[mod]).map do |r|
-          SemanticPuppet::VersionRange.parse(r[:dependency], @strict_semver) rescue SemanticPuppet::VersionRange.parse('>= 0.0.0', @strict_semver)
+          Puppet::Module.parse_range(r[:dependency], @strict_semver) rescue Puppet::Module.parse_range('>= 0.0.0', @strict_semver)
         end.inject(&:&)
       end
 

lib/puppet/pops/lookup/lookup_adapter.rb

@@ -68,7 +68,8 @@ def lookup(key, lookup_invocation, merge)
   end
 
   def lookup_global(key, lookup_invocation, merge_strategy)
-    terminus = Puppet[:data_binding_terminus]
+    # hiera_xxx will always use global_provider regardless of data_binding_terminus setting
+    terminus = lookup_invocation.hiera_xxx_call? ? :hiera : Puppet[:data_binding_terminus]
     case terminus
     when :hiera, 'hiera'
       provider = global_provider(lookup_invocation)

lib/puppet/util/logging.rb

@@ -155,26 +155,30 @@ def puppet_deprecation_warning(message, options = {})
   FILE_AND_LINE = MM::TUPLE
   FILE_NO_LINE  = MM.new(MM::NOT_NIL, nil).freeze
   NO_FILE_LINE  = MM.new(nil, MM::NOT_NIL).freeze
+  SUPPRESS_FILE_LINE = MM.new(:default, :default).freeze
 
   # Logs a (non deprecation) warning once for a given key.
   #
   # @param kind [String] The kind of warning. The
   #   kind must be one of the defined kinds for the Puppet[:disable_warnings] setting.
   # @param message [String] The message to log (logs via warning)
   # @param key [String] Key used to make this warning unique
-  # @param file [String,nil] the File related to the warning
-  # @param line [Integer,nil] the Line number related to the warning
+  # @param file [String,:default,nil] the File related to the warning
+  # @param line [Integer,:default,nil] the Line number related to the warning
   #   warning as unique
+  # @param level [Symbol] log level to use, defaults to :warning
   #
   # Either :file and :line and/or :key must be passed.
-  def warn_once(kind, key, message, file = nil, line = nil)
+  def warn_once(kind, key, message, file = nil, line = nil, level = :warning)
     return if Puppet[:disable_warnings].include?(kind)
     $unique_warnings ||= {}
     if $unique_warnings.length < 100 then
       if (! $unique_warnings.has_key?(key)) then
         $unique_warnings[key] = message
         call_trace =
         case MM.new(file, line)
+        when SUPPRESS_FILE_LINE
+          ''
         when FILE_AND_LINE
           _("\n   (at %{file}:%{line})") % { file: file, line: line }
         when FILE_NO_LINE
@@ -184,7 +188,7 @@ def warn_once(kind, key, message, file = nil, line = nil)
         else
           _("\n   (file & line not available)")
         end
-        warning("#{message}#{call_trace}")
+        send_log(level, "#{message}#{call_trace}")
       end
     end
   end