Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore Command tests #77

Merged
merged 3 commits into from
Dec 6, 2021
Merged

Restore Command tests #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8679f95
test: test restore command
m-s- Nov 26, 2021
a4048c7
fix: remove JSON extension in environment config name
m-s- Nov 26, 2021
01d807d
refactor(tests): use Assert.ThrowsException instead of try/catch
m-s- Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions cmf-cli/Handlers/PackageType/PackageTypeHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public abstract class PackageTypeHandler : IPackageTypeHandler
/// Initializes a new instance of the <see cref="PackageTypeHandler" /> class.
/// </summary>
/// <exception cref="CliException"></exception>
public PackageTypeHandler(CmfPackage cmfPackage) : this(cmfPackage, new FileSystem()) { }
public PackageTypeHandler(CmfPackage cmfPackage) : this(cmfPackage, cmfPackage.FileSystem) { }

/// <summary>
/// Initializes a new instance of the <see cref="PackageTypeHandler" /> class.
Expand Down Expand Up @@ -563,7 +563,7 @@ public virtual void RestoreDependencies(Uri[] repoUris)
Log.Debug($"Found package {identifier} at {dependency.CmfPackage.Uri.AbsoluteUri}");
if (dependency.CmfPackage.Uri.IsDirectory())
{
using (FileStream zipToOpen = new(dependency.CmfPackage.Uri.LocalPath, FileMode.Open))
using (Stream zipToOpen = this.fileSystem.FileStream.Create(dependency.CmfPackage.Uri.LocalPath, FileMode.Open))
{
using (ZipArchive zip = new(zipToOpen, ZipArchiveMode.Read))
{
Expand All @@ -582,15 +582,16 @@ public virtual void RestoreDependencies(Uri[] repoUris)
continue;
}

if (!File.Exists(target)) // TODO: support overwriting if requested
if (!fileSystem.File.Exists(target)) // TODO: support overwriting if requested
{
var overwrite = false;
Log.Debug($"Extracting {entry.Item1.FullName} to {target}");
if (!string.IsNullOrEmpty(targetDir))
{
Directory.CreateDirectory(targetDir);
fileSystem.Directory.CreateDirectory(targetDir);
}

entry.Item1.ExtractToFile(target);
entry.Item1.ExtractToFile(target, overwrite, fileSystem);
}
else
{
Expand Down
5 changes: 3 additions & 2 deletions cmf-cli/Objects/CmfPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public class CmfPackage : IEquatable<CmfPackage>

#region Internal Properties

internal IFileSystem FileSystem => fileSystem;

/// <summary>
/// Gets the name of the package.
/// </summary>
Expand Down Expand Up @@ -496,8 +498,7 @@ public void LoadDependencies(IEnumerable<Uri> repoUris, bool recurse = false)
var missingRepoDirectories = repoDirectories?.Where(r => r.Exists == false).ToArray();
if (missingRepoDirectories.HasAny())
{
Log.Error($"Some of the provided repositories do not exist: {string.Join(", ", missingRepoDirectories.Select(d => d.FullName))}");
return;
throw new CliException($"Some of the provided repositories do not exist: {string.Join(", ", missingRepoDirectories.Select(d => d.FullName))}");
}
foreach (var dependency in this.Dependencies)
{
Expand Down
Loading