Major project refactor

FancyPixel · Apr 30, 2015 · 228e260 · 228e260
1 parent 653936a
commit 228e260
Show file tree

Hide file tree

Showing 126 changed files with 1,348 additions and 1,349 deletions.
diff --git a/BigGulp WatchKit App/Images.xcassets/AppIcon.appiconset/Icon-watch-172 copy.png b/BigGulp WatchKit App/Images.xcassets/AppIcon.appiconset/Icon-watch-172 copy.png
diff --git a/BigGulp WatchKit App/Images.xcassets/AppIcon.appiconset/Icon-watch-196 copy.png b/BigGulp WatchKit App/Images.xcassets/AppIcon.appiconset/Icon-watch-196 copy.png
diff --git a/BigGulp.xcodeproj/project.pbxproj b/BigGulp.xcodeproj/project.pbxproj
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'cocoapods', '0.37.0.rc.1'
+gem 'xcpretty'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -47,9 +47,11 @@ GEM
     xcodeproj (0.24.1)
       activesupport (>= 3)
       colored (~> 1.2)
+    xcpretty (0.1.10)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cocoapods (= 0.37.0.rc.1)
+  xcpretty
diff --git a/...chKit App/Base.lproj/Interface.storyboard → ...chKit App/Base.lproj/Interface.storyboard b/...chKit App/Base.lproj/Interface.storyboard → ...chKit App/Base.lproj/Interface.storyboard
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
@@ -50,15 +50,13 @@
       "size" : "86x86",
       "idiom" : "watch",
       "scale" : "2x",
-      "filename" : "Icon-watch-172 copy.png",
       "role" : "quickLook",
       "subtype" : "38mm"
     },
     {
       "size" : "98x98",
       "idiom" : "watch",
       "scale" : "2x",
-      "filename" : "Icon-watch-196 copy.png",
       "role" : "quickLook",
       "subtype" : "42mm"
     }

diff --git a/...AppIcon.appiconset/Icon-watch-48 copy.png → ...AppIcon.appiconset/Icon-watch-48 copy.png b/...AppIcon.appiconset/Icon-watch-48 copy.png → ...AppIcon.appiconset/Icon-watch-48 copy.png
diff --git a/...AppIcon.appiconset/Icon-watch-55 copy.png → ...AppIcon.appiconset/Icon-watch-55 copy.png b/...AppIcon.appiconset/Icon-watch-55 copy.png → ...AppIcon.appiconset/Icon-watch-55 copy.png
diff --git a/...pIcon.appiconset/Icon-watch-58 copy-1.png → ...pIcon.appiconset/Icon-watch-58 copy-1.png b/...pIcon.appiconset/Icon-watch-58 copy-1.png → ...pIcon.appiconset/Icon-watch-58 copy-1.png
diff --git a/...AppIcon.appiconset/Icon-watch-80 copy.png → ...AppIcon.appiconset/Icon-watch-80 copy.png b/...AppIcon.appiconset/Icon-watch-80 copy.png → ...AppIcon.appiconset/Icon-watch-80 copy.png
diff --git a/...AppIcon.appiconset/Icon-watch-87 copy.png → ...AppIcon.appiconset/Icon-watch-87 copy.png b/...AppIcon.appiconset/Icon-watch-87 copy.png → ...AppIcon.appiconset/Icon-watch-87 copy.png
diff --git a/...AppIcon.appiconset/Icon-watch-88 copy.png → ...AppIcon.appiconset/Icon-watch-88 copy.png b/...AppIcon.appiconset/Icon-watch-88 copy.png → ...AppIcon.appiconset/Icon-watch-88 copy.png
diff --git a/...cassets/button-big.imageset/Contents.json → ...cassets/button-big.imageset/Contents.json b/...cassets/button-big.imageset/Contents.json → ...cassets/button-big.imageset/Contents.json
diff --git a/...assets/button-big.imageset/button-big.png → ...assets/button-big.imageset/button-big.png b/...assets/button-big.imageset/button-big.png → ...assets/button-big.imageset/button-big.png
diff --git a/...ssets/button-small.imageset/Contents.json → ...ssets/button-small.imageset/Contents.json b/...ssets/button-small.imageset/Contents.json → ...ssets/button-small.imageset/Contents.json
diff --git a/...ts/button-small.imageset/button-small.png → ...ts/button-small.imageset/button-small.png b/...ts/button-small.imageset/button-small.png → ...ts/button-small.imageset/button-small.png
diff --git a/...ages.xcassets/gulp.imageset/Contents.json → ...ages.xcassets/gulp.imageset/Contents.json b/...ages.xcassets/gulp.imageset/Contents.json → ...ages.xcassets/gulp.imageset/Contents.json
diff --git a/....xcassets/gulp.imageset/Icon-watch-58.png → ....xcassets/gulp.imageset/Icon-watch-58.png b/....xcassets/gulp.imageset/Icon-watch-58.png → ....xcassets/gulp.imageset/Icon-watch-58.png
diff --git a/...s/progress-0-watch.imageset/Contents.json → ...s/progress-0-watch.imageset/Contents.json b/...s/progress-0-watch.imageset/Contents.json → ...s/progress-0-watch.imageset/Contents.json
diff --git a/.../progress-0-watch.imageset/progress-0.png → .../progress-0-watch.imageset/progress-0.png b/.../progress-0-watch.imageset/progress-0.png → .../progress-0-watch.imageset/progress-0.png
diff --git a/...s/progress-1-watch.imageset/Contents.json → ...s/progress-1-watch.imageset/Contents.json b/...s/progress-1-watch.imageset/Contents.json → ...s/progress-1-watch.imageset/Contents.json
diff --git a/.../progress-1-watch.imageset/progress-1.png → .../progress-1-watch.imageset/progress-1.png b/.../progress-1-watch.imageset/progress-1.png → .../progress-1-watch.imageset/progress-1.png
diff --git a/.../progress-10-watch.imageset/Contents.json → .../progress-10-watch.imageset/Contents.json b/.../progress-10-watch.imageset/Contents.json → .../progress-10-watch.imageset/Contents.json
diff --git a/...rogress-10-watch.imageset/progress-10.png → ...rogress-10-watch.imageset/progress-10.png b/...rogress-10-watch.imageset/progress-10.png → ...rogress-10-watch.imageset/progress-10.png
diff --git a/...s/progress-2-watch.imageset/Contents.json → ...s/progress-2-watch.imageset/Contents.json b/...s/progress-2-watch.imageset/Contents.json → ...s/progress-2-watch.imageset/Contents.json
diff --git a/.../progress-2-watch.imageset/progress-2.png → .../progress-2-watch.imageset/progress-2.png b/.../progress-2-watch.imageset/progress-2.png → .../progress-2-watch.imageset/progress-2.png
diff --git a/...s/progress-3-watch.imageset/Contents.json → ...s/progress-3-watch.imageset/Contents.json b/...s/progress-3-watch.imageset/Contents.json → ...s/progress-3-watch.imageset/Contents.json
diff --git a/.../progress-3-watch.imageset/progress-3.png → .../progress-3-watch.imageset/progress-3.png b/.../progress-3-watch.imageset/progress-3.png → .../progress-3-watch.imageset/progress-3.png
diff --git a/...s/progress-4-watch.imageset/Contents.json → ...s/progress-4-watch.imageset/Contents.json b/...s/progress-4-watch.imageset/Contents.json → ...s/progress-4-watch.imageset/Contents.json
diff --git a/.../progress-4-watch.imageset/progress-4.png → .../progress-4-watch.imageset/progress-4.png b/.../progress-4-watch.imageset/progress-4.png → .../progress-4-watch.imageset/progress-4.png
diff --git a/...s/progress-5-watch.imageset/Contents.json → ...s/progress-5-watch.imageset/Contents.json b/...s/progress-5-watch.imageset/Contents.json → ...s/progress-5-watch.imageset/Contents.json
diff --git a/.../progress-5-watch.imageset/progress-5.png → .../progress-5-watch.imageset/progress-5.png b/.../progress-5-watch.imageset/progress-5.png → .../progress-5-watch.imageset/progress-5.png
diff --git a/...s/progress-6-watch.imageset/Contents.json → ...s/progress-6-watch.imageset/Contents.json b/...s/progress-6-watch.imageset/Contents.json → ...s/progress-6-watch.imageset/Contents.json
diff --git a/.../progress-6-watch.imageset/progress-6.png → .../progress-6-watch.imageset/progress-6.png b/.../progress-6-watch.imageset/progress-6.png → .../progress-6-watch.imageset/progress-6.png
diff --git a/...s/progress-7-watch.imageset/Contents.json → ...s/progress-7-watch.imageset/Contents.json b/...s/progress-7-watch.imageset/Contents.json → ...s/progress-7-watch.imageset/Contents.json
diff --git a/.../progress-7-watch.imageset/progress-7.png → .../progress-7-watch.imageset/progress-7.png b/.../progress-7-watch.imageset/progress-7.png → .../progress-7-watch.imageset/progress-7.png
diff --git a/...s/progress-8-watch.imageset/Contents.json → ...s/progress-8-watch.imageset/Contents.json b/...s/progress-8-watch.imageset/Contents.json → ...s/progress-8-watch.imageset/Contents.json
diff --git a/.../progress-8-watch.imageset/progress-8.png → .../progress-8-watch.imageset/progress-8.png b/.../progress-8-watch.imageset/progress-8.png → .../progress-8-watch.imageset/progress-8.png
diff --git a/...s/progress-9-watch.imageset/Contents.json → ...s/progress-9-watch.imageset/Contents.json b/...s/progress-9-watch.imageset/Contents.json → ...s/progress-9-watch.imageset/Contents.json
diff --git a/.../progress-9-watch.imageset/progress-9.png → .../progress-9-watch.imageset/progress-9.png b/.../progress-9-watch.imageset/progress-9.png → .../progress-9-watch.imageset/progress-9.png
diff --git a/BigGulp WatchKit App/Info.plist → Gulps WatchKit App/Info.plist b/BigGulp WatchKit App/Info.plist → Gulps WatchKit App/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>Gulps</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -15,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/...Extension/ActionInterfaceController.swift → ...Extension/ActionInterfaceController.swift b/...Extension/ActionInterfaceController.swift → ...Extension/ActionInterfaceController.swift
diff --git a/...WatchKit Extension/GlanceController.swift → ...WatchKit Extension/GlanceController.swift b/...WatchKit Extension/GlanceController.swift → ...WatchKit Extension/GlanceController.swift
diff --git a/...n/BigGulp WatchKit Extension.entitlements → ...ion/Gulps WatchKit Extension.entitlements b/...n/BigGulp WatchKit Extension.entitlements → ...ion/Gulps WatchKit Extension.entitlements
diff --git a/...ages.xcassets/README__ignoredByTemplate__ → ...ages.xcassets/README__ignoredByTemplate__ b/...ages.xcassets/README__ignoredByTemplate__ → ...ages.xcassets/README__ignoredByTemplate__
diff --git a/BigGulp WatchKit Extension/Info.plist → Gulps WatchKit Extension/Info.plist b/BigGulp WatchKit Extension/Info.plist → Gulps WatchKit Extension/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

diff --git a/...chKit Extension/InterfaceController.swift → ...chKit Extension/InterfaceController.swift b/...chKit Extension/InterfaceController.swift → ...chKit Extension/InterfaceController.swift
diff --git a/...it Extension/NotificationController.swift → ...it Extension/NotificationController.swift b/...it Extension/NotificationController.swift → ...it Extension/NotificationController.swift
diff --git a/...it Extension/PushNotificationPayload.apns → ...it Extension/PushNotificationPayload.apns b/...it Extension/PushNotificationPayload.apns → ...it Extension/PushNotificationPayload.apns
diff --git a/Gulps.xcodeproj/project.pbxproj b/Gulps.xcodeproj/project.pbxproj
diff --git a/BigGulp/AppDelegate.swift → Gulps/AppDelegate.swift b/BigGulp/AppDelegate.swift → Gulps/AppDelegate.swift
diff --git a/BigGulp/Base.lproj/LaunchScreen.xib → Gulps/Base.lproj/LaunchScreen.xib b/BigGulp/Base.lproj/LaunchScreen.xib → Gulps/Base.lproj/LaunchScreen.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14D98g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14E7f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>

diff --git a/BigGulp/Base.lproj/Main.storyboard → Gulps/Base.lproj/Main.storyboard b/BigGulp/Base.lproj/Main.storyboard → Gulps/Base.lproj/Main.storyboard
diff --git a/BigGulp/Onboarding.storyboard → Gulps/Base.lproj/Onboarding.storyboard b/BigGulp/Onboarding.storyboard → Gulps/Base.lproj/Onboarding.storyboard
diff --git a/BigGulp/BigGulp.entitlements → Gulps/Gulps.entitlements b/BigGulp/BigGulp.entitlements → Gulps/Gulps.entitlements
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...cassets/AppIcon.appiconset/Icon-120-1.png → ...cassets/AppIcon.appiconset/Icon-120-1.png b/...cassets/AppIcon.appiconset/Icon-120-1.png → ...cassets/AppIcon.appiconset/Icon-120-1.png
diff --git a/....xcassets/AppIcon.appiconset/Icon-120.png → ....xcassets/AppIcon.appiconset/Icon-120.png b/....xcassets/AppIcon.appiconset/Icon-120.png → ....xcassets/AppIcon.appiconset/Icon-120.png
diff --git a/....xcassets/AppIcon.appiconset/Icon-180.png → ....xcassets/AppIcon.appiconset/Icon-180.png b/....xcassets/AppIcon.appiconset/Icon-180.png → ....xcassets/AppIcon.appiconset/Icon-180.png
diff --git a/...s.xcassets/AppIcon.appiconset/Icon-58.png → ...s.xcassets/AppIcon.appiconset/Icon-58.png b/...s.xcassets/AppIcon.appiconset/Icon-58.png → ...s.xcassets/AppIcon.appiconset/Icon-58.png
diff --git a/...s.xcassets/AppIcon.appiconset/Icon-80.png → ...s.xcassets/AppIcon.appiconset/Icon-80.png b/...s.xcassets/AppIcon.appiconset/Icon-80.png → ...s.xcassets/AppIcon.appiconset/Icon-80.png
diff --git a/...s.xcassets/AppIcon.appiconset/Icon-87.png → ...s.xcassets/AppIcon.appiconset/Icon-87.png b/...s.xcassets/AppIcon.appiconset/Icon-87.png → ...s.xcassets/AppIcon.appiconset/Icon-87.png
diff --git a/...sets/big-tiny-icon.imageset/Contents.json → ...sets/big-tiny-icon.imageset/Contents.json b/...sets/big-tiny-icon.imageset/Contents.json → ...sets/big-tiny-icon.imageset/Contents.json
diff --git a/.../big-tiny-icon.imageset/big-tiny-icon.pdf → .../big-tiny-icon.imageset/big-tiny-icon.pdf b/.../big-tiny-icon.imageset/big-tiny-icon.pdf → .../big-tiny-icon.imageset/big-tiny-icon.pdf
diff --git a/...ts/blue-check-icon.imageset/Contents.json → ...ts/blue-check-icon.imageset/Contents.json b/...ts/blue-check-icon.imageset/Contents.json → ...ts/blue-check-icon.imageset/Contents.json
diff --git a/...e-check-icon.imageset/blue-check-icon.pdf → ...e-check-icon.imageset/blue-check-icon.pdf b/...e-check-icon.imageset/blue-check-icon.pdf → ...e-check-icon.imageset/blue-check-icon.pdf
diff --git a/...sets/calendar-icon.imageset/Contents.json → ...sets/calendar-icon.imageset/Contents.json b/...sets/calendar-icon.imageset/Contents.json → ...sets/calendar-icon.imageset/Contents.json
diff --git a/.../calendar-icon.imageset/calendar-icon.pdf → .../calendar-icon.imageset/calendar-icon.pdf b/.../calendar-icon.imageset/calendar-icon.pdf → .../calendar-icon.imageset/calendar-icon.pdf
diff --git a/...cassets/check-icon.imageset/Contents.json → ...cassets/check-icon.imageset/Contents.json b/...cassets/check-icon.imageset/Contents.json → ...cassets/check-icon.imageset/Contents.json
diff --git a/...assets/check-icon.imageset/check-icon.pdf → ...assets/check-icon.imageset/check-icon.pdf b/...assets/check-icon.imageset/check-icon.pdf → ...assets/check-icon.imageset/check-icon.pdf
diff --git a/...cassets/drink-icon.imageset/Contents.json → ...cassets/drink-icon.imageset/Contents.json b/...cassets/drink-icon.imageset/Contents.json → ...cassets/drink-icon.imageset/Contents.json
diff --git a/...assets/drink-icon.imageset/drink-icon.pdf → ...assets/drink-icon.imageset/drink-icon.pdf b/...assets/drink-icon.imageset/drink-icon.pdf → ...assets/drink-icon.imageset/drink-icon.pdf
diff --git a/...cassets/large-icon.imageset/Contents.json → ...cassets/large-icon.imageset/Contents.json b/...cassets/large-icon.imageset/Contents.json → ...cassets/large-icon.imageset/Contents.json
diff --git a/...assets/large-icon.imageset/large-icon.pdf → ...assets/large-icon.imageset/large-icon.pdf b/...assets/large-icon.imageset/large-icon.pdf → ...assets/large-icon.imageset/large-icon.pdf
diff --git a/...cassets/minus-icon.imageset/Contents.json → ...cassets/minus-icon.imageset/Contents.json b/...cassets/minus-icon.imageset/Contents.json → ...cassets/minus-icon.imageset/Contents.json
diff --git a/...assets/minus-icon.imageset/minus-icon.pdf → ...assets/minus-icon.imageset/minus-icon.pdf b/...assets/minus-icon.imageset/minus-icon.pdf → ...assets/minus-icon.imageset/minus-icon.pdf
diff --git a/...xcassets/next-icon.imageset/Contents.json → ...xcassets/next-icon.imageset/Contents.json b/...xcassets/next-icon.imageset/Contents.json → ...xcassets/next-icon.imageset/Contents.json
diff --git a/...xcassets/next-icon.imageset/next-icon.pdf → ...xcassets/next-icon.imageset/next-icon.pdf b/...xcassets/next-icon.imageset/next-icon.pdf → ...xcassets/next-icon.imageset/next-icon.pdf
diff --git a/...xcassets/plus-icon.imageset/Contents.json → ...xcassets/plus-icon.imageset/Contents.json b/...xcassets/plus-icon.imageset/Contents.json → ...xcassets/plus-icon.imageset/Contents.json
diff --git a/...xcassets/plus-icon.imageset/plus-icon.pdf → ...xcassets/plus-icon.imageset/plus-icon.pdf b/...xcassets/plus-icon.imageset/plus-icon.pdf → ...xcassets/plus-icon.imageset/plus-icon.pdf
diff --git a/...xcassets/prev-icon.imageset/Contents.json → ...xcassets/prev-icon.imageset/Contents.json b/...xcassets/prev-icon.imageset/Contents.json → ...xcassets/prev-icon.imageset/Contents.json
diff --git a/...xcassets/prev-icon.imageset/prev-icon.pdf → ...xcassets/prev-icon.imageset/prev-icon.pdf b/...xcassets/prev-icon.imageset/prev-icon.pdf → ...xcassets/prev-icon.imageset/prev-icon.pdf
diff --git a/...sets/settings-icon.imageset/Contents.json → ...sets/settings-icon.imageset/Contents.json b/...sets/settings-icon.imageset/Contents.json → ...sets/settings-icon.imageset/Contents.json
diff --git a/.../settings-icon.imageset/settings-icon.pdf → .../settings-icon.imageset/settings-icon.pdf b/.../settings-icon.imageset/settings-icon.pdf → .../settings-icon.imageset/settings-icon.pdf
diff --git a/...cassets/small-icon.imageset/Contents.json → ...cassets/small-icon.imageset/Contents.json b/...cassets/small-icon.imageset/Contents.json → ...cassets/small-icon.imageset/Contents.json
diff --git a/...assets/small-icon.imageset/small-icon.pdf → ...assets/small-icon.imageset/small-icon.pdf b/...assets/small-icon.imageset/small-icon.pdf → ...assets/small-icon.imageset/small-icon.pdf
diff --git a/...ts/small-tiny-icon.imageset/Contents.json → ...ts/small-tiny-icon.imageset/Contents.json b/...ts/small-tiny-icon.imageset/Contents.json → ...ts/small-tiny-icon.imageset/Contents.json
diff --git a/...ll-tiny-icon.imageset/small-tiny-icon.pdf → ...ll-tiny-icon.imageset/small-tiny-icon.pdf b/...ll-tiny-icon.imageset/small-tiny-icon.pdf → ...ll-tiny-icon.imageset/small-tiny-icon.pdf
diff --git a/...cassets/tiny-check.imageset/Contents.json → ...cassets/tiny-check.imageset/Contents.json b/...cassets/tiny-check.imageset/Contents.json → ...cassets/tiny-check.imageset/Contents.json
diff --git a/...assets/tiny-check.imageset/tiny-check.pdf → ...assets/tiny-check.imageset/tiny-check.pdf b/...assets/tiny-check.imageset/tiny-check.pdf → ...assets/tiny-check.imageset/tiny-check.pdf
diff --git a/...es.xcassets/tiny-x.imageset/Contents.json → ...es.xcassets/tiny-x.imageset/Contents.json b/...es.xcassets/tiny-x.imageset/Contents.json → ...es.xcassets/tiny-x.imageset/Contents.json
diff --git a/...mages.xcassets/tiny-x.imageset/tiny-x.pdf → ...mages.xcassets/tiny-x.imageset/tiny-x.pdf b/...mages.xcassets/tiny-x.imageset/tiny-x.pdf → ...mages.xcassets/tiny-x.imageset/tiny-x.pdf
diff --git a/BigGulp/Info.plist → Gulps/Info.plist b/BigGulp/Info.plist → Gulps/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

diff --git a/BigGulp/Model/Entry.swift → Gulps/Model/Entry.swift b/BigGulp/Model/Entry.swift → Gulps/Model/Entry.swift
diff --git a/BigGulp/Model/EntryHandler.swift → Gulps/Model/EntryHandler.swift b/BigGulp/Model/EntryHandler.swift → Gulps/Model/EntryHandler.swift
diff --git a/BigGulp/Model/Gulp.swift → Gulps/Model/Gulp.swift b/BigGulp/Model/Gulp.swift → Gulps/Model/Gulp.swift
diff --git a/BigGulp/Resources/Fonts/KaushanScript.ttf → Gulps/Resources/Fonts/KaushanScript.ttf b/BigGulp/Resources/Fonts/KaushanScript.ttf → Gulps/Resources/Fonts/KaushanScript.ttf
diff --git a/BigGulp/Resources/Fonts/Lato-Light.ttf → Gulps/Resources/Fonts/Lato-Light.ttf b/BigGulp/Resources/Fonts/Lato-Light.ttf → Gulps/Resources/Fonts/Lato-Light.ttf
diff --git a/BigGulp/Support/Colors.swift → Gulps/Support/Colors.swift b/BigGulp/Support/Colors.swift → Gulps/Support/Colors.swift
diff --git a/BigGulp/Support/Globals.swift → Gulps/Support/Globals.swift b/BigGulp/Support/Globals.swift → Gulps/Support/Globals.swift
diff --git a/BigGulp/Support/NSUserDefaults-BigGulp.swift → Gulps/Support/NSUserDefaults-BigGulp.swift b/BigGulp/Support/NSUserDefaults-BigGulp.swift → Gulps/Support/NSUserDefaults-BigGulp.swift
diff --git a/BigGulp/Support/NotificationHelper.swift → Gulps/Support/NotificationHelper.swift b/BigGulp/Support/NotificationHelper.swift → Gulps/Support/NotificationHelper.swift
diff --git a/BigGulp/Support/ProgressMeter.swift → Gulps/Support/ProgressMeter.swift b/BigGulp/Support/ProgressMeter.swift → Gulps/Support/ProgressMeter.swift
diff --git a/BigGulp/Support/Settings.swift → Gulps/Support/Settings.swift b/BigGulp/Support/Settings.swift → Gulps/Support/Settings.swift
diff --git a/...wControllers/CalendarViewController.swift → ...wControllers/CalendarViewController.swift b/...wControllers/CalendarViewController.swift → ...wControllers/CalendarViewController.swift
diff --git a/...lers/DrinkViewController+Animations.swift → ...lers/DrinkViewController+Animations.swift b/...lers/DrinkViewController+Animations.swift → ...lers/DrinkViewController+Animations.swift
diff --git a/...ViewControllers/DrinkViewController.swift → ...ViewControllers/DrinkViewController.swift b/...ViewControllers/DrinkViewController.swift → ...ViewControllers/DrinkViewController.swift
diff --git a/...llers/Onboarding/GoalViewController.swift → ...llers/Onboarding/GoalViewController.swift b/...llers/Onboarding/GoalViewController.swift → ...llers/Onboarding/GoalViewController.swift
diff --git a/...lers/Onboarding/GulpsViewController.swift → ...lers/Onboarding/GulpsViewController.swift b/...lers/Onboarding/GulpsViewController.swift → ...lers/Onboarding/GulpsViewController.swift
diff --git a/...rs/Onboarding/MeasureViewController.swift → ...rs/Onboarding/MeasureViewController.swift b/...rs/Onboarding/MeasureViewController.swift → ...rs/Onboarding/MeasureViewController.swift
diff --git a/...boarding/NotificationViewController.swift → ...boarding/NotificationViewController.swift b/...boarding/NotificationViewController.swift → ...boarding/NotificationViewController.swift
diff --git a/...Onboarding/OnboardingViewController.swift → ...Onboarding/OnboardingViewController.swift b/...Onboarding/OnboardingViewController.swift → ...Onboarding/OnboardingViewController.swift
diff --git a/...wControllers/SettingsViewController.swift → ...wControllers/SettingsViewController.swift b/...wControllers/SettingsViewController.swift → ...wControllers/SettingsViewController.swift
diff --git a/BigGulpTests/DrinkViewControllerTests.swift → GulpsTests/DrinkViewControllerTests.swift b/BigGulpTests/DrinkViewControllerTests.swift → GulpsTests/DrinkViewControllerTests.swift
diff --git a/BigGulpTests/Info.plist → GulpsTests/Info.plist b/BigGulpTests/Info.plist → GulpsTests/Info.plist
diff --git a/...__should_update_the_progress_label@2x.png → ...__should_update_the_progress_label@2x.png b/...__should_update_the_progress_label@2x.png → ...__should_update_the_progress_label@2x.png
diff --git a/..._added__should_update_the_progress@2x.png → ..._added__should_update_the_progress@2x.png b/..._added__should_update_the_progress@2x.png → ..._added__should_update_the_progress@2x.png
diff --git a/...ads__should_present_an_empty_meter@2x.png → ...ads__should_present_an_empty_meter@2x.png b/...ads__should_present_an_empty_meter@2x.png → ...ads__should_present_an_empty_meter@2x.png
diff --git a/BigGulpToday/BigGulpToday.entitlements → GulpsToday/GulpsToday.entitlements b/BigGulpToday/BigGulpToday.entitlements → GulpsToday/GulpsToday.entitlements
diff --git a/BigGulpToday/Info.plist → GulpsToday/Info.plist b/BigGulpToday/Info.plist → GulpsToday/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>

