fastlane-plugin-approved 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f6872c458a5f49b5a1c7a835f9909370504f5e7f3a32d0a9329e72f16ae116
-  data.tar.gz: 6a00e2d1f00fb2f99de85d62f03a4dab7de41652047c8940a63ea76f4c8ed9c0
+  metadata.gz: 8470e76d8e4b1dd64d18ed7cb374b5a684a1d61d1334112ba5472ebce240b32b
+  data.tar.gz: fc0b7a00aa459f10016aa0a6699a3ed95744a2353b867681eedbc6f328ae04ee
 SHA512:
-  metadata.gz: 8222aa92d8868e3566ed048c584e65c82c6e990bde2bb0d816282f604bafe8c5b78102cb5c8b1d02740753f39b9d38e635575fe3d678d6b980eb9ccba5ffcbbc
-  data.tar.gz: d42c4825dff3154cd14b6532502fa28d5d45930c129c7ddb438e49693936d7f8d5dafe34a5db8a924c44cd99d13e8af00abffc02462c20ab91a86b16fdd534d1
+  metadata.gz: a069ed2c4a51716c4533fe50a01ec6bd5dbecb5327bd3acc7c8d7c846c392fdb18718bdfa9b5cc770365c068a5b2862a2dc6d340cc3193b42ba2dff8bc96ec99
+  data.tar.gz: '00783349ed6141ea2051ef728293b22992c7ef46193d8b63763b14a226888791b621a06e10d30552b095c1f09cccdfef0157afc7c214ce3a1584e24770718120'

data/lib/fastlane/plugin/approved/actions/approved_action.rb

@@ -6,15 +6,28 @@ module Fastlane
     class ApprovedAction < Action
       def self.run(params)
         require 'pathname'
+        require 'fileutils'
+
         repo_path = Dir.getwd
         repo_pathname = Pathname.new(repo_path)
         other_action.approved_precheck
         
         head = Actions.sh("git -C #{repo_path} rev-parse HEAD").strip
 
-        approved_file_path = params[:approval_file_path]
-        approved_file_absolute_path = approved_file_path.replace approved_file_path.sub("#{repo_pathname}", "./")
-        puts " -- updated = #{approved_file_absolute_path}".yellow
+        approved_folder_path = params[:approval_folder]
+        approved_folder_absolute_path = approved_folder_path.replace approved_folder_path.sub("#{repo_pathname}", "./")
+        # Prepare Approval Folder
+        FileUtils.mkdir_p approved_folder_absolute_path
+
+        existing_files = Dir[File.join(approved_folder_absolute_path, "*")]
+        existing_files.each { |file|
+          puts " -- remove old approval file > #{file}".yellow
+          File.delete(file)
+        }
+
+        approved_file_absolute_path = File.join(approved_folder_absolute_path, head)
+
+        puts " -- create approval file > #{approved_file_absolute_path}".yellow
         File.expand_path(File.join(repo_pathname, approved_file_absolute_path))
 
         File.open(approved_file_absolute_path, "w") { |f| f.write "#{head}" }
@@ -24,6 +37,7 @@ module Fastlane
         else
           # then create a commit with a message
           Actions.sh("git -C #{repo_path} add #{approved_file_absolute_path}")
+          existing_files.each { |file| Actions.sh("git -C #{repo_path} rm #{file}") }
           begin
             commit_message = "Approved commit #{head}"
             Actions.sh("git -C #{repo_path} commit -m '#{commit_message}'")
@@ -54,9 +68,9 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :approval_file_path,
-                                  env_name: "APPROVED_FILE_PATH",
-                               description: "Path to approval file",
+          FastlaneCore::ConfigItem.new(key: :approval_folder,
+                                  env_name: "APPROVED_FOLDER",
+                               description: "Folder to store approval file",
                                   optional: true,
                                       type: String,
                              default_value: ".approved"),

data/lib/fastlane/plugin/approved/actions/approved_precheck_action.rb

@@ -10,9 +10,11 @@ module Fastlane
         UI.message("Performing Approved Pre-check!")
         git_dirty_files = Actions.sh("git -C #{repo_path} diff --name-only HEAD").split("\n") + Actions.sh("git -C #{repo_path} ls-files --other --exclude-standard").split("\n")
 
-        approved_file_path = params[:approval_file_path]
-        approved_file_name = File.basename(approved_file_path)
-        git_dirty_files.delete(approved_file_name)
+        approved_folder_path = params[:approval_folder]
+        approved_folder_name = File.basename(approved_folder_path)
+        git_dirty_files.delete_if {|path| 
+          path.start_with?(approved_folder_name) 
+        }
 
         unless git_dirty_files.empty?
           error = [
@@ -44,10 +46,10 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :approval_file_path,
-                                  env_name: "APPROVED_FILE_PATH",
-                               description: "Path to aproval file",
-                                  optional: false,
+          FastlaneCore::ConfigItem.new(key: :approval_folder,
+                                  env_name: "APPROVED_FOLDER",
+                               description: "Folder to store approval file",
+                                  optional: true,
                                       type: String,
                              default_value: ".approved")
         ]

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Approved
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-approved
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chalermpong Satayavibul
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler