Allow local override of LDAP Gem name

apache · Feb 13, 2025 · 2c7b9f9 · 2c7b9f9
1 parent 2c750d9
commit 2c7b9f9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ migrating.txt
 /www/notice.txt
 .ruby-version
 asfldap.version
+asfldap.gemname
diff --git a/asf.gemspec b/asf.gemspec
@@ -6,6 +6,15 @@ rescue Exception => e
   nil
 end
 
+# Allow override of ldap gem name
+ldapname = 
+begin
+  File.read(File.expand_path('../asfldap.gemname', __FILE__)).strip
+rescue Exception => e
+  'ruby-ldap'
+end
+
+
 Gem::Specification.new do |s|
 
   # Change these as appropriate
@@ -29,7 +38,7 @@ Gem::Specification.new do |s|
   # relevant versions
   s.add_dependency('nokogiri')
   s.add_dependency('rack')
-  s.add_dependency('ruby-ldap', ldapversion)
+  s.add_dependency(ldapname, ldapversion)
   s.add_dependency('tzinfo')
   s.add_dependency('tzinfo-data')
   s.add_dependency('wunderbar')

diff --git a/lib/Gemfile b/lib/Gemfile
@@ -7,11 +7,19 @@ rescue Exception => e
   nil
 end
 
+# Allow override of ldap gem name
+ldapname = 
+begin
+  File.read(File.expand_path('../../asfldap.gemname', __FILE__)).strip
+rescue Exception => e
+  'ruby-ldap'
+end
+
 # lib needs these at run-time
 gem 'json'
 gem 'nokogiri'
 gem 'rake'
-gem 'ruby-ldap', ldapversion
+gem ldapname, ldapversion
 gem 'wunderbar'
 gem 'pdf-reader'