Merge pull request #303 from BranchMetrics/automation-updates

Automation updates

Author: jdee

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "cocoapods", "~> 1.2"
-gem "fastlane", "~> 2.26"
+gem "fastlane", "~> 2.69"
 gem "rubocop"
 gem "travis"
 

Gemfile.lock

@@ -79,7 +79,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.68.2)
+    fastlane (2.69.0)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -107,7 +107,7 @@ GEM
       slack-notifier (>= 1.3, < 2.0.0)
       terminal-notifier (>= 1.6.2, < 2.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (~> 0.6.2)
+      tty-screen (~> 0.6.3)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.5.2, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
@@ -185,20 +185,18 @@ GEM
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.0)
+    rainbow (3.0.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.1)
     rouge (2.0.7)
-    rubocop (0.51.0)
+    rubocop (0.52.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-macho (1.1.0)
@@ -251,7 +249,7 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (~> 1.2)
-  fastlane (~> 2.26)
+  fastlane (~> 2.69)
   fastlane-plugin-branch
   fastlane-plugin-patch
   fastlane-plugin-yarn

fastlane/Fastfile

@@ -1,6 +1,6 @@
 actions_path("lib")
 
-fastlane_version "2.26.1"
+fastlane_version "2.69.0"
 
 default_platform :ios
 

fastlane/lib/update_native_sdks.rb

@@ -9,35 +9,20 @@ def run(params)
 
           update_submodules params
 
+          return unless @android_update_needed || @ios_update_needed
+
           @android_subdir = File.expand_path 'android', '.'
           @ios_subdir = File.expand_path 'ios', '.'
 
           # Update embedded Android SDK
-          update_android_jar
+          update_android_jar if @android_update_needed
 
           # Update embedded iOS SDK
-          update_ios_branch_source
-          update_branch_podspec_from_submodule
-          adjust_rnbranch_xcodeproj
-
-          %w{
-            examples/testbed_native_ios
-            examples/webview_example_native_ios
-            .
-          }.each { |f| other_action.yarn package_path: File.join("..", f, "package.json") }
-
-          %w{
-            examples/testbed_native_ios
-            examples/webview_example_native_ios
-            native-tests/ios
-          }.each do |folder|
-            other_action.cocoapods(
-              # relative to fastlane folder when using other_action
-              podfile: File.join("..", folder, "Podfile"),
-              silent: true,
-              use_bundle_exec: true
-            )
-            other_action.git_add(path: File.join("..", folder))
+          if @ios_update_needed
+            update_ios_branch_source
+            update_branch_podspec_from_submodule
+            adjust_rnbranch_xcodeproj
+            update_pods_in_tests_and_examples
           end
 
           commit if params[:commit]
@@ -75,7 +60,11 @@ def git_q_flag
         end
 
         def commit
-          sh "git commit -a -m'[Fastlane] Branch native SDK update: Android #{@android_version}, iOS #{@ios_version}'"
+          message = "[Fastlane] Branch native SDK update:"
+          message << " #{@android_version} (Android)," if @android_update_needed
+          message << " #{@ios_version} (iOS)" if @ios_update_needed
+
+          sh "git", "commit", "-a", "-m", message.chomp(",")
         end
 
         def update_submodules(params)
@@ -85,6 +74,9 @@ def update_submodules(params)
             folder = "native-sdks/#{platform}"
             Dir.chdir(folder) do
               UI.message "Updating submodule in #{folder}"
+
+              original_commit = current_commit
+
               sh "git checkout#{git_q_flag} master"
               sh "git pull --tags#{git_q_flag}" # Pull all available branch refs so anything can be checked out
               key = "#{platform}_checkout".to_sym
@@ -97,13 +89,24 @@ def update_submodules(params)
                 version = checkout_last_git_tag
               end
 
+              update_needed = current_commit != original_commit
+
               instance_variable_set "@#{platform}_version", version
+              instance_variable_set "@#{platform}_update_needed", update_needed
 
-              UI.success "Updated submodule in #{folder}"
+              if update_needed
+                UI.success "Updated submodule in #{folder}"
+              else
+                UI.message "#{folder} is current. No update required."
+              end
             end
           end
         end
 
+        def current_commit
+          `git rev-list HEAD --max-count=1`
+        end
+
         def update_android_jar
           jar = Dir['native-sdks/android/Branch*.jar'].reject { |j| j =~ /core/ }.first
           version = jar.sub(/^.*Branch-/, '').sub(/\.jar$/, '')
@@ -114,9 +117,9 @@ def update_android_jar
           # Remove the old and add the new
           Dir.chdir("#{@android_subdir}/libs") do
             old_jars = Dir['Branch*.jar']
-            sh "cp #{jar_path} ."
-            sh "git add Branch-#{version}.jar"
-            sh "git rm -f #{old_jars.join ' '}"
+            sh "cp", jar_path, "."
+            sh "git", "add", "Branch-#{version}.jar"
+            sh "git", "rm", "-f", *old_jars unless old_jars.empty?
           end
 
           # Patch build.gradle
@@ -138,8 +141,9 @@ def update_branch_podspec_from_submodule
           branch_sdk_podspec_path = "#{@ios_subdir}/Branch-SDK.podspec"
 
           # Copy the podspec from the submodule
-          sh "cp native-sdks/ios/Branch.podspec #{branch_sdk_podspec_path}"
-          UI.user_error! "Unable to update #{branch_sdk_podspec_path}" unless $?.exitstatus == 0
+          sh "cp", "native-sdks/ios/Branch.podspec", branch_sdk_podspec_path do |status|
+            UI.user_error! "Unable to update #{branch_sdk_podspec_path}" unless status.success?
+          end
 
           # Change the pod name to Branch-SDK
           other_action.patch(
@@ -160,6 +164,36 @@ def update_branch_podspec_from_submodule
           UI.success "Updated ios/Branch-SDK.podspec"
         end
 
+        def update_pods_in_tests_and_examples
+          # Updates to CocoaPods for unit tests and examples (requires
+          # node_modules for each)
+          %w{
+            examples/testbed_native_ios
+            examples/webview_example_native_ios
+            .
+          }.each do |folder|
+            other_action.yarn package_path: File.join("..", folder, "package.json")
+
+            pods_folder = folder
+
+            # The Podfile there installs from node_modules in the repo root.
+            pods_folder = "native-tests/ios" if folder == "."
+
+            other_action.cocoapods(
+              # relative to fastlane folder when using other_action
+              podfile: File.join("..", pods_folder, "Podfile"),
+              silent: true,
+              use_bundle_exec: true
+            )
+
+            other_action.git_add(path: File.join("..", pods_folder))
+
+            # node_modules only required for pod install. Remove to speed up
+            # subsequent calls to yarn.
+            sh "rm", "-fr", File.join(folder, "node_modules")
+          end
+        end
+
         def adjust_rnbranch_xcodeproj
           @project = Xcodeproj::Project.open "#{@ios_subdir}/RNBranch.xcodeproj"
           # check_file_refs