Merge pull request #1 from alunny/master

merge latest updates into mcgrews3-fork

Author: mcgrews3

lib/pbxFile.js

@@ -94,9 +94,14 @@ function defaultEncoding(fileRef) {
 }
 
 function detectGroup(fileRef) {
-    var filetype = fileRef.lastKnownFileType || fileRef.explicitFileType,
+    var extension = path.extname(fileRef.basename).substring(1),
+        filetype = fileRef.lastKnownFileType || fileRef.explicitFileType,
         groupName = GROUP_BY_FILETYPE[unquoted(filetype)];
 
+    if (extension === 'xcdatamodeld') {
+        return 'Sources';
+    }
+
     if (!groupName) {
         return DEFAULT_GROUP;
     }
@@ -105,18 +110,18 @@ function detectGroup(fileRef) {
 }
 
 function detectSourcetree(fileRef) {
-    
+
     var filetype = fileRef.lastKnownFileType || fileRef.explicitFileType,
         sourcetree = SOURCETREE_BY_FILETYPE[unquoted(filetype)];
 
     if (fileRef.explicitFileType) {
         return DEFAULT_PRODUCT_SOURCETREE;
     }
-    
+
     if (fileRef.customFramework) {
         return DEFAULT_SOURCETREE;
     }
-    
+
     if (!sourcetree) {
         return DEFAULT_SOURCETREE;
     }
@@ -131,7 +136,7 @@ function defaultPath(fileRef, filePath) {
     if (fileRef.customFramework) {
         return filePath;
     }
-    
+
     if (defaultPath) {
         return path.join(defaultPath, path.basename(filePath));
     }
@@ -151,23 +156,22 @@ function defaultGroup(fileRef) {
 
 function pbxFile(filepath, opt) {
     var opt = opt || {};
-    
+
     self = this;
 
+    this.basename = path.basename(filepath);
     this.lastKnownFileType = opt.lastKnownFileType || detectType(filepath);
     this.group = detectGroup(self);
 
     // for custom frameworks
     if (opt.customFramework == true) {
         this.customFramework = true;
-        this.dirname = path.dirname(filepath);
+        this.dirname = path.dirname(filepath).replace(/\\/g, '/');
     }
 
-    this.basename = path.basename(filepath);
-    this.path = defaultPath(this, filepath);
+    this.path = defaultPath(this, filepath).replace(/\\/g, '/');
     this.fileEncoding = this.defaultEncoding = opt.defaultEncoding || defaultEncoding(self);
 
-
     // When referencing products / build output files
     if (opt.explicitFileType) {
         this.explicitFileType = opt.explicitFileType;
@@ -189,6 +193,14 @@ function pbxFile(filepath, opt) {
             this.settings = {};
         this.settings.COMPILER_FLAGS = util.format('"%s"', opt.compilerFlags);
     }
+
+    if (opt.sign) {
+      if (!this.settings)
+          this.settings = {};
+      if (!this.settings.ATTRIBUTES)
+          this.settings.ATTRIBUTES = [];
+      this.settings.ATTRIBUTES.push('CodeSignOnCopy');
+    }
 }
 
 module.exports = pbxFile;