flycal-cli 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5920907ee209e0ea1204364f39bff454f52eb5214d4a2f72011b037cb6f6e58
-  data.tar.gz: e140b8f76c717c338d33b85f53b08defb9fde1aecfbdcf6e416ad33b2a87ed94
+  metadata.gz: 406ca19950c40ebb2ab3d0215d16c97154c6d322d90a3e7dce39440b8c272601
+  data.tar.gz: 79734bbb5b9a884517be0095351ee6cb43fd52af62d8022592860d884de302fc
 SHA512:
-  metadata.gz: 737242d48ae220aefad6560bf0a205ee83862b78ebedb479a2dc825da432a31516382fbea88681eede9bc66e61775b2e774f0508d2a6cb0b0e65469ebadbfd3f
-  data.tar.gz: b9aab68b6f14e0abb7d97ce3a975ee5be64ba3bc96a4263f8d7b01a1c24c121f4f46fce3913651a7cfeb83e7b7544698c1001724716abc8a86d1a7dc102bed70
+  metadata.gz: ead67f0591807b59784123b7943c6a27975b6dec986327a4888cae463f0929c7c1b770b807ebef18c887f5499eec9b0dcc662e4d64362a8f17211db45ac549b2
+  data.tar.gz: 2023d313314d76377b9e287f59f5ff0170864d1b8bf5726d3eed08d594f36477cb08016624b046d8d8153bf47408a3e109c767fd4f5d15532c712517cf5e690c

data/lib/flycal/cli/config.rb

@@ -172,7 +172,16 @@ module Cli
         return false unless File.file?(source)
 
         FileUtils.mkdir_p(config_dir)
-        FileUtils.mv(source, config_backup_file)
+        FileUtils.mv(source, config_backup_file, force: true)
+        FileUtils.rm_f(source)
+        true
+      end
+
+      def remove_tokens!
+        path = tokens_path
+        return false unless File.file?(path)
+
+        FileUtils.rm_f(path)
         true
       end
 

data/lib/flycal/cli/hooks.rb

@@ -19,14 +19,16 @@ module Cli
         return if skip_post_uninstall?
         return unless interactive?
         return unless last_flycal_cli_install?
-        return unless File.file?(Config.config_file)
+        return unless uninstall_cleanup_needed?
 
-        print "#{Locale.t('hooks.after_uninstall.prompt')} "
+        print "#{uninstall_text('hooks.after_uninstall.prompt')} "
         return unless accept_default_no?
 
-        if Config.backup_and_remove_config!
-          puts Locale.t("hooks.after_uninstall.saved", { backup: Config.config_backup_file })
-        end
+        backed_up = Config.backup_and_remove_config!
+        Config.remove_tokens!
+
+        puts uninstall_text("hooks.after_uninstall.saved", { backup: Config.config_backup_file }) if backed_up
+        puts uninstall_text("hooks.after_uninstall.tokens_removed")
       end
 
       def after_login
@@ -77,6 +79,19 @@ module Cli
         true
       end
 
+      def uninstall_cleanup_needed?
+        File.file?(Config.config_file) || File.file?(Config.tokens_path)
+      end
+
+      # Avoid Cli::Locale (it reads Config and would recreate config.yml after the backup).
+      def uninstall_text(key, vars = {})
+        previous = Thread.current[:flycal_locale_default_provider]
+        Thread.current[:flycal_locale_default_provider] = nil
+        Flycal::Locale.t(key, vars)
+      ensure
+        Thread.current[:flycal_locale_default_provider] = previous
+      end
+
       def skip_cli_after_install?(argv)
         argv = Array(argv)
         return true if argv.intersect?(%w[--version -v --help -h])

data/lib/flycal.rb

@@ -4,7 +4,7 @@
 # Under Rails, Zeitwerk autoloads lib/flycal/*.
 # The CLI gem entrypoint (flycal_cli/lib/flycal_cli.rb) eager-requires what it needs.
 module Flycal
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 
   def self.connect(credentials:)
     Client.new(credentials: credentials)

data/locales/en.json

@@ -63,8 +63,9 @@
       "goodbye": "happy calendling!"
     },
     "after_uninstall": {
-      "prompt": "Remove ~/.flycal/config.yml? It will be saved as config.backup.yml (y/N):",
-      "saved": "Saved as %{backup}"
+      "prompt": "Remove Flycal config and Google session? config.yml will be saved as config.backup.yml, tokens.yml will be deleted (y/N):",
+      "saved": "Saved as %{backup}",
+      "tokens_removed": "Removed ~/.flycal/tokens.yml"
     }
   },
   "errors": {

data/locales/it.json

@@ -63,8 +63,9 @@
       "goodbye": "happy calendling!"
     },
     "after_uninstall": {
-      "prompt": "Vuoi rimuovere ~/.flycal/config.yml? Verrà salvato come config.backup.yml (y/N):",
-      "saved": "Salvato in %{backup}"
+      "prompt": "Vuoi rimuovere la configurazione e la sessione Google? config.yml verrà salvato come config.backup.yml, tokens.yml verrà cancellato (y/N):",
+      "saved": "Salvato in %{backup}",
+      "tokens_removed": "Rimosso ~/.flycal/tokens.yml"
     }
   },
   "errors": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flycal-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - flycal-cli