fastlane-plugin-taiwan_number_one 0.2.5 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38998812e7cb61b9ab73987cd633e0a1a8eef8ef10b1ce12724316112e7ffc4f
-  data.tar.gz: 50a7d3caf5a59ced69c251792d8c5a6aa5d1f0710ec37d66dc5b16a424360e35
+  metadata.gz: c7a52ae95184c56210567ff8e07044f3211006e0c2573ae4bca75fe92e2fde95
+  data.tar.gz: 4566306d89b9d912349db6e51006e498b4504dc88e8b32504728807fbbcc4ef4
 SHA512:
-  metadata.gz: 2964c997b6f0e2b438f28ecae85f41d60e0bbb5dcf0019c983efc59b8003f14e5f5404fc45d32382b2703b27840869e9ccb3af9b566cabd9e618b68f6a2f9329
-  data.tar.gz: ef10e5896baeb418ea40dacac2ef93a8bc279a872d29816ae41058085bbe5ede053690e381cf1cf1d09466a2ffbd50f40256fff56ae2cfb1b483a818ff0e5a16
+  metadata.gz: 994f6edc6152386ee0d3c1c571600e0a63dc6b28fa312c42a9d2d45f6afd2e076357b0ba75ce830cfb333ca3fd8a844f589274281586edddf659cc01b29e8e48
+  data.tar.gz: 74195ccb3f67a13e2e7a962a9e568247225d7497e6fece51661d924d26652a1b35a58d306f046c2173b918a01301fd0d9b7c9220049a23c7b52bfaa6956d04f5

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

@@ -1,10 +1,11 @@
 require "fastlane/action"
+require "spaceship"
 require_relative "../helper/taiwan_number_one_helper"
 
 module Fastlane
   module Actions
     class TaiwanNumberOneAction < Action
-      module DicisionType
+      module DecisionType
         RELEASE = "release"
         REJECT = "reject"
       end
@@ -15,7 +16,6 @@ module Fastlane
       end
 
       def self.run(params)
-        require 'spaceship'
         begin
           params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
 
@@ -53,6 +53,16 @@ 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
+            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 +73,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 +113,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 +199,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 +253,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.5"
+    VERSION = "1.0.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.5
+  version: 1.0.1
 platform: ruby
 authors:
 - andrew54068
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry