dapr 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4ae91a840e9e8bd3f0690d7df96ca49ffc67bab2335d875f58742aa7559d26
-  data.tar.gz: 05e4355dbc51c83e9e05a3eff5e835441d2c48d8f4727a23acf1ff73624a5b4d
+  metadata.gz: e9f4294d26869aed36aea295650b7f6ffcf15173812fbc76679dc361093a6a2d
+  data.tar.gz: c068d94e60edbe17b2120d7393af514a497474dd980b587da784fdb467a33bfb
 SHA512:
-  metadata.gz: 32f912473a0eb40cf9790d2a5e5816f1a3c273695e5bffb2d014cb60506ab83f3f1eba8c0a81a4d280162559df5f2ff5fae258d19dd46881042cedc9b6e78229
-  data.tar.gz: a0df7ede1af8f9700efd0a98ec3432dec5284a52e7011a92fbe90897954a52a1517be382b2a5b88ae16e0952795303bc29134e89ec9a89bf72b108299ca4e316
+  metadata.gz: 8055172e840a45c368f1444a38df0f417c25ab2b3763b04718572a018cb78df8943fc8c9f08f3d7197abaa863000a33615ec1d496e03f23b8a1391d7d71c664e
+  data.tar.gz: 8e4a426aa303f960c27903b42bf145b52e73398090de48736eb9503ced92f5dc08d9a980fad5fb021a323163feef46fedf360d7437f064956fd2c9d8c0eb6e3f

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.2.6"
+  ".": "0.2.7"
 }

data/.version.txt

@@ -1 +1 @@
-0.2.6
+0.2.7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [0.2.7](https://github.com/rubyists/dapr-ruby-client/compare/v0.2.6...v0.2.7) (2024-06-03)
+
+
+### Features
+
+* **lock:** Release distributed lock component ([#47](https://github.com/rubyists/dapr-ruby-client/issues/47)) ([706d6d5](https://github.com/rubyists/dapr-ruby-client/commit/706d6d58e93c70a25db56ae8bf94975e36963509))
+
 ## [0.2.6](https://github.com/rubyists/dapr-ruby-client/compare/v0.2.5...v0.2.6) (2024-06-03)
 
 

data/Readme.adoc

@@ -137,6 +137,14 @@ value = Rubyists::Dapr::Client::Configuration.get('TEST_KEY')
 
 Implementation of {distributed-lock-block}
 
+[source,ruby]
+----
+require 'dapr/client/lock'
+lock = Rubyists::Dapr::Client::Lock.acquire('TEST_LOCK')
+... do_important_stuff ...
+lock.unlock!
+----
+
 === Workflow
 
 Implementation of {workflow-block}

data/ci/build_image

@@ -0,0 +1,248 @@
+#!/usr/bin/env bash
+
+if readlink -f . >/dev/null 2>&1 # {{{ makes readlink work on mac
+then
+    readlink=readlink
+else
+    if greadlink -f . >/dev/null 2>&1
+    then
+        readlink=greadlink
+    else
+        printf "You must install greadlink to use this (brew install coreutils)\n" >&2
+    fi
+fi # }}}
+
+# Set here to the full path to this script
+me=${BASH_SOURCE[0]}
+[ -L "$me" ] && me=$($readlink -f "$me")
+here=$(cd "$(dirname "$me")" && pwd)
+just_me=$(basename "$me")
+
+repo_top=$(git rev-parse --show-toplevel)
+cd "$repo_top" || {
+    printf "Could not cd to %s\n" "$repo_top" >&2
+    exit 1
+}
+
+base_dir=$(basename "$(pwd)")
+: "${IMAGE_NAME:=$base_dir}"
+: "${BUILD_CONTEXT:=$(pwd)}"
+: "${LICENSE:=MIT}"
+: "${REGISTRY:=ghcr.io}"
+
+usage() { # {{{
+    cat <<-EOT
+    Build an image, optionally pushing it to the registry
+
+    Usage: $0 <options> <image_tag>
+        Options:
+            -c CONTAINERFILE  Path to the containerfile (default: ./oci/Containerfile)
+            -C CONTEXT        Build context (default: $BUILD_CONTEXT)
+            -i NAME           Name of the image (default: $IMAGE_NAME)
+            -l LICENSE        License of the image (default: $LICENSE)
+            -r REGISTRY       Registry to push the image to when -p is given (default: $REGISTRY)
+            -p                Push the image to the registry
+            -h                Show help / usage
+EOT
+} # }}}
+
+die() { # {{{
+    local -i code
+    code=$1
+    shift
+    error "$*"
+    printf "\n" >&2
+    usage >&2
+    # shellcheck disable=SC2086
+    exit $code
+} # }}}
+
+## Logging functions # {{{
+log() { # {{{
+    printf "%s [%s] <%s> %s\n" "$(date '+%Y-%m-%d %H:%M:%S.%6N')" "$$" "${just_me:-$0}" "$*"
+} # }}}
+
+debug() { # {{{
+    [ $verbose -lt 2 ] && return 0
+    # shellcheck disable=SC2059
+    log_line=$(printf "$@")
+    log "[DEBUG] $log_line" >&2
+} # }}}
+
+warn() { # {{{
+    # shellcheck disable=SC2059
+    log_line=$(printf "$@")
+    log "[WARN] $log_line" >&2
+} # }}}
+
+error() { # {{{
+    # shellcheck disable=SC2059
+    log_line=$(printf "$@")
+    log "[ERROR] $log_line" >&2
+} # }}}
+
+info() { # {{{
+    [ $verbose -lt 1 ] && return 0
+    # shellcheck disable=SC2059
+    log_line=$(printf "$@")
+    log "[INFO] $log_line" >&2
+} # }}}
+# }}}
+
+push=0
+verbose=0
+while getopts :hpvc:C:i:l:r: opt # {{{
+do
+    case $opt in
+        c)
+            CONTAINERFILE=$OPTARG
+            ;;
+        C)
+            BUILD_CONTEXT=$OPTARG
+            ;;
+        i)
+            IMAGE_NAME=$OPTARG
+            ;;
+        l)
+            LICENSE=$OPTARG
+            ;;
+        r)
+            REGISTRY=$OPTARG
+            ;;
+        p)
+            push=1
+            ;;
+        v)
+            verbose=$((verbose + 1))
+            ;;
+        h)
+            usage
+            exit
+            ;;
+        :)
+            printf "Option %s requires an argument\n" "$OPTARG" >&2
+            usage >&2
+            exit 28
+            ;;
+        ?)
+            printf "Invalid option '%s'\n" "$OPTARG" >&2
+            usage >&2
+            exit 27
+            ;;
+    esac
+done # }}}
+shift $((OPTIND-1))
+
+tag=$1
+[ -z "$tag" ] && die 1 "Missing image tag"
+shift
+
+# Check for extra argument
+if [ $# -gt 0 ]; then
+    # If we have the special argument '--' we shift it away, otherwise we die
+    [ "$1" != '--' ] && die 2 "Too many arguments"
+    # Once this is shifted away, the rest of the arguments are passed to the build command, below
+    shift
+fi
+
+
+if [ -z "$CONTAINERFILE" ]; then
+    printf "No containerfile specified, looking for default locations\n"
+    for containerfile in Containerfile Dockerfile
+    do
+        if [ -f ./oci/"$containerfile" ]; then
+            debug "Found ./oci/%s\n" "$containerfile"
+            containerfile=./oci/"$containerfile"
+            break
+        fi
+        if [ -f "$containerfile" ]; then
+            debug "Found %s\n" "$containerfile"
+            break
+        fi
+    done
+else
+    [ -f "$CONTAINERFILE" ] || die 3 "Containerfile '$CONTAINERFILE' not found"
+    debug "Using containerfile %s\n" "$CONTAINERFILE"
+    containerfile=$CONTAINERFILE
+fi
+
+[ -f "$containerfile" ] || die 4 "No containerfile found"
+
+[ -d "$BUILD_CONTEXT" ] || die 5 "Build context '$BUILD_CONTEXT' not found"
+
+debug 'Building image from %s in in %s\n' "$containerfile" "$here"
+# Build the image
+if command -v podman 2>/dev/null
+then
+    runtime=podman
+elif command -v docker 2>/dev/null
+then
+    runtime=docker
+else
+    die 6 "No container runtime found"
+fi
+
+revision=$(git rev-parse HEAD)
+shortref=$(git rev-parse --short "$revision")
+repo_url=$(git remote get-url origin)
+if [ -z "$repo_url" ]
+then
+    die 7 "No remote found"
+fi
+if [[ $repo_url == *github.com/* ]]
+then
+    owner_and_repo=${repo_url#*github.com/}
+else
+    owner_and_repo=${repo_url##*:}
+fi
+# Get rid of the trailing .git
+service=$(basename "$owner_and_repo" .git)
+owner=$(dirname "$owner_and_repo")
+
+# Pass any extra arguments to the build command ("$@" contains the rest of the arguments)
+$runtime build --tag   "$IMAGE_NAME:$tag" "$@" \
+               --label org.opencontainers.image.created="$(date --utc --iso-8601=seconds)" \
+               --label org.opencontainers.image.description="Image for $service" \
+               --label org.opencontainers.image.licenses="$LICENSE" \
+               --label org.opencontainers.image.revision="$revision" \
+               --label org.opencontainers.image.url="$repo_url" \
+               --label org.opencontainers.image.title="$IMAGE_NAME" \
+               --label org.opencontainers.image.source="Generated by gitops_tools/bin/build_image ($USER@$HOSTNAME)" \
+               --label org.opencontainers.image.version="$tag" \
+               --label shortref="$shortref" \
+               -f "$containerfile" "$BUILD_CONTEXT" || die 8 "Failed to build image"
+
+[ $push -eq 1 ] || exit 0
+if ! $runtime login --get-login "$REGISTRY" >/dev/null 2>/dev/null
+then
+    printf "Not logged in to '%s', trying to login\n" "$REGISTRY" >&2
+    [ -z "$GITHUB_TOKEN" ] && die 9 "No GITHUB_TOKEN set, cannot login"
+    printf "%s" "$GITHUB_TOKEN" | $runtime login -u "$GITHUB_TOKEN" --password-stdin "$REGISTRY" || die 10 "Failed to login to $REGISTRY"
+fi
+
+tags=($(echo "$tag" | awk -F'.' 'NF==3{print $1"."$2"."$3" "$1"."$2" "$1} NF==2{print $1"."$2" "$1} NF==1{print $1}'))
+for t in "${tags[@]}"
+do
+    proper_tag=$IMAGE_NAME:$tag
+    new_tag=$IMAGE_NAME:$t
+    debug "Tagging %s as %s\n" "$proper_tag" "$new_tag"
+    if [ "$runtime" = "podman" ]
+    then
+        if [ "$proper_tag" != "$new_tag" ]
+        then
+            podman tag "$proper_tag" "$new_tag" || die 11 "Failed to tag image $proper_tag as $new_tag"
+        fi
+        registry_image_name="$REGISTRY/$owner/$new_tag"
+        podman push "$new_tag" "$registry_image_name" || die 12 "Failed to push image $new_tag to $registry_image_name"
+    else
+        registry_image_name="$REGISTRY/$owner/$new_tag"
+        proper_registry_name="$REGISTRY/$owner/$proper_tag"
+        if [ "$proper_tag" != "$new_tag" ]
+        then
+            docker tag "$proper_registry_name" "$registry_image_name" || die 13 "Failed to tag image $proper_tag as $new_tag"
+        fi
+        docker push "$registry_image_name" || die 14 "Failed to push image $new_tag to $registry_image_name"
+    fi
+done
+
+# vim: set foldmethod=marker et ts=4 sts=4 sw=4 ft=bash :

data/lib/dapr/version.rb

@@ -3,7 +3,7 @@
 module Rubyists
   module Dapr
     # x-release-please-start-version
-    VERSION = '0.2.6'
+    VERSION = '0.2.7'
     # x-release-please-end
   end
 end

data/oci/Containerfile

@@ -35,7 +35,7 @@ RUN rm -rf node_modules tmp/cache app/assets vendor/assets spec
 ############### Build step done ###############
 ARG ALPINE_VERSION=3.19
 ARG RUBY_VERSION=3.3.1
-FROM docker.io/$RUBY_VERSION-alpine$ALPINE_VERSION
+FROM docker.io/ruby:$RUBY_VERSION-alpine$ALPINE_VERSION
 
 ARG APP_ROOT=/app
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapr
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Tj (bougyman) Vanderpoel
@@ -55,6 +55,7 @@ files:
 - CHANGELOG.md
 - Rakefile
 - Readme.adoc
+- ci/build_image
 - ci/publish-gem.sh
 - coverage/coverage.json
 - lib/dapr.rb