Merge branch 'master' of git://github.com/puppetlabs/puppetlabs-stdlib

1 files changed, 14 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index 791e7a5..50df2ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,15 @@
-source :rubygems
+source "https://rubygems.org"
+
+def location_for(place, fake_version = nil)
+  mdata = /^(git:[^#]*)#(.*)/.match(place)
+  if mdata
+    [fake_version, { :git => mdata[1], :branch => mdata[2], :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path(mdata[1]), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
 
 group :development do
   gem 'watchr'
@@ -6,6 +17,7 @@ end
 
 group :development, :test do
   gem 'rake'
+  gem 'puppetmodule-stdlib', ">= 1.0.0", :path => File.expand_path("..", __FILE__)
   gem 'rspec', "~> 2.11.0", :require => false
   gem 'mocha', "~> 0.10.5", :require => false
   gem 'puppetlabs_spec_helper', :require => false
@@ -13,7 +25,7 @@ group :development, :test do
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
+  gem 'puppet', *location_for(puppetversion)
 else
   gem 'puppet', :require => false
 end