flycal-cli 1.0 → 1.2

data/lib/flycal/slot_templates.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Flycal
+  # Named and custom slot windows. YAML/JSON shape matches ~/.flycal/config.yml:
+  #
+  #   days: [1, 2, 3, 4, 5]
+  #   hours:
+  #     - 9:30-13:00
+  #     - 14:00-18:30
+  module SlotTemplates
+    BUILTIN = {
+      "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" ]
+      }
+    }.freeze
+
+    module_function
+
+    def names(catalog = nil)
+      normalize_catalog(catalog || DefaultSlots.templates).keys
+    end
+
+    # Resolve a named template, or a custom YAML-shaped hash.
+    # +custom+ wins over +name+ when present.
+    def resolve(name: nil, custom: nil, catalog: nil)
+      if custom_present?(custom)
+        parsed = parse(custom)
+        return parsed.merge(name: "custom")
+      end
+
+      source = normalize_catalog(catalog || DefaultSlots.templates)
+      raise Error, "slots.templates is missing." if source.empty?
+      key = name.to_s.strip
+      key = source.keys.first.to_s if key.empty?
+      definition = source[key]
+      unless definition
+        raise Error, "Unknown slots template #{key.inspect}. Available: #{source.keys.join(", ")}"
+      end
+
+      parse(definition).merge(name: key)
+    end
+
+    def parse(definition)
+      data = indifferent(definition)
+      days = parse_days(data[:days])
+      hours = parse_hours(data[:hours])
+      { days: days, hours: hours }
+    end
+
+    def parse_days(values)
+      days = Array(values).map(&:to_i)
+      raise Error, "slots template days cannot be empty." if days.empty?
+
+      invalid = days.reject { |d| d.between?(1, 7) }
+      raise Error, "Invalid template days #{invalid.inspect}. Use 1 (Mon) .. 7 (Sun)." unless invalid.empty?
+
+      days.uniq
+    end
+
+    def parse_hours(values)
+      return values if values.is_a?(Array) && values.first.is_a?(Array)
+
+      ranges = Array(values).map { |item| parse_hour_range(item) }
+      raise Error, "template hours cannot be empty." if ranges.empty?
+
+      ranges.sort_by { |sh, sm, _eh, _em| (sh * 60) + sm }
+    end
+
+    def parse_hour_range(item)
+      start_str, end_str = item.to_s.strip.split("-", 2)
+      if start_str.nil? || end_str.nil? || start_str.empty? || end_str.empty?
+        raise Error, "Invalid hours item #{item.inspect}. Use format like '9-13' or '14:30-18:00'."
+      end
+
+      sh, sm = parse_clock(start_str)
+      eh, em = parse_clock(end_str)
+      start_minutes = (sh * 60) + sm
+      end_minutes = (eh * 60) + em
+      raise Error, "Invalid hours range #{item.inspect}: end must be after start." if end_minutes <= start_minutes
+
+      [ sh, sm, eh, em ]
+    end
+
+    def parse_clock(value)
+      str = value.to_s.strip
+      if str.match?(/\A\d{1,2}\z/)
+        hour = str.to_i
+        raise Error, "Invalid hour #{value.inspect}. Must be 0-23." unless hour.between?(0, 23)
+
+        return [ hour, 0 ]
+      end
+
+      hour_s, minute_s = str.split(":", 2)
+      hour = hour_s.to_i
+      minute = minute_s.to_i
+      unless hour.between?(0, 23) && minute.between?(0, 59)
+        raise Error, "Invalid time #{value.inspect}. Use HH:MM (e.g. 9:00, 18:30)."
+      end
+
+      [ hour, minute ]
+    end
+
+    def custom_present?(custom)
+      return false if custom.nil?
+      return false if custom.respond_to?(:blank?) && custom.blank?
+      return false if custom.respond_to?(:empty?) && custom.empty?
+
+      true
+    end
+
+    def normalize_catalog(catalog)
+      indifferent(catalog).each_with_object({}) do |(key, value), out|
+        out[key.to_s] = value
+      end
+    end
+
+    def indifferent(value)
+      return {} if value.nil?
+      return value.with_indifferent_access if value.respond_to?(:with_indifferent_access)
+
+      value
+    end
+  end
+end

data/lib/flycal/time_format.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require "time"
+require "date"
+require "active_support/time"
+
+module Flycal
+  # Named-zone clock for template hours and every datetime Flycal emits.
+  #
+  # Wall-clock windows (work 9:30–13, dinner 19–23, template_custom) are local
+  # to this zone — never the server process TZ (often UTC in production).
+  # JSON start/end/from/to always share that same offset.
+  module TimeFormat
+    DEFAULT_ZONE = "Europe/Rome"
+
+    module_function
+
+    def with_zone(name)
+      previous = Thread.current[:flycal_timezone]
+      Thread.current[:flycal_timezone] = coerce_zone(name)
+      yield current_zone
+    ensure
+      Thread.current[:flycal_timezone] = previous
+    end
+
+    def current_zone
+      Thread.current[:flycal_timezone] || coerce_zone(DEFAULT_ZONE)
+    end
+
+    def coerce_zone(name)
+      return name if name.is_a?(ActiveSupport::TimeZone)
+
+      key = name.to_s.strip
+      key = DEFAULT_ZONE if key.empty?
+      ActiveSupport::TimeZone[key] || ActiveSupport::TimeZone[DEFAULT_ZONE]
+    end
+
+    def zone_name(name = nil)
+      zone = if name.nil? || name.to_s.strip.empty?
+               current_zone
+             else
+               coerce_zone(name)
+             end
+      zone.tzinfo&.identifier || zone.name
+    end
+
+    # explicit param → Google calendar timeZone → FLYCAL_TIMEZONE → Europe/Rome.
+    # Never uses ENV["TZ"] (Docker/Kamal set that to UTC).
+    def resolve(explicit: nil, calendars: nil, calendar_ids: nil)
+      key = explicit.to_s.strip
+      return zone_name(key) unless key.empty?
+
+      from_cal = from_calendars(calendars, calendar_ids)
+      return from_cal if from_cal
+
+      env = ENV["FLYCAL_TIMEZONE"].to_s.strip
+      return zone_name(env) unless env.empty?
+
+      DEFAULT_ZONE
+    end
+
+    def from_calendars(calendars, calendar_ids = nil)
+      return nil if calendars.nil? || (calendars.respond_to?(:empty?) && calendars.empty?)
+
+      ids = Array(calendar_ids).map(&:to_s)
+      list = Array(calendars)
+      selected =
+        if ids.empty?
+          list
+        else
+          matched = list.select { |cal| cal.respond_to?(:id) && ids.include?(cal.id.to_s) }
+          matched.empty? ? list : matched
+        end
+      cal = selected.find { |c| c.respond_to?(:primary) && c.primary } || selected.first
+      tz = cal.respond_to?(:time_zone) ? cal.time_zone : nil
+      return nil if tz.to_s.strip.empty?
+
+      zone_name(tz)
+    end
+
+    def now
+      current_zone.now
+    end
+
+    def today
+      current_zone.today
+    end
+
+    def local(year, month, day, hour = 0, min = 0, sec = 0, zone: current_zone)
+      coerce_zone(zone).local(year, month, day, hour, min, sec)
+    end
+
+    def iso8601(value, zone: current_zone)
+      unified(value, zone: zone)&.iso8601
+    end
+
+    def unified(value, zone: current_zone)
+      time = coerce(value)
+      return nil unless time
+
+      coerce_zone(zone).at(time.to_f)
+    end
+
+    def coerce(value)
+      return nil if value.nil?
+      return value if value.is_a?(Time)
+      return value.to_time if value.respond_to?(:to_time)
+
+      Time.parse(value.to_s)
+    rescue ArgumentError
+      nil
+    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.0"
+  VERSION = "1.2"
 
   def self.connect(credentials:)
     Client.new(credentials: credentials)

data/lib/flycal_cli.rb

@@ -10,6 +10,7 @@ $LOAD_PATH.unshift(cli_lib) unless $LOAD_PATH.include?(cli_lib)
 require "flycal/version"
 require "flycal/error"
 require "flycal/locale"
+require "flycal/time_format"
 require "flycal/credentials"
 require "flycal/event_mapper"
 require "flycal/cache_key"
@@ -21,11 +22,15 @@ require "flycal/description_query"
 require "flycal/calendar_query"
 require "flycal/calendar_service"
 require "flycal/slot_finder"
+require "flycal/slot_templates"
+require "flycal/default_slots"
+require "flycal/slot_query"
 require "flycal/slot_formatter"
 require "flycal/mock"
 require "flycal/mock/config"
 require "flycal/mock/event_generator"
 require "flycal/mock/calendar_service"
+require "flycal/mock/slot_scenario"
 require "flycal/pipeline"
 require "flycal/pipeline/params"
 require "flycal/pipeline/retriever"

data/locales/en.json

@@ -28,6 +28,24 @@
       "failed": "Error: could not open config with %{editor}."
     }
   },
+  "login": {
+    "prompt": "How do you want to sign in?",
+    "options": {
+      "flycal": "Google account (Flycal)",
+      "json": "Your own Google Cloud client JSON (~/.flycal/credentials.json)"
+    },
+    "already_connected": "✓ You are already connected to your Google account.",
+    "next_config": "Run 'flycal config' to set the default calendar.",
+    "success": "✓ Authentication completed successfully!",
+    "cancelled": "Login cancelled.",
+    "unknown_client": "Unknown OAuth client %{client}. Use flycal or json.",
+    "open_link": "Open this link in your browser to authenticate:",
+    "waiting": "After authentication, you will be redirected back here automatically.",
+    "browser_done_title": "Authentication complete!",
+    "browser_done_body": "You can close this window and return to the terminal.",
+    "flycal_missing": "Flycal OAuth client is missing from this install (%{path}).",
+    "json_missing": "Credentials file not found at %{path}.\nCreate a Desktop app at https://console.cloud.google.com/apis/credentials\nand save the JSON there.\nAuthorized redirect URI: %{redirect}"
+  },
   "slots": {
     "no_available": "No available slots found.",
     "no_calendar": "No calendar found. Run 'flycal config' to set a default.",

data/locales/it.json

@@ -28,6 +28,24 @@
       "failed": "Errore: impossibile aprire il config con %{editor}."
     }
   },
+  "login": {
+    "prompt": "Come vuoi accedere?",
+    "options": {
+      "flycal": "Account Google (Flycal)",
+      "json": "Il tuo client JSON di Google Cloud (~/.flycal/credentials.json)"
+    },
+    "already_connected": "✓ Sei già connesso al tuo account Google.",
+    "next_config": "Esegui 'flycal config' per impostare il calendario predefinito.",
+    "success": "✓ Autenticazione completata!",
+    "cancelled": "Login annullato.",
+    "unknown_client": "Client OAuth sconosciuto: %{client}. Usa flycal o json.",
+    "open_link": "Apri questo link nel browser per autenticarti:",
+    "waiting": "Dopo l'autenticazione verrai reindirizzato qui automaticamente.",
+    "browser_done_title": "Autenticazione completata!",
+    "browser_done_body": "Puoi chiudere questa finestra e tornare al terminale.",
+    "flycal_missing": "Il client OAuth Flycal manca da questa installazione (%{path}).",
+    "json_missing": "File credenziali non trovato: %{path}.\nCrea un'app Desktop su https://console.cloud.google.com/apis/credentials\ne salva il JSON lì.\nURI di reindirizzamento autorizzato: %{redirect}"
+  },
   "slots": {
     "no_available": "Nessuno slot disponibile.",
     "no_calendar": "Nessun calendario trovato. Esegui 'flycal config' per impostare il predefinito.",

data/mcp/tools.json

@@ -82,7 +82,7 @@
     "path": "~/.flycal/config.yml",
     "credentials_path": "~/.flycal/credentials.json",
     "tokens_path": "~/.flycal/tokens.yml",
-    "credentials_note": "Default/test phase: project-provided API credentials — just run flycal login. Creating your own Google Cloud Console OAuth client is optional and only needed if you want to use your own API project; save that JSON as ~/.flycal/credentials.json then run flycal login.",
+    "credentials_note": "flycal login offers two clients: (1) Flycal Desktop OAuth, no Google Cloud project needed; (2) optional ~/.flycal/credentials.json from your own Desktop app. Non-interactive default is flycal (`flycal login --client flycal`). For your own JSON: `flycal login --client json`.",
     "keys": {
       "calendar_default": {
         "type": ["string", "null"],
@@ -206,7 +206,7 @@
     {
       "name": "flycal_login",
       "title": "Connect Google account",
-      "description": "Start OAuth browser login. Requires ~/.flycal/credentials.json and a browser/TTY. Interactive.",
+      "description": "Start OAuth browser login. Interactive menu: Flycal Desktop client (default) or ~/.flycal/credentials.json. Use --client flycal|json to skip the menu.",
       "interactive": true,
       "requires_auth": false,
       "side_effects": ["writes_tokens"],
@@ -214,6 +214,13 @@
         "argv": ["flycal", "login"]
       },
       "parameters": {
+        "client": {
+          "cli": ["--client"],
+          "type": "string",
+          "enum": ["flycal", "json"],
+          "required": false,
+          "description": "Skip the login menu. flycal = Flycal Desktop OAuth; json = ~/.flycal/credentials.json."
+        },
         "locale": {
           "cli": ["--locale"],
           "type": "string",
@@ -226,6 +233,11 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
+          "client": {
+            "type": "string",
+            "enum": ["flycal", "json"],
+            "description": "OAuth client (--client flycal|json)."
+          },
           "locale": {
             "type": "string",
             "enum": ["en", "it"],
@@ -595,7 +607,7 @@
     "execution": "Spawn the flycal binary with argv from command.argv, or build argv from argv_template + option_map for each provided parameter. Capture stdout/stderr and exit code. Return stdout as MCP text content.",
     "parameter_building": "For each non-null input property present in option_map, append the mapped flag and value. Quote values with spaces. Always append --locale when locale is set.",
     "interactive_tools": "Do not auto-run tools with interactive=true unless the host provides a TTY. Tell the user to run them in a terminal.",
-    "auth_errors": "If output indicates the user is not connected, suggest flycal login (after credentials.json is in place).",
+    "auth_errors": "If output indicates the user is not connected, suggest flycal login (Flycal Desktop client by default; credentials.json only if they use their own Google Cloud project).",
     "tool_filter": "Prefer exposing flycal_search, flycal_slots, flycal_calendars, and flycal_version to agents."
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flycal-cli
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.2'
 platform: ruby
 authors:
 - flycal-cli
@@ -134,6 +134,7 @@ files:
 - README.md
 - bin/flycal
 - config/defaults.yml
+- config/oauth_client.json
 - lib/flycal.rb
 - lib/flycal/cache_annotator.rb
 - lib/flycal/cache_key.rb
@@ -149,6 +150,7 @@ files:
 - lib/flycal/client.rb
 - lib/flycal/credentials.rb
 - lib/flycal/date_time_parser.rb
+- lib/flycal/default_slots.rb
 - lib/flycal/description_query.rb
 - lib/flycal/duration_parser.rb
 - lib/flycal/error.rb
@@ -158,6 +160,7 @@ files:
 - lib/flycal/mock/calendar_service.rb
 - lib/flycal/mock/config.rb
 - lib/flycal/mock/event_generator.rb
+- lib/flycal/mock/slot_scenario.rb
 - lib/flycal/pipeline.rb
 - lib/flycal/pipeline/aggregator.rb
 - lib/flycal/pipeline/json_renderer.rb
@@ -168,6 +171,9 @@ files:
 - lib/flycal/pipeline/text_renderer.rb
 - lib/flycal/slot_finder.rb
 - lib/flycal/slot_formatter.rb
+- lib/flycal/slot_query.rb
+- lib/flycal/slot_templates.rb
+- lib/flycal/time_format.rb
 - lib/flycal/version.rb
 - lib/flycal_cli.rb
 - locales/en.json