Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ember-cli-deploy/ember-cli-deploy-redis
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.1.0
Choose a base ref
...
head repository: ember-cli-deploy/ember-cli-deploy-redis
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 17 commits
  • 7 files changed
  • 3 contributors

Commits on Oct 22, 2021

  1. Copy the full SHA
    ffd2abd View commit details
  2. Merge pull request #128 from ember-cli-deploy/bug/url

    Fix issue where ioredis constructor args were being passed in an unsupported manner
    lukemelia authored Oct 22, 2021
    Copy the full SHA
    1d4e55f View commit details
  3. Copy the full SHA
    7baff0e View commit details
  4. v3.1.1

    lukemelia committed Oct 22, 2021
    Copy the full SHA
    1c1bf07 View commit details

Commits on Nov 29, 2021

  1. Switch to Github Actions for CI

    Dropping Travis and setting up Github Actions for CI
    jrjohnson committed Nov 29, 2021
    Copy the full SHA
    b2f06ac View commit details
  2. Merge pull request #129 from jrjohnson/use-github-action

    Switch to Github Actions for CI
    jrjohnson authored Nov 29, 2021
    Copy the full SHA
    f93fdd6 View commit details

Commits on Dec 6, 2022

  1. Bump decode-uri-component from 0.2.0 to 0.2.2

    Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
    - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
    - [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2)
    
    ---
    updated-dependencies:
    - dependency-name: decode-uri-component
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Dec 6, 2022
    Copy the full SHA
    54a1bcf View commit details

Commits on Jun 4, 2023

  1. Copy the full SHA
    419c80f View commit details
  2. Merge pull request #140 from ember-cli-deploy/update-deps

    Update dependencies and node versions
    lukemelia authored Jun 4, 2023
    Copy the full SHA
    8cf4528 View commit details
  3. Bump express from 4.17.1 to 4.18.2

    Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2.
    - [Release notes](https://github.com/expressjs/express/releases)
    - [Changelog](https://github.com/expressjs/express/blob/master/History.md)
    - [Commits](expressjs/express@4.17.1...4.18.2)
    
    ---
    updated-dependencies:
    - dependency-name: express
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Jun 4, 2023
    Copy the full SHA
    576fcb2 View commit details
  4. Bump node-fetch from 2.6.6 to 2.6.11

    Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.11.
    - [Release notes](https://github.com/node-fetch/node-fetch/releases)
    - [Commits](node-fetch/node-fetch@v2.6.6...v2.6.11)
    
    ---
    updated-dependencies:
    - dependency-name: node-fetch
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Jun 4, 2023
    Copy the full SHA
    2afe8e4 View commit details
  5. Bump follow-redirects from 1.14.5 to 1.15.2

    Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.15.2.
    - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
    - [Commits](follow-redirects/follow-redirects@v1.14.5...v1.15.2)
    
    ---
    updated-dependencies:
    - dependency-name: follow-redirects
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Jun 4, 2023
    Copy the full SHA
    86ac736 View commit details
  6. Merge pull request #142 from ember-cli-deploy/dependabot/npm_and_yarn…

    …/follow-redirects-1.15.2
    
    Bump follow-redirects from 1.14.5 to 1.15.2
    lukemelia authored Jun 4, 2023
    Copy the full SHA
    07b5a0d View commit details
  7. Merge pull request #141 from ember-cli-deploy/dependabot/npm_and_yarn…

    …/node-fetch-2.6.11
    
    Bump node-fetch from 2.6.6 to 2.6.11
    lukemelia authored Jun 4, 2023
    Copy the full SHA
    9bef3d3 View commit details
  8. Merge pull request #139 from ember-cli-deploy/dependabot/npm_and_yarn…

    …/express-4.18.2
    
    Bump express from 4.17.1 to 4.18.2
    lukemelia authored Jun 4, 2023
    Copy the full SHA
    ec972dc View commit details
  9. Merge pull request #138 from ember-cli-deploy/dependabot/npm_and_yarn…

    …/decode-uri-component-0.2.2
    
    Bump decode-uri-component from 0.2.0 to 0.2.2
    lukemelia authored Jun 4, 2023
    Copy the full SHA
    282c84d View commit details
  10. v4.0.0

    lukemelia committed Jun 4, 2023
    Copy the full SHA
    d596a8b View commit details
Showing with 1,943 additions and 2,496 deletions.
  1. +40 −0 .github/workflows/ci.yaml
  2. +0 −26 .travis.yml
  3. +13 −0 CHANGELOG.md
  4. +7 −2 lib/redis.js
  5. +13 −10 package.json
  6. +14 −10 tests/unit/index-test.js
  7. +1,856 −2,448 yarn.lock
40 changes: 40 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Continuous Integration

on:
push:
pull_request:

jobs:
test:
name: Test
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x, 16.x, 18.x, 20.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn install
- run: yarn test

test-floating:
name: Floating Dependencies
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x, 16.x, 18.x, 20.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- name: install dependencies
run: yarn install --no-lockfile
- name: test
run: yarn test
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,19 @@ Version 9 of Highlight.js has reached EOL and is no longer supported.
Please upgrade or ask whatever dependency you are using to upgrade.
https://github.com/highlightjs/highlight.js/issues/2877

Version 9 of Highlight.js has reached EOL and is no longer supported.
Please upgrade or ask whatever dependency you are using to upgrade.
https://github.com/highlightjs/highlight.js/issues/2877

## v4.0.0 (2023-06-04)

#### :boom: Breaking Change
* [#140](https://github.com/ember-cli-deploy/ember-cli-deploy-redis/pull/140) Update dependencies and node versions ([@lukemelia](https://github.com/lukemelia))

#### Committers: 2
- Jon Johnson ([@jrjohnson](https://github.com/jrjohnson))
- Luke Melia ([@lukemelia](https://github.com/lukemelia))

## v3.0.0 (2021-06-08)

#### :boom: Breaking Change
9 changes: 7 additions & 2 deletions lib/redis.js
Original file line number Diff line number Diff line change
@@ -31,8 +31,13 @@ module.exports = CoreObject.extend({
RedisLib = require('ioredis');
}

this._client = new RedisLib(libOptions);

if (libOptions.url) {
let url = libOptions.url;
delete libOptions.url;
this._client = new RedisLib(url, libOptions);
} else {
this._client = new RedisLib(libOptions);
}
this._maxRecentUploads = options.maxRecentUploads || 10;
this._allowOverwrite = options.allowOverwrite || false;
this._activationSuffix = options.activationSuffix || 'current';
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-cli-deploy-redis",
"version": "3.1.0",
"version": "4.0.0",
"description": "Ember CLI Deploy plugin to deploy file(s) into redis.",
"directories": {
"doc": "doc",
@@ -12,29 +12,29 @@
},
"repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-redis",
"engines": {
"node": ">= 12"
"node": "14.* || 16.* || 18.* || >= 20"
},
"author": "Aaron Chambers and the ember-cli-deploy team",
"license": "MIT",
"dependencies": {
"chalk": "^4.1.1",
"core-object": "^3.1.5",
"ember-cli-deploy-plugin": "^0.2.9",
"ioredis": "^4.27.5",
"ioredis": "^4.28.5",
"rsvp": "^4.8.5"
},
"devDependencies": {
"chai": "^4.3.4",
"chai": "^4.3.7",
"chai-as-promised": "^7.1.1",
"ember-cli": "^3.26.1",
"eslint": "^7.28.0",
"glob": "^7.1.7",
"ioredis-mock": "^5.6.0",
"ember-cli": "^3.28.6",
"eslint": "^8.42.0",
"glob": "^10.2.6",
"ioredis-mock": "^5.9.1",
"lerna-changelog": "^1.0.1",
"mocha": "^8.4.0",
"release-it": "14.8.0",
"release-it-lerna-changelog": "^3.1.0",
"sinon": "^11.1.1"
"sinon": "^11.1.2"
},
"keywords": [
"ember-addon",
@@ -43,14 +43,17 @@
"ember-addon": {
"configPath": "tests/dummy/config"
},
"publishConfig": {
"registry": "https://registry.npmjs.org/"
},
"release-it": {
"git": {
"tagName": "v${version}",
"commitMessage": "v${version}",
"pushArgs": "--follow-tags --no-verify"
},
"npm": {
"publish": false
"publish": true
},
"github": {
"release": true
24 changes: 14 additions & 10 deletions tests/unit/index-test.js
Original file line number Diff line number Diff line change
@@ -94,13 +94,16 @@ describe("redis plugin", function() {
plugin.configure(context);
plugin.readConfig("redisDeployClient");

assert.isTrue(
redisLibStub.calledWith({
host: "somehost",
port: 1234,
db: 4,
tls: { rejectUnauthorized: false }
})
assert.deepEqual(
redisLibStub.lastCall.args,
[
{
host: "somehost",
port: 1234,
db: 4,
tls: { rejectUnauthorized: false }
}
]
);
});

@@ -126,8 +129,9 @@ describe("redis plugin", function() {
plugin.configure(context);
plugin.readConfig("redisDeployClient");

assert.isTrue(
redisLibStub.calledWith({ url: "redis://:password@host.amazonaws.com:6379/4" })
assert.deepEqual(
redisLibStub.lastCall.args,
["redis://:password@host.amazonaws.com:6379/4", {}],
);
});

@@ -153,7 +157,7 @@ describe("redis plugin", function() {
plugin.readConfig("redisDeployClient");

assert.isTrue(
redisLibStub.calledWith({ url: "redis://:password@host.amazonaws.com:6379/4" })
redisLibStub.calledWith("redis://:password@host.amazonaws.com:6379/4")
);
});

Loading