fastlane-plugin-flutter 0.3.18 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324cf3f1f840b7c09a1fbe82842e16520a61a2e466830a080efcbef86159a439
-  data.tar.gz: f0cddd43de933afb6041bf589f473f6bc1540b6d33bc63320c8d5e16f8ab4cc1
+  metadata.gz: c0484e466e397f4bacea7891de3becea2e85c5b4bf04684f06a167788d57735b
+  data.tar.gz: f9996d24c9a41cc4aec9ce774c41ce8a01e8e1055c3e6a153bd23c08dc701d98
 SHA512:
-  metadata.gz: 2b80d40a54281fd23c1c43d41cdc3385e1b105148ed0fb973b516ef34d5b3fc3ef7c04fd0dafc35eb1d79877fbbe3bebcf59af71dc4c06fc18f25084a0afea5d
-  data.tar.gz: 7bdc04fee452d112d3e7306a0c7d40cd64d4c5b24de5619bd67f7f2bc87eb648c7924e7be83737d1184d819609d0437f88c10b8e3286287167a0c4a807988749
+  metadata.gz: 7d580e8ed5bb91a9ad0d3ae87657757ce74b88adfb3eea8dff96bd361c48d69b326913c233339274a7869141d839fe3690f42c24bf74bfa408afdcb2f4feb08a
+  data.tar.gz: 731f76c07eb9715b79f6705826204fe580446069b46d85da17c9b8ff14ed5ba80ea76e4cb9622bced34a6d5090db69e0f5bd55a6cd2f0164cb9e8221c1dca29c

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/fastlane-plugin-flutter.svg)](https://badge.fury.io/rb/fastlane-plugin-flutter)
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-flutter)
+[![codecov](https://codecov.io/gh/dotdoom/fastlane-plugin-flutter/branch/master/graph/badge.svg)](https://codecov.io/gh/dotdoom/fastlane-plugin-flutter)
 [![Build Status](https://github.com/dotdoom/fastlane-plugin-flutter/workflows/end-to-end%20test/badge.svg?branch=master)](https://github.com/dotdoom/fastlane-plugin-flutter/actions?query=workflow%3A"end-to-end+test"+branch%3Amaster)
 
 Automated end-to-end test (download Flutter, create an app, build it) on the

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

@@ -34,13 +34,16 @@ module Fastlane
         else
           Helper::FlutterHelper.git(
             'clone', # no --depth limit to keep Flutter tag-based versioning.
-            "--branch=#{flutter_channel || 'beta'}",
+            "--branch=#{flutter_channel || 'stable'}",
             '--quiet',
             '--',
             FLUTTER_REMOTE_REPOSITORY,
             flutter_sdk_root,
           )
         end
+
+        # Return installation path of Flutter SDK.
+        flutter_sdk_root
       end
 
       def self.need_upgrade_to_channel?(flutter_sdk_root, flutter_channel)

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

@@ -52,12 +52,7 @@ module Fastlane
 
         Helper::FlutterHelper.flutter('build', *build_args) do |status, res|
           if status.success?
-            if res =~ /Built (.*?)(:? \([^)]*\))?\.$/
-              lane_context[SharedValues::FLUTTER_OUTPUT] =
-                File.absolute_path($1)
-            else
-              UI.important('Cannot parse built file path from "flutter build"')
-            end
+            process_build_output(res, build_args)
             # gym (aka build_ios_app) action call may follow build; let's help
             # it identify the project, since Flutter project structure is
             # usually standard.
@@ -71,6 +66,17 @@ module Fastlane
           false
         end
 
+        # Fill in some well-known context variables so that next commands may
+        # pick them up.
+        case params[:build]
+        when 'apk'
+          lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] =
+            lane_context[SharedValues::FLUTTER_OUTPUT]
+        when 'appbundle'
+          lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH] =
+            lane_context[SharedValues::FLUTTER_OUTPUT]
+        end
+
         lane_context[SharedValues::FLUTTER_OUTPUT]
       end
 
@@ -110,6 +116,21 @@ form instead.
         end
       end
 
+      def self.process_build_output(output, build_args)
+        artifacts = output.scan(/Built (.*?)(:? \([^)]*\))?\.$/).
+                    map { |path| File.absolute_path(path[0]) }
+        if artifacts.size == 1
+          lane_context[SharedValues::FLUTTER_OUTPUT] = artifacts.first
+        elsif artifacts.size > 1
+          # Could be the result of "flutter build apk --split-per-abi".
+          lane_context[SharedValues::FLUTTER_OUTPUT] = artifacts
+        elsif build_args.include?('--config-only')
+          UI.message('Config-only "build" detected, no output file name')
+        else
+          UI.important('Cannot parse built file path from "flutter build"')
+        end
+      end
+
       def self.description
         'Run "flutter build" to build a Flutter application'
       end

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

@@ -9,6 +9,13 @@ module Fastlane
     class FlutterGenerateAction < Action
       extend FlutterActionBase
 
+      # Although this file is autogenerated, we should not call it ".g.dart",
+      # because it is common for coverage configuration to exclude such files.
+      # Note that it's also common to configure Dart analyser to exclude these
+      # files from checks; this won't match, and we have to use ignore_for_file
+      # for all known lint rules that we might be breaking.
+      ALL_IMPORTS_TEST_FILE = 'test/all_imports_for_coverage_test.dart'
+
       def self.run(params)
         Helper::FlutterHelper.flutter(*%w(packages get)) {}
 
