From: JT (Jonny) <jonathan.tripathy@puppetlabs.com>
Date: Thu, 26 Mar 2015 14:40:32 +0000 (+0000)
Subject: Merge pull request #503 from anodelman/master
X-Git-Tag: 1.5.0~3
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=292b9abaab456d1bf431975d27a47b050a1adbbd;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge pull request #503 from anodelman/master

(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
---

292b9abaab456d1bf431975d27a47b050a1adbbd
diff --cc Gemfile
index cc77f38,e1ae0fa..fcd27d5
--- a/Gemfile
+++ b/Gemfile
@@@ -1,8 -1,21 +1,18 @@@
  source ENV['GEM_SOURCE'] || "https://rubygems.org"
  
+ def location_for(place, fake_version = nil)
+   if place =~ /^(git:[^#]*)#(.*)/
+     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+   elsif place =~ /^file:\/\/(.*)/
+     ['>= 0', { :path => File.expand_path($1), :require => false }]
+   else
+     [place, { :require => false }]
+   end
+ end
+ 
  group :development, :unit_tests do
 -  gem 'rake',                    :require => false
    gem 'rspec-core', '3.1.7',     :require => false
 -  gem 'rspec-puppet', '~> 1.0',  :require => false
    gem 'puppetlabs_spec_helper',  :require => false
 -  gem 'puppet-lint',             :require => false
    gem 'simplecov',               :require => false
    gem 'puppet_facts',            :require => false
    gem 'json',                    :require => false