fastlane-plugin-dropbox_upload 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3125d437d27ef16ee2c54448771e36b4020ba6f
-  data.tar.gz: a0c44590d99b07192439737e8b4b24347b7f8c40
+  metadata.gz: d368238c2089c867dc14cb5a3599aeefb5887d46
+  data.tar.gz: 4f1b1f983d2921f07a4e42840b35da5fa94247df
 SHA512:
-  metadata.gz: 8f28511356f7d3208fa36abae71442333547e77766c820a657819ef2c75a2121627c0bdd2677bd8dd76cc5a1b01a3c16d7ab51fffc761568622462fb0fdcd5ec
-  data.tar.gz: 79a3f03044697f63340e29db2199acc0f494352db9b9bcb322fcff5592c4aa3423997c8e5ce0288642727dd5be3a24ff15481cc350a45584809162290a028e9d
+  metadata.gz: d2ed47e0a3e601f789f8962c7eb0628c5ba77159d11f6a6d34b796546d42db7bf09089d7039a0c0d93082e5af0cc5178e34981e3c9dc009897a70bbac58bfd3c
+  data.tar.gz: d384a1275712cc2a559677cc64df32c4fe00f8f4745fe1db518a935019efa8d87d77b56c7c3779cf162c887f3660bb16ddeab31f20148dac9d308d463fd481a5

data/lib/fastlane/plugin/dropbox_upload/actions/dropbox_upload_action.rb

@@ -12,6 +12,7 @@ module Fastlane
         access_token = params[:access_token]
         file_path = params[:file_path]
         dropbox_path = params[:dropbox_path]
+        enable_clear = params[:enable_clear]
 
         UI.message ''
         UI.message("The dropbox_upload plugin is working!")
@@ -21,6 +22,9 @@ module Fastlane
         if write_mode.nil?
             write_mode = 'add'
         end
+        if enable_clear.nil?
+            enable_clear = false
+        end
         if write_mode.eql? 'update'
             if update_rev.nil?
                 UI.user_error! 'You need to specify `update_rev` when using `update` write_mode.'
@@ -37,12 +41,14 @@ module Fastlane
 
         client = DropboxApi::Client.new(access_token)
         fileSize = File.size(file_path)
-        more_space = is_space_enough(client, fileSize)
-        if more_space >= 0
+        remain_space = is_space_enough(client, fileSize)
+        if remain_space >= 0
             UI.message 'space is enough'
+        elsif enable_clear
+            UI.message "space almost fill need more #{-remain_space}, delete the earliest file"
+            delete_earliest_file(client, -remain_space)
         else
-            UI.message "space almost fill need more #{-more_space}, delete the earliest file"
-            delete_earliest_file(client, -more_space)
+            UI.user_error! "Can't to upload file to Dropbox, space is full!"
         end
 
         output_file = nil
@@ -126,15 +132,15 @@ module Fastlane
         return unuse - fileSize
       end
 
-      def self.delete_earliest_file(client, more_space)
+      def self.delete_earliest_file(client, space)
         UI.message ''
-        UI.important "Need space #{more_space}"
+        UI.important "Need space #{space}"
         UI.message ''
         delete_space = 0
         files = get_all_files(client)
         files.each { |file|
             delete_space = delete_space + delete_file(client, file)
-            if delete_space > more_space
+            if delete_space > space
                 break
             end
           }
@@ -153,7 +159,7 @@ module Fastlane
         files.sort_by { |a|
             a.client_modified
         }
-        return files
+        return files.reverse
       end
 
       def self.list_folder(client, path = '')
@@ -212,7 +218,7 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :file_path,
+            FastlaneCore::ConfigItem.new(key: :file_path,
                                        env_name: 'DROPBOX_FILE_PATH',
                                        description: 'Path to the uploaded file',
                                        type: String,
@@ -221,12 +227,12 @@ module Fastlane
                                          UI.user_error!("No file path specified for upload to Dropbox, pass using `file_path: 'path_to_file'`") unless value && !value.empty?
                                          UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
                                        end),
-          FastlaneCore::ConfigItem.new(key: :dropbox_path,
+            FastlaneCore::ConfigItem.new(key: :dropbox_path,
                                        env_name: 'DROPBOX_PATH',
                                        description: 'Path to the destination Dropbox folder',
                                        type: String,
                                        optional: true),
-          FastlaneCore::ConfigItem.new(key: :write_mode,
+            FastlaneCore::ConfigItem.new(key: :write_mode,
                                        env_name: 'DROPBOX_WRITE_MODE',
                                        description: 'Determines uploaded file write mode. Supports `add`, `overwrite` and `update`',
                                        type: String,
@@ -249,7 +255,13 @@ module Fastlane
                                        optional: false,
                                        verify_block: proc do |value|
                                          UI.user_error!("access_token not specified for Dropbox app. Provide your app's access_token or create a new ") unless value && !value.empty?
-                                       end)
+                                       end),
+        FastlaneCore::ConfigItem.new(key: :enable_clear,
+                                     env_name: 'ENABLE_CLEAR',
+                                     description: 'enable delete file when space is full',
+                                     type: Boolean,
+                                     optional: true,
+                                     )
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module DropboxUpload
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-dropbox_upload
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - jason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox_api