From: Hunter Haugen Date: Mon, 1 Jul 2013 23:19:48 +0000 (-0700) Subject: Merge pull request #136 from hunner/change_specs X-Git-Tag: 1.1.1~3 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0665a5d77a4f26d23417dce221a15b8d112cd7b0;hp=142b72bbe21fcfa6bbd713f94c337ff3cda23b40;p=puppet-modules%2Fpuppetlabs-apt.git Merge pull request #136 from hunner/change_specs Update travis and bundler --- diff --git a/.travis.yml b/.travis.yml index a19074d..71054bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,26 +4,23 @@ script: "bundle exec rake spec SPEC_OPTS='--format documentation'" rvm: - 1.8.7 - 1.9.3 - - ruby-head + - 2.0.0 env: - - PUPPET_GEM_VERSION="~> 2.6.0" - PUPPET_GEM_VERSION="~> 2.7.0" - PUPPET_GEM_VERSION="~> 3.0.0" - PUPPET_GEM_VERSION="~> 3.1.0" - PUPPET_GEM_VERSION="~> 3.2.0" matrix: exclude: - - rvm: ruby-head - env: PUPPET_GEM_VERSION="~> 3.0.0" - - rvm: ruby-head - env: PUPPET_GEM_VERSION="~> 3.1.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: ruby-head + - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 2.6.0" - - rvm: ruby-head - env: PUPPET_GEM_VERSION="~> 2.6.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.1.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 3.2.0" notifications: email: false diff --git a/Gemfile b/Gemfile index 8e5e04d..881fc90 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ -source :rubygems +source 'https://rubygems.org' group :development, :test do + gem 'rake', :require => false + gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false end