flycal-cli 1.0 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0683f1fd5316c424662349a75956309890f9fe5d38fd0cd50a4e158f9a7085e1'
-  data.tar.gz: b7507dee7df050d2e4f11bfb80002f82c2d4cb2689daff89c1d4be62f244b5e1
+  metadata.gz: 55605292daf7d56f71dc210b4c607ebceeb0aa1be1bc464ba73d82ce26583c4a
+  data.tar.gz: 256c9dd132265a9d7b36ac7a144c516b06d5c298f9a8e8fb8ac29e1fe2a7bc53
 SHA512:
-  metadata.gz: ccabe113d4314bacfd16f3072986d9686919acf4c489a7d8cf9ec05e2bb6dddec59576a859cc210485f9ef56afe7ad9a8522432ba37f0976ae10e5385ffe6e93
-  data.tar.gz: 6fb81eb48cb1bc8ed7ea84b8764eb8c677f1a6b346c5a0841a9498aecd63a06b73f1c801e8dee0f915d3ebf20901e74195356d83a3323edf3ef2725c85fdb4d3
+  metadata.gz: b7a93a60e2cfd438b9b9ef9b52bf1c1a06e07c329bf3e86d3e8ef2253a5bf96c8bbbb390c5258b5250d71e0f87d6669b1088c1b7d10a3bebac0ad9809dc4f638
+  data.tar.gz: 5fc7e9f8a1d202e84caf771498a5758023a8aa16a240e6490108eb31d73507889857ca40a2db00309a78f7c15de34f16db1a334037bc44cd684531bac8d73053

data/config/defaults.yml

@@ -1,30 +1,5 @@
 calendar_default: ~
 locale: en
-slots:
-  templates:
-    work:
-      days:
-        - 1
-        - 2
-        - 3
-        - 4
-        - 5
-      hours:
-        - 9:30-13:00
-        - 14:00-18:30
-    dinner:
-      days:
-        - 1
-        - 2
-        - 3
-        - 4
-        - 5
-        - 6
-      hours:
-        - 19-23
-  exclude_calendars: []
-  defaults:
-    from: now
-    default_duration: 45min
-  free_before: 0m
-  free_after: 15m
+timezone: Europe/Rome
+# `slots` is injected from Flycal::DefaultSlots at load/setup time.
+# After first write, the CLI reads templates from this file on disk.

data/config/oauth_client.json

@@ -0,0 +1,14 @@
+{
+  "installed": {
+    "client_id": "854938129342-tnf0miouj03b4vgi17aol1j8aann25mn.apps.googleusercontent.com",
+    "project_id": "flycal-387320",
+    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+    "token_uri": "https://oauth2.googleapis.com/token",
+    "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+    "client_secret": "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",
+    "redirect_uris": [
+      "http://localhost",
+      "http://127.0.0.1:9292/oauth2callback"
+    ]
+  }
+}

data/lib/flycal/cli/app.rb

@@ -22,29 +22,23 @@ module Cli
     end
 
     desc "login", "Connect to your Google account"
+    option :client, type: :string,
+           desc: "OAuth client: flycal (Flycal Desktop app) or json (~/.flycal/credentials.json)"
     def login
       apply_locale_override
       if Auth.logged_in?
-        puts "✓ You are already connected to your Google account."
-        puts "\nRun 'flycal config' to set the default calendar."
+        puts Locale.t("login.already_connected")
+        puts "\n#{Locale.t('login.next_config')}"
         return
       end
 
-      unless Config.credentials_exist?
-        puts "Error: Credentials file not found."
-        puts "\nTo configure flycal:"
-        puts "1. Go to https://console.cloud.google.com/apis/credentials"
-        puts "2. Create 'Desktop app' credentials"
-        puts "3. Download the JSON and save it as: #{Config.credentials_path}"
-        puts "\nAlso add this URI as an authorized redirect:"
-        puts "  http://127.0.0.1:9292/oauth2callback"
-        return
-      end
+      mode = resolve_login_mode
+      return unless mode
 
       begin
-        Auth.login
-        puts "\n✓ Authentication completed successfully!"
-        puts "\nRun 'flycal config' to set the default calendar."
+        Auth.login(mode)
+        puts "\n#{Locale.t('login.success')}"
+        puts "\n#{Locale.t('login.next_config')}"
       rescue Flycal::Error => e
         puts "Error: #{e.message}"
         exit 1
@@ -332,16 +326,28 @@ module Cli
       from_value = options[:from].to_s.strip
       from_value = defaults["from"].to_s.strip if from_value.empty?
       from_value = "now" if from_value.empty?
+      timezone = Config.timezone
+      template_name = nil
+      hours = nil
+      days = nil
+      slot_duration = nil
+      free_before = nil
+      free_after = nil
+      time_min = nil
+      time_max = nil
 
       begin
-        template_name, template = resolve_slots_template(slot_cfg, options[:template])
-        slot_duration = DurationParser.to_seconds(duration_value)
-        free_before = DurationParser.to_seconds(slot_cfg["free_before"] || "0m")
-        free_after = DurationParser.to_seconds(slot_cfg["free_after"] || "0m")
-        time_min = parse_slots_from(from_value)
-        time_max = DurationParser.add_to_time(in_value, time_min)
-        hours = parse_workhours(template["hours"])
-        days = parse_template_days(template["days"])
+        TimeFormat.with_zone(timezone) do
+          resolved = SlotTemplates.resolve(name: options[:template], catalog: slot_cfg["templates"])
+          template_name = resolved[:name]
+          hours = resolved[:hours]
+          days = resolved[:days]
+          slot_duration = DurationParser.to_seconds(duration_value)
+          free_before = DurationParser.to_seconds(slot_cfg["free_before"] || "0m")
+          free_after = DurationParser.to_seconds(slot_cfg["free_after"] || "0m")
+          time_min = parse_slots_from(from_value)
+          time_max = DurationParser.add_to_time(in_value, time_min)
+        end
       rescue Flycal::Error => e
         puts "Error: #{e.message}"
         exit 1
@@ -379,6 +385,7 @@ module Cli
         free_after: slot_cfg["free_after"] || "0m",
         template: template_name,
         locale: Locale.current_locale,
+        timezone: timezone,
         calendar: options[:calendar],
         hours: hours,
         days: days,
@@ -403,55 +410,57 @@ module Cli
       if output.nil?
         FileCache.delete(cache_key) if nocache
 
-        calendars = client.list_calendars
-        calendar_meta = exclude_calendar_ids.filter_map do |id|
-          cal = calendars.find { |c| c.id == id }
-          name = cal&.summary || id
-          { id: id, name: name }
-        end
-
-        fetch_from = time_min - free_before
-        events = exclude_calendar_ids.flat_map do |calendar_id|
-          client.list_events(
-            calendar_id,
-            time_min: fetch_from,
-            time_max: time_max
-          )
-        rescue Google::Apis::Error => e
-          warn Locale.t("errors.calendar_fetch", calendar: calendar_id, message: e.message)
-          []
-        end
+        TimeFormat.with_zone(timezone) do
+          calendars = client.list_calendars
+          calendar_meta = exclude_calendar_ids.filter_map do |id|
+            cal = calendars.find { |c| c.id == id }
+            name = cal&.summary || id
+            { id: id, name: name }
+          end
 
-        finder = SlotFinder.new(
-          events: events,
-          time_min: time_min,
-          time_max: time_max,
-          slot_duration_seconds: slot_duration,
-          hours: hours,
-          days: days,
-          free_before_seconds: free_before,
-          free_after_seconds: free_after
-        )
+          fetch_from = time_min - free_before
+          events = exclude_calendar_ids.flat_map do |calendar_id|
+            client.list_events(
+              calendar_id,
+              time_min: fetch_from,
+              time_max: time_max
+            )
+          rescue Google::Apis::Error => e
+            warn Locale.t("errors.calendar_fetch", calendar: calendar_id, message: e.message)
+            []
+          end
 
