From 538c8ff4262ab9c42b096a5192026917d962431a Mon Sep 17 00:00:00 2001
From: James Wheare <james@wheare.org>
Date: Wed, 20 Sep 2017 14:22:29 +0100
Subject: [PATCH] Get review_information from files

---
 fastlane/Fastfile                             | 23 +++++--------------
 fastlane/metadata-enterprise/review_notes.txt |  1 +
 fastlane/metadata/review_notes.txt            |  1 +
 fastlane/review_info.json                     |  8 +++++++
 4 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 fastlane/metadata-enterprise/review_notes.txt
 create mode 100644 fastlane/metadata/review_notes.txt
 create mode 100644 fastlane/review_info.json

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 34d7ee77b..5bc750843 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,7 +16,7 @@ fastlane_version "2.57.1"
 default_platform :ios
 
 def app_vers
-  sh("head ../build-scripts/VERSION").strip
+  File.read('../build-scripts/VERSION').split('\n')[0].strip
 end
 
 platform :ios do
@@ -120,25 +120,14 @@ platform :ios do
 
   desc "Upload metadata"
   lane :metadata do |options|
-    app_review_information = {
-      'first_name' => "first_name",
-      'last_name' => "last_name",
-      'phone_number' => "phone_number",
-      'email_address' => "email_address",
-      'demo_user' => "demo_user",
-      'demo_password' => "demo_password",
-      'notes' => <<-REVIEW_NOTES
-notes
-REVIEW_NOTES
-    }
+    require 'json'
+    review_info = JSON.parse(File.read('review_info.json'))
+    review_info['notes'] = File.read('metadata/review_notes.txt')
 
     if options[:enterprise]
         metadata_path = "./fastlane/metadata-enterprise"
         app_identifier = "com.irccloud.enterprise"
-        app_review_information['notes'] = <<-REVIEW_NOTES
-For Host, please use www.irccloud.com
-#{app_review_information['notes']}
-REVIEW_NOTES
+        review_info['notes'] = File.read('metadata-enterprise/review_notes.txt')
     else
         metadata_path = "./fastlane/metadata"
         app_identifier = "com.irccloud.IRCCloud"
@@ -153,7 +142,7 @@ REVIEW_NOTES
         skip_binary_upload: true,
         skip_screenshots: skip_screenshots,
         metadata_path: metadata_path,
-        app_review_information: app_review_information,
+        app_review_information: review_info,
         automatic_release: true
     )
     precheck(
diff --git a/fastlane/metadata-enterprise/review_notes.txt b/fastlane/metadata-enterprise/review_notes.txt
new file mode 100644
index 000000000..3041adec9
--- /dev/null
+++ b/fastlane/metadata-enterprise/review_notes.txt
@@ -0,0 +1 @@
+notes
\ No newline at end of file
diff --git a/fastlane/metadata/review_notes.txt b/fastlane/metadata/review_notes.txt
new file mode 100644
index 000000000..3041adec9
--- /dev/null
+++ b/fastlane/metadata/review_notes.txt
@@ -0,0 +1 @@
+notes
\ No newline at end of file
diff --git a/fastlane/review_info.json b/fastlane/review_info.json
new file mode 100644
index 000000000..302e71c7e
--- /dev/null
+++ b/fastlane/review_info.json
@@ -0,0 +1,8 @@
+{
+  "first_name": "first_name",
+  "last_name": "last_name",
+  "phone_number": "phone_number",
+  "email_address": "email_address",
+  "demo_user": "demo_user",
+  "demo_password": "demo_password"
+}