From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 4 Oct 2014 09:50:18 +0000 (+0200)
Subject: Merge gemfiles tuning into one loop.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=42859d6750767becf2b4ff917dc3d813573aad9e;p=rOCCI-packaging-fedora.git

Merge gemfiles tuning into one loop.
---

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index 114b0ac..7609117 100644
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -127,20 +127,20 @@ cp -p lib/authentication_strategies/bundles/Gemfile.keystone Gemfile.keystone.up
 cp -p lib/backends/bundles/Gemfile.opennebula Gemfile.opennebula.upstream
 cp -p lib/backends/bundles/Gemfile.ec2 Gemfile.ec2.upstream
 # jbuilder still needed
-sed -i "s/#\(gem 'jbuilder'\)/\1/" Gemfile
+sed -i "s/#\(\s*gem ['\"]jbuilder['\"]\)/\1/" Gemfile
 # relax upstream requirements
-while read name ver; do
-  echo "'$name' '$ver'"
-  sed -i "s/\(gem ['\"]$name['\"]\).*/\1, '>= $ver'/" Gemfile
+while read name ver file; do
+  echo "$name >= $ver (`rpm -q --qf '%{NAME} %{VERSION}' rubygem-$name`)"
+  file=${file:-'Gemfile'}
+  sed -i "s/^\(\s*gem ['\"]$name['\"]\).*/\1, '>= $ver'/" $file
 done << EOF
 jbuilder     1.5.0
 rails        4.0.0
 rails-api    0.1.0
 passenger    4.0.18
 rspec-rails  2.14.0
+opennebula   4.4.0   lib/backends/bundles/Gemfile.opennebula
 EOF
-sed -i "s/\(gem ['\"]opennebula['\"]\).*/\1, '>= 4.4.0'/" lib/backends/bundles/Gemfile.opennebula
-sed -i "s/\(gem ['\"]aws-sdk-core['\"]\).*/\1, '>= 2.0.0'/" lib/backends/bundles/Gemfile.ec2
 # gems not needed for tests
 for p in sdoc capistrano rvm-capistrano debugger whenever fuubar pry-rails pry-rescue pry-stack_explorer guard-bundler guard-rails rb-inotify libnotify yard redcarpet bond hirb; do
   sed -i "s/^\(\s*gem ['\"]$p['\"].*\)/#disabled: \1/" Gemfile