Updating Kiwi and simulator target

Objection.xcodeproj/project.pbxproj

@@ -178,6 +178,20 @@
 			remoteGlobalIDString = 832C8323157263B300F160D5;
 			remoteInfo = "Kiwi-OSX";
 		};
+		4BABED1818E65FCB002F266F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4B5D25FA16D2E13200E862AA /* Kiwi.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DA084E7317E3838100592D5A;
+			remoteInfo = "Kiwi-XCTest";
+		};
+		4BABED1A18E65FCB002F266F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4B5D25FA16D2E13200E862AA /* Kiwi.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DA084D3E17E3804200592D5A;
+			remoteInfo = KiwiXCTests;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -429,6 +443,8 @@
 				4B5D260516D2E13200E862AA /* libKiwi.a */,
 				4B5D260716D2E13200E862AA /* libKiwi-OSX.a */,
 				4B5D260916D2E13200E862AA /* KiwiTests.octest */,
+				4BABED1918E65FCB002F266F /* libKiwi-XCTest.a */,
+				4BABED1B18E65FCB002F266F /* KiwiXCTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -667,6 +683,20 @@
 			remoteRef = 4B5D260816D2E13200E862AA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		4BABED1918E65FCB002F266F /* libKiwi-XCTest.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libKiwi-XCTest.a";
+			remoteRef = 4BABED1818E65FCB002F266F /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		4BABED1B18E65FCB002F266F /* KiwiXCTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = KiwiXCTests.xctest;
+			remoteRef = 4BABED1A18E65FCB002F266F /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -1055,6 +1085,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
@@ -1072,7 +1103,10 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = NO;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/Vendor/Kiwi/Classes";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/Vendor/Kiwi/Classes/**",
+					"$(SRCROOT)/Vendor/Kiwi/NonARC/**",
+				);
 				INFOPLIST_FILE = "Specs-OSX/Specs-OSX-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1092,6 +1126,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
@@ -1107,7 +1142,10 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = NO;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/Vendor/Kiwi/Classes";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/Vendor/Kiwi/Classes/**",
+					"$(SRCROOT)/Vendor/Kiwi/NonARC/**",
+				);
 				INFOPLIST_FILE = "Specs-OSX/Specs-OSX-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_LDFLAGS = (

Rakefile

@@ -2,7 +2,7 @@ PROJECT_NAME = "Objection"
 CONFIGURATION = "Debug"
 SPECS_TARGET_NAME = "Specs-OSX"
 UI_SPECS_TARGET_NAME = "Specs-iOS"
-IOS_VERSION = "6.1"
+IOS_VERSION = "7.1"
 SDK_DIR = "iphonesimulator#{IOS_VERSION}"
 
 def xcodebuild_executable

Vendor/Kiwi/.gitignore

@@ -12,3 +12,11 @@ xcuserdata/
 *.perspectivev3
 *.pbxuser
 output
+
+# AppCode files
+.idea
+
+# raw logs
+xcodebuild.log
+xcodebuild_error.log
+

Vendor/Kiwi/.travis.yml

@@ -0,0 +1,5 @@
+language: objective-c
+before_install:
+  - gem install xcpretty
+script: make ci | xcpretty -c
+

Vendor/Kiwi/CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Welcome to Kiwi!
+
+We're building a BDD library that is exquisitely simple to setup and use,
+and we'd love your help!
+
+## Reporting Bugs
+
+Kiwi currently uses two channels for reporting bugs:
+
+ 1. If Kiwi isn't working as you'd expect it to, but you're not sure whether
+    you're using it correctly, please send a message to the
+    [Kiwi Google group](https://groups.google.com/forum/#!forum/kiwi-bdd).
+
+    Once your issue has been resolved, please consider contributing to the
+    [Wiki](https://github.com/allending/Kiwi/wiki) to help people
+    who might experience similar issues in the future.
+
+ 2. If you're sure that you're using Kiwi correctly, but Kiwi still does not
+    behave as you'd expect it to, you may have found a bug. If no one
+    has [already reported the issue](https://github.com/allending/Kiwi/issues?state=open),
+    please [submit a new issue](https://github.com/allending/Kiwi/issues/new),
+    and include any and all information maintainers might need to fix the problem.
+    It's not easy to fix bugs, but detailed reports help!
+
+## Pull Requests
+
+Our work flow is a typical GitHub flow, where contributors fork the
+[Kiwi repository](https://github.com/allending/Kiwi), make their changes on branch,
+and submit a pull request.
+
+Please include a description of your changes with your pull request.
+All pull requests that involve changes to the source code should include
+tests that prove the changes behave as stated in the pull request message.

Vendor/Kiwi/Classes/KWAny.h → Vendor/Kiwi/Classes/Core/KWAny.h

@@ -10,8 +10,7 @@
 // match any value. Used for pointers as well as for scalar values.
 @interface KWAny : NSObject
 
-#pragma mark -
-#pragma mark Initializing
+#pragma mark - Initializing
 
 + (id)any;
 

Vendor/Kiwi/Classes/Core/KWAny.m

@@ -0,0 +1,23 @@
+//
+// Licensed under the terms in License.txt
+//
+// Copyright 2010 Allen Ding. All rights reserved.
+//
+
+#import "KWAny.h"
+
+@implementation KWAny
+
+#pragma mark - Initializing
+
++ (id)any {
+    static KWAny *sharedAny = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedAny = [self new];
+
+    });
+    return sharedAny;
+}
+
+@end

Vendor/Kiwi/Classes/Core/KWBlock.h

@@ -0,0 +1,25 @@
+//
+// Licensed under the terms in License.txt
+//
+// Copyright 2010 Allen Ding. All rights reserved.
+//
+
+#import "KiwiConfiguration.h"
+
+@interface KWBlock : NSObject
+
+#pragma mark - Initializing
+- (id)initWithBlock:(void (^)(void))block;
+
++ (id)blockWithBlock:(void (^)(void))block;
+
+#pragma mark - Calling Blocks
+
+- (void)call;
+
+@end
+
+#pragma mark - Creating Blocks
+
+KWBlock *theBlock(void (^block)(void));
+KWBlock *lambda(void (^block)(void));

Vendor/Kiwi/Classes/Core/KWBlock.m

@@ -0,0 +1,50 @@
+//
+// Licensed under the terms in License.txt
+//
+// Copyright 2010 Allen Ding. All rights reserved.
+//
+
+#import "KWBlock.h"
+
+@interface KWBlock()
+
+#pragma mark - Properties
+
+@property (nonatomic, readonly, copy) void (^block)(void);
+
+@end
+
+@implementation KWBlock
+
+#pragma mark - Initializing
+
+- (id)initWithBlock:(void (^)(void))block {
+    self = [super init];
+    if (self) {
+        _block = [block copy];
+    }
+
+    return self;
+}
+
++ (id)blockWithBlock:(void (^)(void))aBlock {
+    return [[self alloc] initWithBlock:aBlock];
+}
+
+#pragma mark - Calling Blocks
+
+- (void)call {
+    self.block();
+}
+
+@end
+
+#pragma mark - Creating Blocks
+
+KWBlock *theBlock(void (^block)(void)) {
+    return lambda(block);
+}
+
+KWBlock *lambda(void (^block)(void)) {
+    return [KWBlock blockWithBlock:block];
+}

Vendor/Kiwi/Classes/KWCallSite.h → Vendor/Kiwi/Classes/Core/KWCallSite.h

@@ -6,27 +6,20 @@
 
 #import "KiwiConfiguration.h"
 
-@interface KWCallSite : NSObject {
-@private
-    NSString *filename;
-    NSUInteger lineNumber;
-}
+@interface KWCallSite : NSObject
 
-#pragma mark -
-#pragma mark Initializing
+#pragma mark - Initializing
 
 - (id)initWithFilename:(NSString *)aFilename lineNumber:(NSUInteger)aLineNumber;
 
 + (id)callSiteWithFilename:(NSString *)aFilename lineNumber:(NSUInteger)aLineNumber;
 
-#pragma mark -
-#pragma mark Properties
+#pragma mark - Properties
 
 @property (nonatomic, readonly, copy) NSString *filename;
 @property (nonatomic, readonly) NSUInteger lineNumber;
 
-#pragma mark -
-#pragma mark Identifying and Comparing
+#pragma mark - Identifying and Comparing
 
 - (BOOL)isEqualToCallSite:(KWCallSite *)aCallSite;
 

Vendor/Kiwi/Classes/KWCallSite.m → Vendor/Kiwi/Classes/Core/KWCallSite.m

@@ -8,35 +8,23 @@
 
 @implementation KWCallSite
 
-#pragma mark -
-#pragma mark Initializing
+#pragma mark - Initializing
 
 - (id)initWithFilename:(NSString *)aFilename lineNumber:(NSUInteger)aLineNumber {
-    if ((self = [super init])) {
-        filename = [aFilename copy];
-        lineNumber = aLineNumber;
+    self = [super init];
+    if (self) {
+        _filename = [aFilename copy];
+        _lineNumber = aLineNumber;
     }
 
     return self;
 }
 
 + (id)callSiteWithFilename:(NSString *)aFilename lineNumber:(NSUInteger)aLineNumber {
-    return [[[self alloc] initWithFilename:aFilename lineNumber:aLineNumber] autorelease];
+    return [[self alloc] initWithFilename:aFilename lineNumber:aLineNumber];
 }
 
-- (void)dealloc {
-    [filename release];
-    [super dealloc];
-}
-
-#pragma mark -
-#pragma mark Accessing Call Site Properties
-
-@synthesize filename;
-@synthesize lineNumber;
-
-#pragma mark -
-#pragma mark Identifying and Comparing
+#pragma mark - Identifying and Comparing
 
 - (NSUInteger)hash {
     return [[NSString stringWithFormat:@"%@%u", self.filename, (unsigned)self.lineNumber] hash];

Vendor/Kiwi/Classes/Core/KWCaptureSpy.h

@@ -0,0 +1,9 @@
+#import "KWMessageSpying.h"
+
+@interface KWCaptureSpy : NSObject<KWMessageSpying>
+
+@property (nonatomic, strong, readonly) id argument;
+
+- (id)initWithArgumentIndex:(NSUInteger)index;
+
+@end