commit 8155233288a4701263b7f11e77df4c87c00e0ce5
author Anis Kadri <anis@apache.org> Fri Jul 31 14:02:04 2015 -0700
committer Anis Kadri <anis@apache.org> Fri Jul 31 14:02:04 2015 -0700
tree e135edbf3cc4c32bc7897b367a9328a37704059f
parent 1b738a4babb665102bff8fad4c627ddfcbfb90b4
parent 7b42cdf36a2eff9b64da917ffa703d18d78798e4

Merge branch 'Icenium-master'

lib/pbxFile.js

diff --git a/lib/pbxFile.js b/lib/pbxFile.js
index 5baa823..887f6e6 100644
--- a/lib/pbxFile.js
+++ b/lib/pbxFile.js
@@ -5,7 +5,7 @@
     BUNDLE_EXTENSION = /[.]bundle$/, BUNDLE = '"wrapper.plug-in"',
     XIB_EXTENSION = /[.]xib$/, XIB_FILE = 'file.xib',
     DYLIB_EXTENSION = /[.]dylib$/, DYLIB = '"compiled.mach-o.dylib"',
-    FRAMEWORK_EXTENSION = /[.]framework/, FRAMEWORK = 'wrapper.framework',
+    FRAMEWORK_EXTENSION = /[.]framework$/, FRAMEWORK = 'wrapper.framework',
     ARCHIVE_EXTENSION = /[.]a$/, ARCHIVE = 'archive.ar',
     DEFAULT_SOURCE_TREE = '"<group>"',
     DEFAULT_FILE_ENCODING = 4;

test/pbxFile.js

diff --git a/test/pbxFile.js b/test/pbxFile.js
index fbfe7da..0e3c4ee 100644
--- a/test/pbxFile.js
+++ b/test/pbxFile.js
@@ -43,6 +43,13 @@
         test.done();
     },
 
+    'should detect that a .framework/.a path means archive.ar': function (test) {
+        var sourceFile = new pbxFile('MessageUI.framework/libGoogleAnalytics.a');
+
+        test.equal('archive.ar', sourceFile.lastType);
+        test.done();
+    },
+    
     'should detect that a .a path means archive.ar': function (test) {
         var sourceFile = new pbxFile('libGoogleAnalytics.a');