ld-eventsource 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 385c043867b40ba6ddb46cb1c9b62837018b06cb
-  data.tar.gz: a64958fc36954f72b93c59d076ebdfb06787e13e
+SHA256:
+  metadata.gz: 4e0485d46aab9fb8bb9ac32ae49c013dde072d0695372089989a2f5e8799b6de
+  data.tar.gz: 7ca30c7591596b56925da6f157bb2ba39a41eaf8a23679bfd823c05ac83edb81
 SHA512:
-  metadata.gz: 96cc3666962b0009ea86ec049ac1f0cac778c630c33037730007b7fa5eb338fbe779726004f0b63fa9a3bd4f6ad137879d731a3415ec1e2012de193fef609743
-  data.tar.gz: 485e8d424a5a9afb394d780fb06790af17f8bc81f03e7c9a5a2eef391c66cfe7fd006e30317b472150cadc3c73ddae712f75e6444d2e7419020e34e065db99c0
+  metadata.gz: 8a41b9daef952bc55ada55788415d25da1bf5bbfcbd071b52d8f39693132281a654c59cbfb05165af49f189be52bdf579ae130b21a974a67a0d96e239b67861e
+  data.tar.gz: 650358cf13547c6db91e0a793ed45f32bdd6221f0d96224121132e6055453fb88d1977c13657c1c4230894873c90a0c66761865ae8db232bc355326d34fdbd3b

data/.circleci/config.yml

@@ -1,51 +1,39 @@
-version: 2
-
+# This CircleCI configuration was generated by Releaser for a specific release. It is not to be used
+# for regular CI builds. Be aware that rerunning this build may cause it to repeat release actions
+# such as publishing to a package manager. However, it will not perform any Git actions other than
+# reading the repository.
+version: 2.1
 workflows:
-  version: 2
   test:
     jobs:
-      - test-2.5
-      - test-2.6
-      - test-2.7
-      - test-3.0
-      - test-jruby-9.2
-
-ruby-docker-template: &ruby-docker-template
-  steps:
-    - checkout
-    - run: |
-        if [[ $CIRCLE_JOB == test-jruby* ]]; then
-          gem install jruby-openssl; # required by bundler, no effect on Ruby MRI
-        fi
-    - run: sudo apt-get update -y && sudo apt-get install -y build-essential
-    - run: ruby -v
-    - run: gem install bundler -v "~> 1.17"
-    - run: bundle install
-    - run: mkdir ./rspec
-    - run: bundle exec rspec --format progress --format RspecJunitFormatter -o ./rspec/rspec.xml spec
-    - store_test_results:
-        path: ./rspec
-    - store_artifacts:
-        path: ./rspec
-
+      - release_linux:
+          context: org-global
 jobs:
-  test-2.5:
-    <<: *ruby-docker-template
+  release_linux:
     docker:
-      - image: circleci/ruby:2.5
-  test-2.6:
-    <<: *ruby-docker-template
-    docker:
-      - image: circleci/ruby:2.6
-  test-2.7:
-    <<: *ruby-docker-template
-    docker:
-      - image: circleci/ruby:2.7
-  test-3.0:
-    <<: *ruby-docker-template
-    docker:
-      - image: circleci/ruby:3.0
-  test-jruby-9.2:
-    <<: *ruby-docker-template
-    docker:
-      - image: circleci/jruby:9.2-jdk
+      - image: cimg/ruby:2.5
+    environment:
+      LD_RELEASE_CIRCLECI_TYPE: linux
+      LD_RELEASE_BRANCH: "master"
+      LD_RELEASE_CIRCLECI_BRANCH: ""
+      LD_RELEASE_DOCS_GITHUB_PAGES: ""
+      LD_RELEASE_DOCS_TITLE: ""
+      LD_RELEASE_PROJECT: "ruby-eventsource"
+      LD_RELEASE_PROJECT_TEMPLATE: "ruby"
+      LD_RELEASE_VERSION: "2.0.1"
+    steps:
+      - checkout
+      - run:
+          name: "Releaser: prepare"
+          command: .ldrelease/circleci/mac/execute.sh prepare .ldrelease/circleci/template/prepare.sh
+      - run:
+          name: "Releaser: build"
+          command: .ldrelease/circleci/mac/execute.sh build .ldrelease/circleci/template/build.sh
+      - run:
+          name: "Releaser: test"
+          command: .ldrelease/circleci/mac/execute.sh test .ldrelease/circleci/template/test.sh
+      - run:
+          name: "Releaser: publish"
+          command: .ldrelease/circleci/mac/execute.sh publish .ldrelease/circleci/template/publish.sh
+      - store_artifacts:
+          path: artifacts

data/.gitignore

@@ -13,4 +13,5 @@
 mkmf.log
 *.gem
 .DS_Store
-rspec
+rspec
+Gemfile.lock

data/.ldrelease/circleci/linux/execute.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -ue
+
+# Performs a delegated release step in a CircleCI Linux container. This mechanism is described
+# in scripts/circleci/README.md. All of the necessary environment variables should already be
+# in the generated CircleCI configuration.
+
+mkdir -p artifacts
+
+export LD_RELEASE_TEMP_DIR=/tmp/project-releaser-temp
+mkdir -p ${LD_RELEASE_TEMP_DIR}
+
+STEP="$1"
+SCRIPT="$2"
+echo
+echo "[${STEP}] executing ${SCRIPT}"
+"./${SCRIPT}"

data/.ldrelease/circleci/mac/execute.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -ue
+
+# Performs a delegated release step in a CircleCI Mac container. This mechanism is described
+# in scripts/circleci/README.md. All of the necessary environment variables should already be
+# in the generated CircleCI configuration.
+
+mkdir -p artifacts
+
+export LD_RELEASE_TEMP_DIR=/tmp/project-releaser-temp
+mkdir -p ${LD_RELEASE_TEMP_DIR}
+
+STEP="$1"
+SCRIPT="$2"
+echo
+echo "[${STEP}] executing ${SCRIPT}"
+"./${SCRIPT}"

data/.ldrelease/circleci/template/build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -ue
+
+# Standard build.sh for Ruby-based projects that publish a gem
+
+echo "Using gem $(gem --version)"
+
+#shellcheck source=/dev/null
+source "$(dirname "$0")/gems-setup.sh"
+
+echo; echo "Installing dependencies"
+${BUNDLER_COMMAND} install
+
+# Build Ruby Gem - this assumes there is a single .gemspec file in the main project directory
+# Note that the gemspec must be able to get the project version either from $LD_RELEASE_VERSION,
+# or from somewhere in the source code that the project-specific update-version.sh has updated.
+echo "Running gem build"
+gem build ./*.gemspec || { echo "gem build failed" >&2; exit 1; }

data/.ldrelease/circleci/template/gems-setup.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# helper script to set GEM_HOME, PATH, and BUNDLER_COMMAND for Ruby - must be sourced, not executed
+
+mkdir -p "${LD_RELEASE_TEMP_DIR}/gems"
+export GEM_HOME="${LD_RELEASE_TEMP_DIR}/gems"
+export PATH="${GEM_HOME}/bin:${PATH}"
+
+# also, determine whether we'll need to run a specific version of Bundler
+
+GEMSPEC_BUNDLER_VERSION=$(sed -n -e "s/.*['\"]bundler['\"], *['\"]\([^'\"]*\)['\"]/\1/p" ./*.gemspec | tr -d ' ')
+if [ -n "${GEMSPEC_BUNDLER_VERSION}" ]; then
+  BUNDLER_COMMAND="bundler _${GEMSPEC_BUNDLER_VERSION}_"
+else
+  BUNDLER_COMMAND="bundler"
+fi

data/.ldrelease/circleci/template/prepare.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -ue
+
+echo "Using gem $(gem --version)"
+
+#shellcheck source=/dev/null
+source "$(dirname "$0")/gems-setup.sh"
+
+# If the gemspec specifies a certain version of bundler, we need to make sure we install that version.
+echo "Installing bundler"
+if [ -n "${GEMSPEC_BUNDLER_VERSION:-}" ]; then
+  GEMSPEC_OPTIONS="-v ${GEMSPEC_BUNDLER_VERSION}"
+else
+  GEMSPEC_OPTIONS=""
+fi
+gem install bundler ${GEMSPEC_OPTIONS} || { echo "installing bundler failed" >&2; exit 1; }

data/.ldrelease/circleci/template/publish.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -ue
+
+# Standard publish.sh for Ruby-based projects - we can assume build.sh has already been run
+
+#shellcheck source=/dev/null
+source "$(dirname "$0")/gems-setup.sh"
+
+# If we're running in CircleCI, the RubyGems credentials will be in an environment
+# variable and should be copied to the variable the gem command expects
+if [ -n "${LD_RELEASE_RUBYGEMS_API_KEY:-}" ]; then
+  export GEM_HOST_API_KEY="${LD_RELEASE_RUBYGEMS_API_KEY}"
+fi
+
+# Since all Releaser builds are clean builds, we can assume that the only .gem file here
+# is the one we just built
+echo "Running gem push"
+gem push ./*.gem || { echo "gem push failed" >&2; exit 1; }

data/.ldrelease/circleci/template/test.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ue
+
+# Standard test.sh for Ruby-based projects
+
+#shellcheck source=/dev/null
+source "$(dirname "$0")/gems-setup.sh"
+
+${BUNDLER_COMMAND} exec rspec spec

data/.ldrelease/circleci/template/update-version.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ue
+
+# Standard update-version.sh for Ruby-based projects - this will work only if the version string
+# is in a source file under lib/ that has a line like his: VERSION = "2.0.0"
+
+"$(dirname "$0")/../update-version-constant.sh" lib '*.rb'

data/.ldrelease/circleci/windows/execute.ps1

@@ -0,0 +1,19 @@
+param(
+    [string]$step,
+    [string]$script
+)
+
+# Performs a delegated release step in a CircleCI Windows container using PowerShell. This
+# mechanism is described in scripts/circleci/README.md. All of the necessary environment
+# variables should already be in the generated CircleCI configuration.
+
+$ErrorActionPreference = "Stop"
+
+New-Item -Path "./artifacts" -ItemType "directory" -Force | Out-Null
+
+$env:LD_RELEASE_TEMP_DIR = "$env:TEMP\project-releaser-temp"
+New-Item -Path $env:LD_RELEASE_TEMP_DIR -ItemType "directory" -Force | Out-Null
+
+Write-Host
+Write-Host "[$step] executing $script"
+& "./$script"

data/.ldrelease/config.yml

@@ -13,5 +13,10 @@ releasableBranches:
   - name: 1.x
     description: 1.x - based on the socketry gem
 
+circleci:
+  linux:
+    image: cimg/ruby:2.5
+    context: org-global
+
 template:
   name: ruby

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to the LaunchDarkly SSE Client for Ruby will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [2.0.1] - 2021-08-10
+### Changed:
+- The dependency version constraint for the `http` gem is now looser: it allows 5.x versions as well as 4.x. The breaking changes in `http` v5.0.0 do not affect `ld-eventsource`.
+- The project's build now uses v2.2.10 of `bundler` due to known vulnerabilities in other versions.
+- `Gemfile.lock` has been removed from source control. As this is a library project, the lockfile never affected application code that used this gem, but only affected the gem's own CI build. It is preferable for the CI build to refer only to the gemspec so that it resolves dependencies the same way an application using this gem would, rather than using pinned dependencies that an application would not use.
+
+## [2.0.0] - 2021-01-26
+### Added:
+- Added a `socket_factory` configuration option which can be used for socket creation by the HTTP client if provided. The value of `socket_factory` must be an object providing an `open(uri, timeout)` method and returning a connected socket.
+
+### Changed:
+- Switched to the `http` gem instead of `socketry` and a custom HTTP client.
+- Dropped support for Ruby < version 2.5
+- Dropped support for JRuby < version 9.2
+
 ## [1.0.3] - 2020-03-17
 ### Fixed:
 - The backoff delay logic for reconnecting after a stream failure was broken so that if a failure occurred after a stream had been active for at least `reconnect_reset_interval` (default 60 seconds), retries would use _no_ delay, potentially causing a flood of requests and a spike in CPU usage.

data/ld-eventsource.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "2.2.10"
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.3.0"
   spec.add_development_dependency "webrick", "~> 1.7"
 
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "http", "~> 4.4.1"
+  spec.add_runtime_dependency "http", ">= 4.4.1", "< 6.0.0"
 end

data/lib/ld-eventsource/version.rb

@@ -1,3 +1,3 @@
 module SSE
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ld-eventsource
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - LaunchDarkly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,22 @@ dependencies:
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 description: LaunchDarkly SSE client for Ruby
 email:
 - team@launchdarkly.com
@@ -103,10 +109,18 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- ".ldrelease/circleci/linux/execute.sh"
+- ".ldrelease/circleci/mac/execute.sh"
+- ".ldrelease/circleci/template/build.sh"
+- ".ldrelease/circleci/template/gems-setup.sh"
+- ".ldrelease/circleci/template/prepare.sh"
+- ".ldrelease/circleci/template/publish.sh"
+- ".ldrelease/circleci/template/test.sh"
+- ".ldrelease/circleci/template/update-version.sh"
+- ".ldrelease/circleci/windows/execute.ps1"
 - ".ldrelease/config.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - ld-eventsource.gemspec
@@ -142,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: LaunchDarkly SSE client

data/Gemfile.lock

@@ -1,67 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ld-eventsource (2.0.0)
-      concurrent-ruby (~> 1.0)
-      http (~> 4.4.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.3)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.14.2)
-    ffi (1.14.2-java)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    http (4.4.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    http-parser (1.2.3)
-      ffi-compiler (>= 1.0, < 2.0)
-    public_suffix (4.0.6)
-    rake (13.0.3)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rspec_junit_formatter (0.3.0)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    unf (0.1.4)
-      unf_ext
-    unf (0.1.4-java)
-    unf_ext (0.0.7.7)
-    webrick (1.7.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  ld-eventsource!
-  rspec (~> 3.2)
-  rspec_junit_formatter (~> 0.3.0)
-  webrick (~> 1.7)
-
-BUNDLED WITH
-   1.17.3