Skip to content

Commit 46a3626

Browse files
committed
Merge branch 'main' into scenario/pr-non-boundary
2 parents c573680 + 0cfc90a commit 46a3626

9 files changed

Lines changed: 376 additions & 31 deletions

File tree

.github/workflows/pr-gate.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,6 @@ jobs:
1717
git fetch --no-tags --prune --depth=1 origin \
1818
+refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
1919
20-
- name: Checkout bear-cli
21-
uses: actions/checkout@v4
22-
with:
23-
repository: ${{ github.repository_owner }}/bear-cli
24-
path: bear-cli
25-
26-
- name: Setup Java
27-
uses: actions/setup-java@v4
28-
with:
29-
distribution: temurin
30-
java-version: '21'
31-
32-
- name: Build and install bear-cli
33-
working-directory: bear-cli
34-
run: |
35-
./gradlew :app:installDist
36-
INSTALL_DIR=$(find /tmp -type d -path '*/bear-cli-build/*/app/install/bear' | sort | tail -n 1)
37-
if [[ -z "${INSTALL_DIR}" ]]; then
38-
echo "unable to locate installDist output" >&2
39-
exit 1
40-
fi
41-
mkdir -p "${GITHUB_WORKSPACE}/.bear/tools"
42-
rm -rf "${GITHUB_WORKSPACE}/.bear/tools/bear-cli"
43-
cp -R "${INSTALL_DIR}" "${GITHUB_WORKSPACE}/.bear/tools/bear-cli"
44-
4520
- name: Run PR gate
4621
run: |
4722
set +e
@@ -50,4 +25,3 @@ jobs:
5025
set -e
5126
grep -E '^(pr-delta:|pr-check:)' pr-gate.log >> "$GITHUB_STEP_SUMMARY" || true
5227
exit $code
53-

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ Given only this repo and a feature request, an agent can:
1515

1616
## Tooling Assumption
1717

18-
Expected local BEAR CLI location:
18+
Committed BEAR CLI bundle (default):
19+
- `tools/bear-cli/bin/bear` (or `.bat` on Windows)
20+
21+
Optional local override:
1922
- `.bear/tools/bear-cli/bin/bear` (or `.bat` on Windows)
2023

2124
`bin/bear.*` also supports `bear` on PATH as a development fallback.

bin/bear.ps1

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,21 @@ param(
55

66
$ErrorActionPreference = 'Stop'
77
$repoRoot = Split-Path -Parent $PSScriptRoot
8+
$vendoredBearBat = Join-Path $repoRoot 'tools/bear-cli/bin/bear.bat'
9+
$vendoredBearSh = Join-Path $repoRoot 'tools/bear-cli/bin/bear'
810
$localBearBat = Join-Path $repoRoot '.bear/tools/bear-cli/bin/bear.bat'
911
$localBearSh = Join-Path $repoRoot '.bear/tools/bear-cli/bin/bear'
1012

13+
if (Test-Path $vendoredBearBat) {
14+
& $vendoredBearBat @BearArgs
15+
exit $LASTEXITCODE
16+
}
17+
18+
if (Test-Path $vendoredBearSh) {
19+
& $vendoredBearSh @BearArgs
20+
exit $LASTEXITCODE
21+
}
22+
1123
if (Test-Path $localBearBat) {
1224
& $localBearBat @BearArgs
1325
exit $LASTEXITCODE
@@ -24,5 +36,5 @@ if ($null -ne $globalBear) {
2436
exit $LASTEXITCODE
2537
}
2638

27-
[Console]::Error.WriteLine('bear wrapper: missing BEAR CLI. Expected .bear/tools/bear-cli/bin/bear(.bat) or bear on PATH.')
28-
exit 127
39+
[Console]::Error.WriteLine('bear wrapper: missing BEAR CLI. Expected tools/bear-cli/bin/bear(.bat), .bear/tools/bear-cli/bin/bear(.bat), or bear on PATH.')
40+
exit 127

bin/bear.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,21 @@ set -euo pipefail
33

44
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
55
REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
6+
VENDORED_BEAR="${REPO_ROOT}/tools/bear-cli/bin/bear"
7+
VENDORED_BEAR_BAT="${REPO_ROOT}/tools/bear-cli/bin/bear.bat"
68
LOCAL_BEAR="${REPO_ROOT}/.bear/tools/bear-cli/bin/bear"
79
LOCAL_BEAR_BAT="${REPO_ROOT}/.bear/tools/bear-cli/bin/bear.bat"
810

11+
if [[ -x "${VENDORED_BEAR}" ]]; then
12+
"${VENDORED_BEAR}" "$@"
13+
exit $?
14+
fi
15+
16+
if [[ -f "${VENDORED_BEAR_BAT}" ]]; then
17+
"${VENDORED_BEAR_BAT}" "$@"
18+
exit $?
19+
fi
20+
921
if [[ -x "${LOCAL_BEAR}" ]]; then
1022
"${LOCAL_BEAR}" "$@"
1123
exit $?
@@ -21,5 +33,5 @@ if command -v bear >/dev/null 2>&1; then
2133
exit $?
2234
fi
2335

24-
echo "bear wrapper: missing BEAR CLI. Expected .bear/tools/bear-cli/bin/bear(.bat) or bear on PATH." >&2
25-
exit 127
36+
echo "bear wrapper: missing BEAR CLI. Expected tools/bear-cli/bin/bear(.bat), .bear/tools/bear-cli/bin/bear(.bat), or bear on PATH." >&2
37+
exit 127

tools/bear-cli/bin/bear

Lines changed: 250 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,250 @@
1+
#!/bin/sh
2+
3+
#
4+
# Copyright © 2015-2021 the original authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
20+
21+
##############################################################################
22+
#
23+
# bear start up script for POSIX generated by Gradle.
24+
#
25+
# Important for running:
26+
#
27+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
28+
# noncompliant, but you have some other compliant shell such as ksh or
29+
# bash, then to run this script, type that shell name before the whole
30+
# command line, like:
31+
#
32+
# ksh bear
33+
#
34+
# Busybox and similar reduced shells will NOT work, because this script
35+
# requires all of these POSIX shell features:
36+
# * functions;
37+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
38+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
39+
# * compound commands having a testable exit status, especially «case»;
40+
# * various built-in commands including «command», «set», and «ulimit».
41+
#
42+
# Important for patching:
43+
#
44+
# (2) This script targets any POSIX shell, so it avoids extensions provided
45+
# by Bash, Ksh, etc; in particular arrays are avoided.
46+
#
47+
# The "traditional" practice of packing multiple parameters into a
48+
# space-separated string is a well documented source of bugs and security
49+
# problems, so this is (mostly) avoided, by progressively accumulating
50+
# options in "$@", and eventually passing that to Java.
51+
#
52+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
53+
# and BEAR_OPTS) rely on word-splitting, this is performed explicitly;
54+
# see the in-line comments for details.
55+
#
56+
# There are tweaks for specific operating systems such as AIX, CygWin,
57+
# Darwin, MinGW, and NonStop.
58+
#
59+
# (3) This script is generated from the Groovy template
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
61+
# within the Gradle project.
62+
#
63+
# You can find Gradle at https://github.com/gradle/gradle/.
64+
#
65+
##############################################################################
66+
67+
# Attempt to set APP_HOME
68+
69+
# Resolve links: $0 may be a link
70+
app_path=$0
71+
72+
# Need this for daisy-chained symlinks.
73+
while
74+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
75+
[ -h "$app_path" ]
76+
do
77+
ls=$( ls -ld "$app_path" )
78+
link=${ls#*' -> '}
79+
case $link in #(
80+
/*) app_path=$link ;; #(
81+
*) app_path=$APP_HOME$link ;;
82+
esac
83+
done
84+
85+
# This is normally unused
86+
# shellcheck disable=SC2034
87+
APP_BASE_NAME=${0##*/}
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}.." > /dev/null && printf '%s\n' "$PWD" ) || exit
90+
91+
# Use the maximum available, or set MAX_FD != -1 to use that value.
92+
MAX_FD=maximum
93+
94+
warn () {
95+
echo "$*"
96+
} >&2
97+
98+
die () {
99+
echo
100+
echo "$*"
101+
echo
102+
exit 1
103+
} >&2
104+
105+
# OS specific support (must be 'true' or 'false').
106+
cygwin=false
107+
msys=false
108+
darwin=false
109+
nonstop=false
110+
case "$( uname )" in #(
111+
CYGWIN* ) cygwin=true ;; #(
112+
Darwin* ) darwin=true ;; #(
113+
MSYS* | MINGW* ) msys=true ;; #(
114+
NONSTOP* ) nonstop=true ;;
115+
esac
116+
117+
CLASSPATH=$APP_HOME/lib/app-0.1.0-SNAPSHOT.jar:$APP_HOME/lib/kernel-0.1.0-SNAPSHOT.jar:$APP_HOME/lib/snakeyaml-2.2.jar
118+
119+
120+
# Determine the Java command to use to start the JVM.
121+
if [ -n "$JAVA_HOME" ] ; then
122+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
123+
# IBM's JDK on AIX uses strange locations for the executables
124+
JAVACMD=$JAVA_HOME/jre/sh/java
125+
else
126+
JAVACMD=$JAVA_HOME/bin/java
127+
fi
128+
if [ ! -x "$JAVACMD" ] ; then
129+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
130+
131+
Please set the JAVA_HOME variable in your environment to match the
132+
location of your Java installation."
133+
fi
134+
else
135+
JAVACMD=java
136+
if ! command -v java >/dev/null 2>&1
137+
then
138+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
139+
140+
Please set the JAVA_HOME variable in your environment to match the
141+
location of your Java installation."
142+
fi
143+
fi
144+
145+
# Increase the maximum file descriptors if we can.
146+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
147+
case $MAX_FD in #(
148+
max*)
149+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
150+
# shellcheck disable=SC2039,SC3045
151+
MAX_FD=$( ulimit -H -n ) ||
152+
warn "Could not query maximum file descriptor limit"
153+
esac
154+
case $MAX_FD in #(
155+
'' | soft) :;; #(
156+
*)
157+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
158+
# shellcheck disable=SC2039,SC3045
159+
ulimit -n "$MAX_FD" ||
160+
warn "Could not set maximum file descriptor limit to $MAX_FD"
161+
esac
162+
fi
163+
164+
# Collect all arguments for the java command, stacking in reverse order:
165+
# * args from the command line
166+
# * the main class name
167+
# * -classpath
168+
# * -D...appname settings
169+
# * --module-path (only if needed)
170+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and BEAR_OPTS environment variables.
171+
172+
# For Cygwin or MSYS, switch paths to Windows format before running java
173+
if "$cygwin" || "$msys" ; then
174+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176+
177+
JAVACMD=$( cygpath --unix "$JAVACMD" )
178+
179+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
180+
for arg do
181+
if
182+
case $arg in #(
183+
-*) false ;; # don't mess with options #(
184+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
185+
[ -e "$t" ] ;; #(
186+
*) false ;;
187+
esac
188+
then
189+
arg=$( cygpath --path --ignore --mixed "$arg" )
190+
fi
191+
# Roll the args list around exactly as many times as the number of
192+
# args, so each arg winds up back in the position where it started, but
193+
# possibly modified.
194+
#
195+
# NB: a `for` loop captures its iteration list before it begins, so
196+
# changing the positional parameters here affects neither the number of
197+
# iterations, nor the values presented in `arg`.
198+
shift # remove old arg
199+
set -- "$@" "$arg" # push replacement arg
200+
done
201+
fi
202+
203+
204+
# Add default JVM options here. You can also use JAVA_OPTS and BEAR_OPTS to pass JVM options to this script.
205+
DEFAULT_JVM_OPTS=""
206+
207+
# Collect all arguments for the java command:
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209+
# and any embedded shellness will be escaped.
210+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211+
# treated as '${Hostname}' itself on the command line.
212+
213+
set -- \
214+
-classpath "$CLASSPATH" \
215+
com.bear.app.BearCli \
216+
"$@"
217+
218+
# Stop when "xargs" is not available.
219+
if ! command -v xargs >/dev/null 2>&1
220+
then
221+
die "xargs is not available"
222+
fi
223+
224+
# Use "xargs" to parse quoted args.
225+
#
226+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
227+
#
228+
# In Bash we could simply go:
229+
#
230+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
231+
# set -- "${ARGS[@]}" "$@"
232+
#
233+
# but POSIX shell has neither arrays nor command substitution, so instead we
234+
# post-process each arg (as a line of input to sed) to backslash-escape any
235+
# character that might be a shell metacharacter, then use eval to reverse
236+
# that process (while maintaining the separation between arguments), and wrap
237+
# the whole thing up as a single "set" statement.
238+
#
239+
# This will of course break if any of these variables contains a newline or
240+
# an unmatched quote.
241+
#
242+
243+
eval "set -- $(
244+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $BEAR_OPTS" |
245+
xargs -n1 |
246+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
247+
tr '\n' ' '
248+
)" '"$@"'
249+
250+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)