Permalink
Switch branches/tags
Commits on Feb 21, 2012
  1. Merge pull request #34 from stahnma/fix_hiera_version

    slippycheeze committed Feb 21, 2012
    Fix VERSION contant in lib/hiera.rb
Commits on Feb 16, 2012
  1. Fix VERSION contant in lib/hiera.rb

    stahnma committed Feb 16, 2012
    When the gem is packaged up, the VERSION field is created based on the
    last signed tag from this git repository; however after that change
    happened and the gem was shipped, I foolishly forgot to commit that
    change so the lib/hiera.rb file thought it was still at 0.2.1 even
    though it was really at 0.3.0. This fixes my mistake.
    
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
Commits on Feb 13, 2012
  1. Merge pull request #33 from mindreframer/master

    slippycheeze committed Feb 13, 2012
    just applied the patch from issue #10975, could you please release a minor update? thx
Commits on Feb 11, 2012
Commits on Jan 23, 2012
  1. Merge pull request #30 from kelseyhightower/maint/master/use_2_space_…

    slippycheeze committed Jan 23, 2012
    …indention
    
    (maint) Code base cleanup, use 2 space indention.
Commits on Dec 28, 2011
  1. (maint) Code base cleanup, use 2 space indention.

    Kelsey Hightower committed Dec 28, 2011
    Before this patch the hiera code base used two different number of
    spaces to indent code. In some cases 2 spaces where used, and the rest 4
    spaces.
    
    This patch normalizes the number of spaces used for indenting code, and
    now uses 2 spaces which is in-line with the Puppetlabs style guide.
Commits on Dec 2, 2011
  1. Merge pull request #28 from stahnma/release

    ripienaar committed Dec 2, 2011
    Fixes a quoting string issue
  2. Fixes a quoting string issue

    stahnma committed Dec 2, 2011
    The gsub wasn't always working when the tag wasn't being quoted properly
    in the sub inside hiera.rb.  This commit ensures the version is quoted.
    
    It will also strip the leading 'v' from tag to make the version
    completely numeric.
    
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
  3. Merge pull request #27 from stahnma/release

    ripienaar committed Dec 2, 2011
    Change Rakefile to autoversion
  4. Change Rakefile to autoversion

    stahnma committed Dec 2, 2011
    This change modifies the Rakefile to derrive the version of the package
    based on a call to "git describe." Also adds a tasks directory for
    additions to the Rake tasks.
    
    git describe will show the current annotated tag or the
    tag-commits-gSHA1 as the version string. Due to the way gem processes
    version strings, the Rakefile replaces '-' with '.' We are also
    stripping the gSHA1 portion, as it causes tests failures with alphabetic
    characters in the version string. The version number is still uniq based
    on the git-describe call.
    
    So, the new release process would be:
      tag (signed), rake default
    
    Future enhancements may add a task for uploads to the puppetlabs
    downloads area.
    
    Note: to test I tagged the first commit as 0.0.1.
    Other options would be to retag the released versions with signed
    tags.
    
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
  5. Merge pull request #26 from ripienaar/rspec_version_fix

    stahnma committed Dec 2, 2011
    rspec 2.7 compatiblity fix
  6. Rspec 2.7 has introduced some non backwards compatible changes

    ripienaar committed Dec 2, 2011
    that is exposed by using require with full paths.
    
    Simplify the requires to use the ruby lib search order instead
    which resolves these
Commits on Dec 1, 2011
  1. Merge pull request #24 from hunner/rakefile_update

    ripienaar committed Dec 1, 2011
    Fix warnings for rake
  2. Merge pull request #25 from stahnma/license_mods

    ripienaar committed Dec 1, 2011
    Switch branding to Puppet Labs
  3. Switch branding to Puppet Labs

    stahnma committed Dec 1, 2011
    Modifies the COPYING and Rakefile to brand the Hiera project as Puppet
    Labs.
    
    Thanks to RI for the project.
    
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
Commits on Nov 14, 2011
  1. Fix warnings for rake

    hunner committed Nov 14, 2011
