flycal-cli 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a7c1e482dd1e5df5126ae7a23f5c43032268c94c1cdf6dcc22e4b145e609be7
-  data.tar.gz: d0d6caf44d2348e66fb53969b5e912fe614a77bfc5a449b31297deb3665eb10d
+  metadata.gz: d7f3ae70fd1c2b1259a400d7bea2ff5b936765ea3c4031e35d11ab59e755bd98
+  data.tar.gz: e9decf6f9520e826f010e7c5dd8f9fe4f2cd5739c079b0ffa133fdebcd721cf4
 SHA512:
-  metadata.gz: fc16924f3ef92c7824e939900334c09292154690b535dd14fd3296a9f7a9a42e2f4f050a637a93fd4f63575986936322bcc27092ec019c3e5ec579a233f95486
-  data.tar.gz: 503012381ef20c95d61b8ca80e0472b93a2715af38a3af5c683cd4a060d12050aebedcf9d6f4b1527bce9a9d5a523526e5e3d4f41c150f27262de14ee72bd1f8
+  metadata.gz: 13cc3c1b5c9aaa8e4b630920e6752a61a0bdd90de2a6d302473bbe75c548566b6ab5438f5c9d86180c4a11d424a902069aa3f8e1b6e0f948e0bacb1292a495ac
+  data.tar.gz: 3d0a56c6403f673b7b8fcf4e06797970e936b3448e2496a22ee2072dc07efed566ece48ad98e42132371f8bae6b8d2143a6915ec281b9e9d0fe0f647db47e7ea

data/bin/flycal

@@ -8,4 +8,6 @@ if ARGV.include?("--version") || ARGV.include?("-v")
   exit 0
 end
 
+Flycal::Cli::Hooks.after_install unless Flycal::Cli::Hooks.skip_cli_after_install?(ARGV)
+
 Flycal::Cli::App.start(ARGV)

data/lib/flycal/cli/config.rb

@@ -45,6 +45,16 @@ 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

data/lib/flycal/cli/hooks.rb

@@ -8,36 +8,45 @@ 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
 
         puts "#{bold('flycal-cli')} #{Locale.t('hooks.after_install.ready')}"
         print "#{Locale.t('hooks.after_install.prompt')} "
-        return unless accept_default_yes?
-
-        launch_login
+        accepted = accept_default_yes?
+        Config.after_install_done = true
+        launch_login if accepted
       end
 
       def after_login
         return unless Auth.logged_in?
-        return if Config.calendar_default
 
+        current = Config.calendar_default.to_s.strip
         calendars = Flycal.connect(credentials: Auth.credentials).list_calendars
-        primary = calendars.find { |calendar| calendar.respond_to?(:primary) && calendar.primary } || calendars.first
-        return unless primary
 
-        Config.calendar_default = primary.id
-        name = primary.summary.to_s.strip
-        name = primary.id if name.empty?
+        if current.empty?
+          selected = calendars.find { |calendar| calendar.respond_to?(:primary) && calendar.primary } || calendars.first
+          return unless selected
 
-        puts "#{bold('flycal-cli')} #{Locale.t('hooks.after_login.using', { calendar: bold(name) })}"
-        puts Locale.t("hooks.after_login.change")
-        puts Locale.t("hooks.after_login.goodbye")
-      rescue StandardError
-        nil
+          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?
+          warn "flycal-cli after_login: #{e.message}"
+        else
+          announce_default_calendar(fallback)
+        end
       end
 
       def launch_login
@@ -53,6 +62,14 @@ module Cli
         ENV["FLYCAL_SKIP_POST_INSTALL"].to_s == "1"
       end
 
+      def skip_cli_after_install?(argv)
+        argv = Array(argv)
+        return true if argv.intersect?(%w[--version -v --help -h])
+
+        command = argv.find { |arg| !arg.start_with?("-") }
+        %w[login help].include?(command.to_s)
+      end
+
       def interactive?
         $stdin.tty? && $stdout.tty?
       end
@@ -72,6 +89,19 @@ module Cli
 
         "\e[1m#{text}\e[0m"
       end
+
+      def announce_default_calendar(name)
+        puts "#{bold('flycal-cli')} #{Locale.t('hooks.after_login.using', { calendar: bold(name) })}"
+        puts Locale.t("hooks.after_login.change")
+        puts Locale.t("hooks.after_login.goodbye")
+      end
+
+      def display_name(calendar)
+        return nil unless calendar
+
+        name = calendar.summary.to_s.strip
+        name.empty? ? calendar.id.to_s : name
+      end
     end
   end
 end

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

metadata

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