Merge branch 'deploy/0.5.6' into productive

Author: Jeehut

CHANGELOG.md

@@ -17,6 +17,22 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Security
 - None.
 
+## [0.5.6] - 2019-04-09
+### Added
+- Adds support for automatically finding schemes named like 'MBProgressHUD Framework tvOS'.
+### Changed
+- Some improvements that make the output information on the console more precise.
+### Deprecated
+- None.
+### Removed
+- None.
+### Fixed
+- Fixes the broken cleanup command of temporary frameworks after completing install.
+- Fixes an issue with multiple targets linking a single framework with schemes named after their platforms.
+- Fixes an issue with different platform specifiers used in scheme names.
+### Security
+- None.
+
 ## [0.5.5] - 2019-04-05
 ### Added
 - None.

CONTRIBUTING.md

@@ -60,7 +60,7 @@ from the file at path `Sources/Accio/main.swift` with something like:
 cli.debugGo(with: "accio update -d /Users/You/path/to/Accio/Demo -v")
 ```
 
-Note that the `-d` option specified the path from within to run Accio and `-v` makes sure the logging level is set to `verbose`.
+Note that the `-d` option specifies the path from within to run Accio and `-v` makes sure the logging level is set to `verbose`.
 
 ### Commit Messages
 

Formula/accio.rb

@@ -1,12 +1,16 @@
 class Accio < Formula
-  desc "Dependency manager driven by SwiftPM for iOS & Co."
+  desc "Dependency manager driven by SwiftPM for iOS/macOS/tvOS/watchOS"
   homepage "https://github.com/JamitLabs/Accio"
-  url "https://github.com/JamitLabs/Accio.git", :tag => "0.5.4", :revision => "6e97a3160d87c391a3bd4d778f903f920354440a"
+  url "https://github.com/JamitLabs/Accio.git", :tag => "0.5.5", :revision => "3b8a910fc4e627c81ffa2e4eafeff450136bb0e4"
   head "https://github.com/JamitLabs/Accio.git"
 
   depends_on :xcode => ["10.2", :build]
 
   def install
     system "make", "install", "prefix=#{prefix}"
   end
+
+  test do
+    system bin/"accio", "version"
+  end
 end

README.md

@@ -13,8 +13,8 @@
              alt="Codebeat Badge">
     </a>
     <a href="https://github.com/JamitLabs/Accio/releases">
-        <img src="https://img.shields.io/badge/Version-0.5.5-blue.svg"
-             alt="Version: 0.5.5">
+        <img src="https://img.shields.io/badge/Version-0.5.6-blue.svg"
+             alt="Version: 0.5.6">
     </a>
     <img src="https://img.shields.io/badge/Swift-5.0-FFAC45.svg"
          alt="Swift: 5.0">
@@ -62,7 +62,7 @@ brew upgrade accio
 
 ## Why should I use this?
 
-**TL;DR**: It's an improvement over Carthage, both regarding supported features & community openness. Also, it's targeted towards official SwiftPM's support for Apple platforms.
+**TL;DR**: It offers many improvements over Carthage, and it's targeted towards official SwiftPM's support for Apple platforms.
 
 <details>
 <summary>
@@ -71,23 +71,19 @@ Detailed Explanation
 
 For developers on Apple platforms there are already well established dependency managers, namely [CocoaPods](https://github.com/CocoaPods/CocoaPods) & [Carthage](https://github.com/Carthage/Carthage). If you like how CocoaPods deals with things, you probably won't ever need to use Accio. It doesn't do anything that CocoaPods doesn't.
 
-But if you are like the many developers who prefer to use Carthage because it's written in Swift (not Ruby) and it doesn't create an Xcode workspace but is rather unintrusive, you might find that Accio solves some of the problems you might have come across with Carthage. Namely:
+But if you are like the many developers who prefer to use Carthage because it's written in Swift (not Ruby) and it doesn't create an Xcode workspace but is rather unintrusive, you might find that Accio solves some of the problems you might have come across with Carthage.
 
-1. Carthage doesn't support cached builds *across projects*
-2. Carthage always builds *all* shared schemes of a dependency
-3. You need to *manually* link/unlink dependencies at two different places (project hierarchy & copy build phase)
+Accios **main advantages** over Carthage as of now are:
+1. Allows to specify *which schemes should be built* and skips all others.   
+([#1227](https://github.com/Carthage/Carthage/issues/1227), [#1990](https://github.com/Carthage/Carthage/pull/1990), [#1616](https://github.com/Carthage/Carthage/pull/1616))
+2. *Automates the linkage & cleanup* of your specified frameworks within your Xcode project.  
+([#1131](https://github.com/Carthage/Carthage/issues/1131), [#2605](https://github.com/Carthage/Carthage/issues/2605), [#145](https://github.com/Carthage/Carthage/issues/145), [#2477](https://github.com/Carthage/Carthage/issues/2477), replaces [Carting](https://github.com/artemnovichkov/Carting))
+3. Automatically uses a device-local cache to *prevent rebuilding* the same commit of a framework *for a different project*.  
+([#2400](https://github.com/Carthage/Carthage/issues/2400), [#2716](https://github.com/Carthage/Carthage/pull/2716))
+4. Has an option to use a *shared cache* path (instead of the device-local cache) within a team so only a single person ever needs to build a specific commit of a dependency and all others in the team can reuse that cached build cutting off build times of the team considerably.  
+(Replaces [Rome](https://github.com/blender/Rome))
 
-While for some users these missing features might not make a huge difference at all, there's also many who really suffer from them. So adding these to Carthage might sound like the most obvious step to take from here and wouldn't need yet another tool. And there actually have been attempts to tackle each of the above issues within Carthage. But Carthage doesn't have a particularly welcoming community so they all failed. Apart from the fact that the project is written in [ReactiveSwift](https://github.com/ReactiveCocoa/ReactiveSwift), which is not bad in itself but still prevents many developers from being able to contribute new features, the main maintainer(s) don't take much responsibility in the concerns of the community. Here's what I mean:
-
-For example problem #2 is tracked in [this](https://github.com/Carthage/Carthage/issues/1227) issue since March 2016 and has many upvotes. But the maintainers seem not to care about it at all. There was even [this PR](https://github.com/Carthage/Carthage/pull/1990)  attempting to fix the issue that was very well received by the community and has (currently) 38 👍s and 14 ❤s. But after ignoring it for a year, the [main maintainers reaction](https://github.com/Carthage/Carthage/pull/1990#issuecomment-407409116) basically was "this is insufficient" and "I don't think we should solve this problem", earning 6 👎s for this comment alone. There was even an earlier approach to fix this issue in [this PR](https://github.com/Carthage/Carthage/pull/1616), but again, the main maintainer [basically said](https://github.com/Carthage/Carthage/pull/1616#issuecomment-271125684) "this is a minor case" and "Apple should fix this in Xcode".
-
-The manual linking problem (#3) was reported several times (for example [here](https://github.com/Carthage/Carthage/issues/1131), [here](https://github.com/Carthage/Carthage/issues/2605) and [here](https://github.com/Carthage/Carthage/issues/145)). While it might have been ["an intentional design decision"](https://github.com/Carthage/Carthage/issues/145#issuecomment-64676821) at the beginning, it is nowadays agreed on to be a bad decision (even by the [main maintainer](https://github.com/Carthage/Carthage/issues/1131#issuecomment-185209513)). But there's no solution to the problem implemented as of now. The most recent attempt to *kind of* fix this was in [this PR](https://github.com/Carthage/Carthage/issues/2477) which was opened in June 2018 and didn't make any real progress since.
-
-Problem #1 is tracked [here](https://github.com/Carthage/Carthage/issues/2400) since April 2018 and was actually tackled recently by [this PR](https://github.com/Carthage/Carthage/pull/2716). But only god knows if and when it will be merged.
-
-The unwelcomingness (is there such a word?) of the Carthage community is so much so that developers tended to rather write another tool than to add the feature to Carthage itself. [Rome](https://github.com/blender/Rome) which attempts to fix the caching problem and [Carting](https://github.com/artemnovichkov/Carting) trying to fix the linking problem are two such examples. But more tools means higher chances that something could break over time and also complicates the configuration for both each developer and also the CI setup.
-
-That's why Accio was designed as the all-in-one tool for any improvements you might need for managing dependencies using Carthage. It's explicitly open for new features from the community as long as they improve aspects of dependency management for the Apple developer community. Also, the implementation of Accio is pretty straight-forward, without the need to learn any reactive programming.
+Accio was designed as the all-in-one tool for any improvements you might need for managing dependencies using Carthage. It's explicitly open for new features from the community as long as they improve aspects of dependency management for the Apple developer community.
 
 Additionally, the core of Accio was designed to use [SwiftPM](https://github.com/apple/swift-package-manager) as much as possible because we think it will at some point replace the need for an extra dependency manager completely. Until that time, making an open source project "Accio compliant" basically means adding a manifest file that exactly matches that of `SwiftPM`. This way Accio is trying to fill the gap between now and the time when Xcode properly supports `SwiftPM` for Apple platform projects (which we guess to be at WWDC 2020) and most Accio compatible projects might already be compatible out of the box when the time comes.
 
@@ -226,7 +222,7 @@ import PackageDescription
 
 let package = Package(
     name: "LibraryName",
-    // platforms: [.iOS("8.0"), .macOS("10.10"), tvOS("9.0"), .watchOS("2.0")],
+    // platforms: [.iOS("8.0"), .macOS("10.10"), .tvOS("9.0"), .watchOS("2.0")],
     products: [
         .library(name: "LibraryName", targets: ["LibraryName"])
     ],
@@ -249,7 +245,7 @@ import PackageDescription
 
 let package = Package(
     name: "LibraryName",
-    // platforms: [.iOS("8.0"), .macOS("10.10"), tvOS("9.0"), .watchOS("2.0")],
+    // platforms: [.iOS("8.0"), .macOS("10.10"), .tvOS("9.0"), .watchOS("2.0")],
     products: [
         .library(name: "LibraryName", targets: ["LibraryName"])
     ],

Sources/Accio/main.swift

@@ -3,7 +3,7 @@ import Foundation
 import SwiftCLI
 
 // MARK: - CLI
-let cli = CLI(name: "accio", version: "0.5.5", description: "A dependency manager driven by SwiftPM that works for iOS/tvOS/watchOS/macOS projects.")
+let cli = CLI(name: "accio", version: "0.5.6", description: "A dependency manager driven by SwiftPM that works for iOS/tvOS/watchOS/macOS projects.")
 
 cli.commands = [InitCommand(), InstallCommand(), UpdateCommand(), CleanCommand(), ClearCacheCommand(), SetSharedCacheCommand()]
 cli.globalOptions.append(contentsOf: GlobalOptions.all)

Sources/AccioKit/Commands/Protocols/DependencyInstaller.swift

@@ -28,7 +28,7 @@ extension DependencyInstaller {
         let checkoutsDirUrl = workingDirectoryUrl.appendingPathComponent("\(Constants.buildPath)/checkouts")
 
         if FileManager.default.fileExists(atPath: checkoutsDirUrl.path) {
-            print("Reverting any changes in previous checkouts ...", level: .info)
+            print("Reverting any changes in the checkouts directory ...", level: .info)
 
             for fileName in try FileManager.default.contentsOfDirectory(atPath: checkoutsDirUrl.path) {
                 let frameworkCheckoutPath: String = checkoutsDirUrl.appendingPathComponent(fileName).path
@@ -75,6 +75,6 @@ extension DependencyInstaller {
         }
 
         try XcodeProjectIntegrationService.shared.handleRemovedTargets(keepingTargets: manifest.appTargets)
-        try bash("rm -rf '\(Constants.temporaryFrameworksUrl)'")
+        try bash("rm -rf '\(Constants.temporaryFrameworksUrl.path)'")
     }
 }

Sources/AccioKit/Models/Platform.swift

@@ -50,4 +50,20 @@ enum Platform: String, CaseIterable {
             return "Mac"
         }
     }
+
+    var specifiers: [String] {
+        switch self {
+        case .iOS:
+            return [rawValue, "iPhone", "iPad"]
+
+        case .macOS:
+            return [rawValue, "OSX", "OS X", "Mac", "Mac OSX", "Mac OS X"]
+
+        case .tvOS:
+            return [rawValue, "Apple TV", "AppleTV"]
+
+        case .watchOS:
+            return [rawValue, "Apple Watch", "AppleWatch"]
+        }
+    }
 }

Sources/AccioKit/Services/CarthageBuilderService.swift

@@ -13,7 +13,10 @@ final class CarthageBuilderService {
     }
 
     func build(framework: Framework, platform: Platform, alreadyBuiltFrameworkProducts: [FrameworkProduct]) throws -> FrameworkProduct {
-        print("Building scheme \(framework.libraryName) with Carthage ...", level: .info)
+        print("Building library \(framework.libraryName) with Carthage ...", level: .info)
+
+        try bash("git -C '\(framework.projectDirectory)' reset HEAD --hard --quiet")
+        try bash("git -C '\(framework.projectDirectory)' clean -fd --quiet")
 
         // link already built subdependencies from previous calls of this method
         for requiredFramework in framework.requiredFrameworks.flattenedDeepFirstOrder() {

Sources/AccioKit/Services/XcodeProjectSchemeHandlerService.swift

@@ -7,25 +7,34 @@ final class XcodeProjectSchemeHandlerService {
         let sharedSchemePaths: [String] = try framework.sharedSchemePaths()
         let librarySchemePaths: [String] = framework.librarySchemePaths(in: sharedSchemePaths, framework: framework)
 
-        let expectedSchemeNames: [String] = [
-            framework.libraryName,
-            "\(framework.libraryName) \(platform.rawValue)",
-            "\(framework.libraryName) (\(platform.rawValue))",
-            "\(framework.libraryName)-\(platform.rawValue)",
-            "\(framework.libraryName)_\(platform.rawValue)",
-            "\(framework.libraryName)-Package"
-        ]
-        let matchingSchemePaths: [String] = librarySchemePaths.filter { expectedSchemeNames.contains($0.fileNameWithoutExtension) }
+        let expectedSchemeNames: [String] = platform.specifiers.flatMap { platformSpecifier in
+            return [
+                framework.libraryName,
+                "\(framework.libraryName) Framework",
+                "\(framework.libraryName) Library",
+                "\(framework.libraryName) \(platformSpecifier)",
+                "\(framework.libraryName) (\(platformSpecifier))",
+                "\(framework.libraryName)-\(platformSpecifier)",
+                "\(framework.libraryName)_\(platformSpecifier)",
+                "\(framework.libraryName) Framework \(platformSpecifier)",
+                "\(framework.libraryName) Library \(platformSpecifier)",
+                "\(framework.libraryName) Framework (\(platformSpecifier))",
+                "\(framework.libraryName) Library (\(platformSpecifier))",
+                "\(framework.libraryName)-Package"
+            ].map { $0.lowercased() }
+        }
+        let matchingSchemePaths: [String] = librarySchemePaths.filter { expectedSchemeNames.contains($0.fileNameWithoutExtension.lowercased()) }
+        let matchingSchemeNames: [String] = matchingSchemePaths.map { $0.fileNameWithoutExtension }
 
         if !matchingSchemePaths.isEmpty {
             let schemePathsToRemove: [String] = sharedSchemePaths.filter { !matchingSchemePaths.contains($0) }
-            print("Found shared scheme with exact name '\(framework.libraryName)' – removing others: \(schemePathsToRemove.map { $0.fileNameWithoutExtension })", level: .verbose)
+            print("Found shared scheme(s) \(matchingSchemeNames) matching specified library – removing others: \(schemePathsToRemove.map { $0.fileNameWithoutExtension })", level: .verbose)
 
             for schemePathToRemove in schemePathsToRemove {
                 try FileManager.default.removeItem(atPath: schemePathToRemove)
             }
         } else {
-            print("No shared schemes found matching framework '\(framework.libraryName)' – can't remove unnecessary shared schemes, keeping all", level: .warning)
+            print("No shared scheme(s) found matching library name '\(framework.libraryName)' – can't remove potentially unnecessary shared schemes, keeping all", level: .warning)
         }
     }
 }