Move Fastlane to Project Root

.circleci/config.yml

@@ -66,7 +66,7 @@ jobs:
           command: rake dependencies
       - run:
           name: Build for Testing
-          command: cd ./Scripts && bundle exec fastlane build_for_testing device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
+          command: bundle exec fastlane build_for_testing device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
       - persist_to_workspace:
           root: ./
           paths:
@@ -94,7 +94,6 @@ jobs:
           command: bundle --path vendor/bundle
       - run:
           name: Run Unit Tests
-          working_directory: Scripts
           command: bundle exec fastlane test_without_building name:WordPressUnitTests try_count:3 device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
       - ios/save-xcodebuild-artifacts:
           result-bundle-path: build/results
@@ -127,7 +126,6 @@ jobs:
           background: true
       - run:
           name: Run UI Tests
-          working_directory: Scripts
           command: bundle exec fastlane test_without_building name:WordPressUITests try_count:3 device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
       - ios/save-xcodebuild-artifacts:
           result-bundle-path: build/results
@@ -161,13 +159,12 @@ jobs:
           command: bundle exec fastlane run configure_apply
       - run:
           name: Build
-          working_directory: Scripts
           command: "bundle exec fastlane build_and_upload_installable_build build_number:$CIRCLE_BUILD_NUM"
       - run:
           name: Prepare Artifacts
           command: |
             mkdir -p Artifacts
-            mv "Scripts/fastlane/comment.json" "Artifacts/comment.json"
+            mv "fastlane/comment.json" "Artifacts/comment.json"
       - store_artifacts:
           path: Artifacts
           destination: Artifacts
@@ -199,7 +196,6 @@ jobs:
             curl -sL https://sentry.io/get-cli/ | bash
       - run:
           name: Build
-          working_directory: Scripts
           command: |
             APP_VERSION=$(cat ../config/Version.Public.xcconfig | grep "^VERSION_LONG" | cut -d "=" -f2)
             echo "export SLACK_FAILURE_MESSAGE=':red_circle: Build for WordPress iOS $APP_VERSION failed!'" >> $BASH_ENV

.gitignore

@@ -70,17 +70,20 @@ WordPress/Images.xcassets/AppIcon-Internal.appiconset
 /vendor/
 
 # Fastlane
-Scripts/fastlane/Preview.html
-Scripts/fastlane/report.xml
-Scripts/fastlane/README.md
-Scripts/Preview.html
-Scripts/fastlane/test_output/
-Scripts/fastlane/google_cloud_keys.json
-Scripts/fastlane/promo_screenshots
-/Scripts/fastlane/metadata/review_information
-/Scripts/default.profraw
+fastlane/Preview.html
+fastlane/report.xml
+fastlane/README.md
+Preview.html
+fastlane/test_output/
+fastlane/google_cloud_keys.json
+fastlane/promo_screenshots
+fastlane/metadata/review_information
+default.profraw
 derived-data/
 
+# CI Artifacts Location
+/Artifacts
+
 # Generated Internal Icons
 /WordPress/Resources/AppImages.xcassets/AppIcon-Internal.appiconset
 /WordPress/Resources/Icons-Internal

Scripts/extract-framework-translations.swift

@@ -3,22 +3,30 @@
 import Foundation
 
 let fileManager = FileManager.default
-let cwd = fileManager.currentDirectoryPath
-let script = CommandLine.arguments[0]
 
-let base = cwd
-let projectDir = base.appending("/WordPress")
+let projectRoot = findProjectRoot()
+let projectDir = projectRoot.appending("/WordPress")
 let resources = projectDir.appending("/Resources")
 let frameworkRoots = [
     "WordPressTodayWidget",
     "WordPressShareExtension"
-    ].map({ projectDir.appending("/\($0)") })
+].map({ projectDir.appending("/\($0)") })
 
 guard fileManager.fileExists(atPath: projectDir) else {
     print("Must run script from project root folder")
     exit(1)
 }
 
+/// Crawl our way up the project tree until we find the root
+func findProjectRoot() -> String {
+    var candidate = URL(fileURLWithPath: fileManager.currentDirectoryPath)
+
+    while !fileManager.fileExists(atPath: candidate.appendingPathComponent(".git").path) && candidate.path != "/" {
+        candidate.deleteLastPathComponent()
+    }
+
+    return candidate.path
+}
 
 func projectLanguages() -> [String] {
     return (try? fileManager.contentsOfDirectory(atPath: resources)

Scripts/update-translations.rb

@@ -40,11 +40,6 @@
 # * Chinese (Taiwan) [zh-Hant]
 # * Welsh
 
-if Dir.pwd =~ /Scripts/
-  puts "Must run script from root folder"
-  exit
-end
-
 ALL_LANGS={
   'ar' => 'ar',         # Arabic
   'bg' => 'bg',         # Bulgarian
@@ -124,27 +119,44 @@
   langs = ALL_LANGS
 end
 
+script_root = __dir__
+project_dir = File.dirname(script_root)
+
 langs.each do |code,local|
-  lang_dir = File.join('WordPress', 'Resources', "#{local}.lproj")
-  puts "Updating #{code}"
+  lang_dir = File.join(project_dir, 'WordPress', 'Resources', "#{local}.lproj")
+  puts "Updating #{code} in #{lang_dir}"
   system "mkdir -p #{lang_dir}"
 
-  # Download for production
-  system "if [ -e #{lang_dir}/Localizable#{strings_file_ext}.strings ]; then cp #{lang_dir}/Localizable#{strings_file_ext}.strings #{lang_dir}/Localizable#{strings_file_ext}.strings.bak; fi"
+  destination = "#{lang_dir}/Localizable#{strings_file_ext}.strings"
+  backup_destination = "#{destination}.bak"
+
+  # Step 2 – Download the new strings
+  if File.exist? destination
+    FileUtils.copy destination, backup_destination
+  end
 
   url = "#{download_url}/#{code}/default/export-translations?#{strings_filter}format=strings"
-  destination = "#{lang_dir}/Localizable#{strings_file_ext}.strings"
 
-  system "curl -fLso #{destination} \"#{url}\"" or begin
+  system "curl -fgLo #{destination} \"#{url}\"" or begin
     puts "Error downloading #{code}"
   end
 
-  if File.size(destination).to_f == 0
-    abort("\e[31mFatal Error: #{destination} appears to be empty. Exiting.\e[0m")
+  # Step 3 – Validate the new file
+  if !File.exist?(destination) or File.size(destination).to_f == 0
+    puts "\e[31mFatal Error: #{destination} appears to be empty. Exiting.\e[0m"
+    abort()
   end
 
-  system "./Scripts/fix-translation #{lang_dir}/Localizable#{strings_file_ext}.strings"
-  system "plutil -lint #{lang_dir}/Localizable#{strings_file_ext}.strings" and system "rm #{lang_dir}/Localizable#{strings_file_ext}.strings.bak"
+  fix_script_path = File.join(script_root, 'fix-translation')
+
+  system "#{fix_script_path} #{lang_dir}/Localizable#{strings_file_ext}.strings"
+  system "plutil -lint #{lang_dir}/Localizable#{strings_file_ext}.strings"
   system "grep -a '\\x00\\x20\\x00\\x22\\x00\\x22\\x00\\x3b$' #{lang_dir}/Localizable#{strings_file_ext}.strings"
+
+  # Clean up after ourselves
+  FileUtils.rm destination if File.exist? destination
 end
-system "Scripts/extract-framework-translations.swift" if strings_filter.empty? 
+
+extract_framework_translations_script_path = File.join(script_root, 'extract-framework-translations.swift')
+
+system extract_framework_translations_script_path if strings_filter.empty?