-        slots_by_day = finder.slots_by_day
+          finder = SlotFinder.new(
+            events: events,
+            time_min: time_min,
+            time_max: time_max,
+            slot_duration_seconds: slot_duration,
+            hours: hours,
+            days: days,
+            free_before_seconds: free_before,
+            free_after_seconds: free_after
+          )
 
-        output =
-          if format == "json"
-            SlotFormatter.format_json(
-              slots_by_day: slots_by_day,
-              time_min: time_min,
-              time_max: time_max,
-              duration: duration_value,
-              template: template_name,
-              calendars: calendar_meta,
-              locale: Locale.current_locale,
-              calendar_option: options[:calendar],
-              from_option: options[:from],
-              in_option: options[:in],
-              free_before: slot_cfg["free_before"],
-              free_after: slot_cfg["free_after"],
-              empty_message: Locale.t("slots.no_available")
-            )
+          slots_by_day = finder.slots_by_day
+
+          output =
+            if format == "json"
+              SlotFormatter.format_json(
+                slots_by_day: slots_by_day,
+                time_min: time_min,
+                time_max: time_max,
+                duration: duration_value,
+                template: template_name,
+                calendars: calendar_meta,
+                locale: Locale.current_locale,
+                timezone: timezone,
+                calendar_option: options[:calendar],
+                from_option: options[:from],
+                in_option: options[:in],
+                free_before: slot_cfg["free_before"],
+                free_after: slot_cfg["free_after"],
+                empty_message: Locale.t("slots.no_available")
+              )
           else
             SlotFormatter.format_text(
               slots_by_day: slots_by_day,
@@ -464,8 +473,9 @@ module Cli
             )
           end
 
-        FileCache.write(cache_key, strip_cache_marker_from_output(output, format))
-        status = "MISS"
+          FileCache.write(cache_key, strip_cache_marker_from_output(output, format))
+          status = "MISS"
+        end
       end
 
       print annotate_cli_output(output, status, cache_key, format)
@@ -541,6 +551,37 @@ module Cli
       lines[(blank_idx + 1)..].join("\n").strip
     end
 
+    def resolve_login_mode
+      requested = options[:client].to_s.strip.downcase
+      unless requested.empty?
+        unless [ Auth::CLIENT_FLYCAL, Auth::CLIENT_JSON ].include?(requested)
+          puts Locale.t("login.unknown_client", client: options[:client])
+          exit 1
+        end
+        return requested
+      end
+
+      return Auth::CLIENT_FLYCAL unless $stdin.tty?
+
+      begin
+        prompt = TTY::Prompt.new
+        choices = {
+          Locale.t("login.options.flycal") => Auth::CLIENT_FLYCAL,
+          Locale.t("login.options.json") => Auth::CLIENT_JSON
+        }
+        default_label =
+          if Config.auth_client == Auth::CLIENT_JSON
+            Locale.t("login.options.json")
+          else
+            Locale.t("login.options.flycal")
+          end
+        prompt.select(Locale.t("login.prompt"), choices, default: default_label, per_page: 5)
+      rescue Interrupt
+        puts "\n#{Locale.t('login.cancelled')}"
+        exit 0
+      end
+    end
+
     def with_config_interrupt_handling
       yield
     rescue Interrupt
@@ -681,37 +722,9 @@ module Cli
     end
 
     def parse_slots_from(value)
-      return Time.now if value.to_s.strip.downcase == "now"
-
       DateTimeParser.parse(value)
     end
 
-    def resolve_slots_template(slot_cfg, requested_name)
-      templates = slot_cfg["templates"]
-      raise Flycal::Error, "slots.templates is missing in config.yml." unless templates.is_a?(Hash) && !templates.empty?
-
-      name = requested_name.to_s.strip
-      name = templates.keys.first.to_s if name.empty?
-
-      template = templates[name]
-      unless template.is_a?(Hash)
-        available = templates.keys.join(", ")
-        raise Flycal::Error, "Unknown slots template #{name.inspect}. Available: #{available}"
-      end
-
-      [name, template]
-    end
-
-    def parse_template_days(values)
-      days = Array(values).map(&:to_i)
-      raise Flycal::Error, "slots template days cannot be empty." if days.empty?
-
-      invalid = days.reject { |d| d.between?(1, 7) }
-      raise Flycal::Error, "Invalid template days #{invalid.inspect}. Use 1 (Mon) .. 7 (Sun)." unless invalid.empty?
-
-      days.uniq
-    end
-
     def copy_slots_to_clipboard(text)
       tool = Clipboard.copy(SlotFormatter.strip_ansi(text))
       return unless tool
@@ -720,50 +733,6 @@ module Cli
       puts Locale.t("slots.copied_to_clipboard", tool: tool)
     end
 
-    def parse_hour_minute(value)
-      match = value.to_s.strip.match(/\A(\d{1,2}):(\d{2})\z/)
-      raise Flycal::Error, "Invalid time format #{value.inspect}. Use HH:MM (e.g. 9:00, 18:30)." unless match
-
-      hour = match[1].to_i
-      minute = match[2].to_i
-      unless hour.between?(0, 23) && minute.between?(0, 59)
-        raise Flycal::Error, "Invalid time #{value.inspect}. Hour must be 0-23 and minute 0-59."
-      end
-
-      [hour, minute]
-    end
-
-    def parse_workhours(values)
-      ranges = Array(values).map do |item|
-        start_str, end_str = item.to_s.strip.split("-", 2)
-        raise Flycal::Error, "Invalid hours item #{item.inspect}. Use format like '9-13' or '14:30-18:00'." if start_str.nil? || end_str.nil?
-
-        sh, sm = parse_hour_minute_flexible(start_str)
-        eh, em = parse_hour_minute_flexible(end_str)
-        start_minutes = (sh * 60) + sm
-        end_minutes = (eh * 60) + em
-        raise Flycal::Error, "Invalid hours range #{item.inspect}: end must be after start." if end_minutes <= start_minutes
-
-        [sh, sm, eh, em]
-      end
-
-      raise Flycal::Error, "template hours cannot be empty in config.yml." if ranges.empty?
-
-      ranges.sort_by { |sh, sm, _eh, _em| (sh * 60) + sm }
-    end
-
-    def parse_hour_minute_flexible(value)
-      str = value.to_s.strip
-      if str.match?(/\A\d{1,2}\z/)
-        hour = str.to_i
-        raise Flycal::Error, "Invalid hour #{value.inspect}. Must be 0-23." unless hour.between?(0, 23)
-
-        return [hour, 0]
-      end
-
-      parse_hour_minute(str)
-    end
-
     def resolve_calendar_ids(service, calendar_option)
       calendar_lists = service.list_calendars
       refs = Flycal::CalendarQuery.refs(calendar_option)

data/lib/flycal/cli/auth.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "webrick"
 require "googleauth"
 require "googleauth/stores/file_token_store"
 require "fileutils"
+require "rbconfig"
 
 module Flycal
 module Cli
@@ -11,23 +11,19 @@ module Cli
     SCOPE = "https://www.googleapis.com/auth/calendar.readonly"
     REDIRECT_PORT = 9292
     REDIRECT_URI = "http://127.0.0.1:#{REDIRECT_PORT}/oauth2callback"
+    CLIENT_FLYCAL = "flycal"
+    CLIENT_JSON = "json"
+    USER_ID = "flycal_user"
+    OAUTH_CLIENT_FILE = File.expand_path("../../../config/oauth_client.json", __dir__)
 
     class << self
       def credentials
