1
0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00

bug #3364: install zendesk_api gem compatible with 1.8.7

(cherry picked from commit abca2ddd03)
This commit is contained in:
Javi Fontan 2014-11-18 14:50:42 +01:00
parent 8499e70e3c
commit 676a8f0c4c

View File

@ -13,17 +13,19 @@ end
if !defined?(RUBY_VERSION) || RUBY_VERSION < '1.9.0' if !defined?(RUBY_VERSION) || RUBY_VERSION < '1.9.0'
$nokogiri='nokogiri --version "< 1.6.0"' $nokogiri='nokogiri --version "< 1.6.0"'
LDAP='net-ldap --version "< 0.9"' LDAP='net-ldap --version "< 0.9"'
ZENDESK_API='zendesk_api --version "< 1.5"'
else else
$nokogiri='nokogiri' $nokogiri='nokogiri'
DEFAULT = DEFAULT_PRE + %w{hybrid} DEFAULT = DEFAULT_PRE + %w{hybrid}
LDAP='net-ldap' LDAP='net-ldap'
ZENDESK_API='zendesk_api'
end end
DEFAULT = DEFAULT_PRE if !defined?(DEFAULT) DEFAULT = DEFAULT_PRE if !defined?(DEFAULT)
GROUPS={ GROUPS={
:quota => [SQLITE, 'sequel'], :quota => [SQLITE, 'sequel'],
:sunstone => ['json', 'rack', 'sinatra', 'thin', 'zendesk_api', SQLITE], :sunstone => ['json', 'rack', 'sinatra', 'thin', ZENDESK_API, SQLITE],
:cloud => %w{amazon-ec2 rack sinatra thin uuidtools curb json}, :cloud => %w{amazon-ec2 rack sinatra thin uuidtools curb json},
:hybrid => %w{softlayer_api configparser azure}, :hybrid => %w{softlayer_api configparser azure},
:auth_ldap => LDAP, :auth_ldap => LDAP,
@ -37,7 +39,8 @@ GROUPS={
PACKAGES=GROUPS.keys PACKAGES=GROUPS.keys
GEM_TEST={ GEM_TEST={
LDAP => 'net/ldap' LDAP => 'net/ldap',
ZENDESK_API => 'zendesk_api'
} }
DISTRIBUTIONS={ DISTRIBUTIONS={