flycal-cli 0.4.1 → 0.6.0

data/lib/flycal_cli/config.rb

@@ -20,7 +20,8 @@ module FlycalCli
                     end
 
         merged, changed = merge_missing_defaults(user_data, default_values)
-        save(merged) if changed || !File.exist?(CONFIG_FILE)
+        merged, migrated = normalize_slots_keys(merged)
+        save(merged) if changed || migrated || !File.exist?(CONFIG_FILE)
 
         merged
       end
@@ -64,6 +65,50 @@ module FlycalCli
         load.fetch("slots", {})
       end
 
+      def exclude_calendars
+        Array(slots_config["exclude_calendars"]).map(&:to_s).reject(&:empty?)
+      end
+
+      def exclude_calendars=(calendar_ids)
+        data = load
+        data["slots"] ||= {}
+        data["slots"]["exclude_calendars"] = Array(calendar_ids).map(&:to_s)
+        save(data)
+      end
+
+      def normalize_slots_keys(data)
+        slots = data["slots"]
+        return [data, false] unless slots.is_a?(Hash)
+
+        changed = false
+        normalized = slots.dup
+
+        if normalized.key?("exclude-calendars") && !normalized.key?("exclude_calendars")
+          normalized["exclude_calendars"] = normalized.delete("exclude-calendars")
+          changed = true
+        end
+
+        if normalized.key?("weekdays-only") && !normalized.key?("weekdays_only")
+          normalized["weekdays_only"] = normalized.delete("weekdays-only")
+          changed = true
+        end
+
+        if normalized.key?("workhours") && !normalized.key?("hours")
+          normalized["hours"] = normalized.delete("workhours")
+          changed = true
+        end
+
+        return [data, false] unless changed
+
+        data = data.dup
+        data["slots"] = normalized
+        [data, true]
+      end
+
+      def config_file
+        CONFIG_FILE
+      end
+
       def locale
         load["locale"].to_s
       end

data/lib/flycal_cli/date_time_parser.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require "date"
+require "time"
+require "active_support/core_ext/time"
+require "active_support/core_ext/date"
+
+module FlycalCli
+  # Parses CLI date/time arguments in a locale-aware way.
+  #
+  # Always accepts ISO-like forms:
+  #   YYYY-MM-DD, YYYY/MM/DD
+  #   YYYY-MM-DDTHH:MM, YYYY-MM-DD HH:MM(:SS)
+  #
+  # With locale +it+: DD-MM-YYYY / DD/MM/YYYY (+ optional time)
+  # With locale +en+ (default): MM-DD-YYYY / MM/DD/YYYY (+ optional time)
+  class DateTimeParser
+    TIME_SUFFIX = '(?:\s+|T)(\d{1,2}):(\d{2})(?::(\d{2}))?'.freeze
+
+    class << self
+      def parse(str, end_of_day: false, locale: nil)
+        value = str.to_s.strip
+        raise FlycalCli::Error, invalid_message(str) if value.empty?
+
+        loc = (locale || Locale.current_locale).to_s
+        formats = formats_for(loc)
+
+        formats.each do |pattern, order|
+          match = value.match(pattern)
+          next unless match
+
+          year, month, day, hour, min, sec = extract_parts(match, order)
+          return build_time(year, month, day, hour, min, sec, end_of_day: end_of_day)
+        end
+
+        # Last resort: ISO8601 / Time.parse for full timestamps
+        begin
+          return Time.iso8601(value)
+        rescue ArgumentError
+          # fall through
+        end
+
+        begin
+          parsed = Time.parse(value)
+          return end_of_day && !time_component?(value) ? end_of_day_for(parsed.to_date) : parsed
+        rescue ArgumentError
+          raise FlycalCli::Error, invalid_message(str)
+        end
+      end
+
+      def parse_or_default(str, default: Time.now, end_of_day: false, locale: nil)
+        return default if str.nil? || str.to_s.strip.empty?
+
+        parse(str, end_of_day: end_of_day, locale: locale)
+      end
+
+      private
+
+      def formats_for(locale)
+        iso = [
+          [/\A(\d{4})[-\/](\d{1,2})[-\/](\d{1,2})#{TIME_SUFFIX}\z/i, %i[year month day hour min sec]],
+          [/\A(\d{4})[-\/](\d{1,2})[-\/](\d{1,2})\z/, %i[year month day]]
+        ]
+
+        local =
+          if locale == "it"
+            [
+              [/\A(\d{1,2})[-\/](\d{1,2})[-\/](\d{4})#{TIME_SUFFIX}\z/i, %i[day month year hour min sec]],
+              [/\A(\d{1,2})[-\/](\d{1,2})[-\/](\d{4})\z/, %i[day month year]]
+            ]
+          else
+            [
+              [/\A(\d{1,2})[-\/](\d{1,2})[-\/](\d{4})#{TIME_SUFFIX}\z/i, %i[month day year hour min sec]],
+              [/\A(\d{1,2})[-\/](\d{1,2})[-\/](\d{4})\z/, %i[month day year]]
+            ]
+          end
+
+        iso + local
+      end
+
+      def extract_parts(match, order)
+        parts = {}
+        order.each_with_index do |key, idx|
+          parts[key] = match[idx + 1]
+        end
+
+        [
+          parts[:year].to_i,
+          parts[:month].to_i,
+          parts[:day].to_i,
+          parts[:hour]&.to_i,
+          parts[:min]&.to_i,
+          parts[:sec]&.to_i
+        ]
+      end
+
+      def build_time(year, month, day, hour, min, sec, end_of_day:)
+        date = Date.new(year, month, day)
+
+        if hour.nil?
+          return end_of_day_for(date) if end_of_day
+          return [date.to_time, Time.now].max if date == Date.today
+
+          return date.to_time
+        end
+
+        Time.local(year, month, day, hour, min || 0, sec || 0)
+      rescue ArgumentError
+        raise FlycalCli::Error, "Invalid date: #{year}-#{month}-#{day}"
+      end
+
+      def end_of_day_for(date)
+        Time.local(date.year, date.month, date.day, 23, 59, 59)
+      end
+
+      def time_component?(value)
+        value.match?(/T|\d{1,2}:\d{2}/)
+      end
+
+      def invalid_message(str)
+        if Locale.current_locale.to_s == "it"
+          "Data non valida: #{str.inspect}. Usa YYYY-MM-DD, DD-MM-YYYY (anche con /) o con orario."
+        else
+          "Invalid date: #{str.inspect}. Use YYYY-MM-DD, MM-DD-YYYY (also with /), or with time."
+        end
+      end
+    end
+  end
+end

data/lib/flycal_cli/duration_parser.rb

@@ -10,7 +10,9 @@ module FlycalCli
       "m" => :minutes, "min" => :minutes, "mins" => :minutes, "minute" => :minutes, "minutes" => :minutes,
       "h" => :hours, "hr" => :hours, "hour" => :hours, "hours" => :hours,
       "d" => :days, "day" => :days, "days" => :days,
-      "w" => :weeks, "week" => :weeks, "weeks" => :weeks
+      "w" => :weeks, "week" => :weeks, "weeks" => :weeks,
+      "month" => :months, "months" => :months,
+      "y" => :years, "year" => :years, "years" => :years
     }.freeze
 
     class << self
@@ -21,11 +23,18 @@ module FlycalCli
         raise FlycalCli::Error, invalid_message(str) unless match
 
         value = match[1].to_f
-        unit = UNITS[match[2]]
+        unit_key = match[2]
+        unit = UNITS[unit_key]
         raise FlycalCli::Error, invalid_message(str) unless unit
-
-        duration = value.public_send(unit)
-        duration
+        # Ambiguous bare "m": treat as minutes (not months)
+        unit = :minutes if unit_key == "m"
+
+        # months/years are Integer-only ActiveSupport extensions
+        if %i[months years].include?(unit)
+          value.to_i.public_send(unit)
+        else
+          value.public_send(unit)
+        end
       end
 
       def to_seconds(str)
@@ -39,7 +48,7 @@ module FlycalCli
       private
 
       def invalid_message(str)
-        "Invalid duration: #{str.inspect}. Examples: 1h, 1 hour, 30 minutes, 3 days"
+        "Invalid duration: #{str.inspect}. Examples: 1h, 30 minutes, 3 days, 1 week, 2 months, 1 year"
       end
     end
   end

data/lib/flycal_cli/locale.rb

@@ -31,6 +31,12 @@ module FlycalCli
       months[idx] || date_or_time.strftime("%B")
     end
 
+    def format_long_date(date_or_time)
+      t = date_or_time.respond_to?(:to_time) ? date_or_time.to_time : date_or_time
+      d = t.to_date
+      "#{day_abbr(d).downcase} #{d.day} #{month_name(d)} #{d.year}"
+    end
+
     def current_locale
       Thread.current[:flycal_locale_override] || Config.locale
     rescue StandardError

data/lib/flycal_cli/slot_finder.rb

@@ -3,6 +3,7 @@
 module FlycalCli
   class SlotFinder
     DEFAULT_WORKHOURS = [[9, 0, 18, 0]].freeze
+    STEP_SECONDS = 900
 
     def initialize(
       events:,
@@ -10,7 +11,9 @@ module FlycalCli
       time_max:,
       slot_duration_seconds:,
       workhours: DEFAULT_WORKHOURS,
-      weekdays_only: true
+      weekdays_only: true,
+      free_before_seconds: 0,
+      free_after_seconds: 0
     )
       @events = events
       @time_min = time_min
@@ -18,6 +21,8 @@ module FlycalCli
       @slot_duration_seconds = slot_duration_seconds
       @workhours = workhours
       @weekdays_only = weekdays_only
+      @free_before_seconds = free_before_seconds
+      @free_after_seconds = free_after_seconds
     end
 
     def slots_by_day
@@ -30,7 +35,9 @@ module FlycalCli
 
           busy = busy_intervals_for(date, day_start, day_end)
           gaps = free_gaps(day_start, day_end, busy)
-          slots.concat(gaps.filter_map { |start_at, end_at| slot_if_fits(start_at, end_at) })
+          gaps.each do |gap_start, gap_end|
+            slots.concat(slots_in_gap(gap_start, gap_end))
+          end
         end
         result[date] = slots unless slots.empty?
       end
@@ -74,7 +81,14 @@ module FlycalCli
       intervals = @events.filter_map do |event|
         interval_for_event(event, date, day_start, day_end)
       end
-      merge_intervals(intervals)
+      merge_intervals(intervals.map { |start_at, end_at| pad_busy_interval(start_at, end_at) })
+    end
+
+    def pad_busy_interval(start_at, end_at)
+      [
+        start_at - @free_before_seconds,
+        end_at + @free_after_seconds
+      ]
     end
 
     def interval_for_event(event, date, day_start, day_end)
@@ -127,26 +141,30 @@ module FlycalCli
       gaps
     end
 
-    def slot_if_fits(start_at, end_at)
-      rounded_start = round_up_15(start_at)
-      rounded_end = round_down_15(end_at)
-      return nil if rounded_start >= rounded_end
-      return nil if (rounded_end - rounded_start) < @slot_duration_seconds
+    def slots_in_gap(start_at, end_at)
+      slots = []
+      cursor = round_up_15(start_at)
+      gap_limit = round_down_15(end_at)
+
+      while cursor + @slot_duration_seconds <= gap_limit
+        slots << [cursor, cursor + @slot_duration_seconds]
+        cursor += STEP_SECONDS
+      end
 
-      [rounded_start, rounded_end]
+      slots
     end
 
     def round_up_15(time)
       sec = time.to_i
-      remainder = sec % 900
+      remainder = sec % STEP_SECONDS
       return time if remainder.zero?
 
-      Time.at(sec + (900 - remainder))
+      Time.at(sec + (STEP_SECONDS - remainder))
     end
 
     def round_down_15(time)
       sec = time.to_i
-      Time.at(sec - (sec % 900))
+      Time.at(sec - (sec % STEP_SECONDS))
     end
 
     def to_time(value)

data/lib/flycal_cli/slot_formatter.rb

@@ -3,6 +3,22 @@
 module FlycalCli
   class SlotFormatter
     class << self
+      def format_header(from:, to:, duration:, calendars:, count:)
+        lines = []
+        lines << Locale.t(
+          "slots.header",
+          count: count,
+          from: underline(Locale.format_long_date(from)),
+          to: underline(Locale.format_long_date(to)),
+          duration: underline(duration)
+        )
+        calendars.each do |cal|
+          lines << cal[:name].to_s
+        end
+        lines << google_calendar_day_url(from)
+        lines.join("\n")
+      end
+
       def format_output(slots_by_day)
         lines = []
 
@@ -19,6 +35,15 @@ module FlycalCli
 
       private
 
+      def underline(str)
+        "\e[4m#{str}\e[0m"
+      end
+
+      def google_calendar_day_url(from)
+        t = from.respond_to?(:to_time) ? from.to_time : from
+        "https://calendar.google.com/calendar/r/day/#{t.year}/#{t.month}/#{t.day}"
+      end
+
       def day_header(date)
         "#{Locale.day_name(date)} #{date.day}/#{date.month}"
       end

data/lib/flycal_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlycalCli
-  VERSION = '0.4.1'
+  VERSION = '0.6.0'
 end

data/lib/flycal_cli.rb

@@ -5,6 +5,7 @@ require "flycal_cli/config"
 require "flycal_cli/locale"
 require "flycal_cli/auth"
 require "flycal_cli/duration_parser"
+require "flycal_cli/date_time_parser"
 require "flycal_cli/calendar_service"
 require "flycal_cli/slot_finder"
 require "flycal_cli/slot_formatter"

data/locales/en.json

@@ -1,5 +1,6 @@
 {
   "common": {
+    "loading_calendars": "Loading calendars...",
     "weekdays": {
       "full": ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"],
       "abbr": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
@@ -8,12 +9,35 @@
       "full": ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
     }
   },
+  "config": {
+    "prompt": "Choose a configuration option:",
+    "options": {
+      "calendar_default": "calendar_default",
+      "exclude_calendars": "exclude_calendars",
+      "edit_config": "edit config"
+    },
+    "calendar_default": {
+      "prompt": "Choose the default calendar:",
+      "saved": "✓ Default calendar set to: %{name}"
+    },
+    "exclude_calendars": {
+      "prompt": "Choose calendars whose events block free slots:",
+      "saved": "✓ Exclude calendars set to: %{names}"
+    },
+    "edit": {
+      "failed": "Error: could not open config with %{editor}."
+    }
+  },
   "slots": {
     "no_available": "No available slots found.",
-    "no_calendar": "No calendar found. Run 'flycal calendars' to set a default."
+    "no_calendar": "No calendar found. Run 'flycal config' to set a default.",
+    "header": "found %{count} slots\nfrom %{from} to %{to}\nwith duration %{duration}\nfor calendars",
+    "copied_to_clipboard": "✓ Slot list copied to clipboard (pbcopy)"
   },
   "errors": {
     "not_connected": "You are not connected. Run 'flycal login' first.",
-    "duration_positive": "Error: --in must be a positive duration."
+    "duration_positive": "Error: --in must be a positive duration.",
+    "no_calendars": "No calendars found.",
+    "calendar_fetch": "Error in calendar %{calendar}: %{message}"
   }
 }

data/locales/it.json

@@ -1,5 +1,6 @@
 {
   "common": {
+    "loading_calendars": "Caricamento calendari...",
     "weekdays": {
       "full": ["domenica", "lunedi", "martedi", "mercoledi", "giovedi", "venerdi", "sabato"],
       "abbr": ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"]
@@ -8,12 +9,35 @@
       "full": ["gennaio", "febbraio", "marzo", "aprile", "maggio", "giugno", "luglio", "agosto", "settembre", "ottobre", "novembre", "dicembre"]
     }
   },
+  "config": {
+    "prompt": "Scegli un'opzione di configurazione:",
+    "options": {
+      "calendar_default": "calendar_default",
+      "exclude_calendars": "exclude_calendars",
+      "edit_config": "edit config"
+    },
+    "calendar_default": {
+      "prompt": "Scegli il calendario predefinito:",
+      "saved": "✓ Calendario predefinito impostato su: %{name}"
+    },
+    "exclude_calendars": {
+      "prompt": "Scegli i calendari i cui eventi bloccano gli slot liberi:",
+      "saved": "✓ Calendari esclusi impostati su: %{names}"
+    },
+    "edit": {
+      "failed": "Errore: impossibile aprire il config con %{editor}."
+    }
+  },
   "slots": {
     "no_available": "Nessuno slot disponibile.",
-    "no_calendar": "Nessun calendario trovato. Esegui 'flycal calendars' per impostare il predefinito."
+    "no_calendar": "Nessun calendario trovato. Esegui 'flycal config' per impostare il predefinito.",
+    "header": "trovati %{count} slot\nda %{from} a %{to}\ncon durata %{duration}\nper i calendari",
+    "copied_to_clipboard": "✓ Lista slot copiata negli appunti (pbcopy)"
   },
   "errors": {
     "not_connected": "Non sei connesso. Esegui prima 'flycal login'.",
-    "duration_positive": "Errore: --in deve essere una durata positiva."
+    "duration_positive": "Errore: --in deve essere una durata positiva.",
+    "no_calendars": "Nessun calendario trovato.",
+    "calendar_fetch": "Errore nel calendario %{calendar}: %{message}"
   }
 }

data/mcp/README.md

@@ -0,0 +1,29 @@
+# flycal MCP catalog
+
+This directory contains a machine-readable description of **flycal-cli** commands for MCP (Model Context Protocol) servers.
+
+## File
+
+- [`tools.json`](./tools.json) — tools catalog with MCP-style `inputSchema`, CLI argv templates, auth/interactivity flags, and config keys.
+
+## How an MCP server can use it
+
+1. Load `tools.json` at startup.
+2. Register each entry in `tools` with your MCP SDK (`server.tool(...)`), using `name`, `description`, and `inputSchema`.
+3. On tool call, build the argv:
+   - static tools → `command.argv`
+   - parameterized tools → start from `command.argv_template`, then append pairs from `command.option_map` for each provided argument
+   - if `locale` is set → append `--locale <value>`
+4. Run `flycal` as a subprocess and return stdout as text content.
+5. Skip or gate tools with `"interactive": true` (`flycal_login`, `flycal_config`) unless a TTY is available.
+
+## Suggested tools to expose
+
+| MCP tool | CLI | Notes |
+|---|---|---|
+| `flycal_search` | `flycal search ...` | Primary read tool |
+| `flycal_slots` | `flycal slots --in ... --duration ...` | Free slots |
+| `flycal_calendars` | `flycal calendars` | List name + id |
+| `flycal_version` | `flycal version` | Health / version check |
+
+Interactive / side-effect tools (`login`, `logout`, `config`, `update`) are documented in the catalog but are usually better left to the user terminal.