Add missing require for 'rspec'; affects some ruby/rspec versions
Update to new path for puppetlabs spec helper libs
Add support for running acceptance tests on EC2

This adds an option to toggle our apt/yum repo
urls for our dev packages to point to the S3
mirrors instead of trying to hit puppetlabs.lan.

Conflicts:

	acceptance/helper.rb
	acceptance/options/README.md
	acceptance/setup/post_suite/10_collect_artifacts.rb
	acceptance/setup/pre_suite/80_add_dev_repo.rb
Acceptance: log puppetdb acceptance config at startup
Acceptance: improve handling / configuration for pkg repo urls

Conflicts:

	acceptance/helper.rb
	acceptance/options/README.md
	acceptance/setup/pre_suite/80_add_dev_repo.rb
Acceptance: add step to collect puppetdb log file
Merge pull request #316 from cprice-puppet/maint/1.0.x/compatibility-with-latest-acceptance

Maint/1.0.x/compatibility with latest acceptance
Merge pull request #313 from haus/ticket/1.0.x/16652_fixup_files_listing_in_spec

(#16652) Replace dir with specific files for terminus package
Update changelog for 1.0.1
Initial scripts / rake tasks for building test packages

This commit does the following:

1) Copy all of the hacky shell code that we are using in Jenkins
   for building our PuppetDB packages into shell scripts in our
   repo.
2) Add a rake task ('test:package') that calls them.

This is not an ideal solution, but it is a step forward.  For now,
it gives us the following benefits:

1) Allows us to track the nastiest parts of our current slew of
   Jenkins jobs in VCS, and get rid of it inside of the Jenkins
   console.
2) Allows us to build a Jenkins job that can run our two packaging
   tasks (rpm, deb) in parallel.

There is more work that should eventually be done here, including
reconciling with Moses' standardized packaging tasks, porting some
or all of this shell stuff over to Ruby, and refactoring to
DRY up some of the repetitive bits.  However, I think this is
a big enough step forward to warrant committing it in its current
state.
Merge pull request #326 from cprice-puppet/maint/1.0.x/scripts-for-test-packages

Initial scripts / rake tasks for building test packages
Port acceptance tests to use new puppetdb module.

This is a cherry-pick of commit
877882e233789ea812d498b8a6102d83c80016aa from master.

Conflicts:

	acceptance/setup/pre_suite/80_add_dev_repo.rb
Explicitly set which version of packages to install for acceptance

(Cherry pick of b0beb79ea17950a33438b5110c1f63fdb17b7ea0 from master)

This will fix an issue where, for instance, the most recent released
version is 1.0.1, but that tag only exists in 1.0.x, so when testing
against master, the development package is never installed because it
isn't "newer".

This also changes the version format specified for
PUPPETDB_EXPECTED_VERSION to exactly the version returned by `rpm -q`
and `dpkg-query`, rather than munging it. That change is because we
already need the unmunged version string to specify which version to
install.

Conflicts:

	acceptance/helper.rb
Merge pull request #327 from cprice-puppet/maint/1.0.x/latest-acceptance-changes

Maint/1.0.x/latest acceptance changes
Acceptance: fix merge conflicts

In the previous commit, I cherry-picked a few acceptance-related
things from the master branch in order to get our acceptance tests
up and running.  I screwed up in resolving one of the merge conflicts;
this should fix it.
(#17178) Update rubylib on debian/ubuntu installs

Previously the terminus would be installed to the 1.8 sitelibdir for ruby1.8 or
the 1.9.1 vendorlibdir on ruby1.9. The ruby1.9 code path was never used, so
platforms with ruby1.9 as the default (such as quantal and wheezy) would not be
able to load the terminus. Modern debian packages put version agnostic ruby
code in vendordir (/usr/lib/ruby/vendor_ruby), so this commit moves the
terminus install dir to be vendordir.