flycal-cli 1.4 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f3ae70fd1c2b1259a400d7bea2ff5b936765ea3c4031e35d11ab59e755bd98
-  data.tar.gz: e9decf6f9520e826f010e7c5dd8f9fe4f2cd5739c079b0ffa133fdebcd721cf4
+  metadata.gz: 406ca19950c40ebb2ab3d0215d16c97154c6d322d90a3e7dce39440b8c272601
+  data.tar.gz: 79734bbb5b9a884517be0095351ee6cb43fd52af62d8022592860d884de302fc
 SHA512:
-  metadata.gz: 13cc3c1b5c9aaa8e4b630920e6752a61a0bdd90de2a6d302473bbe75c548566b6ab5438f5c9d86180c4a11d424a902069aa3f8e1b6e0f948e0bacb1292a495ac
-  data.tar.gz: 3d0a56c6403f673b7b8fcf4e06797970e936b3448e2496a22ee2072dc07efed566ece48ad98e42132371f8bae6b8d2143a6915ec281b9e9d0fe0f647db47e7ea
+  metadata.gz: ead67f0591807b59784123b7943c6a27975b6dec986327a4888cae463f0929c7c1b770b807ebef18c887f5499eec9b0dcc662e4d64362a8f17211db45ac549b2
+  data.tar.gz: 2023d313314d76377b9e287f59f5ff0170864d1b8bf5726d3eed08d594f36477cb08016624b046d8d8153bf47408a3e109c767fd4f5d15532c712517cf5e690c

data/lib/flycal/cli/app.rb

@@ -30,7 +30,6 @@ module Cli
       if Auth.logged_in?
         puts Locale.t("login.already_connected")
         Hooks.after_login
-        puts "\n#{Locale.t('login.next_config')}" unless Config.calendar_default
         return
       end
 
@@ -41,7 +40,6 @@ module Cli
         Auth.login(mode)
         puts "\n#{Locale.t('login.success')}"
         Hooks.after_login
-        puts "\n#{Locale.t('login.next_config')}" unless Config.calendar_default
       rescue Flycal::Error => e
         puts "Error: #{e.message}"
         exit 1

data/lib/flycal/cli/auth.rb

@@ -28,6 +28,8 @@ module Cli
       end
 
       def logged_in?
+        return false unless tokens_present?
+
         creds = credentials
         return false unless creds
 
@@ -37,6 +39,12 @@ module Cli
         false
       end
 
+      # Google session file. config.yml is not a login signal (it survives uninstall).
+      def tokens_present?
+        path = Config.tokens_path
+        File.file?(path) && !File.size(path).to_i.zero?
+      end
+
       def login(mode)
         mode = normalize_mode(mode)
         if Config.auth_client && Config.auth_client != mode && File.exist?(Config.tokens_path)

data/lib/flycal/cli/config.rb

@@ -8,6 +8,7 @@ module Cli
   class Config
     CONFIG_DIR = File.expand_path("~/.flycal")
     CONFIG_FILE = File.join(CONFIG_DIR, "config.yml")
+    CONFIG_BACKUP_FILE = File.join(CONFIG_DIR, "config.backup.yml")
     CREDENTIALS_FILE = File.join(CONFIG_DIR, "credentials.json")
     TOKENS_FILE = File.join(CONFIG_DIR, "tokens.yml")
     DEFAULTS_FILE = File.expand_path("../../../config/defaults.yml", __dir__)
@@ -45,16 +46,6 @@ module Cli
         save(data)
       end
 
-      def after_install_done?
-        load["after_install_done"] == true
-      end
-
-      def after_install_done=(value)
-        data = load
-        data["after_install_done"] = value ? true : false
-        save(data)
-      end
-
       def credentials_path
         CREDENTIALS_FILE
       end
@@ -172,6 +163,28 @@ module Cli
         CONFIG_FILE
       end
 
+      def config_backup_file
+        CONFIG_BACKUP_FILE
+      end
+
+      def backup_and_remove_config!
+        source = config_file
+        return false unless File.file?(source)
+
+        FileUtils.mkdir_p(config_dir)
+        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
+
       def locale
         load["locale"].to_s
       end

data/lib/flycal/cli/hooks.rb

@@ -8,45 +8,52 @@ module Cli
       def after_install
         return if skip_post_install?
         return unless interactive?
-        return if Config.after_install_done?
-
-        if Auth.logged_in?
-          after_login
-          Config.after_install_done = true
-          return
-        end
+        return if Auth.logged_in?
 
         puts "#{bold('flycal-cli')} #{Locale.t('hooks.after_install.ready')}"
         print "#{Locale.t('hooks.after_install.prompt')} "
-        accepted = accept_default_yes?
-        Config.after_install_done = true
-        launch_login if accepted
+        launch_login if accept_default_yes?
       end
 
-      def after_login
-        return unless Auth.logged_in?
+      def after_uninstall
+        return if skip_post_uninstall?
+        return unless interactive?
+        return unless last_flycal_cli_install?
+        return unless uninstall_cleanup_needed?
 
-        current = Config.calendar_default.to_s.strip
-        calendars = Flycal.connect(credentials: Auth.credentials).list_calendars
+        print "#{uninstall_text('hooks.after_uninstall.prompt')} "
+        return unless accept_default_no?
 
-        if current.empty?
-          selected = calendars.find { |calendar| calendar.respond_to?(:primary) && calendar.primary } || calendars.first
-          return unless selected
+        backed_up = Config.backup_and_remove_config!
+        Config.remove_tokens!
 
-          Config.calendar_default = selected.id
-          announce_default_calendar(display_name(selected))
-        else
-          selected = calendars.find { |calendar| calendar.id.to_s == current } ||
-                     calendars.find { |calendar| calendar.summary.to_s == current }
-          announce_default_calendar(display_name(selected) || current)
-        end
-      rescue StandardError => e
-        fallback = Config.calendar_default.to_s.strip
-        if fallback.empty?
+        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
+        creds = Auth.credentials
+        return unless creds
+
+        selected = nil
+        begin
+          calendars = Flycal.connect(credentials: creds).list_calendars
+          current = Config.calendar_default.to_s.strip
+          if current.empty?
+            selected = calendars.find { |calendar| calendar.respond_to?(:primary) && calendar.primary } || calendars.first
+            Config.calendar_default = selected.id if selected
+          else
+            selected = calendars.find { |calendar| calendar.id.to_s == current } ||
+                       calendars.find { |calendar| calendar.summary.to_s == current }
+          end
+        rescue StandardError => e
           warn "flycal-cli after_login: #{e.message}"
-        else
-          announce_default_calendar(fallback)
         end
+
+        name = display_name(selected) || Config.calendar_default
+        return if name.to_s.strip.empty?
+
+        announce_default_calendar(name)
       end
 
       def launch_login
@@ -62,6 +69,29 @@ module Cli
         ENV["FLYCAL_SKIP_POST_INSTALL"].to_s == "1"
       end
 
+      def skip_post_uninstall?
+        ENV["FLYCAL_SKIP_POST_UNINSTALL"].to_s == "1"
+      end
+
+      def last_flycal_cli_install?
+        Gem::Specification.find_all_by_name("flycal-cli").size <= 1
+      rescue StandardError
+        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])
@@ -84,6 +114,16 @@ module Cli
         %w[y yes].include?(answer)
       end
 
+      def accept_default_no?(input = $stdin)
+        line = input.gets
+        return false if line.nil?
+
+        answer = line.strip.downcase
+        return false if answer.empty?
+
+        %w[y yes].include?(answer)
+      end
+
       def bold(text)
         return text.to_s unless $stdout.tty?
 

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.4"
+  VERSION = "1.5.2"
 
   def self.connect(credentials:)
     Client.new(credentials: credentials)

data/lib/rubygems_plugin.rb

@@ -11,3 +11,14 @@ Gem.post_install do |installer|
     warn "flycal-cli post-install: #{e.message}"
   end
 end
+
+Gem.pre_uninstall do |uninstaller|
+  next unless uninstaller.spec.name == "flycal-cli"
+
+  begin
+    require "flycal_cli"
+    Flycal::Cli::Hooks.after_uninstall
+  rescue LoadError, StandardError => e
+    warn "flycal-cli pre-uninstall: #{e.message}"
+  end
+end

data/locales/en.json

@@ -61,6 +61,11 @@
       "using": "is using %{calendar} by default,",
       "change": "you can change it using command 'flycal config',",
       "goodbye": "happy calendling!"
+    },
+    "after_uninstall": {
+      "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

@@ -61,6 +61,11 @@
       "using": "sta usando %{calendar} come predefinito,",
       "change": "puoi cambiarlo con il comando 'flycal config',",
       "goodbye": "happy calendling!"
+    },
+    "after_uninstall": {
+      "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.4'
+  version: 1.5.2
 platform: ruby
 authors:
 - flycal-cli