Merge pull request #153 from vimeo/release/1.0.2

Release/1.0.2

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,38 @@
 #### Ticket
-**Required for Vimeans only**
+
 [TICKET_NUMBER](https://vimean.atlassian.net/browse/TICKET_NUMBER)
 
-#### Ticket Summary
-A brief but thorough description of the ticket.
+- *Note: this is required for Vimeo staff only. If not applicable to your PR, use "N/A".*
+
+#### Pull Request Checklist
+
+- [ ] Resolved any merge conflicts
+- [ ] No build errors or warnings are introduced
+- [ ] New files are written in Swift
+- [ ] New classes contain license headers
+- [ ] New classes have Documentation
+- [ ] New public methods have Documentation
+
+#### Issue Summary
+
+- *Outline the goals of the PR in technical terms. If this branch fixes a bug, state what caused the bug.*
 
 #### Implementation Summary
-A brief but thorough description of the changes put in place to address the ticket.
+
+- *Identify the core components that were added or changed, and briefly state the reasoning behind these changes.*
+
+- *List any key assumptions made.*
+
+#### Reviewer Tips
+
+- *Provide the order in which files or components should be reviewed.* 
+
+- *List the general components that this PR will affect.*
+
+- *Identify any copy and pasted code with a large diff.*
 
 #### How to Test
-Detailed *list* of what to test and how to test it. Including all edge cases.
+
+- *Identify necessary conditions for testing (e.g. logged out, bad connectivity).*
+
+- *If a special type of account is needed for log in, contact a developer privately to provide credentials.*

Examples/VimeoUpload-iOS/VimeoUpload-iOS/ViewControllers/VideoSettingsViewController.swift

@@ -42,6 +42,16 @@ import VimeoUpload
 
 class VideoSettingsViewController: UIViewController, UITextFieldDelegate
 {
+    private struct Constants
+    {
+        struct TwoStepUploadPermissionAlert
+        {
+            static let Title = "Cannot Upload Video"
+            static let Message = "Check the project target to confirm you selected Old-Upload. New-Upload is not available to third-party apps yet."
+            static let ActionTitle = "OK"
+        }
+    }
+
     static let UploadInitiatedNotification = "VideoSettingsViewControllerUploadInitiatedNotification"
     static let NibName = "VideoSettingsViewController"
     private static let PreUploadViewPrivacy = "pre_upload"
@@ -285,12 +295,24 @@ class VideoSettingsViewController: UIViewController, UITextFieldDelegate
 
     private func applyVideoSettings()
     {
-        let videoUri = self.uploadTicket!.video!.uri!
-        let videoSettings = self.videoSettings!
+        guard let videoURI = self.uploadTicket?.video?.uri, let videoSettings = self.videoSettings else
+        {
+            let alertController = UIAlertController(
+                title: Constants.TwoStepUploadPermissionAlert.Title,
+                message: Constants.TwoStepUploadPermissionAlert.Message,
+                preferredStyle: .alert
+            )
+            alertController.addAction(UIAlertAction(title: Constants.TwoStepUploadPermissionAlert.ActionTitle, style: .default, handler: { [weak self] (action) in
+                self?.activityIndicatorView.stopAnimating()
+            }))
+            self.present(alertController, animated: true, completion: nil)
+
+            return
+        }
 
         do
         {
-            self.task = try NewVimeoUploader.sharedInstance.foregroundSessionManager.videoSettingsDataTask(videoUri: videoUri, videoSettings: videoSettings, completionHandler: { [weak self] (video, error) -> Void in
+            self.task = try NewVimeoUploader.sharedInstance.foregroundSessionManager.videoSettingsDataTask(videoUri: videoURI, videoSettings: videoSettings, completionHandler: { [weak self] (video, error) -> Void in
 
                 self?.task = nil
 

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 gem 'fastlane', '2.42.0'
-gem 'cocoapods', '1.1.1'
+gem 'cocoapods', '1.2.0'
 gem 'xcode-install', '2.1.0'
 gem 'xcpretty-json-formatter', '0.1.0'
 gem 'danger-xcode_summary', '0.1.0'

Gemfile.lock

@@ -15,25 +15,26 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.1.1)
+    cocoapods (1.2.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.1)
+      cocoapods-core (= 1.2.0)
       cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.2, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.1.1, < 2.0)
+      cocoapods-trunk (>= 1.1.2, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.5.5)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.3, < 2.0)
-    cocoapods-core (1.1.1)
+      ruby-macho (~> 0.2.5)
+      xcodeproj (>= 1.4.1, < 2.0)
+    cocoapods-core (1.2.0)
       activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -43,7 +44,7 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.2)
+    cocoapods-trunk (1.2.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
@@ -160,7 +161,7 @@ GEM
     mini_magick (4.5.1)
     mini_portile2 (2.1.0)
     minitest (5.10.2)
-    molinillo (0.5.5)
+    molinillo (0.5.7)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -181,6 +182,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.0.2)
     rouge (2.0.7)
+    ruby-macho (0.2.6)
     rubyzip (1.2.1)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -224,7 +226,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.1.1)
+  cocoapods (= 1.2.0)
   danger-xcode_summary (= 0.1.0)
   fastlane (= 2.42.0)
   fastlane-plugin-pretty_junit

Podfile.lock

@@ -36,4 +36,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: dd1c01077873d3593d24f554a22b00f665c04b49
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.0