haraka-plugin-karma 2.0.3 → 2.1.0

package/.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".release"]
+	path = .release
+	url = https://github.com/msimerson/.release

package/Changes.md

@@ -2,6 +2,18 @@
 #### N.N.N - YYYY-MM-DD
 
 
+### [2.1.0] - 2022-11-29
+
+- fix: in disconnect, call redis_unsub after skip check
+- dep(redis): 4 -> 4.1
+- dep(pi-redis): 2 -> 2.0.5
+
+
+#### 2.0.4 - 2022-05-28
+
+- use .release as submodule
+
+
 #### 2.0.3 - 2022-05-28
 
 - fix: depend directly on redis
@@ -92,3 +104,4 @@
 #### 1.0.2 - 2017-01-24
 
 - use redis.merge_redis_ini()
+[2.1.0]: https://github.com/haraka/haraka-plugin-karma/releases/tag/2.1.0

package/index.js

@@ -684,10 +684,10 @@ exports.increment = function (connection, key, val) {
 exports.hook_disconnect = function (next, connection) {
   const plugin = this
 
-  plugin.redis_unsubscribe(connection)
-
   if (plugin.should_we_skip(connection)) return next()
 
+  plugin.redis_unsubscribe(connection)
+
   const k = connection.results.get('karma')
   if (!k || k.score === undefined) {
     connection.results.add(plugin, {err: 'karma results missing'})
@@ -708,7 +708,7 @@ exports.hook_disconnect = function (next, connection) {
   }
 
   connection.results.add(plugin, {emit: true })
-  return next()
+  next()
 }
 
 exports.get_award_loc_from_note = function (connection, award) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-karma",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "A heuristics scoring and reputation engine for SMTP connections",
   "main": "index.js",
   "scripts": {
@@ -26,8 +26,8 @@
     "address-rfc2821": "*",
     "haraka-constants": ">=1.0.2",
     "haraka-utils": "*",
-    "haraka-plugin-redis": "2",
-    "redis": "4"
+    "haraka-plugin-redis": "2.0.5",
+    "redis": "4.1"
   },
   "devDependencies": {
     "eslint": "8",

package/.release/base.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-branch_is_master()
-{
-    if [ "$(git branch --show-current)" = "master" ]; then
-        return 0
-    fi
-
-    return 1
-}
-
-repo_is_clean()
-{
-    if [ -z "$(git status --porcelain)" ]; then
-        return 0
-    fi
-
-    return 1
-}
-
-assure_repo_is_clean()
-{
-    if repo_is_clean; then return 0; fi
-
-    echo
-    echo "ERROR: Uncommitted changes, cowardly refusing to continue..."
-    echo
-    sleep 2
-
-    git status
-
-    return 1
-}
-
-find_changelog()
-{
-    CHANGELOG=$(ls [Cc][Hh][Aa]*.md)
-    export CHANGELOG
-    #echo "I found your CHANGELOG at: $CHANGELOG"
-}

package/.release/do.sh

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-usage() {
-    echo "do.sh {major | minor | patch}"
-    exit
-}
-
-. .release/base.sh || exit
-
-case "$1" in
-    "major" )
-    ;;
-    "minor" )
-    ;;
-    "patch" )
-    ;;
-    *)
-    usage
-    ;;
-esac
-
-NEW_VERSION=$(npm --no-git-tag-version version "$1")
-
-YMD=$(date "+%Y-%m-%d")
-# echo "Preparing $NEW_VERSION - $YMD"
-
-if branch_is_master; then
-    git checkout -b "release-${NEW_VERSION}"
-fi
-
-update_changes() {
-    tee .release/new.txt <<EO_CHANGE
-
-
-#### ${NEW_VERSION//v} - $YMD
-
--
--
-EO_CHANGE
-
-    sed -i '' -e "/#### N.N.N.*$/r .release/new.txt" "$CHANGELOG"
-    rm .release/new.txt
-
-    if command -v open; then open "$CHANGELOG"; fi
-
-    echo
-    echo "AFTER editing $CHANGELOG, run: .release/push.sh"
-}
-
-find_changelog
-update_changes

package/.release/push.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-. .release/base.sh || exit
-
-if branch_is_master; then
-    echo "ERROR: run the release scripts in a feature branch! (not master)"
-    exit
-fi
-
-VERSION=$(node -e 'console.log(require("./package.json").version)')
-
-find_changelog
-
-git add package.json
-git add "$CHANGELOG"
-
-git commit -m "Release v$VERSION"
-
-git push --set-upstream origin "$(git branch --show-current)"
-
-if command -v gh; then
-    gh pr create
-fi