-
Notifications
You must be signed in to change notification settings - Fork 205
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: maintain working directory across script steps (#711)
This PR addresses the issue raised in #470, where the working directory is not maintained across multiple steps in a script. For example, consider the following script: ```yaml fail: steps: - cd packages/ - pwd ``` When running this script using melos run, the output will show the workspace root directory, not the `packages/` directory as expected. This PR introduces a change to ensure that the working directory is properly maintained across multiple steps in a script. The key changes are: - Modify the script execution logic to preserve the working directory from one step to the next. - Add a safeguard to prevent users from mixing && operators with multi-step scripts, as this can lead to unexpected behavior. By running the script defined in the issue with the fix implemented in this PR, the output is now: ```shell ➜ melos git:(bugfix/melos_run_script_steps_working_directory) ✗ melos success Building package executable... Built melos:melos. melos run success └> cd packages/ └> RUNNING melos run success └> cd packages/ └> SUCCESS melos run success └> pwd └> RUNNING /Users/jessicatarra/Development/melos/packages melos run success └> pwd └> SUCCESS ``` ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ `feat` -- New feature (non-breaking change which adds functionality) - [x] 🛠️ `fix` -- Bug fix (non-breaking change which fixes an issue) - [ ] ❌ `!` -- Breaking change (fix or feature that would cause existing functionality to change) - [x] 🧹 `refactor` -- Code refactor - [ ] ✅ `ci` -- Build configuration change - [ ] 📝 `docs` -- Documentation - [ ] 🗑️ `chore` -- Chore
- Loading branch information
1 parent
dc05a52
commit a3784c1
Showing
6 changed files
with
234 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
import 'dart:async'; | ||
import 'dart:convert'; | ||
import 'dart:io'; | ||
|
||
import '../logging.dart'; | ||
import 'environment_variable_key.dart'; | ||
import 'platform.dart'; | ||
import 'utils.dart'; | ||
|
||
class PersistentShell { | ||
PersistentShell({ | ||
required this.logger, | ||
required this.environment, | ||
this.workingDirectory, | ||
}); | ||
|
||
final _isWindows = currentPlatform.isWindows; | ||
final MelosLogger logger; | ||
final Map<String, String> environment; | ||
final String? workingDirectory; | ||
late final Process _process; | ||
Completer<void>? _commandCompleter; | ||
final String _successEndMarker = '__SUCCESS_COMMAND_END__'; | ||
final String _failureEndMarker = '__FAILURE_COMMAND_END__'; | ||
|
||
Future<void> startShell() async { | ||
final executable = _isWindows ? 'cmd.exe' : '/bin/sh'; | ||
|
||
_process = await Process.start( | ||
executable, | ||
[], | ||
workingDirectory: workingDirectory, | ||
environment: { | ||
...environment, | ||
EnvironmentVariableKey.melosTerminalWidth: terminalWidth.toString(), | ||
}, | ||
); | ||
|
||
_listenToProcessStream(_process.stdout); | ||
_listenToProcessStream(_process.stderr, isError: true); | ||
} | ||
|
||
Future<bool> sendCommand(String command) async { | ||
assert(_commandCompleter == null, 'A command is already in progress.'); | ||
_commandCompleter = Completer<void>(); | ||
|
||
final fullCommand = _buildFullCommand(command); | ||
_process.stdin.writeln(fullCommand); | ||
|
||
return _awaitCommandCompletion(); | ||
} | ||
|
||
Future<void> stopShell() async { | ||
await _process.stdin.close(); | ||
final exitCode = await _process.exitCode; | ||
if (exitCode == 0) { | ||
logger.log(successLabel); | ||
return; | ||
} | ||
logger.log(failedLabel); | ||
} | ||
|
||
Future<bool> _awaitCommandCompletion() async { | ||
try { | ||
await _commandCompleter!.future; | ||
return true; | ||
} catch (e) { | ||
return false; | ||
} finally { | ||
_commandCompleter = null; | ||
} | ||
} | ||
|
||
void _listenToProcessStream( | ||
Stream<List<int>> stream, { | ||
bool isError = false, | ||
}) { | ||
stream.listen((event) { | ||
final output = utf8.decode(event, allowMalformed: true); | ||
logger.logAndCompleteBasedOnMarkers( | ||
output, | ||
_successEndMarker, | ||
_failureEndMarker, | ||
_commandCompleter, | ||
isError: isError, | ||
); | ||
}); | ||
} | ||
|
||
String _buildFullCommand(String command) { | ||
final formattedScriptStep = | ||
targetStyle(command.addStepPrefixEmoji().withoutTrailing('\n')); | ||
final echoCommand = 'echo "$formattedScriptStep"'; | ||
final echoSuccess = 'echo $_successEndMarker'; | ||
final echoFailure = 'echo $_failureEndMarker'; | ||
|
||
if (_isWindows) { | ||
return ''' | ||
$echoCommand && $command || VER>NUL && if %ERRORLEVEL% NEQ 0 ($echoFailure) else ($echoSuccess) | ||
'''; | ||
} | ||
|
||
return ''' | ||
$echoCommand && $command || true && if [ \$? -ne 0 ]; | ||
then $echoFailure; else $echoSuccess; fi | ||
'''; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.