From: Jeff McCune <jeff@puppetlabs.com>
Date: Mon, 25 Feb 2013 22:19:13 +0000 (-0800)
Subject: Merge branch '4.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9a06f11b11c96fff20a2e62c69a29684d943b773;p=puppet-stdlib.git

Merge branch '4.x'

* 4.x:
  (maint) Add Ruby 2.0.0 to Travis build matrix

Conflicts:
	.gitignore
	.travis.yml
	Gemfile
---

9a06f11b11c96fff20a2e62c69a29684d943b773
diff --cc .travis.yml
index df58d5a,7e40b3f..1bb1889
--- a/.travis.yml
+++ b/.travis.yml
@@@ -1,21 -1,22 +1,20 @@@
  language: ruby
  bundler_args: --without development
- script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+ script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'"
  rvm:
-   - 1.9.3
    - 1.8.7
++  - 1.9.3
++  - 2.0.0
 +  - ruby-head
  env:
-   - PUPPET_GEM_VERSION="~> 2.7"
 -  - PUPPET_VERSION=">= 3.0.0"
 -  - PUPPET_VERSION="~> 2.7.0"
 -  - PUPPET_VERSION=2.7.13
 -  - PUPPET_VERSION=2.7.6
 -  - PUPPET_VERSION=2.6.9
 +  - PUPPET_GEM_VERSION=">= 3.0.0"
  matrix:
    allow_failures:
+     - rvm: 2.0.0
 +    - rvm: ruby-head
-   exclude:
-     - rvm: 1.9.3
-       env: PUPPET_GEM_VERSION="~> 2.7"
-     - rvm: ruby-head
+   include:
 -    - rvm: 2.0.0
 -      env: PUPPET_VERSION=">= 3.0.0"
 -    - rvm: 1.9.3
 -      env: PUPPET_VERSION=">= 3.0.0"
++    - rvm: 1.8.7
 +      env: PUPPET_GEM_VERSION="~> 2.7"
  notifications:
    email: false
    webhooks:
diff --cc Gemfile
index 791e7a5,3ddc07e..1026074
--- a/Gemfile
+++ b/Gemfile
@@@ -1,21 -1,8 +1,21 @@@
- source :rubygems
+ source "https://rubygems.org"
  
 -if puppetversion = ENV['PUPPET_VERSION']
 -  gem 'puppet', puppetversion
 +group :development do
 +  gem 'watchr'
 +end
 +
 +group :development, :test do
 +  gem 'rake'
 +  gem 'rspec', "~> 2.11.0", :require => false
 +  gem 'mocha', "~> 0.10.5", :require => false
 +  gem 'puppetlabs_spec_helper', :require => false
 +  gem 'rspec-puppet', :require => false
 +end
 +
 +if puppetversion = ENV['PUPPET_GEM_VERSION']
 +  gem 'puppet', puppetversion, :require => false
  else
 -  gem 'puppet'
 +  gem 'puppet', :require => false
  end
 -gem 'puppetlabs_spec_helper', '>= 0.1.0'
 +
 +# vim:ft=ruby