fastlane-plugin-flutter 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71b75b4acebe52bb46d4b6a1bef25fce042dc93c
-  data.tar.gz: e75c011fe43192ba4bc99a82da5a1fcd262f96bf
+  metadata.gz: 6e6a88f1db8b61e5437c89b66268d9665f85b5b2
+  data.tar.gz: ef730cd4ff058b3d6b347312f55f35926cac6bb3
 SHA512:
-  metadata.gz: 674121b5b3ed1046086c06382f565546b121ff3fc5b9175114eede689ed069ce62a98a656a484ad156846f1f1dd25b0dd7d91fe6b68df3e2362e0f737312b14b
-  data.tar.gz: 2dd5e57c2804f935133373ee5e35680c83326c1964815232c3600cac0de79d6c5fb034572d77b6bd632d7d75a14dc52de70ca017b4d7d4b5a8c8ad0dc6c63de6
+  metadata.gz: f89d1e9ef42289a526b60e198871f137a51cf549e8a811e9bc6444cf413604076a5b042719117be15eb4c3cb1c7480053cd61992921cf93544e619d467e74762
+  data.tar.gz: 24585aeeeea8bc8db4778fad5dde4b0362915f5c6860bde8afb1c958931ce07b0a180abf0b4a20c5ec87da26fad3b2351ed7d63510a7da5a96ab1129107ee774

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

@@ -23,23 +23,21 @@ module Fastlane
           UI.message("Upgrading Flutter SDK in #{flutter_sdk_root}...")
           if flutter_channel
             UI.message("Making sure Flutter is on channel #{flutter_channel}")
-            Helper::FlutterHelper.flutter(
-              'channel', flutter_channel,
-              log: false
-            )
+            Helper::FlutterHelper.flutter('channel', flutter_channel) {}
           end
-          Helper::FlutterHelper.flutter('upgrade', log: false)
+          Helper::FlutterHelper.flutter('upgrade') {}
         else
           Helper::FlutterHelper.git(
             'clone', # no --depth to keep Flutter tag-based versioning.
             "--branch=#{flutter_channel || 'beta'}",
+            '--quiet',
             '--',
             'https://github.com/flutter/flutter.git',
             flutter_sdk_root,
           )
         end
         UI.message('Precaching Flutter SDK binaries...')
-        Helper::FlutterHelper.flutter('precache', log: false)
+        Helper::FlutterHelper.flutter('precache') {}
       end
 
       def self.android_sdk_root!

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

@@ -58,10 +58,9 @@ module Fastlane
             else
               UI.important('Cannot parse built file path from "flutter build"')
             end
-          else
-            # fastlane does not fail automatically if we provide a block.
-            UI.build_failure!('"flutter build" has failed')
           end
+          # Tell upstream to NOT ignore error.
+          false
         end
 
         lane_context[SharedValues::FLUTTER_OUTPUT]

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

@@ -10,7 +10,7 @@ module Fastlane
       extend FlutterActionBase
 
       def self.run(params)
-        Helper::FlutterHelper.flutter(*%w(packages get), log: false)
+        Helper::FlutterHelper.flutter(*%w(packages get)) {}
 
         # In an ideal world, this should be a part of build_runner:
         # https://github.com/dart-lang/intl_translation/issues/32

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

@@ -6,8 +6,7 @@ module Fastlane
       def self.build
         Helper::FlutterHelper.flutter(
           *%w(packages pub run build_runner build --delete-conflicting-outputs),
-          log: false,
-        )
+        ) {}
       end
     end
   end

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

@@ -5,21 +5,11 @@ module Fastlane
   module Helper
     class FlutterHelper
       def self.flutter(*argv, &block)
-        # TODO(dotdoom): use CommandExecutor instead of Actions.sh.
-        # TODO(dotdoom): explain special keys in params, like "log" etc.
-        # TODO(dotdoom): most commands set "log: false", which means that the
-        #                output is lost (even in case of error). Perhaps we
-        #                could print the output here, via error_callback?
-        # https://github.com/fastlane/fastlane/blob/b1495d134eec6681c8d7a544aa3520f1da00c80e/fastlane/lib/fastlane/helper/sh_helper.rb#L73
-        # Workaround for Fastlane not printing output if block is not given.
-        block ||= proc {}
-        Actions.sh(File.join(flutter_sdk_root, 'bin', 'flutter'), *argv, &block)
+        execute(File.join(flutter_sdk_root, 'bin', 'flutter'), *argv, &block)
       end
 
       def self.git(*argv, &block)
-        # Workaround for Fastlane not printing output if block is not given.
-        block ||= proc {}
-        Actions.sh('git', *argv, &block)
+        execute('git', *argv, &block)
       end
 
       def self.flutter_sdk_root
@@ -37,6 +27,36 @@ module Fastlane
       def self.dev_dependency?(package)
         (YAML.load_file('pubspec.yaml')['dev_dependencies'] || {}).key?(package)
       end
+
+      def self.execute(*command)
+        # TODO(dotdoom): make CommandExecutor (and Actions.sh) behave similarly.
+        command = command.shelljoin
+        UI.command(command)
+        Open3.popen3(command) do |stdin, stdout, stderr, wait_thread|
+          errors_thread = Thread.new { stderr.read }
+          stdin.close
+
+          if block_given?
+            output = stdout.read
+            ignore_error = yield(wait_thread.value, output, errors_thread)
+          else
+            stdout.each_line do |stdout_line|
+              UI.command_output(stdout_line.chomp)
+            end
+          end
+
+          unless wait_thread.value.success? || (ignore_error == true)
+            UI.shell_error!(<<-ERROR)
+The following command has failed:
+
+$ #{command}
+[#{wait_thread.value}]
+
+#{errors_thread.value}
+ERROR
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Flutter
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-flutter
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Artem Sheremet