-        return nil unless Config.credentials_exist?
-
-        token_store = Google::Auth::Stores::FileTokenStore.new(file: Config.tokens_path)
-        client_id = Google::Auth::ClientId.from_file(Config.credentials_path)
-        authorizer = Google::Auth::UserAuthorizer.new(
-          client_id,
-          SCOPE,
-          token_store,
-          "/oauth2callback"
-        )
-
-        creds = authorizer.get_credentials("flycal_user")
-        return creds if creds
+        mode = resolved_mode
+        return nil unless mode
+        return nil unless File.exist?(Config.tokens_path)
 
+        authorizer_for(mode).get_credentials(USER_ID)
+      rescue Signet::AuthorizationError, Flycal::Error
         nil
       end
 
@@ -41,52 +37,109 @@ module Cli
         false
       end
 
-      def login
-        unless Config.credentials_exist?
-          raise Flycal::Error,
-                "Credentials file not found. Create #{Config.credentials_path} with OAuth credentials from Google Cloud Console.\n" \
-                "Go to: https://console.cloud.google.com/apis/credentials\n" \
-                "Create 'Desktop app' credentials and download the JSON as credentials.json"
+      def login(mode)
+        mode = normalize_mode(mode)
+        if Config.auth_client && Config.auth_client != mode && File.exist?(Config.tokens_path)
+          logout
         end
 
-        token_store = Google::Auth::Stores::FileTokenStore.new(file: Config.tokens_path)
-        client_id = Google::Auth::ClientId.from_file(Config.credentials_path)
-        authorizer = Google::Auth::UserAuthorizer.new(
-          client_id,
-          SCOPE,
-          token_store,
-          "/oauth2callback"
-        )
+        Config.auth_client = mode
+        authorizer = authorizer_for(mode)
 
-        creds = authorizer.get_credentials("flycal_user")
+        creds = authorizer.get_credentials(USER_ID)
         if creds
-          creds.fetch_access_token!
-          return creds
+          begin
+            creds.fetch_access_token!
+            return creds
+          rescue Signet::AuthorizationError
+            token_store = Google::Auth::Stores::FileTokenStore.new(file: Config.tokens_path)
+            token_store.delete(USER_ID)
+            File.delete(Config.tokens_path) if File.exist?(Config.tokens_path)
+            authorizer = authorizer_for(mode)
+          end
         end
 
-        # Start local server to receive the auth code
         code = start_redirect_server(authorizer)
-        raise Flycal::Error, "Authentication cancelled or failed" if code.nil? || code.empty?
+        raise Flycal::Error, Locale.t("login.cancelled") if code.nil? || code.empty?
 
         authorizer.get_and_store_credentials_from_code(
-          user_id: "flycal_user",
+          user_id: USER_ID,
           code: code,
           base_url: "http://127.0.0.1:#{REDIRECT_PORT}"
         )
       end
 
       def logout
-        return true unless File.exist?(Config.tokens_path)
-
-        token_store = Google::Auth::Stores::FileTokenStore.new(file: Config.tokens_path)
-        token_store.delete("flycal_user")
-        File.delete(Config.tokens_path) if File.exist?(Config.tokens_path)
+        if File.exist?(Config.tokens_path)
+          token_store = Google::Auth::Stores::FileTokenStore.new(file: Config.tokens_path)
+          token_store.delete(USER_ID)
+          File.delete(Config.tokens_path) if File.exist?(Config.tokens_path)
+        end
+        Config.auth_client = nil
         true
       end
 
+      def client_id_for(mode)
+        mode = normalize_mode(mode)
+        path = client_id_path(mode)
+        unless File.exist?(path)
+          raise Flycal::Error, missing_client_message(mode, path)
+        end
+
+        Google::Auth::ClientId.from_file(path)
+      end
+
+      def bundled_client_path
+        OAUTH_CLIENT_FILE
+      end
+
       private
 
+      def resolved_mode
+        stored = Config.auth_client
+        return stored if stored
+        return CLIENT_JSON if Config.credentials_exist?
+        return CLIENT_FLYCAL if File.exist?(Config.tokens_path)
+
+        nil
+      end
+
+      def normalize_mode(mode)
+        value = mode.to_s.strip.downcase
+        return value if [ CLIENT_FLYCAL, CLIENT_JSON ].include?(value)
+
+        raise Flycal::Error, Locale.t("login.unknown_client", client: mode)
+      end
+
+      def client_id_path(mode)
+        mode == CLIENT_JSON ? Config.credentials_path : bundled_client_path
+      end
+
+      def authorizer_for(mode)
+        token_store = Google::Auth::Stores::FileTokenStore.new(file: Config.tokens_path)
+        Google::Auth::UserAuthorizer.new(
+          client_id_for(mode),
+          SCOPE,
+          token_store,
+          "/oauth2callback"
+        )
+      end
+
+      def missing_client_message(mode, path)
+        if mode == CLIENT_JSON
+          Locale.t(
+            "login.json_missing",
+            path: path,
+            redirect: REDIRECT_URI
+          )
+        else
+          Locale.t("login.flycal_missing", path: path)
+        end
+      end
+
       def start_redirect_server(authorizer)
+        require "webrick"
+
         auth_code = nil
         state = SecureRandom.hex(16)
         code_verifier = Google::Auth::UserAuthorizer.generate_code_verifier
@@ -110,7 +163,7 @@ module Cli
           elsif params["code"]
             auth_code = params["code"]
             res.status = 200
-            res.body = "<h1>Authentication complete!</h1><p>You can close this window and return to the terminal.</p>"
+            res.body = "<h1>#{Locale.t('login.browser_done_title')}</h1><p>#{Locale.t('login.browser_done_body')}</p>"
           end
 
           Thread.new { server.shutdown }
@@ -121,13 +174,31 @@ module Cli
           state: state
         )
 
-        puts "\nOpen this link in your browser to authenticate:\n\n"
+        puts "\n#{Locale.t('login.open_link')}\n\n"
         puts "  #{url}\n\n"
-        puts "After authentication, you will be redirected back here automatically.\n\n"
+        puts "#{Locale.t('login.waiting')}\n\n"
+        open_browser(url)
 
         server.start
         auth_code
       end
+
+      def open_browser(url)
+        host_os = RbConfig::CONFIG["host_os"].to_s
+        cmd =
+          if host_os.match?(/darwin/)
+            [ "open", url ]
+          elsif host_os.match?(/linux/)
+            [ "xdg-open", url ]
+          elsif host_os.match?(/mswin|mingw|cygwin/)
+            [ "cmd", "/c", "start", "", url ]
+          end
+        return unless cmd
+
+        system(*cmd, out: File::NULL, err: File::NULL)
+      rescue StandardError
+        nil
+      end
     end
   end
 end

data/lib/flycal/cli/config.rb

@@ -53,6 +53,23 @@ module Cli
         File.exist?(CREDENTIALS_FILE)
       end
 
+      def auth_client
+        value = load["auth_client"].to_s.strip.downcase
+        return value if %w[flycal json].include?(value)
+
+        nil
+      end
+
+      def auth_client=(value)
+        data = load
+        if value.to_s.strip.empty?
+          data.delete("auth_client")
+        else
+          data["auth_client"] = value.to_s.strip.downcase
+        end
+        save(data)
+      end
+
       def tokens_path
         TOKENS_FILE
       end
@@ -149,6 +166,11 @@ module Cli
         load["locale"].to_s
       end
 
+      def timezone
+        value = load["timezone"].to_s.strip
+        value.empty? ? Flycal::TimeFormat::DEFAULT_ZONE : value
+      end
+
       def locale=(value)
         data = load
         data["locale"] = value.to_s
@@ -159,7 +181,8 @@ module Cli
         @default_values ||= begin
           raise "Defaults file not found: #{DEFAULTS_FILE}" unless File.exist?(DEFAULTS_FILE)
 
-          YAML.load_file(DEFAULTS_FILE) || {}
+          file = YAML.load_file(DEFAULTS_FILE) || {}
+          file.merge("slots" => Flycal::DefaultSlots.config_fragment)
         end
       end