[Pkg-puppet-devel] [facter] 12/352: Maint: Don't try to install json gem on Windows

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit b1c8c5657cd3bbfa63f38ab5a530a381968ed2b3
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Mon Sep 9 09:57:22 2013 -0700

    Maint: Don't try to install json gem on Windows
    
    Previously, `bundle install` would fail on windows without the ruby devkit
    installed. As this is not something we ship with, confine the gem to only be
    installed on ruby platforms, i.e. not windows.
    
    Also running `bundle install --without development test` followed by `bundle
    exec facter` on all platforms would fail due to `facter` being in the
    development/test group.
---
 Gemfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index c0dbcc6..986731d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,13 +6,14 @@ end
 
 group :development, :test do
   gem 'rake'
-  gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__), :require => false
   gem 'rspec', "~> 2.11.0", :require => false
   gem 'mocha', "~> 0.10.5", :require => false
-  gem 'json', "~> 1.7", :require => false
+  gem 'json', "~> 1.7", :platforms => :ruby, :require => false
   gem 'puppetlabs_spec_helper', :require => false
 end
 
+gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__), :require => false
+
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git