fastlane-plugin-auto_version_name 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 786d23d7922236df9c7f658a188c82be0e19c6de2135742caf00089a24cfbe39
-  data.tar.gz: 1b25b601ee511504b73ad010fdbf20c431af362946e43243b603a45298333f59
+  metadata.gz: f7c09abca8957f803d8c78260e14c3e7f7ce80a4482e34200a3c17e09cd55086
+  data.tar.gz: 9b13c63d00aae7a350c1372d4748a392d53faca2cd30424c9c0272208e3ed74e
 SHA512:
-  metadata.gz: 21acb54c2d35390b0d109a1ac37abee5d87fa845fc4a490b1d10204c3574d399e2a47658d0817128292de3b9e99c059a252cb341a869e049acd726e953157de0
-  data.tar.gz: d6767ad0df99cc1f2715ee2f12ec9bceb237fa9ee794952ea67823d61aeb57fe20a51f6b1f04ea4f328196ad82a56d31e207c022cb6ecfbe90f93298eda5e55e
+  metadata.gz: 63e01ee2984bc620921501ef862a4c8b8ef58ee6ae04c6b38588a53b5aa7d1b76af4ee643f530585d43bbb2ee4fa506bf1ce4b97d5a66a5dd9460a23ae5c58ae
+  data.tar.gz: 1c3e91b93bd0a39dbc83935b0c8d0734fed76f3036789eb6e2bae11b21db0126ea2eb2d9ef17ed72f9d484b3a84eba92b6965ff2e180c9c62b0fabf2bb2c5bf0

data/README.md

@@ -32,8 +32,15 @@ Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plu
 ```ruby
 platform :android do
   # [...]
+  root_directory = `cd ../.. && pwd`.chomp
+
+  package_name = "your.package.name"
+
   def get_live_version() # METHOD
-    return google_play_track_release_names().first 
+    return google_play_track_release_names(
+      json_key: "#{root_directory}/android/google-play-key.json",
+      package_name: package_name
+    ).first
     # main method returns an array by default. ["1.0.0"] => "1.0.0"
   end
   # [...]
@@ -100,10 +107,10 @@ platform :android do
     # [...]
     root_directory = `cd ../.. && pwd`.chomp
 
-    ios_lane = import("../../ios/fastlane/Fastfile")
+    ios_lane = import("#{root_directory}/ios/fastlane/Fastfile")
 
     version = auto_version_name(
-      minimal_version_string: File.open("#{root_directory}/version_name").read.chomp,
+      minimal_version: File.open("#{root_directory}/version_name").read.chomp,
       android_live_version: get_live_version(),
       ios_live_version: ios_lane.runner.execute("live_version_name", "ios"),
       # IMPORTANT: if your version lanes have the same name, you need to especify the platform on execute
@@ -132,7 +139,7 @@ platform :ios do
     android_lane = import("#{root_directory}/android/fastlane/Fastfile")
 
     version = auto_version_name(
-      minimal_version_string: File.open("#{root_directory}/version_name").read.chomp,
+      minimal_version: File.open("#{root_directory}/version_name").read.chomp,
       ios_live_version: get_live_version(),
       android_live_version: android_lane.runner.execute("live_version_name", "android"),
       # IMPORTANT: if your version lanes have the same name, you need to especify the platform on execute

data/lib/fastlane/plugin/auto_version_name/actions/auto_version_name_action.rb

@@ -5,49 +5,88 @@ module Fastlane
   module Actions
     class AutoVersionNameAction < Action
       def self.run(params)
+        # INITIALIZE
+        branch = Actions.git_branch()
+        last_commit_message = Actions.last_git_commit_message()
+        final_version_array = []
+        final_version_string = ""
+        minimal_version_string = params[:minimal_version]
+        has_any_live_version = false
+
+        # FUNCTIONS
         def self.version_string_to_array(version_string)
           return version_string.split('.').map { |value| value.to_i }
         end
 
-        def self.get_greater_version(version1, version2, version3)
+        def self.get_greater_version(minimal, ios, android)
           greater_version = ""
 
-          version1 = version1 == nil ? "" : version1
-          version2 = version2 == nil ? "" : version2
-          version3 = version3 == nil ? "" : version3
+          minimal = minimal == nil ? "" : minimal
+          ios = ios == nil ? "" : ios
+          android = android == nil ? "" : android
 
-          is_v1_greater = Gem::Version.new(version1) >= Gem::Version.new(version2) && Gem::Version.new(version1) >= Gem::Version.new(version3)
+          is_minimal_greater = Gem::Version.new(minimal) >= Gem::Version.new(ios) && Gem::Version.new(minimal) >= Gem::Version.new(android)
 
-          is_v2_greater = Gem::Version.new(version2) >= Gem::Version.new(version1) && Gem::Version.new(version2) >= Gem::Version.new(version3)
+          is_ios_greater = Gem::Version.new(ios) >= Gem::Version.new(minimal) && Gem::Version.new(ios) >= Gem::Version.new(android)
 
-          is_v3_greater = Gem::Version.new(version3) >= Gem::Version.new(version1) && Gem::Version.new(version3) >= Gem::Version.new(version2)
+          is_android_greater = Gem::Version.new(android) >= Gem::Version.new(minimal) && Gem::Version.new(android) >= Gem::Version.new(ios)
 
-          if (is_v1_greater)
-            greater_version = version1
-          elsif (is_v2_greater)
-            greater_version = version2
-          elsif (is_v3_greater)
-            greater_version = version3
+          if (is_minimal_greater)
+            greater_version = minimal
+          elsif (is_ios_greater)
+            greater_version = ios
+          elsif (is_android_greater)
+            greater_version = android
           end
 
           if (greater_version.empty? || greater_version == nil)
-            greater_version = "1.0.0"
+            greater_version = minimal_version_string
           end
 
           return greater_version
+        end        
+        
+        # iOS
+        begin
+          AppStoreBuildNumberAction.run(
+            api_key: params[:ios_api_key],
+            app_identifier: params[:ios_app_identifier],
+            username: params[:ios_username],
+            team_id: params[:ios_team_id],
+            platform: "ios",
+            live: true,
+          )
+          ios_version_string = lane_context[SharedValues::LATEST_VERSION];
+          has_any_live_version = true
+
+        rescue => exception
+          puts exception
+          ios_version_string = minimal_version_string
         end
 
-        # Initialize
-        branch = Actions.git_branch()
-        final_version_array = []
-        final_version_string = ""
-        minimal_version_string = params[:minimal_version]
-        ios_version_string = params[:ios_live_version]
-        android_version_string = params[:android_live_version]
-
-        final_version_array = get_greater_version(
+        # ANDROID
+        begin
+          android_version_string = GooglePlayTrackReleaseNamesAction.run(
+            json_key: params[:android_json_key_path],
+            package_name: params[:android_package_name],
+            track: "production",
+          ).first
+          has_any_live_version = true
+
+        rescue => exception
+          puts exception
+          android_version_string = minimal_version_string
+        end
+        
+        greater_version_string = get_greater_version(
           minimal_version_string, ios_version_string, android_version_string
-        ).split('.').map { |value| value.to_i }
+        )        
+        
+        if (!has_any_live_version || greater_version_string == minimal_version_string)
+          return minimal_version_string
+        end
+
+        final_version_array = greater_version_string.split('.').map { |value| value.to_i }
 
         # Upgrade final version array and return
         major = final_version_array[0]
@@ -56,7 +95,7 @@ module Fastlane
 
         # Auto increment.
         # 1.0.1 => 1.0.1(+1) => 1.0.2 || 1.0.1 => 1.0(+1).1 => 1.1.0
-        if (branch.include? 'hotfix')
+        if ((branch.include? 'hotfix') || (last_commit_message.include? 'hotfix'))
           patch += 1
         else
           minor += 1
@@ -75,13 +114,9 @@ module Fastlane
           major += 1
         end
 
-        live_versions_not_setted = (ios_version_string == nil || ios_version_string.empty?) && (android_version_string == nil || android_version_string.empty?)
-
-        unless (live_versions_not_setted)
-          final_version_array[0] = major
-          final_version_array[1] = minor
-          final_version_array[2] = patch
-        end
+        final_version_array[0] = major
+        final_version_array[1] = minor
+        final_version_array[2] = patch
 
         final_version_string = final_version_array.join('.') # [1, 0, 0] => "1.0.0"
         return final_version_string
@@ -106,21 +141,68 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :minimal_version,
-                                  env_name: "MINIMAL_VERSION_STRING",
-                               description: "A minimal version to be set",
-                                  optional: true,
-                                      type: String),
-          FastlaneCore::ConfigItem.new(key: :android_live_version,
-                                  env_name: "ANDROID_LIVE_VERSION",
-                               description: "Android's live version name e.g. \"1.0.0\"",
-                                  optional: true,
-                                      type: String),
-          FastlaneCore::ConfigItem.new(key: :ios_live_version,
-                                  env_name: "IOS_LIVE_VERSION",
-                               description: "iOS's live version name e.g. \"1.0.0\"",
-                                  optional: true,
-                                      type: String),
+          FastlaneCore::ConfigItem.new(
+            key: :android_package_name,
+            env_name: "ANDROID_PACKAGE_NAME",
+            description: "The package_name of your android app",
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :ios_app_identifier,
+            env_name: "IOS_PACKAGE_NAME",
+            description: "The bundle_identifier of your iOS app",
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :minimal_version,
+            env_name: "MINIMAL_VERSION_STRING", 
+            description: "A minimal version to be set",
+            optional: true,
+            default_value: "1.0.0",
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :android_json_key_path,
+            env_name: "ANDROID_JSON_KEY_PATH",
+            description: "The path to a file containing service account JSON, used to authenticate with Google",
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :ios_api_key,
+            env_names: ["APPSTORE_BUILD_NUMBER_API_KEY", "APP_STORE_CONNECT_API_KEY"],
+            description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-hash-option)",
+            type: Hash,
+            default_value: Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::APP_STORE_CONNECT_API_KEY],
+            default_value_dynamic: true,
+            optional: true,
+            sensitive: true,
+            conflicting_options: [:api_key_path]
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :ios_username,
+            short_option: "-u",
+            env_name: "ITUNESCONNECT_USER",
+            description: "Your Apple ID Username",
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :ios_team_id,
+            short_option: "-k",
+            env_name: "APPSTORE_BUILD_NUMBER_LIVE_TEAM_ID",
+            description: "The ID of your App Store Connect team if you're in multiple teams",
+            optional: true,
+            skip_type_validation: true, # as we also allow integers, which we convert to strings anyway
+            code_gen_sensitive: true,
+            default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_id),
+            default_value_dynamic: true,
+            verify_block: proc do |value|
+              ENV["FASTLANE_ITC_TEAM_ID"] = value.to_s
+            end
+          ),
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AutoVersionName
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-auto_version_name
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - gileadeteixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler