Version 0.6.0

.travis.yml

@@ -10,4 +10,5 @@ script:
     # Build the app target
     - xctool -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
     # Run the test target
-    - xctool -project Loop.xcodeproj -scheme LoopTests -sdk iphonesimulator9.3 test
+    - xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone 6' test | xcpretty
+    - xctool -project Loop.xcodeproj -scheme DoseMathTests -sdk iphonesimulator9.3 test

Cartfile

@@ -1,4 +1,4 @@
-github "loudnate/LoopKit" ~> 0.3.3
+github "loudnate/LoopKit" ~> 0.3.4
 github "loudnate/xDripG5" ~> 0.5.0
 github "loudnate/SwiftCharts" "loudnate/naterade"
 github "mddub/dexcom-share-client-swift" ~> 0.1

Cartfile.resolved

@@ -1,6 +1,6 @@
 github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7"
 github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3"
-github "loudnate/LoopKit" "v0.3.3"
+github "loudnate/LoopKit" "v0.3.4"
 github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
 github "mddub/dexcom-share-client-swift" "v0.1.3"
 github "loudnate/xDripG5" "0.5.0"

LoopTests/DoseMathTests.swift → DoseMathTests/DoseMathTests.swift

@@ -12,6 +12,21 @@ import InsulinKit
 import LoopKit
 
 
