Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2025-02-16 12:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

🔍 Upgrade only to newer versions

Browse source
This commit is contained in:
Chris Araman 2021-04-16 16:47:13 -07:00
parent 2891fe985e
commit e6dd54b227
No known key found for this signature in database
GPG key ID: BB4499D9E11B61E0
5 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MasKit/Commands/Outdated.swift
View file

@ -36,7 +36,7 @@ public struct OutdatedCommand: CommandProtocol {
for installedApp in appLibrary.installedApps {
do {
if let storeApp = try storeSearch.lookup(app: installedApp.itemIdentifier.intValue) {
if installedApp.bundleVersion != storeApp.version {
if installedApp.isOutdatedWhenComparedTo(storeApp) {
print(
"""
\(installedApp.itemIdentifier) \(installedApp.appName) \

2
MasKit/Commands/Upgrade.swift
View file

@ -49,7 +49,7 @@ public struct UpgradeCommand: CommandProtocol {
.compactMap { (installedApp: SoftwareProduct) -> SoftwareProduct? in
// only upgrade apps whose local version differs from the store version
if let storeApp = try storeSearch.lookup(app: installedApp.itemIdentifier.intValue) {
return storeApp.version != installedApp.bundleVersion
return installedApp.isOutdatedWhenComparedTo(storeApp)
? installedApp
: nil
} else {

16
MasKit/Models/SoftwareProduct.swift
View file

@ -7,6 +7,7 @@
//
import Foundation
import Version
/// Protocol describing the members of CKSoftwareProduct used throughout MasKit.
public protocol SoftwareProduct {
@ -31,4 +32,19 @@ extension SoftwareProduct {
var appNameOrBbundleIdentifier: String {
appName == "" ? bundleIdentifier : appName
}
func isOutdatedWhenComparedTo(_ storeApp: SearchResult) -> Bool {
// The App Store does not enforce semantic versioning, but we assume most apps follow versioning
// schemes that increase numerically over time.
guard let semanticBundleVersion = Version(tolerant: bundleVersion),
let semanticAppStoreVersion = Version(tolerant: storeApp.version)
else {
// If a version string can't be parsed as a Semantic Version, our best effort is to check for
// equality. The only version that matters is the one in the App Store.
// https://semver.org
return bundleVersion != storeApp.version
}
return semanticBundleVersion < semanticAppStoreVersion
}
}

27
mas-cli.xcodeproj/project.pbxproj
View file

@ -76,6 +76,7 @@
B5DBF81321DEEC7C00F3B151 /* OpenCommandSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBF81221DEEC7C00F3B151 /* OpenCommandSpec.swift */; };
B5DBF81521E02BA900F3B151 /* StoreSearchMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBF81421E02BA900F3B151 /* StoreSearchMock.swift */; };
B5DBF81721E02E3400F3B151 /* OpenSystemCommandMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBF81621E02E3400F3B151 /* OpenSystemCommandMock.swift */; };
C56C4FF5262A50F5004F37EB /* Version in Frameworks */ = {isa = PBXBuildFile; productRef = C56C4FF4262A50F5004F37EB /* Version */; };
ED031A7C1B5127C00097692E /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED031A7B1B5127C00097692E /* main.swift */; };
F80B27B62611116A00A285C9 /* AppListFormatterSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80B27B52611116A00A285C9 /* AppListFormatterSpec.swift */; };
F80B27BA2611118E00A285C9 /* AppListFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80B27B92611118E00A285C9 /* AppListFormatter.swift */; };
@ -336,6 +337,7 @@
buildActionMask = 2147483647;
files = (
F83213A22173DC13008BA8A0 /* Commandant.framework in Frameworks */,
C56C4FF5262A50F5004F37EB /* Version in Frameworks */,
B5552928219A1BB900ACB4CA /* CommerceKit.framework in Frameworks */,
B5552929219A1BC700ACB4CA /* StoreFoundation.framework in Frameworks */,
);
@ -790,6 +792,9 @@
dependencies = (
);
name = MasKit;
packageProductDependencies = (
C56C4FF4262A50F5004F37EB /* Version */,
);
productName = MasKit;
productReference = F8FB715220F2B41400F56FDC /* MasKit.framework */;
productType = "com.apple.product-type.framework";
@ -850,6 +855,9 @@
Base,
);
mainGroup = ED031A6F1B5127C00097692E;
packageReferences = (
C56C4FF0262A4ED0004F37EB /* XCRemoteSwiftPackageReference "Version" */,
);
productRefGroup = ED031A791B5127C00097692E /* Products */;
projectDirPath = "";
projectRoot = "";
@ -1398,6 +1406,25 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
C56C4FF0262A4ED0004F37EB /* XCRemoteSwiftPackageReference "Version" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/mxcl/Version.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
C56C4FF4262A50F5004F37EB /* Version */ = {
isa = XCSwiftPackageProductDependency;
package = C56C4FF0262A4ED0004F37EB /* XCRemoteSwiftPackageReference "Version" */;
productName = Version;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = ED031A701B5127C00097692E /* Project object */;
}

16
mas.xcworkspace/xcshareddata/swiftpm/Package.resolved Normal file
View file

@ -0,0 +1,16 @@
{
"object": {
"pins": [
{
"package": "Version",
"repositoryURL": "https://github.com/mxcl/Version.git",
"state": {
"branch": null,
"revision": "a94b48f36763c05629fc102837398505032dead9",
"version": "2.0.0"
}
}
]
},
"version": 1
}