@@ -26,6 +33,38 @@ module Fastlane
           UI.message('Found build_runner dependency, running build...')
           Helper::FlutterGenerateBuildRunnerHelper.build
         end
+
+        if params[:coverage_all_imports]
+          UI.message("Generating #{ALL_IMPORTS_TEST_FILE} for coverage...")
+
+          dart_file_literals = Dir['lib/**/*.dart'].reject do |file_name|
+            # ".g.dart" files often are "part of" files and can not be imported
+            # directly. Commonly coverage for generated files is not that useful
+            file_name.end_with?('.g.dart')
+          end.map do |file_name|
+            Helper::FlutterHelper.
+              import_path_for_test(file_name, '..').
+              gsub("'", "\\\\'")
+          end
+
+          File.write(
+            ALL_IMPORTS_TEST_FILE,
+            <<-DART
+// This file is autogenerated by fastlane flutter_generate action.
+// It imports all files in lib/ so that test coverage in percentage
+// of overall project is calculated correctly. Do not modify this
+// file manually!
+
+// ignore_for_file: unused_import, directives_ordering
+// ignore_for_file: avoid_relative_lib_imports
+// ignore_for_file: lines_longer_than_80_chars
+
+#{dart_file_literals.map { |fn| "import '#{fn}';" }.sort.join("\n")}
+
+void main() {}
+            DART
+          )
+        end
       end
 
       def self.generate_translation?
@@ -33,11 +72,15 @@ module Fastlane
       end
 
       def self.description
-        "1. Run `build_runner build` if build_runner is in dev_dependencies\n" \
-        "2. According to `package:intl`, take `$strings_file` and generate " \
+        "(1) Run `flutter packages get`;  " \
+        "(2) Run `build_runner build` if build_runner is in dev_dependencies;" \
+        "   " \
+        "(3) According to `package:intl`, take `$strings_file` and generate " \
         "`${strings_file.dirname}/arb/intl_messages.arb`, then take all " \
         "files matching `${strings_file.dirname}/intl_*.arb`, fix them and " \
-        "generate .dart files from them"
+        "generate .dart files from them.  " \
+        "(4) Generate an empty test importing all files, which would be used " \
+        "to calculate correct full coverage numbers."
       end
 
       def self.available_options
@@ -62,6 +105,19 @@ module Fastlane
             description: 'Locale of the default data in the strings_file',
             optional: true,
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :coverage_all_imports,
+            env_name: 'FL_FLUTTER_COVERAGE_ALL_IMPORTS',
+            description: <<-DESCRIPTION,
+            Set to true to generate an empty test importing all .dart files in
+            lib/, which would allow calculating correct coverage numbers for the
+            whole project. NOTE: Don't forget to add
+              /#{ALL_IMPORTS_TEST_FILE}
+            to .gitignore!
+            DESCRIPTION
+            optional: true,
+            type: Boolean,
+          ),
         ]
       end
     end

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

@@ -14,7 +14,10 @@ module Fastlane
 
       def self.flutter_sdk_root
         @flutter_sdk_root ||= File.expand_path(
-          if ENV.include?('FLUTTER_SDK_ROOT')
+          if File.executable?(File.join(Dir.pwd, '.flutter', 'bin', 'flutter'))
+            # Support flutterw and compatible projects.
+            File.join(Dir.pwd, '.flutter')
+          elsif ENV.include?('FLUTTER_SDK_ROOT')
             UI.deprecated(
               'FLUTTER_SDK_ROOT environment variable is deprecated. ' \
               'To point to a Flutter installation directory, use ' \
@@ -27,6 +30,7 @@ module Fastlane
           elsif flutter_binary = FastlaneCore::CommandExecutor.which('flutter')
             File.dirname(File.dirname(flutter_binary))
           else
+            # Where we'd prefer to install flutter.
             File.join(Dir.pwd, 'vendor', 'flutter')
           end
         )
@@ -45,6 +49,30 @@ module Fastlane
         (YAML.load_file('pubspec.yaml')['dev_dependencies'] || {}).key?(package)
       end
 
+      def self.pub_package_name
+        YAML.load_file('pubspec.yaml')['name']
+      end
+
+      def self.import_path_for_test(file_to_import, relative_path)
+        unless file_to_import.start_with?('lib/')
+          return File.join(relative_path, file_to_import)
+        end
+
+        # Import file schema in tests have to match files in lib/ exactly. From
+        # Dart perspective, symbols in files imported via relative and
+        # "package:" file paths are different symbols.
+        package_specification = "package:#{pub_package_name}/"
+        if File.read(file_to_import, 4096).include?(package_specification)
+          # If there's a package reference in the first few bytes of the file,
+          # chances are, it's using "package:..." imports. Indeed, checking the
+          # file itself isn't sufficient to explore all of its dependencies, but
+          # we expect imports to be consistent in the project.
+          "#{package_specification}#{file_to_import['lib/'.size..-1]}"
+        else
+          File.join(relative_path, file_to_import)
+        end
+      end
+
       def self.execute(*command)
         # TODO(dotdoom): make CommandExecutor (and Actions.sh) behave similarly.
         command = command.shelljoin

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Flutter
-    VERSION = '0.3.18'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-flutter
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.6.0
 platform: ruby
 authors:
 - Artem Sheremet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Flutter actions plugin for Fastlane