fastlane-plugin-flutter 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8218973005eea440047e5cee9dfbeba1f6646cda
-  data.tar.gz: 4f97597a00ccb11a8e06cbb21cb168932984d987
+  metadata.gz: 3401caabc2c40bdeaa3cd30b75f06c0eb3b738a9
+  data.tar.gz: 8ee1e4db0532b1107d1b83ac8de93f2b7e41d218
 SHA512:
-  metadata.gz: d17d251d30d1231762cd54d3f056544939a450f028c1ca9771f4a9cef16f780b804a2bf7c24a4c452978f6625c138c3cd5f6f4186d347db27f34e81951c08c3c
-  data.tar.gz: 24a6445e48fe4e1b7e00ed2a2ade067ad30e6a58179b1c055bdb780a5200a1a4f67df606cb23bf2ef4154de27ed230f43943d52fd9326211028d6a0dbf3cb0cd
+  metadata.gz: 7933a7a644f24a6b860dc364c8deab13ae6ebd36f02f2f4e1d79a5c4c84567784f802170f797d75d9169fa562d4f0ea5233dd244801c068b0230b0a08becbdf0
+  data.tar.gz: 9d4f64602a4c85ddaca7fd1afb26ca959e4acb71ff77e3ce8e6080a8362dc5ba2f756744010a86be4b66fa18943e83fb5147633ec67bf8fbb7721b72f9d47a93

data/lib/fastlane/plugin/flutter/actions/flutter_bootstrap_action.rb

@@ -8,6 +8,8 @@ module Fastlane
     class FlutterBootstrapAction < Action
       extend FlutterActionBase
 
+      FLUTTER_REMOTE_REPOSITORY = 'https://github.com/flutter/flutter.git'
+
       def self.run(params)
         if params[:android_licenses]
           Helper::FlutterBootstrapHelper.accept_licenses(
@@ -19,29 +21,58 @@ module Fastlane
         # Upgrade or install Flutter SDK.
         flutter_sdk_root = Helper::FlutterHelper.flutter_sdk_root
         flutter_channel = params[:flutter_channel]
-        if File.directory?(flutter_sdk_root)
+        if Helper::FlutterHelper.flutter_installed?
           if flutter_channel
             UI.message("Making sure Flutter is on channel #{flutter_channel}")
             Helper::FlutterHelper.flutter('channel', flutter_channel) {}
           end
-          if params[:flutter_auto_upgrade]
+          if params[:flutter_auto_upgrade] &&
+             need_upgrade_to_channel?(flutter_sdk_root, flutter_channel)
             UI.message("Upgrading Flutter SDK in #{flutter_sdk_root}...")
             Helper::FlutterHelper.flutter('upgrade') {}
           end
         else
           Helper::FlutterHelper.git(
-            'clone', # no --depth to keep Flutter tag-based versioning.
+            'clone', # no --depth limit to keep Flutter tag-based versioning.
             "--branch=#{flutter_channel || 'beta'}",
             '--quiet',
             '--',
-            'https://github.com/flutter/flutter.git',
+            FLUTTER_REMOTE_REPOSITORY,
             flutter_sdk_root,
           )
         end
+
         UI.message('Precaching Flutter SDK binaries...')
         Helper::FlutterHelper.flutter('precache') {}
       end
 
+      def self.need_upgrade_to_channel?(flutter_sdk_root, flutter_channel)
+        # No channel specified -- always upgrade.
+        return true unless flutter_channel
+
+        remote_hash = Helper::FlutterHelper.git(
+          'ls-remote', FLUTTER_REMOTE_REPOSITORY, flutter_channel
+        ) do |status, output, errors_thread|
+          output.split[0].strip if status.success?
+        end
+        local_hash = Helper::FlutterHelper.git(
+          '-C', flutter_sdk_root, 'rev-parse', 'HEAD'
+        ) do |status, output, errors_thread|
+          output.strip if status.success?
+        end
+
+        if !local_hash.nil? && local_hash == remote_hash
+          UI.message("Local and remote Flutter repository hashes match " \
+                     "(#{local_hash}), no upgrade necessary. Keeping Git " \
+                     "index untouched!")
+          false
+        else
+          UI.message("Local hash (#{local_hash}) of Flutter repository " \
+                     "differs from remote (#{remote_hash}), upgrading")
+          true
+        end
+      end
+
       def self.android_sdk_root!
         (ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT']).tap do |path|
           unless path

data/lib/fastlane/plugin/flutter/helper/flutter_helper.rb

@@ -5,7 +5,7 @@ module Fastlane
   module Helper
     class FlutterHelper
       def self.flutter(*argv, &block)
-        execute(File.join(flutter_sdk_root, 'bin', 'flutter'), *argv, &block)
+        execute(flutter_binary, *argv, &block)
       end
 
       def self.git(*argv, &block)
@@ -24,6 +24,14 @@ module Fastlane
         )
       end
 
+      def self.flutter_installed?
+        File.executable?(flutter_binary)
+      end
+
+      def self.flutter_binary
+        File.join(flutter_sdk_root, 'bin', 'flutter')
+      end
+
       def self.dev_dependency?(package)
         (YAML.load_file('pubspec.yaml')['dev_dependencies'] || {}).key?(package)
       end
@@ -55,6 +63,8 @@ $ #{command}
 #{errors_thread.value}
 ERROR
           end
+
+          ignore_error
         end
       end
     end

data/lib/fastlane/plugin/flutter/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Flutter
-    VERSION = '0.3.4'
+    VERSION = '0.3.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-flutter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Artem Sheremet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2019-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry