(whimsy) branch master updated: Allow local override of LDAP Gem name

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c7b9f91 Allow local override of LDAP Gem name
2c7b9f91 is described below

commit 2c7b9f916c4691edc94245ee24a84b3877d07198
Author: Sebb <s...@apache.org>
AuthorDate: Thu Feb 13 22:19:00 2025 +0000

    Allow local override of LDAP Gem name
---
 .gitignore  |  1 +
 asf.gemspec | 11 ++++++++++-
 lib/Gemfile | 10 +++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 86bfddfc..e3b309ac 100644
--- 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
index c305e344..bc301a62 100644
--- 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
index 458a94db..131d1e42 100644
--- 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'