iCuke 0.5.5 → 0.6.0

data/.gitignore

@@ -11,3 +11,5 @@ pkg
 
 ## PROJECT::SPECIFIC
 events.plist
+
+bin/waxsim

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ext/WaxSim"]
+	path = ext/WaxSim
+	url = git://github.com/robholland/WaxSim.git

data/README.rdoc

@@ -20,8 +20,8 @@ Write some scenarios like:
 
 == How it works
 
-iCuke uses applescript to drive Xcode in order to launch your application into the iPhone Simulator. A preload library
-is used to add a HTTP server into your application.
+iCuke launches your application into the iPhone Simulator. A preload library is used to add a HTTP server into your
+application.
 
 The HTTP server allows us to see an XML version of the iPhone's screen, and to emulate taps/swipes etc.
 
@@ -30,19 +30,20 @@ to function sensibly. If your accessibility information is not accurate, iCuke m
 
 == Bugs
 
-iCuke does not support testing applications on real devices, because I don't know of a way get a preload library to load
-on the device.
+iCuke does not support testing applications on real devices, because I don't know of a way get a preload library to
+load on the device.
 
-iCuke does not support drags or pinches yet. They'll be here soon!
+iCuke does not support pinches yet. They'll be here soon!
 
-iCuke compiles against the 3.1.2 SDK. I'm not sure how to make that configurable as the compilation is done at gem
-install time.
+iCuke compiles against the latest 3.1 and 4.0 SDKs it can find. Compiling against 3.2 is not currently supported as Apple have released two versions with different ABIs.
 
 == Contributors
 
 * Nigel Taylor
 * Aslak Hellesøy
 * Dominic Baggott
+* Jeff Morgan
+* Luke Redpath
 
 == Thanks
 

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'lib/icuke/sdk'
 
 begin
   require 'jeweler'
@@ -11,21 +12,24 @@ begin
     gem.homepage = "http://github.com/unboxed/iCuke"
     gem.authors = ["Rob Holland"]
     gem.add_dependency "cucumber", ">= 0"
-    gem.add_dependency "rb-appscript", ">= 0"
     gem.add_dependency "httparty", ">= 0"
     gem.add_dependency "nokogiri", ">= 0"
-    gem.extensions = ['ext/iCuke/Rakefile']
-    gem.files += ['ext/iCuke/libicuke.dylib']
+    gem.extensions = ['ext/Rakefile']
+    gem.files += ['ext/bin/waxsim']
+    gem.files += ['ext/iCuke/libicuke*.dylib']
+    gem.files += ['ext/WaxSim/**/*']
+    gem.files -= ['ext/WaxSim/build']
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-file 'app/build/Debug-iphonesimulator/UICatalog.app/UICatalog' do
-  sh 'cd app && xcodebuild -target UICatalog -configuration Debug -sdk iphonesimulator3.1.2'
+file 'app/build/Debug-iphonesimulator/Universal.app/Universal' do
+  ICuke::SDK.use_latest
+  sh "cd app && xcodebuild -target Universal -configuration Debug -sdk #{ICuke::SDK.fullname}"
 end
-task :app => 'app/build/Debug-iphonesimulator/UICatalog.app/UICatalog'
+task :app => 'app/build/Debug-iphonesimulator/Universal.app/Universal'
 task :features => :app
 
 task :lib do
@@ -55,27 +59,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-task :launch => [:app, :lib] do
-  require 'lib/icuke/simulator'
-
-  simulator = ICuke::Simulator.new
-  simulator.launch File.expand_path('app/iCuke/build/Debug-iphonesimulator/iCuke.app'),
-    :env => { 'DYLD_INSERT_LIBRARIES' => File.expand_path(File.dirname(__FILE__) + '/ext/iCuke/libicuke.dylib') }
-end
-
-task :replay => :launch do
-  simulator = ICuke::Simulator.new
-  simulator.load(File.expand_path(File.dirname(__FILE__) + '/events.plist'))
-  simulator.play
-end
-
-task :debug => [:app, :lib] do
-  require 'lib/icuke/simulator'
-
-  simulator = ICuke::Simulator.new
-  simulator.launch File.expand_path('app/iCuke/build/Debug-iphonesimulator/iCuke.app'),
-    :env => { 'DYLD_INSERT_LIBRARIES' => File.expand_path(File.dirname(__FILE__) + '/ext/iCuke/libicuke.dylib') },
-    :debugger => true
-  puts `ps aux|grep [i]Cuke.app/iCuke`
-end

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.6.0

data/app/.gitignore

@@ -1 +1,4 @@
+.DS_Store
 build
+*.mode1v3
+*.pbxuser

data/app/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Sam Soffes
+
+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.

data/app/Readme.markdown

@@ -0,0 +1,3 @@
+# Universal iPad/iPhone Example
+
+Simple example app that uses 3.2 as the base SDK and 3.1.3 as the iPhone deployment target.

data/app/Shared/AppDelegate_Shared.h

@@ -0,0 +1,17 @@
+//
+//  AppDelegate_Shared.h
+//  Universal
+//
+//  Created by Sam Soffes on 4/12/10.
+//  Copyright 2010 Sam Soffes. All rights reserved.
+//
+
+@interface AppDelegate_Shared : NSObject <UIApplicationDelegate> {
+
+	UIWindow *window;
+	UINavigationController *navigationController;
+}
+
+@property (nonatomic, retain) IBOutlet UIWindow *window;
+
+@end

data/app/Shared/AppDelegate_Shared.m

@@ -0,0 +1,25 @@
+    //
+//  AppDelegate_Shared.m
+//  Universal
+//
+//  Created by Sam Soffes on 4/12/10.
+//  Copyright 2010 Sam Soffes. All rights reserved.
+//
+
+#import "AppDelegate_Shared.h"
+
+@implementation AppDelegate_Shared
+
+@synthesize window;
+
+#pragma mark -
+#pragma mark NSObject
+#pragma mark -
+
+- (void)dealloc {
+	[window release];
+	[navigationController release];
+	[super dealloc];
+}
+
+@end

data/app/Shared/ModalViewController.h

@@ -0,0 +1,15 @@
+//
+//  ModalViewController.h
+//  Universal
+//
+//  Created by Sam Soffes on 4/12/10.
+//  Copyright 2010 Sam Soffes. All rights reserved.
+//
+
+@interface ModalViewController : UITableViewController {
+
+}
+
+- (void)close:(id)sender;
+
+@end

data/app/Shared/ModalViewController.m

@@ -0,0 +1,96 @@
+//
+//  ModalViewController.m
+//  Universal
+//
+//  Created by Sam Soffes on 4/12/10.
+//  Copyright 2010 Sam Soffes. All rights reserved.
+//
+
+#import "ModalViewController.h"
+
+@implementation ModalViewController
+
+NSString *lorem[] = {
+	@"Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
+	@"Donec dictum vehicula suscipit.",
+	@"Morbi eget mauris vel mauris pellentesque luctus ut sed nulla.",
+	@"Aliquam blandit risus ut magna egestas ac commodo lacus sagittis.",
+	@"Duis dui nunc, rutrum a tincidunt nec, commodo vitae ante.",
+	@"Mauris fringilla est at nibh porta pulvinar.",
+	@"Quisque mattis, odio sit amet ultrices elementum, dui libero scelerisque nisl, a bibendum ante orci ut metus.",
+	@"Aliquam id lorem arcu.",
+	@"Fusce luctus, nibh facilisis sagittis ornare, neque ligula accumsan ipsum, non dignissim sapien nulla et turpis.",
+	@"Proin pretium erat nec ipsum fringilla pellentesque.",
+	@"Fusce sem nisi, tincidunt in sodales ac, tincidunt non lorem."
+};
+
+
+#pragma mark -
+#pragma mark UIViewController
+#pragma mark -
+
+- (void)viewDidLoad {
+	[super viewDidLoad];
+	
+	self.title = @"Shared Modal";
+	
+	if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+		self.contentSizeForViewInPopover = CGSizeMake(320.0, 300.0);
+	} else {
+		UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithTitle:@"Close" style:UIBarButtonItemStyleBordered target:self action:@selector(close:)];
+		self.navigationItem.rightBarButtonItem = closeButton;
+		[closeButton release];
+	}
+}
+
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+		return YES;
+	}
+	
+	return interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown;
+}
+
+
+#pragma mark -
+#pragma mark Actions
+#pragma mark -
+
+- (void)close:(id)sender {
+	[self.navigationController dismissModalViewControllerAnimated:YES];
+}
+
+
+#pragma mark -
+#pragma mark UITableViewDataSource
+#pragma mark -
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return sizeof(lorem) / sizeof(NSString *);
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+	static NSString *cellIdentifier = @"cellIdentifier";
+	
+	UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier];
+	if (!cell) {
+		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier] autorelease];
+	}
+	
+	cell.textLabel.text = lorem[indexPath.row];
+	
+	return cell;
+}
+
+
+#pragma mark -
+#pragma mark UITableViewDelegate
+#pragma mark -
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+	[tableView deselectRowAtIndexPath:indexPath animated:YES];
+}
+
+@end