Commits on Oct 18, 2011
  1. Do not sort arrays after building them as array data with complex

    ripienaar committed Oct 18, 2011
    data in them like hashes will fail to sort and raise exceptions
Commits on Oct 12, 2011
  1. Merge pull request #21 from hunner/issue/allow_empty_yaml_files

    ripienaar committed Oct 12, 2011
    Fixes: Hiera errors on empty yaml files
Commits on Oct 11, 2011
  1. Test cases for #21

    hunner committed Oct 11, 2011
    Previously we weren't actually testing *anything* having to do with
    *actual* yaml loading. So the previous test cases were writing what we
    expected it to be, then checking that it was what we expected.
    
    Using `YAML.load` I am simulating loading actual yaml files for the
    tests, which should match the expected return values, not just expected
    matching expected.
    
    For the `hiera.yaml` config, we didn't test behaviour if it was missing
    or empty.
  2. Fixes: Hiera errors on empty yaml files

    hunner committed Oct 11, 2011
    If a completely empty yaml file is loaded then it will return `false`,
    but if a yaml file is loaded with only '---' in it, it returns `nil`.
    In either case hiera should handle the cases as expected instead of
    erroring. This commit causes these answers to be considered the same as
    if the file didn't exist at all.
  3. Merge pull request #20 from hunner/issue/15/false_returns_nil

    ripienaar committed Oct 11, 2011
    Fixes #15 Hiera return nil for false value
  4. Revising backend bool spec test that nil /= false

    hunner committed Oct 11, 2011
    If the backend lookup() was requested to return true then it would,
    however if it was requested to return `false` or `nil` specifically (both of
    which equate to "falsity" in ruby) then it would only respond with
    `nil`. This revised spec test would fail previous to this bugfix.
  5. Merge pull request #10 from hunner/check_resolution_type_error

    ripienaar committed Oct 11, 2011
    Add type mismatch error output and test cases
  6. Fixes #15 Hiera return nil for false value

    hunner committed Oct 11, 2011
    The backend would assume that a `false` answer should return the
    default, when in fact a false answer would be specifically returned.
    After this commit, Hiera should only return the default answer if `nil`
    is returned by the backend (for non-existant values).
Commits on Sep 14, 2011
  1. Merge pull request #18 from ody/scope/master/inventory_service

    ripienaar committed Sep 14, 2011
    Adding inventory_service option to scope.
  2. Adding inventory_service option to scope.

    ody committed Sep 13, 2011
      This commit gives the person  using of the hiera command the option to use the
      Puppet inventory service as a fact source for scope to determine which source
      to address in the hierarchy.
Commits on Aug 25, 2011
  1. Merge pull request #17 from hunner/13-sub-hierarchies

    ripienaar committed Aug 25, 2011
    (#13) Hierarchy includes sub-hierarchy
  2. (#13) Hierarchy includes sub-hierarchy

    hunner committed Aug 25, 2011
    Any time a hierarchy has multiple levels as directories, ie
     #{country}/#{dc}/#{fqdn} and one of the levels is not defined, we do not
    want to process this in hiera. If any level of one line is undefined,
    that line will either end with /, begin with /, or have // in the middle
    somewhere, and we don't want to look up data files for that.
    
    This regex just checks for that before yielding to the backend.
Commits on Aug 21, 2011
  1. Merge pull request #16 from adamgibbins/patch-1

    ripienaar committed Aug 21, 2011
    Corrected invalid YAML markup.
Commits on Aug 3, 2011
Commits on Jul 18, 2011
  1. Merge pull request #12 from chrisboulton/master

    ripienaar committed Jul 18, 2011
    Hiera does not handle boolean/numeric values correctly, and instead returns nil/null for them
  2. Make hiera handle boolean/numeric values correctly instead of just re…

    Chris Boulton committed Jul 18, 2011
    …turning nil
Commits on Jul 5, 2011
  1. Add type mismatch error output and test cases

    hunner committed Jul 5, 2011
    For hiera issue#9