@beplus/be 0.5.0 → 0.7.0

package/bin/be

@@ -64,7 +64,7 @@ function n_grep() {
 # Setup and state
 #
 
-VERSION="v0.5.0"
+VERSION="v0.7.0"
 
 BE_PREFIX="${BE_PREFIX-/usr/local}"
 BE_PREFIX=${BE_PREFIX%/}
@@ -1082,7 +1082,12 @@ function get_latest_resolved_version() {
     g_target_beplus="${simple_version}"
   else
     # Complicated recognising exact version, KISS and lookup.
+    # display_remote_versions lists newest first and may return several matches
+    # (e.g. 'be 1' -> every 1.x); keep the newest as the single install target.
     g_target_beplus=$(display_remote_versions "$version")
+    local status=$?
+    g_target_beplus="${g_target_beplus%%$'\n'*}"
+    return "${status}"
   fi
 }
 
@@ -1111,6 +1116,9 @@ function display_remote_versions() {
   local version="$1"
   local match='.'
   local match_count="${BE_MAX_REMOTE_MATCHES}"
+  # Restrict to official releases (skip pre-releases and drafts) for the
+  # 'latest'/'current'/'stable' labels.
+  local official_only=
 
   # Transform some labels before processing further.
   if is_beplus_support_version "${version}"; then
@@ -1126,17 +1134,20 @@ function display_remote_versions() {
   elif [[ "${version}" = "stable" ]]; then
     match_count=1
     match='.'
+    official_only=1
   elif [[ "${version}" = "latest" || "${version}" = "current" ]]; then
     match_count=1
     match='.'
+    official_only=1
   elif is_numeric_version "${version}"; then
     version="v${version#v}"
     # Avoid restriction message if exact version
     is_exact_numeric_version "${version}" && match_count=1
     # Quote any dots in version so they are literal for expression
     match="${version//\./\.}"
-    # Avoid 1.2 matching 1.23
-    match="^${match}[^0-9]"
+    # Anchor the end so '1' matches v1.x but not v10.x, while an exact
+    # 'v1.2.3' still matches its bare name (which has no trailing separator).
+    match="^${match}([^0-9]|$)"
   else
     abort "invalid version '$1'"
   fi
@@ -1145,12 +1156,19 @@ function display_remote_versions() {
   # local index_url="https://beplus.s3.amazonaws.com/cli/releases.json"
   local index_url="${BE_RELEASE_INDEX_URL:-https://beplus.s3.amazonaws.com/cli/releases.json}"
 
-  for row in $(do_get_index "${index_url}" | jq -r '.[] | @base64'); do
-    _jq() {
-     echo ${row} | base64 --decode | jq -r ${1}
-    }
-   echo $(_jq '.name')
-  done | awk "NR<=${match_count}" \
+  # Select the release names to consider. GitHub lists the newest release
+  # first, including any in-progress pre-releases (e.g. a v2 published while v1
+  # is still the current release), so 'latest'/'current'/'stable' filter those
+  # out to resolve to the newest official release.
+  local jq_release_filter='.[]'
+  if [[ -n "${official_only}" ]]; then
+    jq_release_filter='.[] | select(.prerelease != true and .draft != true)'
+  fi
+
+  do_get_index "${index_url}" \
+    | jq -r "${jq_release_filter} | .name" \
+    | n_grep -E "${match}" \
+    | awk "NR<=${match_count}" \
     | cut -f 1 \
     | n_grep -E -o '[^v].*'
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@beplus/be",
   "description": "Interactively Manage beplus CLI Versions",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "author": "Igor Lamos <igor@be.plus>",
   "homepage": "https://github.com/beplus/be",
   "bugs": "https://github.com/beplus/be",