data/app/Shared/TestViewController_Shared.h

@@ -0,0 +1,15 @@
+//
+//  TestViewController_Shared.h
+//  Universal
+//
+//  Created by Sam Soffes on 4/12/10.
+//  Copyright 2010 Sam Soffes. All rights reserved.
+//
+
+@interface TestViewController_Shared : UIViewController {
+
+}
+
+- (void)test:(id)sender;
+
+@end

data/app/Shared/TestViewController_Shared.m

@@ -0,0 +1,43 @@
+//
+//  TestViewController_Shared.m
+//  Universal
+//
+//  Created by Sam Soffes on 4/12/10.
+//  Copyright 2010 Sam Soffes. All rights reserved.
+//
+
+#import "TestViewController_Shared.h"
+
+@implementation TestViewController_Shared
+
+#pragma mark -
+#pragma mark UIViewController
+#pragma mark -
+
+- (void)viewDidLoad {
+	UIButton *button = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+	button.frame = CGRectMake(20.0, 20.0, 280.0, 44.0);
+	[button setTitle:@"Show Test Modal" forState:UIControlStateNormal];
+	[button addTarget:self action:@selector(test:) forControlEvents:UIControlEventTouchUpInside];
+	[self.view addSubview:button];
+}
+
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+		return YES;
+	}
+	
+	return interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown;
+}
+
+
+#pragma mark -
+#pragma mark Actions
+#pragma mark -
+
+- (void)test:(id)sender {
+	// Must be overridden by subclass
+}
+
+@end

data/app/{Info.plist → Shared/Universal-Info.plist}

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>English</string>
 	<key>CFBundleDisplayName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>
@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Icon.png</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+	<string>com.samsoffes.universal-ipad-iphone-example</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -21,10 +21,23 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.6</string>
+	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>
-	<string>MainWindow</string>
+	<string>MainWindow_Phone</string>
+	<key>NSMainNibFile~ipad</key>
+	<string>MainWindow_Pad</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
 </dict>
 </plist>

data/app/Shared/Universal_Prefix.pch

@@ -0,0 +1,8 @@
+//
+// Prefix header for all source files of the 'Universal' target in the 'Universal' project
+//
+
+#ifdef __OBJC__
+    #import <Foundation/Foundation.h>
+    #import <UIKit/UIKit.h>
+#endif

data/app/Shared/main.m

@@ -0,0 +1,14 @@
+//
+//  main.m
+//  Universal
+//
+//  Created by Sam Soffes on 4/12/10.
+//  Copyright Sam Soffes 2010. All rights reserved.
+//
+
+int main(int argc, char *argv[]) {
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    int retVal = UIApplicationMain(argc, argv, nil, nil);
+    [pool release];
+    return retVal;
+}