diff --git a/BigGulpToday/MainInterface.storyboard → GulpsToday/MainInterface.storyboard b/BigGulpToday/MainInterface.storyboard → GulpsToday/MainInterface.storyboard
diff --git a/...Today/TodayViewController+Animation.swift → ...Today/TodayViewController+Animation.swift b/...Today/TodayViewController+Animation.swift → ...Today/TodayViewController+Animation.swift
diff --git a/BigGulpToday/TodayViewController.swift → GulpsToday/TodayViewController.swift b/BigGulpToday/TodayViewController.swift → GulpsToday/TodayViewController.swift
diff --git a/Podfile b/Podfile
@@ -1,22 +1,40 @@
 source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 
-pod 'pop', '~> 1.0'
-pod 'MMWormhole', '~> 1.1'
-pod 'Realm', '~> 0.91'
-pod 'AMPopTip', '~> 0.7'
-pod 'UICountingLabel', '~> 1.2'
-pod 'Realm', '~> 0.91'
-pod 'JTCalendar', git: 'https://github.com/andreamazz/JTCalendar', branch: 'develop'
-pod 'AMWaveTransition', '~> 0.5'
-pod 'AHKActionSheet', '~> 0.5'
-pod 'DPMeterView', git: 'https://github.com/andreamazz/DPMeterView'
+def common_pods
+  pod 'Realm', '~> 0.91'
+  pod 'AMWaveTransition', '~> 0.5'
+  pod 'AHKActionSheet', '~> 0.5'
+  pod 'pop', '~> 1.0'
+  pod 'MMWormhole', '~> 1.1'
+  pod 'AMPopTip', '~> 0.7'
+  pod 'UICountingLabel', '~> 1.2'
+  pod 'JTCalendar', git: 'https://github.com/andreamazz/JTCalendar', branch: 'develop'
+  pod 'DPMeterView', git: 'https://github.com/andreamazz/DPMeterView'
+end
+
+target 'Gulps' do
+  common_pods
+end
 
-target 'BigGulpTests', exclusive: true do
+target 'GulpsTests' do
+  common_pods
   pod 'Nimble'
   pod 'Quick'
   pod 'Nimble-Snapshots'
 end
 
+target 'GulpsToday' do
+  pod 'Realm', '~> 0.91'
+  pod 'pop', '~> 1.0'
+  pod 'MMWormhole', '~> 1.1'
+end
+
+target 'Gulps WatchKit Extension' do
+  pod 'Realm', '~> 0.91'
+  pod 'MMWormhole', '~> 1.1'
+end
+
 inhibit_all_warnings!
 use_frameworks!
+
diff --git a/Rakefile b/Rakefile
@@ -0,0 +1,12 @@
+desc "Run the test suite"
+
+task :test do
+  build = "xcodebuild \
+    -workspace Gulps.xcworkspace \
+    -scheme Gulps \
+    -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=8.3'"
+  system "#{build} test | xcpretty --test --color"  
+end
+
+task :default => :test
+