From d5a051802e4444572e3131d48d3b12388ad9e54f Mon Sep 17 00:00:00 2001 From: Kevin McCormack Date: Thu, 2 Jul 2020 16:59:45 -0400 Subject: [PATCH 1/2] Bump rake dev dependency to 13 Quiet a GitHub alert about https://github.com/advisories/GHSA-jppv-gw3r-w3q8 --- lib/net/ldap/connection.rb | 2 +- net-ldap.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb index b01984f4..2f9d84f7 100644 --- a/lib/net/ldap/connection.rb +++ b/lib/net/ldap/connection.rb @@ -181,7 +181,7 @@ def setup_encryption(args, timeout=nil) # have to call it, but perhaps it will come in handy someday. #++ def close - return if @conn.nil? + return if !defined?(@conn) || @conn.nil? @conn.close @conn = nil end diff --git a/net-ldap.gemspec b/net-ldap.gemspec index d6f1388b..adcd4615 100644 --- a/net-ldap.gemspec +++ b/net-ldap.gemspec @@ -30,7 +30,7 @@ the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).} 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} s.add_development_dependency("flexmock", "~> 1.3") - s.add_development_dependency("rake", "~> 10.0") + s.add_development_dependency("rake", "~> 13.0") s.add_development_dependency("rubocop", "~> 0.49.0") s.add_development_dependency("test-unit") s.add_development_dependency("byebug") From 8cdb71e6a91bcad09f1b55b0eee4a3942a2e6736 Mon Sep 17 00:00:00 2001 From: Kevin McCormack Date: Thu, 2 Jul 2020 17:37:48 -0400 Subject: [PATCH 2/2] Use Rake 12.3 for testing to support Ruby 2.0 and 2.1 Also add JRuby 9.2 as optional in Travis --- .travis.yml | 2 ++ net-ldap.gemspec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 07d86a6d..c13d61e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ rvm: # optional - ruby-head - jruby-19mode + - jruby-9.2 - jruby-head - rbx-2 @@ -48,6 +49,7 @@ matrix: allow_failures: - rvm: ruby-head - rvm: jruby-19mode + - rvm: jruby-9.2 - rvm: jruby-head - rvm: rbx-2 fast_finish: true diff --git a/net-ldap.gemspec b/net-ldap.gemspec index adcd4615..13ad7be6 100644 --- a/net-ldap.gemspec +++ b/net-ldap.gemspec @@ -30,7 +30,7 @@ the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).} 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} s.add_development_dependency("flexmock", "~> 1.3") - s.add_development_dependency("rake", "~> 13.0") + s.add_development_dependency("rake", "~> 12.3.3") s.add_development_dependency("rubocop", "~> 0.49.0") s.add_development_dependency("test-unit") s.add_development_dependency("byebug")