Skip to content

C
cocoapods
Commit 6b9e1931 authored by Eloy Duran's avatar Eloy Duran
Browse files
Options

Merge branch 'master' into dependency-targets 

Conflicts:
	spec/integration_spec.rb
parents fe1f812c b2fbf8b9
Show whitespace changes
Inline Side-by-side
Showing with 1095 additions and 54 deletions
.gitignore
View file @ 6b9e1931
...@@ -11,3 +11,5 @@ examples/Podfile ...@@ -11,3 +11,5 @@ examples/Podfile
examples/Pods examples/Pods
examples/**/Pods examples/**/Pods
spec/fixtures/banana-lib spec/fixtures/banana-lib
pod
/concatenated.*
examples/ConfigureTest/ConfigureTest.xcodeproj/project.pbxproj 0 → 100644
View file @ 6b9e1931
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>archiveVersion</key>
<string>1</string>
<key>classes</key>
<dict/>
<key>objectVersion</key>
<string>46</string>
<key>objects</key>
<dict>
<key>1FCB00F9333B4E83B1FEBF70</key>
<dict>
<key>fileRef</key>
<string>F08D5ACC836446268BF48194</string>
<key>isa</key>
<string>PBXBuildFile</string>
</dict>
<key>516164A7145623DE0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164BC145623DF0045B749</string>
<string>516164B5145623DE0045B749</string>
<string>516164B3145623DE0045B749</string>
<string>C3E4C0061587490794951548</string>
<string>F08D5ACC836446268BF48194</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164A9145623DE0045B749</key>
<dict>
<key>attributes</key>
<dict>
<key>LastUpgradeCheck</key>
<string>0420</string>
</dict>
<key>buildConfigurationList</key>
<string>516164AC145623DE0045B749</string>
<key>compatibilityVersion</key>
<string>Xcode 3.2</string>
<key>developmentRegion</key>
<string>English</string>
<key>hasScannedForEncodings</key>
<string>0</string>
<key>isa</key>
<string>PBXProject</string>
<key>knownRegions</key>
<array>
<string>en</string>
</array>
<key>mainGroup</key>
<string>516164A7145623DE0045B749</string>
<key>productRefGroup</key>
<string>516164B3145623DE0045B749</string>
<key>projectDirPath</key>
<string></string>
<key>projectRoot</key>
<string></string>
<key>targets</key>
<array>
<string>516164B1145623DE0045B749</string>
</array>
</dict>
<key>516164AC145623DE0045B749</key>
<dict>
<key>buildConfigurations</key>
<array>
<string>516164CE145623DF0045B749</string>
<string>516164CF145623DF0045B749</string>
</array>
<key>defaultConfigurationIsVisible</key>
<string>0</string>
<key>defaultConfigurationName</key>
<string>Release</string>
<key>isa</key>
<string>XCConfigurationList</string>
</dict>
<key>516164AE145623DE0045B749</key>
<dict>
<key>buildActionMask</key>
<string>2147483647</string>
<key>files</key>
<array>
<string>516164C3145623DF0045B749</string>
<string>516164CA145623DF0045B749</string>
</array>
<key>isa</key>
<string>PBXSourcesBuildPhase</string>
<key>runOnlyForDeploymentPostprocessing</key>
<string>0</string>
</dict>
<key>516164AF145623DE0045B749</key>
<dict>
<key>buildActionMask</key>
<string>2147483647</string>
<key>files</key>
<array>
<string>516164B7145623DE0045B749</string>
<string>1FCB00F9333B4E83B1FEBF70</string>
</array>
<key>isa</key>
<string>PBXFrameworksBuildPhase</string>
<key>runOnlyForDeploymentPostprocessing</key>
<string>0</string>
</dict>
<key>516164B0145623DE0045B749</key>
<dict>
<key>buildActionMask</key>
<string>2147483647</string>
<key>files</key>
<array>
<string>516164C1145623DF0045B749</string>
<string>516164C7145623DF0045B749</string>
<string>516164CD145623DF0045B749</string>
</array>
<key>isa</key>
<string>PBXResourcesBuildPhase</string>
<key>runOnlyForDeploymentPostprocessing</key>
<string>0</string>
</dict>
<key>516164B1145623DE0045B749</key>
<dict>
<key>buildConfigurationList</key>
<string>516164D0145623DF0045B749</string>
<key>buildPhases</key>
<array>
<string>516164AE145623DE0045B749</string>
<string>516164AF145623DE0045B749</string>
<string>516164B0145623DE0045B749</string>
</array>
<key>buildRules</key>
<array/>
<key>dependencies</key>
<array/>
<key>isa</key>
<string>PBXNativeTarget</string>
<key>name</key>
<string>ConfigureTest</string>
<key>productName</key>
<string>ConfigureTest</string>
<key>productReference</key>
<string>516164B2145623DE0045B749</string>
<key>productType</key>
<string>com.apple.product-type.application</string>
</dict>
<key>516164B2145623DE0045B749</key>
<dict>
<key>explicitFileType</key>
<string>wrapper.application</string>
<key>includeInIndex</key>
<string>0</string>
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
<string>ConfigureTest.app</string>
<key>path</key>
<string>ConfigureTest.app</string>
<key>sourceTree</key>
<string>BUILT_PRODUCTS_DIR</string>
</dict>
<key>516164B3145623DE0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164B2145623DE0045B749</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
<key>name</key>
<string>Products</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164B5145623DE0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164B6145623DE0045B749</string>
<string>516164B8145623DE0045B749</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
<key>name</key>
<string>Frameworks</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164B6145623DE0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>wrapper.framework</string>
<key>name</key>
<string>Cocoa.framework</string>
<key>path</key>
<string>System/Library/Frameworks/Cocoa.framework</string>
<key>sourceTree</key>
<string>SDKROOT</string>
</dict>
<key>516164B7145623DE0045B749</key>
<dict>
<key>fileRef</key>
<string>516164B6145623DE0045B749</string>
<key>isa</key>
<string>PBXBuildFile</string>
</dict>
<key>516164B8145623DE0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164B9145623DF0045B749</string>
<string>516164BA145623DF0045B749</string>
<string>516164BB145623DF0045B749</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
<key>name</key>
<string>Other Frameworks</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164B9145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>wrapper.framework</string>
<key>name</key>
<string>AppKit.framework</string>
<key>path</key>
<string>System/Library/Frameworks/AppKit.framework</string>
<key>sourceTree</key>
<string>SDKROOT</string>
</dict>
<key>516164BA145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>wrapper.framework</string>
<key>name</key>
<string>CoreData.framework</string>
<key>path</key>
<string>System/Library/Frameworks/CoreData.framework</string>
<key>sourceTree</key>
<string>SDKROOT</string>
</dict>
<key>516164BB145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>wrapper.framework</string>
<key>name</key>
<string>Foundation.framework</string>
<key>path</key>
<string>System/Library/Frameworks/Foundation.framework</string>
<key>sourceTree</key>
<string>SDKROOT</string>
</dict>
<key>516164BC145623DF0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164C8145623DF0045B749</string>
<string>516164C9145623DF0045B749</string>
<string>516164CB145623DF0045B749</string>
<string>516164BD145623DF0045B749</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
<key>path</key>
<string>ConfigureTest</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164BD145623DF0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164BE145623DF0045B749</string>
<string>516164BF145623DF0045B749</string>
<string>516164C2145623DF0045B749</string>
<string>516164C4145623DF0045B749</string>
<string>516164C5145623DF0045B749</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
<key>name</key>
<string>Supporting Files</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164BE145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>text.plist.xml</string>
<key>name</key>
<string>ConfigureTest-Info.plist</string>
<key>path</key>
<string>ConfigureTest-Info.plist</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164BF145623DF0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164C0145623DF0045B749</string>
</array>
<key>isa</key>
<string>PBXVariantGroup</string>
<key>name</key>
<string>InfoPlist.strings</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164C0145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>text.plist.strings</string>
<key>name</key>
<string>en</string>
<key>path</key>
<string>en.lproj/InfoPlist.strings</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164C1145623DF0045B749</key>
<dict>
<key>fileRef</key>
<string>516164BF145623DF0045B749</string>
<key>isa</key>
<string>PBXBuildFile</string>
</dict>
<key>516164C2145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>sourcecode.c.objc</string>
<key>name</key>
<string>main.m</string>
<key>path</key>
<string>main.m</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164C3145623DF0045B749</key>
<dict>
<key>fileRef</key>
<string>516164C2145623DF0045B749</string>
<key>isa</key>
<string>PBXBuildFile</string>
</dict>
<key>516164C4145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>sourcecode.c.h</string>
<key>name</key>
<string>ConfigureTest-Prefix.pch</string>
<key>path</key>
<string>ConfigureTest-Prefix.pch</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164C5145623DF0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164C6145623DF0045B749</string>
</array>
<key>isa</key>
<string>PBXVariantGroup</string>
<key>name</key>
<string>Credits.rtf</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164C6145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>text.rtf</string>
<key>name</key>
<string>en</string>
<key>path</key>
<string>en.lproj/Credits.rtf</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164C7145623DF0045B749</key>
<dict>
<key>fileRef</key>
<string>516164C5145623DF0045B749</string>
<key>isa</key>
<string>PBXBuildFile</string>
</dict>
<key>516164C8145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>sourcecode.c.h</string>
<key>name</key>
<string>AppDelegate.h</string>
<key>path</key>
<string>AppDelegate.h</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164C9145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>sourcecode.c.objc</string>
<key>name</key>
<string>AppDelegate.m</string>
<key>path</key>
<string>AppDelegate.m</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164CA145623DF0045B749</key>
<dict>
<key>fileRef</key>
<string>516164C9145623DF0045B749</string>
<key>isa</key>
<string>PBXBuildFile</string>
</dict>
<key>516164CB145623DF0045B749</key>
<dict>
<key>children</key>
<array>
<string>516164CC145623DF0045B749</string>
</array>
<key>isa</key>
<string>PBXVariantGroup</string>
<key>name</key>
<string>MainMenu.xib</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164CC145623DF0045B749</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>file.xib</string>
<key>name</key>
<string>en</string>
<key>path</key>
<string>en.lproj/MainMenu.xib</string>
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
<key>516164CD145623DF0045B749</key>
<dict>
<key>fileRef</key>
<string>516164CB145623DF0045B749</string>
<key>isa</key>
<string>PBXBuildFile</string>
</dict>
<key>516164CE145623DF0045B749</key>
<dict>
<key>buildSettings</key>
<dict>
<key>ALWAYS_SEARCH_USER_PATHS</key>
<string>NO</string>
<key>ARCHS</key>
<string>$(ARCHS_STANDARD_64_BIT)</string>
<key>COPY_PHASE_STRIP</key>
<string>NO</string>
<key>GCC_C_LANGUAGE_STANDARD</key>
<string>gnu99</string>
<key>GCC_DYNAMIC_NO_PIC</key>
<string>NO</string>
<key>GCC_ENABLE_OBJC_EXCEPTIONS</key>
<string>YES</string>
<key>GCC_OPTIMIZATION_LEVEL</key>
<string>0</string>
<key>GCC_PREPROCESSOR_DEFINITIONS</key>
<array>
<string>DEBUG=1</string>
<string>$(inherited)</string>
</array>
<key>GCC_SYMBOLS_PRIVATE_EXTERN</key>
<string>NO</string>
<key>GCC_VERSION</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>GCC_WARN_64_TO_32_BIT_CONVERSION</key>
<string>YES</string>
<key>GCC_WARN_ABOUT_MISSING_PROTOTYPES</key>
<string>YES</string>
<key>GCC_WARN_ABOUT_RETURN_TYPE</key>
<string>YES</string>
<key>GCC_WARN_UNUSED_VARIABLE</key>
<string>YES</string>
<key>MACOSX_DEPLOYMENT_TARGET</key>
<string>10.7</string>
<key>ONLY_ACTIVE_ARCH</key>
<string>YES</string>
<key>SDKROOT</key>
<string>macosx</string>
</dict>
<key>isa</key>
<string>XCBuildConfiguration</string>
<key>name</key>
<string>Debug</string>
</dict>
<key>516164CF145623DF0045B749</key>
<dict>
<key>buildSettings</key>
<dict>
<key>ALWAYS_SEARCH_USER_PATHS</key>
<string>NO</string>
<key>ARCHS</key>
<string>$(ARCHS_STANDARD_64_BIT)</string>
<key>COPY_PHASE_STRIP</key>
<string>YES</string>
<key>DEBUG_INFORMATION_FORMAT</key>
<string>dwarf-with-dsym</string>
<key>GCC_C_LANGUAGE_STANDARD</key>
<string>gnu99</string>
<key>GCC_ENABLE_OBJC_EXCEPTIONS</key>
<string>YES</string>
<key>GCC_VERSION</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>GCC_WARN_64_TO_32_BIT_CONVERSION</key>
<string>YES</string>
<key>GCC_WARN_ABOUT_MISSING_PROTOTYPES</key>
<string>YES</string>
<key>GCC_WARN_ABOUT_RETURN_TYPE</key>
<string>YES</string>
<key>GCC_WARN_UNUSED_VARIABLE</key>
<string>YES</string>
<key>MACOSX_DEPLOYMENT_TARGET</key>
<string>10.7</string>
<key>SDKROOT</key>
<string>macosx</string>
</dict>
<key>isa</key>
<string>XCBuildConfiguration</string>
<key>name</key>
<string>Release</string>
</dict>
<key>516164D0145623DF0045B749</key>
<dict>
<key>buildConfigurations</key>
<array>
<string>516164D1145623DF0045B749</string>
<string>516164D2145623DF0045B749</string>
</array>
<key>defaultConfigurationIsVisible</key>
<string>0</string>
<key>isa</key>
<string>XCConfigurationList</string>
</dict>
<key>516164D1145623DF0045B749</key>
<dict>
<key>baseConfigurationReference</key>
<string>C3E4C0061587490794951548</string>
<key>buildSettings</key>
<dict>
<key>GCC_PRECOMPILE_PREFIX_HEADER</key>
<string>YES</string>
<key>GCC_PREFIX_HEADER</key>
<string>ConfigureTest/ConfigureTest-Prefix.pch</string>
<key>INFOPLIST_FILE</key>
<string>ConfigureTest/ConfigureTest-Info.plist</string>
<key>PRODUCT_NAME</key>
<string>$(TARGET_NAME)</string>
<key>WRAPPER_EXTENSION</key>
<string>app</string>
</dict>
<key>isa</key>
<string>XCBuildConfiguration</string>
<key>name</key>
<string>Debug</string>
</dict>
<key>516164D2145623DF0045B749</key>
<dict>
<key>baseConfigurationReference</key>
<string>C3E4C0061587490794951548</string>
<key>buildSettings</key>
<dict>
<key>GCC_PRECOMPILE_PREFIX_HEADER</key>
<string>YES</string>
<key>GCC_PREFIX_HEADER</key>
<string>ConfigureTest/ConfigureTest-Prefix.pch</string>
<key>INFOPLIST_FILE</key>
<string>ConfigureTest/ConfigureTest-Info.plist</string>
<key>PRODUCT_NAME</key>
<string>$(TARGET_NAME)</string>
<key>WRAPPER_EXTENSION</key>
<string>app</string>
</dict>
<key>isa</key>
<string>XCBuildConfiguration</string>
<key>name</key>
<string>Release</string>
</dict>
<key>6786F1960A40426590889C9F</key>
<dict>
<key>fileRef</key>
<string>C3E4C0061587490794951548</string>
<key>isa</key>
<string>PBXBuildFile</string>
</dict>
<key>C3E4C0061587490794951548</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>text.xcconfig</string>
<key>name</key>
<string>Pods.xcconfig</string>
<key>path</key>
<string>Pods/Pods.xcconfig</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
<key>F08D5ACC836446268BF48194</key>
<dict>
<key>includeInIndex</key>
<string>0</string>
<key>isa</key>
<string>PBXFileReference</string>
<key>lastKnownFileType</key>
<string>archive.ar</string>
<key>name</key>
<string>libPods.a</string>
<key>path</key>
<string>libPods.a</string>
<key>sourceTree</key>
<string>BUILT_PRODUCTS_DIR</string>
</dict>
</dict>
<key>rootObject</key>
<string>516164A9145623DE0045B749</string>
</dict>
</plist>
examples/ConfigureTest/ConfigureTest.xcworkspace/contents.xcworkspacedata 0 → 100644
View file @ 6b9e1931
<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Workspace version="1.0"><FileRef location="group:ConfigureTest.xcodeproj"></FileRef><FileRef location="group:Pods/Pods.xcodeproj"></FileRef></Workspace>
\ No newline at end of file
examples/ConfigureTest/ConfigureTest/AppDelegate.h 0 → 100644
View file @ 6b9e1931
//
// AppDelegate.h
// ConfigureTest
//
// Created by Eloy Duran on 25-10-11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
@interface AppDelegate : NSObject <NSApplicationDelegate>
@property (assign) IBOutlet NSWindow *window;
@end
examples/ConfigureTest/ConfigureTest/AppDelegate.m 0 → 100644
View file @ 6b9e1931
//
// AppDelegate.m
// ConfigureTest
//
// Created by Eloy Duran on 25-10-11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//
#import "AppDelegate.h"
@implementation AppDelegate
@synthesize window = _window;
- (void)dealloc
{
[super dealloc];
}
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
// Insert code here to initialize your application
}
@end
examples/ConfigureTest/ConfigureTest/ConfigureTest-Info.plist 0 → 100644
View file @ 6b9e1931
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2011 __MyCompanyName__. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
examples/ConfigureTest/ConfigureTest/ConfigureTest-Prefix.pch 0 → 100644
View file @ 6b9e1931
//
// Prefix header for all source files of the 'ConfigureTest' target in the 'ConfigureTest' project
//
#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
#endif
examples/ConfigureTest/ConfigureTest/en.lproj/Credits.rtf 0 → 100644
View file @ 6b9e1931
{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;}
{\colortbl;\red255\green255\blue255;}
\paperw9840\paperh8400
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\f0\b\fs24 \cf0 Engineering:
\b0 \
Some people\
\
\b Human Interface Design:
\b0 \
Some other people\
\
\b Testing:
\b0 \
Hopefully not nobody\
\
\b Documentation:
\b0 \
Whoever\
\
\b With special thanks to:
\b0 \
Mom\
}
examples/ConfigureTest/ConfigureTest/en.lproj/MainMenu.xib 0 → 100644
View file @ 6b9e1931
This source diff could not be displayed because it is too large. You can view the blob instead.
examples/ConfigureTest/ConfigureTest/main.m 0 → 100644
View file @ 6b9e1931
//
// main.m
// ConfigureTest
//
// Created by Eloy Duran on 25-10-11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
int main(int argc, char *argv[])
{
return NSApplicationMain(argc, (const char **)argv);
}
examples/ConfigureTest/Podfile 0 → 100644
View file @ 6b9e1931
platform :osx
dependency 'JSONKit'
lib/cocoapods.rb
View file @ 6b9e1931
module Pod module Pod
VERSION = '0.1.1' VERSION = '0.2.0'
class Informative < StandardError class Informative < StandardError
end end
...@@ -12,6 +12,7 @@ module Pod ...@@ -12,6 +12,7 @@ module Pod
autoload :Executable, 'cocoapods/executable' autoload :Executable, 'cocoapods/executable'
autoload :Installer, 'cocoapods/installer' autoload :Installer, 'cocoapods/installer'
autoload :Podfile, 'cocoapods/podfile' autoload :Podfile, 'cocoapods/podfile'
autoload :ProjectTemplate, 'cocoapods/project_template'
autoload :Resolver, 'cocoapods/resolver' autoload :Resolver, 'cocoapods/resolver'
autoload :Source, 'cocoapods/source' autoload :Source, 'cocoapods/source'
autoload :Spec, 'cocoapods/specification' autoload :Spec, 'cocoapods/specification'
...@@ -22,6 +23,7 @@ module Pod ...@@ -22,6 +23,7 @@ module Pod
autoload :Config, 'cocoapods/xcode/config' autoload :Config, 'cocoapods/xcode/config'
autoload :CopyResourcesScript, 'cocoapods/xcode/copy_resources_script' autoload :CopyResourcesScript, 'cocoapods/xcode/copy_resources_script'
autoload :Project, 'cocoapods/xcode/project' autoload :Project, 'cocoapods/xcode/project'
autoload :Workspace, 'cocoapods/xcode/workspace'
end end
autoload :Pathname, 'pathname' autoload :Pathname, 'pathname'
......
lib/cocoapods/command/install.rb
View file @ 6b9e1931
...@@ -4,10 +4,11 @@ module Pod ...@@ -4,10 +4,11 @@ module Pod
def self.banner def self.banner
%{Installing dependencies of a pod spec: %{Installing dependencies of a pod spec:
$ pod install [NAME] $ pod install [NAME] [PROJECT]
Downloads all dependencies of the specified podspec file `NAME' and Downloads all dependencies of the specified podspec file `NAME',
creates an Xcode Pods library project in `./Pods'. In case `NAME' is creates an Xcode Pods library project in `./Pods', and sets up `PROJECT'
to use the specified pods (if `PROJECT' is given). In case `NAME' is
omitted it defaults to either `Podfile' or `*.podspec' in the current omitted it defaults to either `Podfile' or `*.podspec' in the current
working directory. working directory.
} }
...@@ -20,9 +21,10 @@ module Pod ...@@ -20,9 +21,10 @@ module Pod
def initialize(argv) def initialize(argv)
config.clean = !argv.option('--no-clean') config.clean = !argv.option('--no-clean')
if podspec = argv.shift_argument projpath = argv.shift_argument
@podspec = Pathname.new(podspec) projpath =~ /\.xcodeproj\/?$/ ? @projpath = projpath : podspec = projpath
end @podspec = Pathname.new(podspec) if podspec
@projpath ||= argv.shift_argument
super unless argv.empty? super unless argv.empty?
end end
...@@ -39,7 +41,9 @@ module Pod ...@@ -39,7 +41,9 @@ module Pod
raise Informative, "No `Podfile' or `.podspec' file found in the current working directory." raise Informative, "No `Podfile' or `.podspec' file found in the current working directory."
end end
end end
Installer.new(spec).install! installer = Installer.new(spec)
installer.install!
installer.configure_project(@projpath) if @projpath
end end
end end
end end
......
lib/cocoapods/command/repo.rb
View file @ 6b9e1931
...@@ -44,7 +44,7 @@ module Pod ...@@ -44,7 +44,7 @@ module Pod
def add def add
puts "==> Cloning spec repo `#{@name}' from `#{@url}'" unless config.silent? puts "==> Cloning spec repo `#{@name}' from `#{@url}'" unless config.silent?
config.repos_dir.mkpath config.repos_dir.mkpath
Dir.chdir(config.repos_dir) { git("clone #{@url} #{@name}") } Dir.chdir(config.repos_dir) { git("clone '#{@url}' #{@name}") }
end end
def update def update
......
lib/cocoapods/installer.rb
View file @ 6b9e1931
...@@ -29,8 +29,12 @@ module Pod ...@@ -29,8 +29,12 @@ module Pod
}) })
end end
def template
@template ||= ProjectTemplate.new(@specification.platform)
end
def xcodeproj def xcodeproj
@xcodeproj ||= Xcode::Project.static_library(@specification.platform) @xcodeproj ||= Xcode::Project.new(template.xcodeproj_path)
end end
# TODO move xcconfig related code into the xcconfig method, like copy_resources_script and generate_bridge_support. # TODO move xcconfig related code into the xcconfig method, like copy_resources_script and generate_bridge_support.
...@@ -79,7 +83,11 @@ module Pod ...@@ -79,7 +83,11 @@ module Pod
generate_project generate_project
root = config.project_pods_root root = config.project_pods_root
xcodeproj.create_in(root) puts " * Copying contents of template directory `#{template.path}' to `#{root}'" if config.verbose?
template.copy_to(root)
pbxproj = File.join(root, 'Pods.xcodeproj')
puts " * Writing Xcode project file to `#{pbxproj}'" if config.verbose?
xcodeproj.save_as(pbxproj)
xcconfig.create_in(root) xcconfig.create_in(root)
if @specification.generate_bridge_support? if @specification.generate_bridge_support?
path = bridge_support_generator.create_in(root) path = bridge_support_generator.create_in(root)
...@@ -89,5 +97,57 @@ module Pod ...@@ -89,5 +97,57 @@ module Pod
build_specifications.each(&:post_install) build_specifications.each(&:post_install)
end end
def configure_project(projpath)
root = File.dirname(projpath)
xcworkspace = File.join(root, File.basename(projpath, '.xcodeproj') + '.xcworkspace')
workspace = Xcode::Workspace.new_from_xcworkspace(xcworkspace)
pods_projpath = File.join(config.project_pods_root, 'Pods.xcodeproj')
root = Pathname.new(root).expand_path
[projpath, pods_projpath].each do |path|
path = Pathname.new(path).expand_path.relative_path_from(root).to_s
workspace << path unless workspace.include? path
end
workspace.save_as(xcworkspace)
app_project = Xcode::Project.new(projpath)
return if app_project.files.find { |file| file.path =~ /libPods\.a$/ }
configfile = app_project.files.new({
'path' => 'Pods/Pods.xcconfig',
'lastKnownFileType' => 'text.xcconfig'
})
app_project.targets.each do |target|
target.buildConfigurationList.buildConfigurations.each do |config|
config.baseConfigurationReference = configfile
end
end
app_project.main_group << configfile
libfile = app_project.files.new({
'path' => 'libPods.a',
'lastKnownFileType' => 'archive.ar',
'includeInIndex' => '0',
'sourceTree' => 'BUILT_PRODUCTS_DIR'
})
app_project.objects.select_by_class(Xcode::Project::PBXFrameworksBuildPhase).each do |build_phase|
build_phase.files << libfile.build_file
end
app_project.main_group << libfile
copy_resources = app_project.objects.add(Xcode::Project::PBXShellScriptBuildPhase, {
'name' => 'Copy Pods Resources',
'buildActionMask' => '2147483647',
'files' => [],
'inputPaths' => [],
'outputPaths' => [],
'runOnlyForDeploymentPostprocessing' => '0',
'shellPath' => '/bin/sh',
'shellScript' => "${SRCROOT}/Pods/PodsResources.sh\n"
})
app_project.targets.each { |target| target.buildPhases << copy_resources }
app_project.save_as(projpath)
end
end end
end end
lib/cocoapods/project_template.rb 0 → 100644
View file @ 6b9e1931
require 'fileutils'
module Pod
class ProjectTemplate
def initialize(platform)
@platform = platform
end
# TODO this is a workaround for an issue with MacRuby with compiled files
# that makes the use of __FILE__ impossible.
#
#TEMPLATES_DIR = Pathname.new(File.expand_path('../../../xcode-project-templates', __FILE__))
# Rest of this is to handle sourcing template projects from standalone
# executable, for which even the $LOADED_FEATURES workaround fails.
possibilities = [
[
$LOADED_FEATURES.find { |file| file =~ %r{cocoapods/project_template\.rbo?$} },
'../../../xcode-project-templates'
],
[$0, '../xcode-project-templates']
]
TEMPLATES_DIR = possibilities.map do |base, relpath|
Pathname.new(File.expand_path(relpath, base))
end.find { |path| path && path.exist? }
def path
@path ||= case @platform
when :osx
TEMPLATES_DIR + 'cocoa-static-library'
when :ios
TEMPLATES_DIR + 'cocoa-touch-static-library'
else
raise "No Xcode project template exists for the platform `#{platform.inspect}'"
end
end
def xcodeproj_path
@xcodeproj_path = File.join(path, 'Pods.xcodeproj')
end
def copy_to(pods_root)
FileUtils.cp_r("#{path}/.", pods_root)
end
end
end
lib/cocoapods/xcode/project.rb
View file @ 6b9e1931
...@@ -88,6 +88,10 @@ module Pod ...@@ -88,6 +88,10 @@ module Pod
end end
file file
end end
def <<(child)
children << child.uuid
end
end end
class PBXFileReference < PBXObject class PBXFileReference < PBXObject
...@@ -122,7 +126,7 @@ module Pod ...@@ -122,7 +126,7 @@ module Pod
# Returns a PBXFileReference instance corresponding to the uuid in the fileRef attribute. # Returns a PBXFileReference instance corresponding to the uuid in the fileRef attribute.
def file def file
project.objects[fileRef] @project.objects[fileRef]
end end
end end
...@@ -140,17 +144,60 @@ module Pod ...@@ -140,17 +144,60 @@ module Pod
list_by_class(file_uuids, PBXBuildFile) list_by_class(file_uuids, PBXBuildFile)
end end
end end
class PBXSourcesBuildPhase < PBXBuildPhase; end class PBXSourcesBuildPhase < PBXBuildPhase; end
class PBXCopyFilesBuildPhase < PBXBuildPhase; end class PBXCopyFilesBuildPhase < PBXBuildPhase; end
class PBXFrameworksBuildPhase < PBXBuildPhase; end
class PBXShellScriptBuildPhase < PBXBuildPhase
attributes_accessor :shellScript
end
class PBXNativeTarget < PBXObject class PBXNativeTarget < PBXObject
attributes_accessor :buildPhases attributes_accessor :buildPhases, :buildConfigurationList
alias_method :build_phase_uuids, :buildPhases alias_method :build_phase_uuids, :buildPhases
alias_method :build_phase_uuids=, :buildPhases= alias_method :build_phase_uuids=, :buildPhases=
alias_method :build_configuration_list_uuid, :buildConfigurationList
alias_method :build_configuration_list_uuid=, :buildConfigurationList=
def buildPhases def buildPhases
list_by_class(build_phase_uuids, PBXBuildPhase) list_by_class(build_phase_uuids, PBXBuildPhase)
end end
def buildConfigurationList
@project.objects[build_configuration_list_uuid]
end
def buildConfigurationList=(config_list)
self.build_configuration_list_uuid = config_list.uuid
end
end
class XCBuildConfiguration < PBXObject
attributes_accessor :baseConfigurationReference
alias_method :base_configuration_reference_uuid, :baseConfigurationReference
alias_method :base_configuration_reference_uuid=, :baseConfigurationReference=
def baseConfigurationReference
@project.objects[base_configuration_reference_uuid]
end
def baseConfigurationReference=(config)
self.base_configuration_reference_uuid = config.uuid
end
end
class XCConfigurationList < PBXObject
attributes_accessor :buildConfigurations
alias_method :build_configuration_uuids, :buildConfigurations
alias_method :build_configuration_uuids=, :buildConfigurations=
def buildConfigurations
list_by_class(build_configuration_uuids, XCBuildConfiguration)
end
def buildConfigurations=(configs)
self.build_configuration_uuids = configs.map(&:uuid)
end
end end
# Missing constants that begin with either `PBX' or `XC' are assumed to be # Missing constants that begin with either `PBX' or `XC' are assumed to be
...@@ -215,42 +262,17 @@ module Pod ...@@ -215,42 +262,17 @@ module Pod
end end
end end
include Pod::Config::Mixin def initialize(xcodeproj)
file = File.join(xcodeproj, 'project.pbxproj')
# TODO this is a workaround for an issue with MacRuby with compiled files @plist = NSMutableDictionary.dictionaryWithContentsOfFile(file.to_s)
# that makes the use of __FILE__ impossible.
#
#TEMPLATES_DIR = Pathname.new(File.expand_path('../../../../xcode-project-templates', __FILE__))
file = $LOADED_FEATURES.find { |file| file =~ %r{cocoapods/xcode/project\.rbo?$} }
TEMPLATES_DIR = Pathname.new(File.expand_path('../../../../xcode-project-templates', file))
def self.static_library(platform)
case platform
when :osx
new TEMPLATES_DIR + 'cocoa-static-library'
when :ios
new TEMPLATES_DIR + 'cocoa-touch-static-library'
else
raise "No Xcode project template exists for the platform `#{platform.inspect}'"
end
end
def initialize(template_dir)
@template_dir = template_dir
file = template_dir + template_file
@template = NSMutableDictionary.dictionaryWithContentsOfFile(file.to_s)
end
def template_file
'Pods.xcodeproj/project.pbxproj'
end end
def to_hash def to_hash
@template @plist
end end
def objects_hash def objects_hash
@template['objects'] @plist['objects']
end end
def objects def objects
...@@ -261,6 +283,11 @@ module Pod ...@@ -261,6 +283,11 @@ module Pod
objects.select_by_class(PBXGroup) objects.select_by_class(PBXGroup)
end end
def main_group
project = objects[@plist['rootObject']]
objects[project.attributes['mainGroup']]
end
# Shortcut access to the `Pods' PBXGroup. # Shortcut access to the `Pods' PBXGroup.
def pods def pods
groups.find { |g| g.name == 'Pods' } groups.find { |g| g.name == 'Pods' }
...@@ -301,12 +328,10 @@ module Pod ...@@ -301,12 +328,10 @@ module Pod
source_files source_files
end end
def create_in(pods_root) def save_as(projpath)
puts " * Copying contents of template directory `#{@template_dir}' to `#{pods_root}'" if config.verbose? projpath = projpath.to_s
FileUtils.cp_r("#{@template_dir}/.", pods_root) FileUtils.mkdir_p(projpath)
pbxproj = pods_root + template_file @plist.writeToFile(File.join(projpath, 'project.pbxproj'), atomically:true)
puts " * Writing Xcode project file to `#{pbxproj}'" if config.verbose?
@template.writeToFile(pbxproj.to_s, atomically:true)
end end
# TODO add comments, or even constants, describing what these magic numbers are. # TODO add comments, or even constants, describing what these magic numbers are.
......
lib/cocoapods/xcode/workspace.rb 0 → 100644
View file @ 6b9e1931
framework 'Foundation'
require 'fileutils'
module Pod
module Xcode
class Workspace
def initialize(*projpaths)
@projpaths = projpaths
end
def self.new_from_xcworkspace(path)
begin
from_s(File.read(File.join(path, 'contents.xcworkspacedata')))
rescue Errno::ENOENT
new
end
end
def self.from_s(xml)
doc = NSXMLDocument.alloc.initWithXMLString(xml, options:0, error:nil)
projpaths = doc.nodesForXPath("/Workspace/FileRef", error:nil).map do |node|
node.attributeForName("location").stringValue.sub(/^group:/, '')
end
new(*projpaths)
end
attr_reader :projpaths
def <<(projpath)
@projpaths << projpath
end
def include?(projpath)
@projpaths.include?(projpath)
end
TEMPLATE = %q[<?xml version="1.0" encoding="UTF-8"?><Workspace version="1.0"></Workspace>]
def to_s
doc = NSXMLDocument.alloc.initWithXMLString(TEMPLATE, options:0, error:nil)
@projpaths.each do |projpath|
el = NSXMLNode.elementWithName("FileRef")
el.addAttribute(NSXMLNode.attributeWithName("location", stringValue:"group:#{projpath}"))
doc.rootElement.addChild(el)
end
NSString.alloc.initWithData(doc.XMLData, encoding:NSUTF8StringEncoding)
end
def save_as(path)
FileUtils.mkdir_p(path)
File.open(File.join(path, 'contents.xcworkspacedata'), 'w') do |out|
out << to_s
end
end
end
end
end
spec/integration_spec.rb
View file @ 6b9e1931
...@@ -141,7 +141,7 @@ else ...@@ -141,7 +141,7 @@ else
installer = Pod::Installer.new(spec) installer = Pod::Installer.new(spec)
installer.generate_project installer.generate_project
project = Pod::Xcode::Project.new(config.project_pods_root) project = Pod::Xcode::Project.new(config.project_pods_root + 'Pods.xcodeproj')
project.source_files.should == installer.xcodeproj.source_files project.source_files.should == installer.xcodeproj.source_files
end end
...@@ -171,6 +171,39 @@ else ...@@ -171,6 +171,39 @@ else
end end
end end
it "sets up an existing project with pods" do
basename = platform == :ios ? 'iPhone' : 'Mac'
projpath = temporary_directory + 'ASIHTTPRequest.xcodeproj'
FileUtils.cp_r(fixture("integration/ASIHTTPRequest/#{basename}.xcodeproj"), projpath)
spec = Pod::Podfile.new do
self.platform platform
dependency 'SSZipArchive'
end
installer = SpecHelper::Installer.new(spec)
installer.install!
installer.configure_project(projpath)
xcworkspace = temporary_directory + 'ASIHTTPRequest.xcworkspace'
workspace = Pod::Xcode::Workspace.new_from_xcworkspace(xcworkspace)
workspace.projpaths.sort.should == ['ASIHTTPRequest.xcodeproj', 'Pods/Pods.xcodeproj']
project = Pod::Xcode::Project.new(projpath)
config = project.files.find { |f| f.path =~ /Pods.xcconfig$/ }
config.should.not.equal nil
copy_resources = project.objects.select_by_class(Pod::Xcode::Project::PBXShellScriptBuildPhase).find do |ss|
ss.shellScript['PodsResources.sh']
end
copy_resources.should.not.equal nil
project.targets.each do |target|
bases = target.buildConfigurationList.buildConfigurations.map(&:baseConfigurationReference)
bases.uniq[0].uuid.should == config.uuid
target.buildPhases.map(&:uuid).should.include copy_resources.uuid
end
lib = project.files.find { |f| f.path =~ /libPods.a$/ }
lib.should.not.equal nil
project.objects.select_by_class(Pod::Xcode::Project::PBXFrameworksBuildPhase).each do |build_phase|
build_phase.files.map(&:uuid).should.include lib.build_file.uuid
end
end
end end
end end
end end
spec/unit/xcode/project_spec.rb
View file @ 6b9e1931
...@@ -4,7 +4,8 @@ describe "Pod::Xcode::Project" do ...@@ -4,7 +4,8 @@ describe "Pod::Xcode::Project" do
extend SpecHelper::TemporaryDirectory extend SpecHelper::TemporaryDirectory
before do before do
@project = Pod::Xcode::Project.static_library(:ios) @template = Pod::ProjectTemplate.new(:ios)
@project = Pod::Xcode::Project.new(@template.xcodeproj_path)
end end
def find_objects(conditions) def find_objects(conditions)
...@@ -18,8 +19,7 @@ describe "Pod::Xcode::Project" do ...@@ -18,8 +19,7 @@ describe "Pod::Xcode::Project" do
end end
it "returns an instance initialized from the iOS static library template" do it "returns an instance initialized from the iOS static library template" do
template_dir = Pod::Xcode::Project::TEMPLATES_DIR + 'cocoa-touch-static-library' template_file = (@template.xcodeproj_path + '/project.pbxproj').to_s
template_file = (template_dir + 'Pods.xcodeproj/project.pbxproj').to_s
@project.to_hash.should == NSDictionary.dictionaryWithContentsOfFile(template_file) @project.to_hash.should == NSDictionary.dictionaryWithContentsOfFile(template_file)
end end
...@@ -178,7 +178,8 @@ describe "Pod::Xcode::Project" do ...@@ -178,7 +178,8 @@ describe "Pod::Xcode::Project" do
end end
it "saves the template with the adjusted project" do it "saves the template with the adjusted project" do
@project.create_in(temporary_directory) @template.copy_to(temporary_directory)
@project.save_as(temporary_directory + 'Pods.xcodeproj')
(temporary_directory + 'Pods-Prefix.pch').should.exist (temporary_directory + 'Pods-Prefix.pch').should.exist
(temporary_directory + 'Pods.xcconfig').should.exist (temporary_directory + 'Pods.xcconfig').should.exist
project_file = (temporary_directory + 'Pods.xcodeproj/project.pbxproj') project_file = (temporary_directory + 'Pods.xcodeproj/project.pbxproj')
......
spec/unit/xcode/workspace_spec.rb 0 → 100644
View file @ 6b9e1931
require File.expand_path('../../../spec_helper', __FILE__)
describe "Pod::Xcode::Workspace" do
before do
@workspace = Pod::Xcode::Workspace.new('Pods/Pods.xcodeproj', 'App.xcodeproj')
end
it "accepts new projects" do
@workspace << 'Framework.xcodeproj'
@workspace.projpaths.should.include 'Framework.xcodeproj'
end
before do
@doc = NSXMLDocument.alloc.initWithXMLString(@workspace.to_s, options:0, error:nil)
end
it "is the right xml workspace version" do
@doc.rootElement.attributeForName("version").stringValue.should == "1.0"
end
it "refers to the projects in xml" do
@doc.nodesForXPath("/Workspace/FileRef", error:nil).map do |node|
node.attributeForName("location").stringValue.sub(/^group:/, '')
end.sort.should == ['App.xcodeproj', 'Pods/Pods.xcodeproj']
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment