update dependencies and add CI for ruby 3 (#141)

Author: apache-hb

.circleci/config.yml

@@ -4,10 +4,10 @@ workflows:
   version: 2
   test:
     jobs:
-      - test-2.4
       - test-2.5
       - test-2.6
       - test-2.7
+      - test-3.0
       - test-jruby-9.2
 
 ruby-docker-template: &ruby-docker-template
@@ -19,7 +19,7 @@ ruby-docker-template: &ruby-docker-template
           sudo apt-get update -y && sudo apt-get install -y build-essential
         fi
     - run: ruby -v
-    - run: gem install bundler -v 1.17.3
+    - run: gem install bundler
     - run: bundle install
     - run: mkdir ./rspec
     - run: bundle exec rspec --format progress --format RspecJunitFormatter -o ./rspec/rspec.xml spec
@@ -29,13 +29,6 @@ ruby-docker-template: &ruby-docker-template
         path: ./rspec
 
 jobs:
-  test-2.4:
-    <<: *ruby-docker-template
-    docker:
-      - image: circleci/ruby:2.4
-      - image: consul
-      - image: redis
-      - image: amazon/dynamodb-local
   test-2.5:
     <<: *ruby-docker-template
     docker:
@@ -57,6 +50,13 @@ jobs:
       - image: consul
       - image: redis
       - image: amazon/dynamodb-local
+  test-3.0:
+    <<: *ruby-docker-template
+    docker:
+      - image: circleci/ruby:3.0
+      - image: consul
+      - image: redis
+      - image: amazon/dynamodb-local
   test-jruby-9.2:
     <<: *ruby-docker-template
     docker:

CONTRIBUTING.md

@@ -18,7 +18,7 @@ Build instructions
 
 ### Prerequisites
 
-This SDK is built with [Bundler](https://bundler.io/). To install Bundler, run `gem install bundler -v 1.17.3`. You might need `sudo` to execute the command successfully. As of this writing, the SDK does not support being built with Bundler 2.0.
+This SDK is built with [Bundler](https://bundler.io/). To install Bundler, run `gem install bundler`. You might need `sudo` to execute the command successfully.
 
 To install the runtime dependencies:
 

Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     launchdarkly-server-sdk (5.8.2)
-      concurrent-ruby (~> 1.0)
+      concurrent-ruby (~> 1.1)
       http (~> 4.4.1)
       json (~> 2.3.1)
       ld-eventsource (= 2.0.0.pre.beta.1)
@@ -13,14 +13,16 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    ast (2.4.2)
     aws-eventstream (1.1.0)
-    aws-partitions (1.388.0)
-    aws-sdk-core (3.109.1)
+    aws-partitions (1.418.0)
+    aws-sdk-core (3.111.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.55.0)
+    aws-sdk-dynamodb (1.58.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
@@ -34,9 +36,9 @@ GEM
       faraday (>= 0.9, < 1.1.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (0.17.3)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.0)
+    ffi (1.14.2)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -55,53 +57,60 @@ GEM
     ld-eventsource (2.0.0.pre.beta.1)
       concurrent-ruby (~> 1.0)
       http (~> 4.4.1)
-    listen (3.2.1)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     multipart-post (2.1.1)
+    oga (2.15)
+      ast
+      ruby-ll (~> 2.1)
     public_suffix (4.0.6)
     rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (3.3.5)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    redis (4.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    rspec_junit_formatter (0.3.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
+    ruby-ll (2.1.2)
+      ansi
+      ast
     semantic (1.6.1)
     timecop (0.9.2)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sdk-dynamodb (~> 1.18)
-  bundler (~> 1.17)
-  connection_pool (>= 2.1.2)
-  diplomat (>= 2.0.2)
-  faraday (~> 0.17)
-  ffi (<= 1.12)
+  aws-sdk-dynamodb (~> 1.57)
+  bundler (~> 2.1)
+  connection_pool (~> 2.2.3)
+  diplomat (~> 2.4.2)
   launchdarkly-server-sdk!
-  listen (~> 3.0)
-  redis (~> 3.3.5)
-  rspec (~> 3.2)
-  rspec_junit_formatter (~> 0.3.0)
-  timecop (~> 0.9.1)
+  listen (~> 3.3)
+  oga (~> 2.2)
+  redis (~> 4.2)
+  rspec (~> 3.10)
+  rspec_junit_formatter (~> 0.4)
+  timecop (~> 0.9)
+  webrick (~> 1.7)
 
 BUNDLED WITH
-   1.17.3
+   2.2.3

README.md

@@ -17,7 +17,7 @@ LaunchDarkly overview
 Supported Ruby versions
 -----------------------
 
-This version of the LaunchDarkly SDK has a minimum Ruby version of 2.3.0, or 9.2.0 for JRuby.
+This version of the LaunchDarkly SDK has a minimum Ruby version of 2.5.0, or 9.2.0 for JRuby.
 
 Getting started
 -----------
@@ -55,4 +55,4 @@ About LaunchDarkly
     * [docs.launchdarkly.com](https://docs.launchdarkly.com/  "LaunchDarkly Documentation") for our documentation and SDK reference guides
     * [apidocs.launchdarkly.com](https://apidocs.launchdarkly.com/  "LaunchDarkly API Documentation") for our API documentation
     * [blog.launchdarkly.com](https://blog.launchdarkly.com/  "LaunchDarkly Blog Documentation") for the latest product updates
-    * [Feature Flagging Guide](https://github.com/launchdarkly/featureflags/  "Feature Flagging Guide") for best practices and strategies
+    * [Feature Flagging Guide](https://github.com/launchdarkly/featureflags/  "Feature Flagging Guide") for best practices and strategies

azure-pipelines.yml

@@ -45,7 +45,7 @@ jobs:
           workingDirectory: $(System.DefaultWorkingDirectory)
           script: |
             ruby -v
-            gem install bundler -v 1.17.3
+            gem install bundler
             bundle install
             mkdir rspec
             bundle exec rspec --format progress --format RspecJunitFormatter -o ./rspec/rspec.xml spec

launchdarkly-server-sdk.gemspec

@@ -19,25 +19,23 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_development_dependency "aws-sdk-dynamodb", "~> 1.18"
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "diplomat", ">= 2.0.2"
-  spec.add_development_dependency "redis", "~> 3.3.5"
-  spec.add_development_dependency "connection_pool", ">= 2.1.2"
-  spec.add_development_dependency "rspec_junit_formatter", "~> 0.3.0"
-  spec.add_development_dependency "timecop", "~> 0.9.1"
-  spec.add_development_dependency "listen", "~> 3.0" # see file_data_source.rb
-  # these are transitive dependencies of listen and consul respectively
-  # we constrain them here to make sure the ruby 2.2, 2.3, and 2.4 CI
-  # cases all pass
-  spec.add_development_dependency "ffi", "<= 1.12" # >1.12 doesnt support ruby 2.2
-  spec.add_development_dependency "faraday", "~> 0.17" # >=0.18 doesnt support ruby 2.2
+  spec.add_development_dependency "aws-sdk-dynamodb", "~> 1.57"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rspec", "~> 3.10"
+  spec.add_development_dependency "diplomat", "~> 2.4.2"
+  spec.add_development_dependency "redis", "~> 4.2"
+  spec.add_development_dependency "connection_pool", "~> 2.2.3"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4"
+  spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "listen", "~> 3.3" # see file_data_source.rb
+  spec.add_development_dependency "webrick", "~> 1.7"
+  # required by dynamodb
+  spec.add_development_dependency "oga", "~> 2.2"
 
   spec.add_runtime_dependency "semantic", "~> 1.6"
-  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_runtime_dependency "concurrent-ruby", "~> 1.1"
   spec.add_runtime_dependency "ld-eventsource", "2.0.0.pre.beta.1"
 
   # lock json to 2.3.x as ruby libraries often remove

lib/ldclient-rb/impl/integrations/redis_impl.rb

@@ -114,9 +114,7 @@ def upsert_internal(kind, new_item)
           end
 
           def initialized_internal?
-            with_connection do |redis|
-              redis.respond_to?(:exists?) ? redis.exists?(inited_key) : redis.exists(inited_key)
-            end
+            with_connection { |redis| redis.exists?(inited_key) }
           end
 
           def stop

spec/launchdarkly-server-sdk_spec.rb

@@ -4,7 +4,7 @@
 describe LaunchDarkly do
   it "can be automatically loaded by Bundler.require" do
     ldclient_loaded =
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         Kernel.system("ruby", "./spec/launchdarkly-server-sdk_spec_autoloadtest.rb")
       end