Skip to content

Commit 28a63ba

Browse files
authored
Merge pull request #7 from sunbirddcim/PIQ-26315_upgrade_to_rails_7
upgrade ruby to 3.3.5
2 parents 637edf4 + 566ef5b commit 28a63ba

File tree

9 files changed

+24
-11
lines changed

9 files changed

+24
-11
lines changed

.rubocop.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
inherit_from: .rubocop_todo.yml
22

33
AllCops:
4+
AllowSymlinksInCacheRootDirectory: true
45
Exclude:
56
- 'pkg/**/*'
7+
- 'vendor/**/*'
8+
- 'node_modules/**/*'
9+
- 'db/schema.rb'
10+
- 'tmp/**/*'
11+
- 'bin/**/*'
612

713
Layout/ExtraSpacing:
814
Enabled: false

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby-3.3.5

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
source 'https://rubygems.org'
22
gemspec
3+
4+
group :development, :test do
5+
gem 'rubocop-sunbird', git: '[email protected]:sunbirddcim/rubocop-sunbird', tag: 'v2.0.0', require: false
6+
end

lib/net/ldap/auth_adapter/gss_spnego.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def bind(auth)
2020
require 'ntlm'
2121

2222
user, psw = [auth[:username] || auth[:dn], auth[:password]]
23-
raise Net::LDAP::BindingInformationInvalidError, "Invalid binding information" unless (user && psw)
23+
raise Net::LDAP::BindingInformationInvalidError, "Invalid binding information" unless user && psw
2424

2525
nego = proc do |challenge|
2626
t2_msg = NTLM::Message.parse(challenge)

lib/net/ldap/auth_adapter/sasl.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Sasl < Net::LDAP::AuthAdapter
3030
def bind(auth)
3131
mech, cred, chall = auth[:mechanism], auth[:initial_credential],
3232
auth[:challenge_response]
33-
raise Net::LDAP::BindingInformationInvalidError, "Invalid binding information" unless (mech && cred && chall)
33+
raise Net::LDAP::BindingInformationInvalidError, "Invalid binding information" unless mech && cred && chall
3434

3535
message_id = @connection.next_msgid
3636

lib/net/ldap/auth_adapter/simple.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def bind(auth)
1111
["", ""]
1212
end
1313

14-
raise Net::LDAP::BindingInformationInvalidError, "Invalid binding information" unless (user && psw)
14+
raise Net::LDAP::BindingInformationInvalidError, "Invalid binding information" unless user && psw
1515

1616
message_id = @connection.next_msgid
1717
request = [

lib/net/ldap/dataset.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def to_entries
8181
# compatible with both 1.8.6 and 1.8.7.
8282
def value_is_binary?(value) # :nodoc:
8383
value = value.to_s
84-
return true if value[0] == ?: or value[0] == ?<
84+
return true if [?:, ?<].include?(value[0])
8585
value.each_byte { |byte| return true if (byte < 32) || (byte > 126) }
8686
false
8787
end

lib/net/ldap/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Net
22
class LDAP
3-
VERSION = "0.19.0-sunbirddcim.0"
3+
VERSION = "0.19.0-sunbirddcim.1"
44
end
55
end

net-ldap.gemspec

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).}
2626
s.homepage = %q{http://github.com/ruby-ldap/ruby-net-ldap}
2727
s.rdoc_options = ["--main", "README.rdoc"]
2828
s.require_paths = ["lib"]
29-
s.required_ruby_version = ">= 2.0.0"
29+
s.required_ruby_version = ">= 3.3"
3030
s.summary = %q{Net::LDAP for Ruby (also called net-ldap) implements client access for the Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for accessing distributed directory services}
3131

32-
s.add_development_dependency("flexmock", "~> 1.3")
33-
s.add_development_dependency("rake", "~> 12.3.3")
34-
s.add_development_dependency("rubocop", "~> 1.48")
35-
s.add_development_dependency("test-unit", "~> 3.3")
36-
s.add_development_dependency("byebug", "~> 9.0.6") unless RUBY_PLATFORM == "java"
32+
s.add_dependency "activesupport", "~> 7.2"
33+
34+
s.add_development_dependency("flexmock", "~> 3.0")
35+
s.add_development_dependency("rake", "~> 13.0")
36+
s.add_development_dependency("rubocop", "~> 1.77")
37+
s.add_development_dependency("test-unit", "~> 3.7")
38+
s.add_development_dependency("byebug", "~> 12.0") unless RUBY_PLATFORM == "java"
3739
end

0 commit comments

Comments
 (0)