fastlane-plugin-flutter 0.1.16 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 242d1757ff287f1f08427ecc5414a6f2ffec1d89
-  data.tar.gz: 626f6a78ee15291a0bd45113aa212eedfaaca6d7
+  metadata.gz: f0cb39c89f3fbcde4fcf59cfc54c1db29e892422
+  data.tar.gz: 52b6ca96f4a4d9ce291456fd657a8a93864fc16d
 SHA512:
-  metadata.gz: e894a556b6a010514d3061915c9ede118a28598764d5c9291261faf60e4fc746dc1631d372976ab7f8ca231da04703c6f0c30908fe9bec1d5853cb6440af3a12
-  data.tar.gz: c8dd712748c078b8ec48ebf818cc01460d88884f476fa7e48178fb813058df16061373f25f7fbe2eb719c7ed7320221bc81d89141c78be419f6360bca8e8a140
+  metadata.gz: 402189c1cad467be3634c24bcf08773364a448da9f8c3be6481d9392a00be8b2cdd25a0831182f707801716ff86d35632662a3dda8407ea1dba9d9ddeb2ec01d
+  data.tar.gz: d6dbd28f31bb8e3f730c63727734ab23a412c97383d603155436b8912abe9cf47e907aa551de066eded33c5b0696ad26f928920dfbdb280c294ff3236c513247

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

@@ -9,8 +9,9 @@ module Fastlane
     module SharedValues
       FLUTTER_OUTPUT_APP = :FLUTTER_OUTPUT_APP
       FLUTTER_OUTPUT_APK = :FLUTTER_OUTPUT_APK
-      FLUTTER_OUTPUT_GIT_BUILD_NUMBER = :FLUTTER_OUTPUT_GIT_BUILD_NUMBER
-      FLUTTER_OUTPUT_GIT_BUILD_NAME = :FLUTTER_OUTPUT_GIT_BUILD_NAME
+      FLUTTER_OUTPUT_BUILD_NUMBER_OVERRIDE =
+        :FLUTTER_OUTPUT_BUILD_NUMBER_OVERRIDE
+      FLUTTER_OUTPUT_BUILD_NAME_OVERRIDE = :FLUTTER_OUTPUT_BUILD_NAME_OVERRIDE
     end
 
     class FlutterAction < Action
@@ -38,21 +39,17 @@ module Fastlane
           additional_args = []
           additional_args.push('--debug') if params[:debug]
 
-          if params[:git_version]
-            build_number = sh(*%w(git rev-list --count HEAD)).strip.to_i
-            lane_context[SharedValues::FLUTTER_OUTPUT_GIT_BUILD_NUMBER] =
-              build_number
+          if lane_context[SharedValues::FLUTTER_OUTPUT_BUILD_NUMBER_OVERRIDE] =
+               build_number = Helper::FlutterHelper.build_number(
+                 params[:build_number_override]
+               )
             additional_args.push('--build-number', build_number.to_s)
+          end
 
-            build_name = sh(
-              *%W(
-                git describe
-                --tags
-                --dirty=#{params[:git_version_dirty_mark]}
-              )
-            ).strip
-            lane_context[SharedValues::FLUTTER_OUTPUT_GIT_BUILD_NAME] =
-              build_name
+          if lane_context[SharedValues::FLUTTER_OUTPUT_BUILD_NAME_OVERRIDE] =
+               build_name = Helper::FlutterHelper.build_name(
+                 params[:build_name_override]
+               )
             additional_args.push('--build-name', build_name)
           end
 
@@ -204,19 +201,46 @@ module Fastlane
             default_value: false,
           ),
           FastlaneCore::ConfigItem.new(
-            key: :git_version,
-            env_name: 'FL_FLUTTER_GIT_VERSION',
-            description: 'Set build number and name based on Git',
+            key: :build_number_override,
+            env_name: 'FL_FLUTTER_BUILD_NUMBER_OVERRIDE',
+            description: <<-'DESCRIPTION',
+              Override build number in pubspec.yaml. Can be either a number, or
+              a schema definition, ex.: ci (take from CI) vcs (take from Git),
+              ci+1000 (take from CI and add 1000).
+              WARNING: does not override Android build number specified in
+                       pubspec.yaml due to Flutter bug:
+                       https://github.com/flutter/flutter/issues/22788.
+            DESCRIPTION
             optional: true,
-            is_string: false,
-            default_value: false,
+            verify_block: proc do |value|
+              begin
+                Helper::FlutterHelper.build_number(value)
+              rescue ArgumentError => e
+                UI.user_error!(e.message)
+              end
+            end,
           ),
           FastlaneCore::ConfigItem.new(
-            key: :git_version_dirty_mark,
-            env_name: 'FL_FLUTTER_GIT_VERSION_DIRTY_MARK',
-            description: 'Append mark if the working tree is "dirty"',
+            key: :build_name_override,
+            env_name: 'FL_FLUTTER_BUILD_NAME_OVERRIDE',
+            description: <<-'DESCRIPTION',
+              Override build name in pubspec.yaml. Can be either a string, or a
+              schema definition, ex.: vcs* (take from VCS, add "*" for dirty
+              tree), vcs (take from VCS, no dirty mark).
+              NOTE: for App Store, must be in the format of at most 3 integeres
+                    separated by a dot (".").
+              WARNING: does not override Android build number specified in
+                       pubspec.yaml due to Flutter bug:
+                       https://github.com/flutter/flutter/issues/22788.
+            DESCRIPTION
             optional: true,
-            default_value: '*',
+            verify_block: proc do |value|
+              begin
+                Helper::FlutterHelper.build_name(value)
+              rescue ArgumentError => e
+                UI.user_error!(e.message)
+              end
+            end,
           ),
           # l10n settings
           FastlaneCore::ConfigItem.new(

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

@@ -57,6 +57,40 @@ module Fastlane
         end
         differencies
       end
+
+      def self.build_number(schema)
+        schema and Integer(schema)
+      rescue ArgumentError
+        build_number_source, build_number_base = schema.split('+', 2)
+
+        case build_number_source
+        when 'vcs'
+          build_number = Integer(sh(*%w(git rev-list --count HEAD)).strip)
+        when 'ci'
+          begin
+            build_number = Integer(ENV['TRAVIS_BUILD_NUMBER'] ||
+                                   ENV['CIRCLE_BUILD_NUM'])
+          rescue ArgumentError
+            raise if ENV.key?('CI')
+            raise ArgumentError, 'CI version requested, but not running on a CI'
+          end
+        end
+
+        if build_number_base
+          build_number + Integer(build_number_base)
+        else
+          build_number
+        end
+      end
+
+      def self.build_name(schema)
+        if schema && schema.start_with?('vcs')
+          dirty_mark = schema['vcs'.size..-1]
+          sh(*%W(git describe --tags --dirty=#{dirty_mark})).strip
+        else
+          schema
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Flutter
-    VERSION = "0.1.16"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-flutter
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.2.0
 platform: ruby
 authors:
 - Artem Sheremet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-08 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry