segv at times in get_device_hardware_name

.gitignore

@@ -1,3 +1,4 @@
-demo
-demo.app
-fruitstrap
+build/*
+node_modules/*
+/.DS_Store
+*~

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+## Contributing to ios-deploy
+
+Github url: 
+
+        https://github.com/phonegap/ios-deploy
+
+Git clone url: 
+
+        https://github.com/phonegap/ios-deploy.git
+
+## Filing an issue
+
+Please run the commands below in your Terminal.app and include it in the issue:
+
+```
+1. sw_vers -productVersion
+2. ios-deploy -V
+3. xcodebuild -version
+4. xcode-select --print-path
+5. gcc --version
+6. lldb --version
+
+```
+Also include **command line arguments** you used for ios-deploy.
+
+Don't forget to check out the [El Capitan](https://github.com/phonegap/ios-deploy/blob/master/README.md#os-x-1011-el-capitan) section of the [README](https://github.com/phonegap/ios-deploy/blob/master/README.md) before filing that issue!
+
+
+## Sending a Pull Request
+
+Please **create a topic branch** for your issue before submitting your pull request. You will be asked to re-submit if your pull request contains unrelated commits.
+
+Please elaborate regarding the problem the pull request is supposed to solve, and perhaps also link to any relevant issues the pull request is trying to fix.

LICENSE

@@ -1,2 +1,8 @@
-fruitstrap is available under the provisions of the GNU General Public License,
-version 3 (or later), available here: http://www.gnu.org/licenses/gpl-3.0.html
+ios-deploy is available under the provisions of the GNU General Public License,
+version 3 (or later), available here: http://www.gnu.org/licenses/gpl-3.0.html
+
+
+Error codes used for error messages were taken from SDMMobileDevice framework,
+originally reverse engineered by Sam Marshall. SDMMobileDevice is distributed
+under BSD 3-Clause license and is available here:
+https://github.com/samdmarshall/SDMMobileDevice

README.md

@@ -1,28 +1,146 @@
-## This project is no longer maintained.
-
-fruitstrap
+ios-deploy
 ==========
-Install and debug iPhone apps without using Xcode. Designed to work on unjailbroken devices.
+Install and debug iOS apps without using Xcode. Designed to work on un-jailbroken devices.
 
 ## Requirements
 
-* Mac OS X. Tested on Snow Leopard only.
-* You need to have a valid iPhone development certificate installed.
-* Xcode must be installed, along with the SDK for your iOS version.
+* Mac OS X. Tested on 10.11 El Capitan and iOS 9.0
+* You need to have a valid iOS Development certificate installed.
+* Xcode 6.4 or greater should be installed
+
+## Roadmap
+
+See our [milestones](https://github.com/phonegap/ios-deploy/milestones).
+
+Significant changes: 
+
+    1.8.0 will use an Xcode project instead of a Makefile (to prepare for 2.0.0) (1.x branch)
+    2.0.0 will break out the commands into their own files, and create ios-deploy-lib for node.js use (master branch)
+
+## Development
+
+The legacy `1.x` version is under the `1.x` branch. Bug fixes for the `1.x` series will occur under there.
+The 'master' branch now contains the `2.x` series, and is the development branch. 	
+
+## Installation
+=======
+
+ios-deploy installation is made simple using the node.js package manager.  If you use [Homebrew](http://brew.sh/), install [node.js](https://nodejs.org):
+
+```
+brew install node
+```
+
+Now install ios-deploy with the [node.js](https://nodejs.org) package manager:
+
+```
+npm install -g ios-deploy
+```
+
+To build from source:
+
+```
+xcodebuild
+```
+
+This will build `ios-deploy` into the `build/Release` folder.
+
+## Testing
+
+Run:
+
+```
+npm install && npm test
+```
+
+### OS X 10.11 El Capitan
+
+If you are *not* using a node version manager like [nvm](https://github.com/creationix/nvm) or [n](https://github.com/tj/n), you may have to do either of these three things below when under El Capitan:
+
+1. Add the `--unsafe-perm=true` flag  when installing ios-deploy
+2. Add the `--allow-root` flag  when installing ios-deploy
+3. Ensure the `nobody` user has write access to `/usr/local/lib/node_modules/ios-deploy/ios-deploy`
 
 ## Usage
 
-* `fruitstrap [-d] -b <app> [device_id]`
-* Optional `-d` flag launches a remote GDB session after the app has been installed.
-* `<app>` must be an iPhone application bundle, *not* an IPA.
-* Optional `device_id`; useful when you have more than one iPhone/iPad connected.
+    Usage: ios-deploy [OPTION]...
+        -d, --debug                  launch the app in lldb after installation
+        -i, --id <device_id>         the id of the device to connect to
+        -c, --detect                 only detect if the device is connected
+        -b, --bundle <bundle.app>    the path to the app bundle to be installed
+        -a, --args <args>            command line arguments to pass to the app when launching it
+        -t, --timeout <timeout>      number of seconds to wait for a device to be connected
+        -u, --unbuffered             don't buffer stdout
+        -n, --nostart                do not start the app when debugging
+        -I, --noninteractive         start in non interactive mode (quit when app crashes or exits)
+        -L, --justlaunch             just launch the app and exit lldb
+        -v, --verbose                enable verbose output
+        -m, --noinstall              directly start debugging without app install (-d not required)
+        -p, --port <number>          port used for device, default: dynamic
+        -r, --uninstall              uninstall the app before install (do not use with -m; app cache and data are cleared) 
+        -9, --uninstall_only         uninstall the app ONLY. Use only with -1 <bundle_id> 
+        -1, --bundle_id <bundle id>  specify bundle id for list and upload
+        -l, --list                   list files
+        -o, --upload <file>          upload file
+        -w, --download               download app tree
+        -2, --to <target pathname>   use together with up/download file/tree. specify target
+        -D, --mkdir <dir>            make directory on device
+        -R, --rm <path>              remove file or directory on device (directories must be empty)
+        -V, --version                print the executable version 
+        -e, --exists                 check if the app with given bundle_id is installed or not 
+        -B, --list_bundle_id         list bundle_id 
+        -W, --no-wifi                ignore wifi devices
+
+## Examples
+
+The commands below assume that you have an app called `my.app` with bundle id `bundle.id`. Substitute where necessary.
+
+    // deploy and debug your app to a connected device
+    ios-deploy --debug --bundle my.app
+
+    // deploy and debug your app to a connected device, skipping any wi-fi connection (use USB)
+    ios-deploy --debug --bundle my.app --no-wifi
+
+    // deploy and launch your app to a connected device, but quit the debugger after
+    ios-deploy --justlaunch --debug --bundle my.app
+
+    // deploy and launch your app to a connected device, quit when app crashes or exits
+    ios-deploy --noninteractive --debug --bundle my.app
+
+    // Upload a file to your app's Documents folder
+    ios-deploy --bundle_id 'bundle.id' --upload test.txt --to Documents/test.txt
+
+    // Download your app's Documents, Library and tmp folders
+    ios-deploy --bundle_id 'bundle.id' --download --to MyDestinationFolder
+
+    // List the contents of your app's Documents, Library and tmp folders
+    ios-deploy --bundle_id 'bundle.id' --list
+
+    // deploy and debug your app to a connected device, uninstall the app first
+    ios-deploy --uninstall --debug --bundle my.app
+
+    // check whether an app by bundle id exists on the device (check return code `echo $?`)
+    ios-deploy --exists --bundle_id com.apple.mobilemail
+
+    // Download the Documents directory of the app *only*
+    ios-deploy --download=/Documents --bundle_id my.app.id --to ./my_download_location
+
+    // List ids and names of connected devices
+    ios-deploy -c
+
+    // Uninstall an app
+    ios-deploy --uninstall_only --bundle_id my.bundle.id
+
+    // list all bundle ids of all apps on your device
+    ios-deploy --list_bundle_id
 
 ## Demo
 
-* The included demo.app represents the minimum required to get code running on iOS.
-* `make install` will install demo.app to the device.
-* `make debug` will install demo.app and launch a GDB session.
+The included demo.app represents the minimum required to get code running on iOS.
+
+* `make demo.app` will generate the demo.app executable. If it doesn't compile, modify `IOS_SDK_VERSION` in the Makefile.
+* `make debug` will install demo.app and launch a LLDB session.
 
 ## Notes
 
-* With some modifications, it may be possible to use this without Xcode installed; however, you would need a copy of the relevant DeveloperDiskImage.dmg (included with Xcode). GDB would also run slower as symbols would be downloaded from the device on-the-fly.
+* With some modifications, it may be possible to use this without Xcode installed; however, you would need a copy of the relevant DeveloperDiskImage.dmg (included with Xcode). lldb would also run slower as symbols would be downloaded from the device on-the-fly.

demo/.gitignore

@@ -0,0 +1,5 @@
+demo
+demo.app
+demo.dSYM
+/.DS_Store
+*~

Info.plist → demo/Info.plist

@@ -10,6 +10,8 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>demo</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
 	<key>CFBundleIdentifier</key>
 	<string>demo</string>
 	<key>CFBundleResourceSpecification</key>

demo/Makefile

@@ -0,0 +1,24 @@
+IOS_SDK_VERSION = 9.1
+
+IOS_CC = gcc -ObjC
+IOS_SDK = $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOS_SDK_VERSION).sdk
+
+all: clean demo.app
+
+demo.app: demo Info.plist
+	mkdir -p demo.app
+	cp demo demo.app/
+	cp Info.plist ResourceRules.plist demo.app/
+	codesign -f -s "iPhone Developer" --entitlements Entitlements.plist demo.app
+
+demo: demo.c
+	$(IOS_CC) -g -arch armv7 -isysroot $(IOS_SDK) -framework CoreFoundation -o demo demo.c
+
+debug: all ios-deploy
+	@../build/Release/ios-deploy --debug --bundle demo.app
+
+clean:
+	@rm -rf *.app demo demo.dSYM
+
+ios-deploy:
+	@xcodebuild -project ../ios-deploy.xcodeproj

demo.c → demo/demo.c

@@ -6,4 +6,4 @@ int main(int argc, const char* argv[]) {
         printf("argv[%d] = %s\n", i, argv[i]);
     }
     return 0;
-}
+}