fastlane-plugin-taiwan_number_one 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d5f839980b3d9ad947203474ba62973abaf7b768dafd9d17518761cb3482605
-  data.tar.gz: 70e6328b3fb8693a83d6979dadf51ac0e8fa47bd4d74b3403f15ac525611b196
+  metadata.gz: d96498468a5871d8e612adb663a7f446ce026e9dfb1ba3ee6a6df3689d2ac786
+  data.tar.gz: 285b7cb87df61d33b387690f9d06c06e9834e078d6948ee46c7a1388eea342b9
 SHA512:
-  metadata.gz: 1535dc058ad8feb38de1d1c473db917f84e9afb01f5de45e9e4043b12332b67b15e173d2186974f8103cf120f11851f66d2880ceea135a0f87b935c5367c9bc0
-  data.tar.gz: 9bfbb71e768956fb71f98f42109535bec08fae6ab4dd64c801ae77860c71504d689e6d20b7dccf54a6d9a63872d0a9574d2eade3dd95d1ffd02bbbd024bd1c42
+  metadata.gz: 12ce29515257361ae7f814ca0fc93dd026a456c211457085071b353bf241ef10631b28ce1569bc3d20307e583e7f0b7dffb09da73a4e5619dfba6669d6c0b812
+  data.tar.gz: 8558a7f279b12c8e4efe192700cccd08ba2867903c71c60ecd346487e93143dfa2b032a9a8d775bb0a5fedd5efb3d9966a57db22ad2ceecefd85c6edf29e4ffc

data/README.md

@@ -70,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
@@ -86,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
 ```
 
@@ -108,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

@@ -53,13 +53,14 @@ 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)
+                                   .sort_by { |v| Gem::Version.new(v.version_string) }
+                                   .last
+            return reject_version_if_possible(client: client, app_store_version: app_store_version)
           end
 
           app_store_version = app.get_app_store_versions(client: client, filter: filter, includes: "appStoreVersionSubmission")
@@ -74,16 +75,15 @@ module Fastlane
               UI.message("🇹🇼 Taiwan helps you do nothing!")
               return ActionResult::DO_NOTHING
             end
-            decision ||= fetch_decision(params)
 
             result = ActionResult::DO_NOTHING
             case decision
             when DecisionType::RELEASE
               UI.message("decision is release")
-              result = release_version_if_possible(app: app, app_store_version: app_store_version, token: token)
+              result = release_version_if_possible(client: client, 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)
+              result = reject_version_if_possible(client: client, app_store_version: app_store_version)
             else
               UI.user_error!("App's decision must be release or reject")
               result = ActionResult::DO_NOTHING
@@ -127,13 +127,13 @@ module Fastlane
         end
 
         begin
-          if token 
+          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
-            })
+                                       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
@@ -146,19 +146,19 @@ module Fastlane
         end
       end
 
-      def self.reject_version_if_possible(app: nil, app_store_version: Spaceship::ConnectAPI::AppStoreVersion)
-        unless app
-          UI.user_error!("Could not find app with bundle identifier '#{params[:app_identifier]}' on account #{params[:username]}")
+      # For example https://appstoreconnect.apple.com/iris/v1/appStoreVersionSubmissions/575ee084-a3a6-4664-8ba5-49dd77a00927
+      # Request Method: DELETE
+      def self.reject_version_if_possible(client: Spaceship::ConnectAPI, app_store_version: Spaceship::ConnectAPI::AppStoreVersion)
+        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
 
-        if app_store_version.reject!
-          UI.success("rejected version #{app_store_version.version_string} Successfully!")
-          return ActionResult::SUCCESS
-        else
-          UI.user_error!("An error occurred while rejected version #{app_store_version}")
-          return ActionResult::DO_NOTHING
-        end
+        client.delete_app_store_version_submission(app_store_version_submission_id: app_store_version.id)
+        UI.success("Rejected version #{app_store_version.version_string} Successfully!")
+        UI.message("🇹🇼 Taiwan can help!")
+        return ActionResult::SUCCESS
       end
 
       def self.api_token(params)
@@ -186,8 +186,8 @@ module Fastlane
 
       def self.output
         [
-          [ActionResult::SUCCESS, 'Successfully release or reject.'],
-          [ActionResult::DO_NOTHING, 'Do nothing.']
+          [ActionResult::SUCCESS, "Successfully release or reject."],
+          [ActionResult::DO_NOTHING, "Do nothing."]
         ]
       end
 
@@ -258,7 +258,7 @@ module Fastlane
                                        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),
+                                       default_value: false)
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TaiwanNumberOne
-    VERSION = "1.0.0"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-taiwan_number_one
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - andrew54068
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry