fastlane-plugin-taiwan_number_one 0.2.6 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a7efee5d2102888aacc0c475d952729991da41eae2010bcdbcb289e56392ce
-  data.tar.gz: '0976e6fcddb1bf2bc35ed104324debc8a8e04718cbbd5347f30d2512b7e0b624'
+  metadata.gz: f021f730281d3fb9f0494a897ed7d2150954a9dd671c1d3f334389ce3b22ec37
+  data.tar.gz: 27bb6277be25f03f4d1a0ec2c35377be6ea262e33ef6857a0df1142806de5bcf
 SHA512:
-  metadata.gz: 9ec00137f9b533afe8fcc910d7eb4109ba387a651c1413e457b132de0f61563afd63caf6a6693b1c67ce2c83c91c1b23735cc608ae16cf3c3ca756028b440f10
-  data.tar.gz: f933489a34359b0374d0b63740888a4e0e1565410502c7c90d6f261149ac007dbe984fd9a6a10375774244fb942adecd1c2b9042d465bb9535fc5ec7b47cb8ea
+  metadata.gz: 50dedbd50733a4ae7c209dc2e2b5724a167a1d70c41ad8f5c702f0620d2d2aecb2b87d5f66ebc4e6a68d5d23e6b43a763c2b586e1312299421d11d4506794988
+  data.tar.gz: 53120452faa6d1d9d6c6601cc865ffaeb4b1e2b35b870c2524969ccde60b807dba892fece311467927648db69dc9cf79f0b3a31a414bfaa26649c3770390cb4e

data/README.md

@@ -10,6 +10,7 @@ This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To
 fastlane add_plugin taiwan_number_one
 ```
 
+Start from v0.2.7 we use this [workaround](https://github.com/fastlane/fastlane/issues/17283#issuecomment-711865915) to solve issue while using App Store Connect Api key.
 ## About taiwan_number_one
 
 To approve or reject if status is `Pending Developer Release`, otherwise do nothing.
@@ -69,7 +70,7 @@ and this:
 ```
 desc "release App store version"
 lane :release_app do
-  result = release_decision(app_decision: Fastlane::Actions::TaiwanNumberOneAction::DicisionType::RELEASE)
+  result = release_decision(app_decision: Fastlane::Actions::TaiwanNumberOneAction::DecisionType::RELEASE)
   if result == Fastlane::Actions::TaiwanNumberOneAction::ActionResult::SUCCESS
     # do your thing here!
   end
@@ -85,7 +86,7 @@ lane :reject_app do
     issuer_id: ENV["ISSUER_ID"],
     key_content: ENV["ASC_API_KEY"]
   )
-  release_decision(app_decision: Fastlane::Actions::TaiwanNumberOneAction::DicisionType::REJECT)
+  release_decision(app_decision: Fastlane::Actions::TaiwanNumberOneAction::DecisionType::REJECT)
 end
 ```
 
@@ -107,9 +108,9 @@ end
 or 
 
 ```
-release_decision(app_decision: Fastlane::Actions::TaiwanNumberOneAction::DicisionType::RELEASE)
+release_decision(app_decision: Fastlane::Actions::TaiwanNumberOneAction::DecisionType::RELEASE)
 
-release_decision(app_decision: Fastlane::Actions::TaiwanNumberOneAction::DicisionType::REJECT)
+release_decision(app_decision: Fastlane::Actions::TaiwanNumberOneAction::DecisionType::REJECT)
 ```
 
 #### Use in terminal

data/lib/fastlane/plugin/taiwan_number_one/actions/taiwan_number_one_action.rb

@@ -5,7 +5,7 @@ require_relative "../helper/taiwan_number_one_helper"
 module Fastlane
   module Actions
     class TaiwanNumberOneAction < Action
-      module DicisionType
+      module DecisionType
         RELEASE = "release"
         REJECT = "reject"
       end
@@ -53,6 +53,21 @@ module Fastlane
             ].join(","),
             platform: platform
           }
+                    
+          decision ||= fetch_decision(params)
+          if params[:force] && decision == DecisionType::REJECT
+            UI.message("decision is reject")
+            app_store_version = app.get_app_store_versions(client: client, includes: "appStoreVersionSubmission")
+                                 .sort_by { |v| Gem::Version.new(v.version_string) }
+                                 .last
+            if app_store_version.app_store_state == Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::DEVELOPER_REJECTED
+              UI.message("app_store_state is already #{app_store_version.app_store_state}")
+              UI.message("🇹🇼 Taiwan helps you do nothing!")
+              return ActionResult::DO_NOTHING
+            end
+            return reject_version_if_possible(app: app, app_store_version: app_store_version)
+          end
+
           app_store_version = app.get_app_store_versions(client: client, filter: filter, includes: "appStoreVersionSubmission")
                                  .sort_by { |v| Gem::Version.new(v.version_string) }
                                  .last
@@ -63,16 +78,15 @@ module Fastlane
             unless state == Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE
               UI.message("AppStoreState is not PENDING_DEVELOPER_RELEASE")
               UI.message("🇹🇼 Taiwan helps you do nothing!")
-              return
+              return ActionResult::DO_NOTHING
             end
-            decision ||= fetch_decision(params)
 
             result = ActionResult::DO_NOTHING
             case decision
-            when DicisionType::RELEASE
+            when DecisionType::RELEASE
               UI.message("decision is release")
-              result = release_version_if_possible(app: app, app_store_version: app_store_version)
-            when DicisionType::REJECT
+              result = release_version_if_possible(app: app, app_store_version: app_store_version, token: token)
+            when DecisionType::REJECT
               UI.message("decision is reject")
               result = reject_version_if_possible(app: app, app_store_version: app_store_version)
             else
@@ -104,23 +118,33 @@ module Fastlane
         end
         # return decision
         UI.message("return type #{decision}")
-        if decision == DicisionType::RELEASE
-          return DicisionType::RELEASE
+        if decision == DecisionType::RELEASE
+          return DecisionType::RELEASE
         else
-          return DicisionType::REJECT
+          return DecisionType::REJECT
         end
       end
 
-      def self.release_version_if_possible(app: nil, app_store_version: Spaceship::ConnectAPI::AppStoreVersion)
+      def self.release_version_if_possible(app: nil, app_store_version: Spaceship::ConnectAPI::AppStoreVersion, token: nil)
         unless app
           UI.user_error!("Could not find app with bundle identifier '#{params[:app_identifier]}' on account #{params[:username]}")
           return ActionResult::DO_NOTHING
         end
 
         begin
-          app_store_version.create_app_store_version_release_request
-          UI.message("release version #{app_store_version.version_string} successfully!")
-          return ActionResult::SUCCESS
+          if token 
+            now = Time.now
+            release_date_string = now.strftime("%Y-%m-%dT%H:00%:z")
+            app_store_version.update(attributes: {
+                earliest_release_date: release_date_string,
+                release_type: Spaceship::ConnectAPI::AppStoreVersion::ReleaseType::SCHEDULED
+            })
+            return ActionResult::SUCCESS
+          else
+            app_store_version.create_app_store_version_release_request
+            UI.message("release version #{app_store_version.version_string} successfully!")
+            return ActionResult::SUCCESS
+          end
         rescue => e
           UI.user_error!("An error occurred while releasing version #{app_store_version}, #{e.message}\n#{e.backtrace.join("\n")}")
           return ActionResult::DO_NOTHING
@@ -180,7 +204,7 @@ module Fastlane
                                        env_name: "app_decision",
                                        description: "A description of your decision, should be release or reject",
                                        optional: false,
-                                       default_value: DicisionType::RELEASE,
+                                       default_value: DecisionType::RELEASE,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :username,
                                        short_option: "-u",
@@ -234,7 +258,12 @@ module Fastlane
                                        type: Hash,
                                        optional: true,
                                        sensitive: true,
-                                       conflicting_options: [:api_key_path])
+                                       conflicting_options: [:api_key_path]),
+          FastlaneCore::ConfigItem.new(key: :force,
+                                       env_name: "FL_DECISION_FORCE",
+                                       description: "Skip verifying of current version state for reject reviewed version or cancel waiting review version",
+                                       is_string: false,
+                                       default_value: false),
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TaiwanNumberOne
-    VERSION = "0.2.6"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-taiwan_number_one
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 1.1.1
 platform: ruby
 authors:
 - andrew54068
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry