Permalink
Commits on Mar 18, 2012
  1. (#13202) Modify join() to pass strings unmodified without errors.

    Previously the join function would raise an error if anything besides an
    array was passed. This changes it to allow strings to be passed through
    join unmodified. This allows puppet code to be written that can accept
    either a string or an array, and act appropriately in both cases
    automatically. Specifically, join("abc") would return "abc".
    Mike Cooper committed with Mar 17, 2012
Commits on Mar 14, 2012
  1. Merge branch '2.3.x'

    * 2.3.x:
      Update CHANGELOG and Modulefile for 2.3.1
      (#13091) Fix LoadError exception with puppet apply
    jeffmccune committed Mar 14, 2012
  2. Merge pull request #50 from jeffmccune/ticket/2.3.x/13091_stdlib_thro…

    …ws_a_loaderror_when_running_with_puppet_apply
    
    (#13091) Fix LoadError exception with puppet apply
    kbarber committed Mar 14, 2012
Commits on Mar 13, 2012
  1. (#13091) Fix LoadError exception with puppet apply

    Puppet apply does not add the stdlib lib directory to the $LOAD_PATH.
    This is a problem because the puppet_vardir fact requires the
    puppet_settings library to be available for the `with_puppet` utility
    method.
    
    Without this patch, puppet apply will result in the following error:
    
        $ puppet apply --modulepath=/vagrant/modules -e 'notice $puppet_vardir'
        warning: Could not load fact file stdlib/lib/facter/puppet_vardir.rb: no such file to load -- facter/util/puppet_settings
        notice: Scope(Class[main]):
        notice: Finished catalog run in 0.01 seconds
    
    With this patch applied, puppet apply works as expected:
    
        $ puppet apply --modulepath=/vagrant/modules.pe -e 'notice $puppet_vardir'
        notice: Scope(Class[main]): /Users/jeff/.puppet/var
        notice: Finished catalog run in 0.01 seconds
    
    This patch defensively tries to load facter/util/puppet_settings.  If it cannot
    load it, it falls back to trying to explicitly locate and load the library.
    
    Once puppet is fixed such that a modules lib directory is truly in the
    $LOAD_PATH, the fall back implementation will no longer be exercised since the
    LoadError should not be raised.
    jeffmccune committed Mar 13, 2012
  2. Merge branch '2.3.x'

    * 2.3.x:
      Update CHANGELOG, Modulefile for 2.3.0 release
    jeffmccune committed Mar 13, 2012
  3. Merge branch '2.3.x'

    * 2.3.x:
      (#12357) Fix broken compatibility with Puppet 2.6
      (maint) Comment Ken's fix to String#any?
      (#13018) Fix missing method any? message for ruby 1.9.x
      (#12357) Add ability to display an error message from validate_re
      (#12357) Add validate_absolute_path() function
      (maint) Stop printing the directory of spec_helper
      (#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d
      (#12357) Add puppet_vardir custom fact
      (#12357) Fix root_home fact on Windows
    jeffmccune committed Mar 13, 2012
Commits on Mar 12, 2012
  1. Merge pull request #49 from jeffmccune/bug/2.3.x/fix_absolute_path_er…

    …ror_with_puppet26
    
    (#12357) Fix broken compatibility with Puppet 2.6
    kbarber committed Mar 12, 2012
  2. (#12357) Fix broken compatibility with Puppet 2.6

    Without this patch, the previous change set to the
    validate_absolute_path() parser function contains Puppet 2.6
    incompatible changes.  stdlib 2.x is compatible with Puppet 2.6.  These
    changes are a problem because we cannot introduce backwards incompatible
    changes in a minor release.
    
    This patch fixes the problem by back porting the implementation of the
    `Puppet::Util.absolute_path?` from 2.7.x to the function block itself.
    
    The function block tests to see if `Puppet::Util.absolute_path?` will
    respond and if not, falls back to the inline back ported implementation.
    
    The spec tests have been updated to simulate the behavior of Puppet 2.6
    even when running with Puppet 2.7.
    jeffmccune committed Mar 12, 2012
Commits on Mar 9, 2012
  1. Merge branch 'ticket/2.3.x/13018_any_on_string' into 2.3.x

    * ticket/2.3.x/13018_any_on_string:
      (maint) Comment Ken's fix to String#any?
      (#13018) Fix missing method any? message for ruby 1.9.x
    jeffmccune committed Mar 9, 2012
  2. (maint) Comment Ken's fix to String#any?

    Just added a comment about why we're doing what we're doing.
    jeffmccune committed Mar 9, 2012
Commits on Mar 8, 2012
  1. (#13018) Fix missing method any? message for ruby 1.9.x

    The any? method doesn't exist for 1.9.x, this converts a string to a single
    element array to work around the problem.
    kbarber committed Mar 8, 2012
Commits on Mar 7, 2012
  1. Merge pull request #47 from jeffmccune/feature/2.3.x/validate_re_bett…

    …er_error_messages
    
    (#12357) Add ability to display an error message from validate_re
    kbarber committed Mar 7, 2012
  2. (#12357) Add ability to display an error message from validate_re

    I've seen a number of times the following error displayed to the end
    user:
    
        validate_re(): "" does not match "^true$|^false$" at /p/t/f.pp:40
    
    This is an absolutely horrific error message.  I'm to blame for it.
    Users stumble over this quite often and they shouldn't have to go read
    the code to sort out what's happening.
    
    This patch makes an effort to fix the problem by adding a third,
    optional, argument to validate_re().  This third argument will be the
    message thrown back in the exception which will be displayed to the end
    user.
    
    This sets the stage for nicer error messages coming from modules we
    write.
    
    This patch is backwards compatible but is a new feature.
    jeffmccune committed Mar 7, 2012
  3. Merge pull request #46 from jeffmccune/feature/2.3.x/validate_absolut…

    …e_path_function
    
    (#12357) Add validate_absolute_path() function
    kbarber committed Mar 7, 2012
  4. (#12357) Add validate_absolute_path() function

    This patch adds a new function to validate if a string is an absolute
    filesystem path or not.
    
    The intent of this is to make this functionality generic and reusable.
    Josh left a comment in another pull request I had:
    
        If node_installdir or $node_vardir is not defined, then we should
        raise an error, otherwise we may create a scheduled task to an
        untrusted directory.
    
    One solution to this comment is to validate the Puppet variable is an
    absolute path.
    
    Examples of this function look like:
    
        function_validate_absolute_path
          Using Puppet::Parser::Scope.new
            Garbage inputs
              validate_absolute_path(nil) should fail
              validate_absolute_path([nil]) should fail
              validate_absolute_path({"foo"=>"bar"}) should fail
              validate_absolute_path({}) should fail
              validate_absolute_path("") should fail
            relative paths
              validate_absolute_path("relative1") should fail
              validate_absolute_path(".") should fail
              validate_absolute_path("..") should fail
              validate_absolute_path("./foo") should fail
              validate_absolute_path("../foo") should fail
              validate_absolute_path("etc/puppetlabs/puppet") should fail
              validate_absolute_path("opt/puppet/bin") should fail
            absolute paths
              validate_absolute_path("C:/") should not fail
              validate_absolute_path("C:\\") should not fail
              validate_absolute_path("C:\\WINDOWS\\System32") should not fail
              validate_absolute_path("C:/windows/system32") should not fail
              validate_absolute_path("X:/foo/bar") should not fail
              validate_absolute_path("X:\\foo\\bar") should not fail
              validate_absolute_path("/var/tmp") should not fail
              validate_absolute_path("/var/lib/puppet") should not fail
              validate_absolute_path("/var/opt/../lib/puppet") should not fail
              validate_absolute_path("C:\\Program Files (x86)\\Puppet Labs\\Puppet Enterprise") should not fail
              validate_absolute_path("C:/Program Files (x86)/Puppet Labs/Puppet Enterprise") should not fail
    
        Finished in 0.05637 seconds
        23 examples, 0 failures
    jeffmccune committed Mar 7, 2012
  5. (maint) Stop printing the directory of spec_helper

    Without this patch every rspec run prints out the directory of the
    spec_helper script.
    
    I think this was just a debugging line or whatever that accidentally got
    added.
    jeffmccune committed Mar 7, 2012
  6. Merge pull request #44 from jeffmccune/ticket/2.3.x/12357_add_puppet_…

    …settings_facts
    
    (#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d
    joshcooper committed Mar 7, 2012
  7. (#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d

    On Windows, we have no folders that match up to the default set of
    directories the facter_dot_d fact looks in by default.  This is a
    problem because the Puppet Enterprise installer writes out the following
    facts by default, and our modules require them to be present:
    
        % cat /etc/puppetlabs/facter/facts.d/puppet_enterprise_installer.txt
        fact_stomp_port=61613
        fact_stomp_server=puppetmaster
        fact_is_puppetagent=true
        fact_is_puppetmaster=true
        fact_is_puppetconsole=true
    
    On windows, the Puppet confdir is quite variable.  On 2003 systems we
    default to the All Users application data directory.  On 2008 systems we
    default to the ProgramData directory.  The actual configuration
    directory varies depending on the Puppet or Puppet Enterprise branding.
    
    In order to simplify all of this variable behavior, this patch fixes the
    problem by automatically looking for facts in
    `%COMMON_APPDATA%/PuppetLabs/facter/facts.d`
    
    This patch paves the way for the MSI installer to use an IniFile element
    to write custom facts during installation.
    jeffmccune committed Feb 28, 2012
Commits on Mar 6, 2012
  1. Merge pull request #45 from jeffmccune/ticket/2.3.x/12357_disable_roo…

    …t_home_fact_on_windows
    
    (#12357) Fix root_home fact on Windows
    joshcooper committed Mar 6, 2012
  2. (#12357) Add puppet_vardir custom fact

    Without this patch the PE modules don't have a way to identify a
    filesystem path where it's OK to place variable data related to managing
    the target node.  This is a problem when a module like pe_compliance
    needs to write a wrapper script to the node's filesystem.
    
    This patch addresses the problem by exposing the node's Puppet[:vardir]
    setting as a Facter fact.
    
    This fact value will be set to `nil` if Puppet is not loaded into
    memory.  If Puppet is loaded, e.g. using `facter --puppet` or using
    `puppet agent` or `puppet apply` then the fact will automatically set
    the value to Puppet[:vardir]
    
    The value of this setting is subject to Puppet's run_mode.
    
    This patch implements a new utility method in the standard library
    module named `Facter::Util::PuppetSettings.with_puppet`.  The method
    accepts a block and will only invoke the block if the Puppet library is
    loaded into the Ruby process.  If Puppet is not loaded, the method
    always returns nil.  This makes it easy to define Facter facts that only
    give values if Puppet is loaded in memory.
    jeffmccune committed Feb 29, 2012
Commits on Mar 5, 2012
  1. (#12357) Fix root_home fact on Windows

    Without this patch the root_home fact fails on windows.  This patch
    fixes the problem by only calling methods on the object returned by the
    `getent passwd root` command if the object evaluates to true.
    
    Because there is no root account on Windows the code block simply
    returns `nil` which makes the Facter fact undefined on Windows
    platforms.
    
    The root cause of the failure is that we always expected the command to
    succeed and return something useful, and it may not on all supported
    platforms.
    jeffmccune committed Feb 28, 2012
Commits on Feb 22, 2012
  1. Merge pull request #37 from fiddyspence/ticket/master/12776-validate_…

    …slength
    
    (#12776) Added validate_slength function and rspec test
    kbarber committed Feb 22, 2012
  2. (#12776) Added validate_slength function and rspec test

    This function is used to validate a string is less than a maximum length.  The
    string, or array of strings, is passed as the first argument to the function.
    The maximum length of the string is passed as the second argument.
    
    It is useful to validate, for example, that Puppet is not sending a username
    to a downstream system that the system cannot cope with, but that might not
    cause an error message - for example, MySQL will not accept a username of
    more than 16 characters.  This enables a Puppet administrator to validate
    the data that it may have been passed from upstream through, for example,
    Hiera.
    fiddyspence committed Feb 22, 2012
Commits on Feb 9, 2012
  1. Merge pull request #36 from duritong/tickets/11017

    implement #11017 - make file_line type ensurable
    slippycheeze committed Feb 9, 2012
  2. implement #11017 - make file_line type ensurable

    * Implement a simple destroy method.
    * Add tests for it
    * Refactor code, so file is actually read only once. However, due
      to the nature how provider tests are run, we need to ensure that
      the file is read before we open it to write it.
    duritong committed Feb 9, 2012
Commits on Feb 7, 2012
  1. Merge branch '2.2.x'

    * 2.2.x:
      (#12377) Avoid infinite loop when retrying require json
    kbarber committed Feb 7, 2012
  2. Merge branch '2.1.x' into 2.2.x

    * 2.1.x:
      (#12377) Avoid infinite loop when retrying require json
    kbarber committed Feb 7, 2012
Commits on Feb 6, 2012
  1. Merge branch 'ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recove…

    …ry_may_be_harmful' into 2.1.x
    
    * ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recovery_may_be_harmful:
      (#12377) Avoid infinite loop when retrying require json
    kbarber committed Feb 6, 2012
  2. (#12377) Avoid infinite loop when retrying require json

    Without this patch an infinite loop will be entered if the json and
    rubygems libraries are not available.
    
    This patch fixes the problem by retrying the `require 'json'` only if
    rubygems was successfully loaded for the first time.  Subsequent
    attempts to load rubygems will cause the LoadError exception from a
    missing json library to be re-raised.
    
    Thanks to Krzysztof Wilczynski for pointing out this issue.
    jeffmccune committed with kbarber Feb 6, 2012
Commits on Feb 3, 2012
  1. Merge pull request #33 from richardc/master

    Update a documentation comment - facts_dot_d
    jeffmccune committed Feb 3, 2012
  2. Update the documentation comment

    This is causing a little confusion, so make the comment match
    the behaviour.
    richardc committed Feb 3, 2012
Commits on Jan 12, 2012
  1. Merge branch '2.2.x'

    * 2.2.x:
      Check according to rfc1035
      Add additional domain name tests
      (maint) Memoize scope in domain_name spec
    jeffmccune committed Jan 12, 2012
  2. Merge branch 'bug/2.2.x/is_domain_name' into 2.2.x

    * bug/2.2.x/is_domain_name:
      Check according to rfc1035
      Add additional domain name tests
      (maint) Memoize scope in domain_name spec
    
    Closes pull request GH-24
    jeffmccune committed Jan 12, 2012