Merge branch 'develop' into feature/seralize

Author: tomlokhorst

Example/Example/main.swift

@@ -9,14 +9,14 @@
 import Foundation
 
 // The xcodeproj file to load, test this with your own project!
-let xcodeproj = "Test.xcodeproj"
+let xcodeproj = NSURL(fileURLWithPath: "/Users/tom/Projects/Xcode.swift/Example/Test.xcodeproj")
 
 
 // Load from a xcodeproj
-let proj = try! XCProjectFile(xcodeprojPath: xcodeproj)
+let proj = try! XCProjectFile(xcodeprojURL: xcodeproj)
 
 // Write out a new pbxproj file
-try! proj.writeToXcodeproj("/Users/tom/Projects/Xcode.swift/Example/" + xcodeproj)
+try! proj.writeToXcodeproj(xcodeprojURL: xcodeproj)
 
 // Print paths for all files in Resources build phases
 for target in proj.project.targets {

LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Tom Lokhorst
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

README.md

@@ -1,6 +1,19 @@
-Xcode.swift
-===========
+<img src="https://cloud.githubusercontent.com/assets/75655/10141830/f92646ca-660e-11e5-8e1e-40c90482ead0.png" width="175" alt="Xcode.swift">
+<hr>
 
-Just playing around with the Xcode pbxproj file format.
+Reading the the Xcode pbxproj file format, from Swift!
 
+Currently, this project is mostly used to support [R.swift](https://github.com/mac-cain13/R.swift).
+
+
+Releases
+--------
+
+ - **0.1.0** - 2015-09-28 - Initial public release
+
+
+Licence & Credits
+-----------------
+
+Xcode.swift is written by [Tom Lokhorst](https://twitter.com/tomlokhorst) and available under the [MIT license](https://github.com/tomlokhorst/Xcode.swift/blob/develop/LICENSE), so feel free to use it in commercial and non-commercial projects.
 

Xcode/Xcode/PBXObject.swift

@@ -115,12 +115,13 @@ public class XCConfigurationList : PBXProjectItem {
 public class PBXReference : PBXContainerItem {
   public lazy var name: String? = self.string("name")
   public lazy var path: String? = self.string("path")
+  public lazy var sourceTree: SourceTree = self.string("sourceTree").flatMap(SourceTree.init)!
 }
 
 public class PBXFileReference : PBXReference {
 
   // convenience accessor
-  public lazy var fullPath: String = self.allObjects.fullFilePaths[self.id]!
+  public lazy var fullPath: Path = self.allObjects.fullFilePaths[self.id]!
 }
 
 public class PBXGroup : PBXReference {
@@ -136,3 +137,35 @@ public class PBXVariantGroup : PBXGroup {
 
 public class XCVersionGroup : PBXReference {
 }
+
+
+public enum SourceTree {
+  case Absolute
+  case Group
+  case RelativeTo(SourceTreeFolder)
+
+  init?(sourceTreeString: String) {
+    switch sourceTreeString {
+    case "<absolute>":
+      self = .Absolute
+    case "<group>":
+      self = .Group
+    default:
+      guard let sourceTreeFolder = SourceTreeFolder(rawValue: sourceTreeString) else { return nil }
+      self = .RelativeTo(sourceTreeFolder)
+    }
+  }
+}
+
+public enum SourceTreeFolder: String {
+  case SourceRoot = "SOURCE_ROOT"
+  case BuildProductsDir = "BUILT_PRODUCTS_DIR"
+  case DeveloperDir = "DEVELOPER_DIR"
+  case SDKRoot = "SDKROOT"
+}
+
+public enum Path {
+  case Absolute(String)
+  case RelativeTo(SourceTreeFolder, String)
+}
+

Xcode/Xcode/Serialization.swift

@@ -10,23 +10,22 @@ import Foundation
 
 extension XCProjectFile {
 
-  public func writeToXcodeproj(xcodeprojPath: String) throws -> Bool {
+  public func writeToXcodeproj(xcodeprojURL url: NSURL) throws -> Bool {
 
-    let url = NSURL(fileURLWithPath: xcodeprojPath, isDirectory: true)
     try NSFileManager.defaultManager().createDirectoryAtURL(url, withIntermediateDirectories: true, attributes: nil)
 
-    let name = try XCProjectFile.projectName(xcodeprojPath)
-    let path = xcodeprojPath + "/project.pbxproj"
+    let name = try XCProjectFile.projectName(url)
+    let path = url.URLByAppendingPathComponent("project.pbxproj")
 
     let serializer = Serializer(projectName: name, projectFile: self)
 
     if format == NSPropertyListFormat.OpenStepFormat {
-      try serializer.openStepSerialization.writeToFile(path, atomically: true, encoding: NSUTF8StringEncoding)
+      try serializer.openStepSerialization.writeToURL(path, atomically: true, encoding: NSUTF8StringEncoding)
       return true
     }
     else {
       let data = try NSPropertyListSerialization.dataWithPropertyList(dict, format: format, options: 0)
-      return data.writeToFile(path, atomically: true)
+      return data.writeToURL(path, atomically: true)
     }
   }
 

Xcode/Xcode/XCProjectFile.swift

@@ -27,7 +27,7 @@ enum ProjectFileError : ErrorType, CustomStringConvertible {
 
 public class AllObjects {
   var dict: [String: PBXObject] = [:]
-  var fullFilePaths: [String: String] = [:]
+  var fullFilePaths: [String: Path] = [:]
 
   func object<T : PBXObject>(key: String) -> T {
     let obj = dict[key]!
@@ -45,9 +45,10 @@ public class XCProjectFile {
   let format: NSPropertyListFormat
   let allObjects = AllObjects()
 
-  public convenience init(xcodeprojPath: String) throws {
+  public convenience init(xcodeprojURL: NSURL) throws {
 
-    guard let data = NSData(contentsOfFile: xcodeprojPath + "/project.pbxproj") else {
+    let pbxprojURL = xcodeprojURL.URLByAppendingPathComponent("project.pbxproj")
+    guard let data = NSData(contentsOfURL: pbxprojURL) else {
       throw ProjectFileError.MissingPbxproj
     }
 
@@ -82,9 +83,7 @@ public class XCProjectFile {
     self.allObjects.fullFilePaths = paths(self.project.mainGroup, prefix: "")
   }
 
-  static func projectName(xcodeprojPath: String) throws -> String {
-
-    let url = NSURL(fileURLWithPath: xcodeprojPath, isDirectory: true)
+  static func projectName(url: NSURL) throws -> String {
 
     guard let subpaths = url.pathComponents,
           let last = subpaths.last,
@@ -109,11 +108,19 @@ public class XCProjectFile {
     return PBXObject(id: id, dict: dict, allObjects: allObjects)
   }
 
-  func paths(current: PBXGroup, prefix: String) -> [String: String] {
-    var ps: [String: String] = [:]
+  func paths(current: PBXGroup, prefix: String) -> [String: Path] {
+
+    var ps: [String: Path] = [:]
 
     for file in current.fileRefs {
-      ps[file.id] = prefix + "/" + file.path!
+      switch file.sourceTree {
+      case .Group:
+        ps[file.id] = .RelativeTo(.SourceRoot, prefix + "/" + file.path!)
+      case .Absolute:
+        ps[file.id] = .Absolute(file.path!)
+      case let .RelativeTo(sourceTreeFolder):
+        ps[file.id] = .RelativeTo(sourceTreeFolder, file.path!)
+      }
     }
 
     for group in current.subGroups {