update common Gemfile, travis.yml

updating common files with changes that are configured in the profiles: Gemfile, travis.yml

Author: arlimus

.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 language: ruby
 bundler_args: --without development integration openstack
 env:
@@ -16,3 +17,11 @@ matrix:
       env: PUPPET_VERSION="~> 2.7.0"
     - rvm: 2.0.0
       env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 1.8.7
+      env: PUPPET_VERSION="~> 4.0.0"
+    - rvm: 1.9.3
+      env: PUPPET_VERSION="~> 4.0.0"
+    - rvm: 2.0.0
+      env: PUPPET_VERSION="~> 4.0.0"

Gemfile

@@ -11,11 +11,16 @@ end
 
 group :test do
   gem 'rake'
+  # bugfix for ruby 1.8, puppet+rspec interplay
+  # https://github.com/rspec/rspec-core/issues/1864
+  if RUBY_VERSION.start_with? '1.8'
+    gem 'rspec', '~> 3.1.0',     :require => false
+  end
   gem 'rspec-puppet'
   # avoid NoMethodError: private method `clone' called for #<RuboCop::Cop::CopStore:0x00000104e286c8>
   gem 'puppetlabs_spec_helper', :git => 'https://github.com/ehaselwanter/puppetlabs_spec_helper'
   gem 'puppet-lint'
-  gem 'rubocop',    '~> 0.27' if RUBY_VERSION > '1.9.2'
+  gem 'rubocop',    '~> 0.31' if RUBY_VERSION > '1.9.2'
 end
 
 group :development do