+extension XCTestCase {
+    public var bundle: NSBundle {
+        return NSBundle(forClass: self.dynamicType)
+    }
+
+    public func loadFixture<T>(resourceName: String) -> T {
+        let path = bundle.pathForResource(resourceName, ofType: "json")!
+        return try! NSJSONSerialization.JSONObjectWithData(NSData(contentsOfFile: path)!, options: []) as! T
+    }
+}
+
+
+public typealias JSONDictionary = [String: AnyObject]
+
+
 extension NSDateFormatter {
     static func ISO8601LocalTimeDateFormatter() -> Self {
         let dateFormatter = self.init()

DoseMathTests/Info.plist

@@ -0,0 +1,24 @@
+<?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>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.6.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme

@@ -66,6 +66,16 @@
                ReferencedContainer = "container:Loop.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43E2D8FC1D20C508004DA55F"
+               BuildableName = "LoopTests2.xctest"
+               BlueprintName = "LoopTests2"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43E2D8D01D20BF42004DA55F"
+               BuildableName = "DoseMathTests.xctest"
+               BlueprintName = "DoseMathTests"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0700"
-   version = "1.7">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -33,12 +33,22 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "43F78D2A1C8FC58F002152D1"
+               BlueprintIdentifier = "43E2D90A1D20C581004DA55F"
                BuildableName = "LoopTests.xctest"
                BlueprintName = "LoopTests"
                ReferencedContainer = "container:Loop.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43E2D8FC1D20C508004DA55F"
+               BuildableName = "LoopTests2.xctest"
+               BlueprintName = "LoopTests2"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
@@ -98,23 +108,5 @@
    <ArchiveAction
       buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
-      <PostActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Run Script"
-               scriptText = "#!/bin/bash&#10;&#10;if [[ ! -d $SRCROOT ]]; then&#10;echo &quot;This script must be run from an Xcode Build Phase&quot;&#10;exit 1;&#10;fi&#10;&#10;# Globals&#10;Tag=&#10;Logfile=&#10;CFBundleVersion=&#10;CFBundleShortVersionString=&#10;&#10;function init_logging () {&#10;    logdir=&quot;$HOME/Library/Logs/$PRODUCT_BUNDLE_IDENTIFIER&quot;&#10;    mkdir -p $logdir&#10;    Logfile=&quot;$logdir/archive_post_actions.log&quot;&#10;    exec &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10;    echo &quot;\n\n\n$(date) Beginning archive post-actions for $CONFIGURATION&quot;&#10;}&#10;&#10;function increment_bundle_version () {&#10;    srcPlist=&quot;$1&quot;&#10;    PlistBuddy=&quot;/usr/libexec/PlistBuddy&quot;&#10;&#10;    CFBundleVersion=`$PlistBuddy -c &quot;Print CFBundleVersion&quot; $srcPlist`&#10;    CFBundleShortVersionString=`$PlistBuddy -c &quot;Print CFBundleShortVersionString&quot; $srcPlist`&#10;    Tag=&quot;v$CFBundleShortVersionString&quot;&#10;&#10;    # Increment the bundle version for future builds&#10;    CFBundleVersionNext=$(($CFBundleVersion + 1))&#10;    $PlistBuddy -c &quot;Set :CFBundleVersion $CFBundleVersionNext&quot; $srcPlist&#10;&#10;    echo &quot;Updated build number of $srcPlist to $CFBundleVersionNext&quot;&#10;&#10;    # Copy the new version to the settings bundle&#10;    # settingsPlist=&quot;$SRCROOT/$PRODUCT_NAME/Settings.bundle/Root.plist&quot;&#10;    # $PlistBuddy -c &quot;Set :PreferenceSpecifiers:0:DefaultValue $CFBundleShortVersionString ($CFBundleVersionNext)&quot; $settingsPlist&#10;&#10;    git add $srcPlist &gt;&gt; $Logfile 2&gt;&amp;1&#10;}&#10;&#10;function commit_and_tag_changes () {&#10;    cd &quot;$SRCROOT&quot;&#10;&#10;    git commit -m &quot;Auto-commit with archive $Tag&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10;    git tag $Tag  &gt;&gt; $Logfile 2&gt;&amp;1&#10;    git push &gt;&gt; $Logfile 2&gt;&amp;1&#10;    git push --tags &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10;    cd -&#10;}&#10;&#10;function merge_to_master () {&#10;    cd &quot;$SRCROOT&quot;&#10;&#10;    branch=$(git symbolic-ref --short HEAD)&#10;&#10;    git checkout master &gt;&gt; $Logfile 2&gt;&amp;1&#10;    git merge &quot;$branch&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10;    git push &gt;&gt; $Logfile 2&gt;&amp;1&#10;    git checkout &quot;$branch&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10;    cd -&#10;}&#10;&#10;## Run&#10;&#10;init_logging&#10;increment_bundle_version &quot;$SRCROOT/$INFOPLIST_FILE&quot;&#10;increment_bundle_version &quot;$SRCROOT/WatchApp/Info.plist&quot;&#10;commit_and_tag_changes&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "43776F8B1B8022E90074EA36"
-                     BuildableName = "Loop.app"
-                     BlueprintName = "Loop"
-                     ReferencedContainer = "container:Loop.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PostActions>
    </ArchiveAction>
 </Scheme>

Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme

@@ -22,6 +22,16 @@
                ReferencedContainer = "container:Loop.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43E2D8FC1D20C508004DA55F"
+               BuildableName = "LoopTests2.xctest"
+               BlueprintName = "LoopTests2"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <AdditionalOptions>
       </AdditionalOptions>

Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme

@@ -76,6 +76,16 @@
                ReferencedContainer = "container:Loop.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43E2D8FC1D20C508004DA55F"
+               BuildableName = "LoopTests2.xctest"
+               BlueprintName = "LoopTests2"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme

@@ -66,6 +66,16 @@
                ReferencedContainer = "container:Loop.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43E2D8FC1D20C508004DA55F"
+               BuildableName = "LoopTests2.xctest"
+               BlueprintName = "LoopTests2"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

Loop/AppDelegate.swift

@@ -20,7 +20,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         NotificationManager.authorize()
 
-        AnalyticsManager.application(application, didFinishLaunchingWithOptions: launchOptions)
+        AnalyticsManager.sharedManager.application(application, didFinishLaunchingWithOptions: launchOptions)
 
         return true
     }
@@ -71,7 +71,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 startDate = notification.userInfo?[NotificationManager.UserInfoKey.BolusStartDate.rawValue] as? NSDate where
                 startDate.timeIntervalSinceNow >= NSTimeInterval(minutes: -5)
             {
-                AnalyticsManager.didRetryBolus()
+                AnalyticsManager.sharedManager.didRetryBolus()
 
                 DeviceDataManager.sharedManager.enactBolus(units) { (error) in
                     if error != nil {