Skip to content
Commits on Oct 2, 2012
  1. Fix up dependencies for Hiera and Facter in RubyGems.

    committed Oct 2, 2012
    Since Puppet 3.0 promises to follow semver, the dependencies should take
    this into account. This means now that only patch releases of Facter and
    Hiera will be pulled in for patch releases of 3.0, and the version
    dependency must be bumped for any minor or major release appropriately.
    
    This also fixes a bug in the Hiera dependency due to the segment
    comparisons in the RubyGems version resolver. Because there was no `.`
    before the `rc` in the current dependency (`1.0.0rc`) this resulted in
    the comparator looking at `1.0` and selecting the first version `>=`
    than it, in this case `1.1.0.rc`. I assume this is unintended and that
    the target was meant to resolve to Hiera `1.0.0`.
  2. @zaphod42

    (Maint) Clean up config file parsing

    zaphod42 committed Oct 2, 2012
    The main loop of parsing the config file has a lot of error handling
    directly in it. This makes it harder to follow the main flow and less
    obvious what it is doing. This pulls out some of that checking and
    removes duplication around creating a new section.
  3. @zaphod42

    Merge pull request #1190 from jeffmccune/fix/master/7316_load_faces_f…

    zaphod42 committed Oct 2, 2012
    …rom_modulepath_try4
    
    (#7316) Do not set default values for confdir and vardir in the master
    
    Conflicts:
    	lib/puppet/settings.rb
    
    Merge conflict config file parsing related to a disallowed section replicated
    in the config_file.rb parser.
Commits on Oct 1, 2012
  1. @zaphod42

    Merge pull request #1195 from zaphod42/maint/master/split-up-settings

    zaphod42 committed Oct 1, 2012
    (Maint) Split out config file parsing
  2. @zaphod42

    (Maint) Add test coverage around config file parsing

    zaphod42 committed Sep 25, 2012
    This adds coverage for, I think, all of the config file structure
    parsing behavior. Since the value transformations are not currently part
    of this parsing code, they are not taken into account.
  3. @zaphod42
  4. @zaphod42
  5. @zaphod42

    (Maint) Move config file parser to its own file

    zaphod42 committed Sep 25, 2012
    This extracts the config file parsing into its own class so that is can
    be worked with independently of the rest of the settings system.
  6. @zaphod42

    (Maint) Pull config file parsing into a class

    zaphod42 committed Sep 24, 2012
    The parser for config files used to be tied up with all of the other
    logic for handling configuration settings. This takes the first step in
    encapsulating that parsing into a class that is dedicated to just
    parsing a configuration file.
Commits on Sep 30, 2012
  1. @jeffmccune

    Merge branch '3.x'

    jeffmccune committed Sep 30, 2012
    * 3.x:
      sample_module.pp refactored text: include sample-module into include sample_module
      This will fix Refactor #16643.
      Update lib/puppet/version.rb for 3.0.0
  2. @jeffmccune

    Merge branch '3.0.x' into 3.x

    jeffmccune committed Sep 30, 2012
    * 3.0.x:
      sample_module.pp refactored text: include sample-module into include sample_module
      This will fix Refactor #16643.
  3. @jeffmccune

    Merge branch 'fix/3.0.x/16643_sample_module_rename' into 3.0.x

    jeffmccune committed Sep 30, 2012
    * fix/3.0.x/16643_sample_module_rename:
      sample_module.pp refactored text: include sample-module into include sample_module
      This will fix Refactor #16643.
  4. @aboe76 @jeffmccune
  5. @aboe76 @jeffmccune

    This will fix Refactor #16643.

    aboe76 committed with jeffmccune Sep 30, 2012
    The Hyphen ‘–’ in name only unofficially supported in some puppet
    versions.
    
    Fix: sample-module name changed into sample_module which is supported.
Commits on Sep 28, 2012
  1. Update lib/puppet/version.rb for 3.0.0

    Moses Mendoza committed Sep 28, 2012
Commits on Sep 26, 2012
  1. @jeffmccune

    (#7316) Do not set default values for confdir and vardir in the master

    jeffmccune committed Sep 26, 2012
    Without this patch applied `puppet master` will explicitly set the value
    for confdir and vardir inside of
    Puppet::Application::Master#app_defaults.  This is a problem because
    it calls a method that does not exist while trying to do so.
    
    This patch fixes the problem by implementing the intended behavior
    documented in #15337, and specifically in commit 38cba0a.  This intended
    behavior is:
    
      1: If provided, use explicit puppet.conf in `--confdir`
      2: If root, use system puppet.conf
      3: Otherwise, use ~/.puppet/puppet.conf
  2. @jeffmccune

    (#7316) Add spec coverage for Puppet::Application::Master#app_defaults

    jeffmccune committed Sep 26, 2012
    Without this patch we don't have any spec test coverage for the
    app_defaults instance method of the Puppet::Application::Master class.
    This lack of coverage is problem because cherry picking the confdir and
    vardir patch from PR-882 in commit b064ee6 appears to work just fine
    after resolving the merge conflicts.  Things were not fine, however,
    because the app_defaults method makes a call that raises an exception
    and none of our spec tests caught this issue.
    
    The acceptance tests did, however, by exercising the command `puppet
    master --configprint pidfile`
  3. @jeffmccune

    Revert "Revert "Merge branch 'fix/3.x/7316_load_faces_from_modulepath…

    jeffmccune committed Sep 26, 2012
    …_try3' into 3.x""
    
    This reverts commit ef3fe69.
  4. @jeffmccune

    Merge branch '3.x'

    jeffmccune committed Sep 26, 2012
    * 3.x:
      (Maint) Remove rspec from shebang line
      Update description of HTTP/HTTPS report
      Updating PUPPETVERSION for 3.0.0-rc8
      Update default cows and mocks
  5. @jeffmccune

    Merge pull request #1188 from jeffmccune/maint/3.x/kill_rspec_shebangs

    jeffmccune committed Sep 26, 2012
    (Maint) Remove rspec from shebang line
  6. @jeffmccune

    (Maint) Remove rspec from shebang line

    jeffmccune committed Sep 26, 2012
    Without this patch Ruby 1.9 is still complaining loudly about trying to
    parse the spec files.  The previous attempt to clean up this problem in
    edc3ddf works for Ruby 1.8 but not 1.9.
    
    I'd prefer to remove the shebang lines entirely, but doing so will cause
    encoding errors in Ruby 1.9.  This patch strives for a happy middle
    ground of convincing Ruby it is actually working with Ruby while not
    confusing it to think it should exec() to rspec.
    
    This patch is the result of the following command run against the source
    tree:
    
        find spec -type f -print0 | \
          xargs -0 perl -pl -i -e 's,^\#\!\s?/(.*)rspec,\#! /usr/bin/env ruby,'
Commits on Sep 25, 2012
  1. @nfagerlund

    Merge pull request #1186 from nfagerlund/http_report

    nfagerlund committed Sep 25, 2012
    Update description of HTTP/HTTPS report
  2. Update description of HTTP/HTTPS report

    nfagerlund committed Sep 25, 2012
    The HTTP report handler can now support HTTPS. This commit updates its
    description accordingly
  3. @haus
  4. @MosesMendoza

    Merge pull request #1185 from haus/maint/3.x/update_default_cows_and_…

    MosesMendoza committed Sep 25, 2012
    …mocks
    
    Update default cows and mocks
  5. @haus

    Update default cows and mocks

    haus committed Sep 25, 2012
    Previously, the default mocks and cows were set to build for both arches.
    Because puppet is a noarch package, building against i386 mocks and cows is
    sufficient and reduces overall build time. This also adds cows for debian
    stable and unstable.
  6. @pcarlisle

    Merge branch '3.x'

    pcarlisle committed Sep 25, 2012
    * 3.x:
      (#16567) Remove :lexical setting default
      Stub DataBinding in undef param tests
      Revert "Merge branch 'fix/3.x/7316_load_faces_from_modulepath_try3' into 3.x"
  7. @zaphod42

    Merge branch 'ticket/3.x/16567-useless-setting-for-lexical-scope' int…

    zaphod42 committed Sep 25, 2012
    …o 3.x
    
    * ticket/3.x/16567-useless-setting-for-lexical-scope:
      (#16567) Remove :lexical setting default
  8. @zaphod42

    (#16567) Remove :lexical setting default

    zaphod42 committed Sep 25, 2012
    This default is not used, nor does it appear to have ever been used.
  9. @pcarlisle

    Stub DataBinding in undef param tests

    pcarlisle committed Sep 25, 2012
    This was causing failures when hiera was not configured properly since we
    aren't trying to test hiera in these tests.
  10. @zaphod42

    Merge remote-tracking branch 'upstream/3.x'

    zaphod42 committed Sep 25, 2012
    * upstream/3.x:
      Revert "Merge branch 'fix/3.x/7316_load_faces_from_modulepath_try3' into 3.x"
  11. @zaphod42

    Revert "Merge branch 'fix/3.x/7316_load_faces_from_modulepath_try3' i…

    zaphod42 committed Sep 25, 2012
    …nto 3.x"
    
    This reverts commit b277bb3, reversing
    changes made to bdf1936.
    
    These changes are being backed out because they referenced a undefined
    methods (`default_global_config_dir` and `default_global_var_dir`).
    After fixing that locally, there was still a problem with `puppet help`
    printing out a large number of warnings because it could not load face
    code correctly.
    
    I think we need to step back from this, re-evaluate what is happening,
    and try a new approach.
  12. @pcarlisle

    Merge branch '3.x'

    pcarlisle committed Sep 24, 2012
    * 3.x:
      Extract methods from set_default_parameters and improve test coverage
      (#16221) Make undef not override default parameters
  13. @pcarlisle

    Extract methods from set_default_parameters and improve test coverage

    pcarlisle committed Sep 24, 2012
    Refactor the set_default_parameters method in Puppet::Resource to be split
    into several methods and improve the test coverage around default parameters
    and undef.
  14. @pcarlisle

    (#16221) Make undef not override default parameters

    pcarlisle committed Sep 24, 2012
    In 2.7.x, passing undef as an argument to a parameterized class will result in
    the argument using the default value given in the class definition. This was
    inadvertently changed, so the variable would not be set at all. This change
    reverts to the 2.7.x behavior.
Something went wrong with that request. Please try again.