Merge pull request voxpupuli#143 from jlambert121/gemfile

remove gemfile.lock, update travis
jacderida · Jun 6, 2014 · 754bb5e · 754bb5e
2 parents d4af4e1 + 10e1c66
commit 754bb5e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 86 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ README.pdf
 *.swp
 spec/fixtures
 *.swo
+Gemfile.lock
+
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,7 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-before_install:
-  - gem update --system 2.1.11
+  - 2.1.0
 script:
   - "rake lint"
   - "rake spec SPEC_OPTS='--format documentation'"
@@ -16,6 +15,8 @@ env:
   - PUPPET_VERSION="~> 3.2.0"
   - PUPPET_VERSION="~> 3.3.0"
   - PUPPET_VERSION="~> 3.4.0"
+  - PUPPET_VERSION="~> 3.5.0"
+  - PUPPET_VERSION="~> 3.6.0"
 matrix:
   exclude:
     - rvm: 1.9.3
@@ -24,6 +25,18 @@ matrix:
       env: PUPPET_VERSION="~> 2.7.0"
     - rvm: 2.0.0
       env: PUPPET_VERSION="~> 3.1.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.0.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.1.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.2.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.3.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.4.0"
 notifications:
   email: false
 
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,12 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper'
-gem 'puppet-syntax'
+gem 'rake', '>= 10.1.1'
+gem 'rspec', '~> 2.99.0'
+gem 'puppet-lint', '>= 0.3.2'
+gem 'rspec-puppet', '>= 1.0.1'
+gem 'puppetlabs_spec_helper', '>= 0.4.1'
+gem 'puppet-syntax', '>= 1.1.0'
+gem 'json'
 gem 'puppet', ENV['PUPPET_VERSION'] || '~> 3.5.1'
 
 group :development do

diff --git a/Gemfile.lock b/Gemfile.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,5 @@ README.pdf @@
     *.swp
     spec/fixtures
     *.swo
+    Gemfile.lock