From 10e1c66aa18c6193825c3b7b10afc715c72f52b5 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Fri, 6 Jun 2014 11:58:50 -0600
Subject: [PATCH] remove gemfile.lock, update travis

---
 .gitignore   |  2 ++
 .travis.yml  | 17 +++++++++--
 Gemfile      | 12 ++++----
 Gemfile.lock | 79 ----------------------------------------------------
 4 files changed, 24 insertions(+), 86 deletions(-)
 delete mode 100644 Gemfile.lock

diff --git a/.gitignore b/.gitignore
index 194ee64ab..fabc79fde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ README.pdf
 *.swp
 spec/fixtures
 *.swo
+Gemfile.lock
+
diff --git a/.travis.yml b/.travis.yml
index b6b454063..316e3451b 100644
--- 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
index d8dc9a10a..c25f31b13 100644
--- 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
deleted file mode 100644
index ef0787787..000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,79 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.2.7)
-    builder (3.2.2)
-    ci_reporter (1.9.1)
-      builder (>= 2.1.2)
-    coderay (1.1.0)
-    columnize (0.3.6)
-    debugger (1.6.5)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.1)
-    debugger-linecache (1.2.0)
-    debugger-pry (0.1.1)
-      debugger (~> 1)
-      pry (>= 0.9.9)
-    debugger-ruby_core_source (1.3.1)
-    diff-lcs (1.2.5)
-    facter (2.0.1)
-      CFPropertyList (~> 2.2.6)
-    hiera (1.3.2)
-      json_pure
-    json_pure (1.8.1)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mocha (1.0.0)
-      metaclass (~> 0.0.1)
-    parallel (0.9.2)
-    parallel_tests (0.16.6)
-      parallel
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    puppet (3.5.1)
-      facter (> 1.6, < 3)
-      hiera (~> 1.0)
-      json_pure
-      rgen (~> 0.6.5)
-    puppet-lint (0.3.2)
-    puppet-syntax (1.1.0)
-      puppet (>= 2.7.0)
-      rake
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
-      rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.1.1)
-    rcov (0.9.11)
-    rgen (0.6.6)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-puppet (1.0.1)
-      rspec
-    slop (3.4.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ci_reporter
-  debugger
-  debugger-pry
-  parallel_tests
-  puppet (~> 3.5.1)
-  puppet-lint
-  puppet-syntax
-  puppetlabs_spec_helper
-  rake
-  rcov
-  rspec-puppet