From: Helen <helen@puppetlabs.com>
Date: Thu, 28 Jul 2016 14:46:41 +0000 (+0100)
Subject: Merge pull request #618 from puppetlabs/update-modulesync
X-Git-Tag: 2.3.0~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cd178a59f7494440bd32846cbf37f1b1d73c3cd9;hp=7169e42d672843b708d1fd74eb2e8a3a1ca3fc21;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #618 from puppetlabs/update-modulesync

(MAINT) Update for modulesync_config 72d19f184
---

diff --git a/.gitignore b/.gitignore
index dd126f2..0cd25de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
 pkg/
 Gemfile.lock
 vendor/
-spec/fixtures/
+spec/fixtures/manifests/
+spec/fixtures/modules/
 .vagrant/
 .bundle/
 coverage/
diff --git a/.travis.yml b/.travis.yml
index 49051cb..509b662 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.1.6
+  - rvm: 2.1.9
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
   - rvm: 2.1.5
diff --git a/Gemfile b/Gemfile
index 9b5b214..c7da908 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,14 +13,12 @@ def location_for(place, version = nil)
 end
 
 group :development, :unit_tests do
-  gem 'json',                      :require => false
-  gem 'metadata-json-lint',        :require => false
-  gem 'puppet_facts',              :require => false
-  gem 'puppetlabs_spec_helper',    :require => false
-  gem 'rspec-puppet', '>= 2.3.2',  :require => false
-  gem 'simplecov',                 :require => false
-  gem 'puppet-blacksmith',         :require => false
-  gem 'rest-client', '~> 1.8.0',   :require => false
+  gem 'metadata-json-lint',             :require => false
+  gem 'puppet_facts',                   :require => false
+  gem 'puppet-blacksmith', '>= 3.4.0',  :require => false
+  gem 'puppetlabs_spec_helper',         :require => false
+  gem 'rspec-puppet', '>= 2.3.2',       :require => false
+  gem 'simplecov',                      :require => false
 end
 group :system_tests do
   gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
@@ -31,10 +29,13 @@ group :system_tests do
   gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
 end
 
+# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
+# if using ruby 1.x
+gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
+
 gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 
-
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end