[Pkg-puppet-devel] [facter] 50/180: (FACT-375) Fix json gem installation on solaris

[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 2ce8849b75339f577f08375adabfdbf50d932c71
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Thu Apr 10 15:34:29 2014 -0700

    (FACT-375) Fix json gem installation on solaris
---
 acceptance/setup/common/00_EnvSetup.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/acceptance/setup/common/00_EnvSetup.rb b/acceptance/setup/common/00_EnvSetup.rb
index f75b55d..be19c45 100644
--- a/acceptance/setup/common/00_EnvSetup.rb
+++ b/acceptance/setup/common/00_EnvSetup.rb
@@ -21,6 +21,7 @@ PACKAGES = {
   :solaris => [
     ['git', 'developer/versioning/git'],
     ['ruby', 'runtime/ruby-18'],
+    # there isn't a package for json, so it is installed later via gems
   ],
   :windows => [
     'git',
@@ -30,7 +31,8 @@ PACKAGES = {
 install_packages_on(hosts, PACKAGES, :check_if_exists => true)
 
 hosts.each do |host|
-  if host['platform'] =~ /windows/
+  case host['platform']
+  when /windows/
     step "#{host} Install ruby from git"
     install_from_git(host, "/opt/puppet-git-repos", :name => 'puppet-win32-ruby', :path => 'git://github.com/puppetlabs/puppet-win32-ruby')
     on host, 'cd /opt/puppet-git-repos/puppet-win32-ruby; cp -r ruby/* /'
@@ -38,5 +40,8 @@ hosts.each do |host|
     on host, 'cd /lib; icacls ruby /reset /T'
     on host, 'ruby --version'
     on host, 'cmd /c gem list'
+  when /solaris/
+    step "#{host} Install json from rubygems"
+    on host, 'gem install json'
   end
 end

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