Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix up 2.3.x for new scope #80

Merged
merged 8 commits into from Jul 23, 2012

Commits on Jul 19, 2012

  1. (Maint) Fix interpreter lines

    This time around I actually know why I'm doing this thanks to the
    reminder from Nick Lewis.
    
    Ruby will replace itself in memory with the executable listed in the
    interpreter line if the string "ruby" is not in there.
    
    Since /usr/bin/env rspec doesn't contain the substring "ruby", you can't
    actually run ruby -W1 or whatever on the file.
    
    This patch fixes the problem by making sure "ruby" is present,
    preventing ruby from replacing itself in memory.
    Jeff McCune committed Jul 19, 2012
    Configuration menu
    Copy the full SHA
    f604bae View commit details
    Browse the repository at this point in the history
  2. (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope

    Without this patch all of the spec tests for parser functions in stdlib
    would instantiate their own scope instances.  This is a problem because
    the standard library is tightly coupled with the internal behavior of
    Puppet.  Tight coupling like this creates failures when we change the
    internal behavior of Puppet.  This is exactly what happened recently
    when we changed the method signature for the initializer of
    Puppet::Parser::Scope instances.
    
    This patch fixes the problem by creating scope instances using the
    puppet labs spec helper.  The specific method that provides scope
    instances in Puppet-version-independent way is something like this:
    
     let(:scope) { PuppetlabsSpec::PuppetSeams.parser_scope }
    
    This patch simply implements this across the board.
    Jeff McCune committed Jul 19, 2012
    Configuration menu
    Copy the full SHA
    8a4e115 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'fix/2.2.x/make_it_green' into 2.2.x

    * fix/2.2.x/make_it_green:
      (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
      (Maint) Fix interpreter lines
    Jeff McCune committed Jul 19, 2012
    Configuration menu
    Copy the full SHA
    6a63fdf View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2012

  1. (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}

    The module PuppetlabsSpec::PuppetSeams has been renamed in the
    puppetlabs_spec_helper gem to PuppetlabsSpec::PuppetInternals.
    
    The method to obtain a scope object has also changed slightly.  Without
    this patch the spec tests will fail because the stdlib module is not
    aligned with the spec helper gem.  This patch fixes the problem by
    matching up messages with their receivers in the spec helper library.
    
    Paired-with: Andrew Parker <andy@puppetlabs.com>
    Jeff McCune committed Jul 23, 2012
    Configuration menu
    Copy the full SHA
    99f0848 View commit details
    Browse the repository at this point in the history
  2. Merge pull request puppetlabs#81 from jeffmccune/maint/2.2.x/rename_s…

    …eams_to_internals
    
    (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
    Jeff McCune committed Jul 23, 2012
    Configuration menu
    Copy the full SHA
    a1bab58 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.x

    * 2.2.x:
      (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
      (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
      (Maint) Fix interpreter lines
    Jeff McCune committed Jul 23, 2012
    Configuration menu
    Copy the full SHA
    f3caf5f View commit details
    Browse the repository at this point in the history
  4. (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)

    This patch is the same approach as the one that want into 2.2.x.  It
    covers the functions in 2.3.x that do not exist in 2.2.x.
    
    Without this patch all of the spec tests for parser functions in stdlib
    would instantiate their own scope instances.  This is a problem because
    the standard library is tightly coupled with the internal behavior of
    Puppet.  Tight coupling like this creates failures when we change the
    internal behavior of Puppet.  This is exactly what happened recently
    when we changed the method signature for the initializer of
    Puppet::Parser::Scope instances.
    
    This patch fixes the problem by creating scope instances using the
    puppet labs spec helper.  The specific method that provides scope
    instances in Puppet-version-independent way is something like this:
    
        let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
    
    This patch simply implements this across the board.
    Jeff McCune committed Jul 23, 2012
    Configuration menu
    Copy the full SHA
    98ff3ab View commit details
    Browse the repository at this point in the history
  5. (Maint) Fix up the get_module_path parser function

    This patch switches the spec tests for the get_module_path function to
    use mock objects.  The underlying Puppet::Module.find method has
    reasonable test coverage inside of Puppet core so we might as well break
    the tight dependency while we're fixing up the specs to use the new
    parser scope.
    
    The behavior of the parser function itself should still have complete
    coverage even though the tests have switched to mock the implementation
    inside of Puppet.
    Jeff McCune committed Jul 23, 2012
    Configuration menu
    Copy the full SHA
    c129775 View commit details
    Browse the repository at this point in the history