flycal-cli 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7333fcbb8ba227c7694b96cba4b35893e324c13e38bdc6d996e69f54cc3d64a
-  data.tar.gz: aab159e8f8e68368db1e45d1a799dd93386f79a0f2f9c29bb92aba776bcefa21
+  metadata.gz: 91347372adf44296db16d6e06a90a327a2b1dd3709137dc207dc4eadaab3a472
+  data.tar.gz: 0ec160527a68a2dee05f466626c28ee8bedd750a05928978a1f77991ae3be779
 SHA512:
-  metadata.gz: 2036031048ebcb74e1954ff1d574051945407bdef922f161f4b1ad7e8be7cd1f3dfdec6dea2efe671502a1310ba834cee44426d837a3b7dfee4fb76fbd504117
-  data.tar.gz: 40646b4ce7bfaa3256a35c435cdf6dcb3913aaf2a3811370219e32c510fc88d7469d652b573973016d96b9e1d5f49cca8da159bfad7d787742dc8c0bba9239d0
+  metadata.gz: 7b8eaa8bdc8e56fbb6f865d77811e017ab239bd800b8e507bbe3477a4513663335dc74ca9f28b3111eeff38fe37cc5aa010dea81d4339074bd38e9ec2c7cf7f0
+  data.tar.gz: faf3a5c3bad9ebf2b966b9ca66f1b924d619496cde86b4c8d1b3246a8af2488a12dc6a5b23cbf2f7be147e1cc09e96ed99b6aa23d7d74ab6e5ce9f2e97ed69b3

data/README.md

@@ -157,10 +157,10 @@ Find free time slots in your calendar. Output is a simple list for copy/paste in
 
 ```bash
 flycal slots
+flycal slots --in "5 days"
+flycal slots --in "12 days" --template dinner
 flycal slots --duration 1h
 flycal slots --from 2026-08-01 --in "2 weeks" --duration 1h
-flycal slots --from 01/08/2026 --in 3days --duration 30min
-flycal slots --in 1week -c Work
 ```
 
 **Options:**
@@ -168,24 +168,26 @@ flycal slots --in 1week -c Work
 - `--duration` — Slot length. Default: `slots.defaults.default_duration` in config (`45min`). Examples: `1h`, `30 minutes`
 - `--from` / `-f` — Start date/time. Default: `slots.defaults.from` in config (`now`). If a date without time is today, starts from the current time.
 - `--in` / `-i` — Search window from `--from`. Default: `1 week`.
+- `--template` / `-T` — Template from `slots.templates` in config. Default: first template (`work`)
 - `--calendar` / `-c` — Calendar name or ID used as fallback when `exclude_calendars` is not configured
 
 **Output:**
 
-Always starts with a header and clickable calendar links (OSC 8), then the availability list:
-
 ```
-found 3 slots
-from wed 29 July 2026 to wed 5 August 2026
-with duration 45min
-for calendars
-Incode - Antonio
-Personal
-https://calendar.google.com/calendar/r/day/2026/7/29
-
-friday 15/7
-10-12
-13-15.30
+found 6 slots
+from sat 1 August 2026 to sat 8 August 2026
+with duration 45min, template dinner
+considering calendars
+- incode - antonio
+- Polimi 10110009
+- antoniomolinari1977@gmail.com
+link: https://calendar.google.com/calendar/r/day/2026/8/1
+
+saturday 1/8
+19 - 23
+
+monday 3/8
+19 - 23
 ```
 
 If `pbcopy` is available (macOS), the slot list without the header is also copied to the clipboard.
@@ -193,44 +195,62 @@ If `pbcopy` is available (macOS), the slot list without the header is also copie
 Slot search windows are configured in `~/.flycal/config.yml`:
 
 ```yaml
+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
+        - 7
+      hours:
+        - 19-23
+  exclude_calendars: []
   defaults:
     from: now
     default_duration: 45min
   free_before: 0m
   free_after: 15m
-  exclude_calendars:
-    - user@example.com
-    - user@gmail.com
-  hours:
-    - 9:30-13:00
-    - 14:00-18:30
-  weekdays_only: true
-locale: en
 ```
 
 Missing keys are filled from `config/defaults.yml` in the gem and saved to your `config.yml` on first read.
 
+- `calendar_default: ~` means no default calendar is set (`~` is YAML null)
+- `templates` — named schedules; default used is the first one (`work`)
+- `templates.*.days` — weekdays as numbers: `1` Monday … `7` Sunday
+- `templates.*.hours` — one or more ranges (`H-H`, `HH:MM-HH:MM`, mixed)
 - `defaults.from` — default `--from` for slots (`now` or a date string)
 - `defaults.default_duration` — default slot length when `--duration` is omitted
-- `free_before` — buffer before each slot; busy intervals are extended backward so no event may fall in this window before a slot
-- `free_after` — buffer after each slot; gaps must fit `duration + free_after`, but output shows slots of `duration` only
-- `exclude_calendars` lists calendars whose events block free slots; if empty or not set, events from `calendar_default` are used
-- `hours` accepts one or more ranges (`H-H`, `HH:MM-HH:MM`, mixed)
-- `weekdays_only: true` limits slots to Monday-Friday
-- `weekdays_only: false` includes weekends
+- `free_before` — buffer before each slot
+- `free_after` — buffer after each slot; gaps must fit `duration + free_after`, output shows continuous free ranges
+- `exclude_calendars` — calendars whose events block free slots; if empty, `calendar_default` is used
 - `locale` supports `en` and `it` (default is `en`)
 
 **Output example:**
 
 ```
 friday 15/7
-10-12
-13-15.30
+10 - 12
+13 - 15.30
 
 monday 21/7
-12-13
-14-15
+12 - 13
+14 - 15
 ```
 
 ## Configuration

data/config/defaults.yml

@@ -1,12 +1,30 @@
+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
-  exclude_calendars: []
-  hours:
-    - 9:30-13:00
-    - 14:00-18:30
-  weekdays_only: true

data/lib/flycal_cli/cli.rb

@@ -182,11 +182,13 @@ module FlycalCli
         --from      from config (default: now)
         --in        1 week
         --duration  from config (default: 45min)
+        --template  first template in config (default: work)
 
       Examples:
         flycal slots
-        flycal slots --duration 1h
-        flycal slots --from 2026-08-01 --in "2 weeks" --duration 1h
+        flycal slots --in "5 days"
+        flycal slots --in "12 days" --template dinner
+        flycal slots --duration 1h --from 2026-08-01
     LONGDESC
     option :duration, type: :string,
            desc: "Slot length (default from config: slots.defaults.default_duration)"
@@ -194,6 +196,8 @@ module FlycalCli
            desc: "Search window from --from (default: 1 week)"
     option :from, type: :string, aliases: "-f",
            desc: "Start date/time (default from config: slots.defaults.from)"
+    option :template, type: :string, aliases: "-T",
+           desc: "Slot template name from config (default: first template, usually work)"
     option :calendar, type: :string, aliases: "-c", desc: "Calendar name or ID"
     def slots
       apply_locale_override
@@ -216,13 +220,14 @@ module FlycalCli
       from_value = "now" if from_value.empty?
 
       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)
-        workhours = parse_workhours(slot_cfg["hours"])
-        weekdays_only = !!slot_cfg["weekdays_only"]
+        hours = parse_workhours(template["hours"])
+        days = parse_template_days(template["days"])
       rescue FlycalCli::Error => e
         puts "Error: #{e.message}"
         exit 1
@@ -266,8 +271,8 @@ module FlycalCli
         time_min: time_min,
         time_max: time_max,
         slot_duration_seconds: slot_duration,
-        workhours: workhours,
-        weekdays_only: weekdays_only,
+        hours: hours,
+        days: days,
         free_before_seconds: free_before,
         free_after_seconds: free_after
       )
@@ -279,7 +284,8 @@ module FlycalCli
         to: time_max,
         duration: duration_value,
         calendars: calendar_meta,
-        count: slot_count
+        count: slot_count,
+        template: template_name
       )
       puts ""
       output = SlotFormatter.format_output(slots_by_day)
@@ -472,10 +478,36 @@ module FlycalCli
       DateTimeParser.parse(value)
     end
 
+    def resolve_slots_template(slot_cfg, requested_name)
+      templates = slot_cfg["templates"]
+      raise FlycalCli::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 FlycalCli::Error, "Unknown slots template #{name.inspect}. Available: #{available}"
+      end
+
+      [name, template]
+    end
+
+    def parse_template_days(values)
+      days = Array(values).map(&:to_i)
+      raise FlycalCli::Error, "slots template days cannot be empty." if days.empty?
+
+      invalid = days.reject { |d| d.between?(1, 7) }
+      raise FlycalCli::Error, "Invalid template days #{invalid.inspect}. Use 1 (Mon) .. 7 (Sun)." unless invalid.empty?
+
+      days.uniq
+    end
+
     def copy_slots_to_clipboard(text)
       return unless pbcopy_available?
 
-      IO.popen("pbcopy", "w") { |io| io.write(text) }
+      IO.popen("pbcopy", "w") { |io| io.write(SlotFormatter.strip_ansi(text)) }
       puts ""
       puts Locale.t("slots.copied_to_clipboard")
     rescue StandardError
@@ -513,7 +545,7 @@ module FlycalCli
         [sh, sm, eh, em]
       end
 
-      raise FlycalCli::Error, "slots.hours cannot be empty in config.yml." if ranges.empty?
+      raise FlycalCli::Error, "template hours cannot be empty in config.yml." if ranges.empty?
 
       ranges.sort_by { |sh, sm, _eh, _em| (sh * 60) + sm }
     end

data/lib/flycal_cli/config.rb

@@ -32,7 +32,10 @@ module FlycalCli
       end
 
       def calendar_default
-        load["calendar_default"]
+        value = load["calendar_default"]
+        return nil if value.nil? || value.to_s.strip.empty? || value.to_s == "~"
+
+        value.to_s
       end
 
       def calendar_default=(calendar_id)
@@ -98,6 +101,38 @@ module FlycalCli
           changed = true
         end
 
+        if normalized.key?("tempaltes") && !normalized.key?("templates")
+          normalized["templates"] = normalized.delete("tempaltes")
+          changed = true
+        end
+
+        templates = normalized["templates"]
+        templates_empty = !templates.is_a?(Hash) || templates.empty?
+
+        if templates_empty && normalized["hours"]
+          days =
+            if normalized.key?("weekdays_only") && normalized["weekdays_only"] == false
+              [1, 2, 3, 4, 5, 6, 7]
+            else
+              [1, 2, 3, 4, 5]
+            end
+
+          normalized["templates"] = {
+            "work" => {
+              "days" => days,
+              "hours" => deep_dup(normalized["hours"])
+            }
+          }
+          changed = true
+        end
+
+        %w[hours weekdays_only weekdays-only workhours tempaltes].each do |legacy_key|
+          next unless normalized.key?(legacy_key)
+
+          normalized.delete(legacy_key)
+          changed = true
+        end
+
         return [data, false] unless changed
 
         data = data.dup

data/lib/flycal_cli/slot_finder.rb

@@ -2,7 +2,8 @@
 
 module FlycalCli
   class SlotFinder
-    DEFAULT_WORKHOURS = [[9, 0, 18, 0]].freeze
+    DEFAULT_HOURS = [[9, 0, 18, 0]].freeze
+    DEFAULT_DAYS = [1, 2, 3, 4, 5].freeze
     STEP_SECONDS = 900
 
     def initialize(
@@ -10,8 +11,8 @@ module FlycalCli
       time_min:,
       time_max:,
       slot_duration_seconds:,
-      workhours: DEFAULT_WORKHOURS,
-      weekdays_only: true,
+      hours: DEFAULT_HOURS,
+      days: DEFAULT_DAYS,
       free_before_seconds: 0,
       free_after_seconds: 0
     )
@@ -19,8 +20,8 @@ module FlycalCli
       @time_min = time_min
       @time_max = time_max
       @slot_duration_seconds = slot_duration_seconds
-      @workhours = workhours
-      @weekdays_only = weekdays_only
+      @hours = hours
+      @days = Array(days).map(&:to_i)
       @free_before_seconds = free_before_seconds
       @free_after_seconds = free_after_seconds
     end
@@ -28,7 +29,7 @@ module FlycalCli
     def slots_by_day
       result = {}
 
-      each_workday do |date|
+      each_template_day do |date|
         slots = []
         day_intervals(date).each do |day_start, day_end|
           next if day_end <= day_start
@@ -47,7 +48,7 @@ module FlycalCli
 
     private
 
-    def each_workday
+    def each_template_day
       date = @time_min.to_date
       end_date = @time_max.to_date
 
@@ -57,18 +58,17 @@ module FlycalCli
       end
     end
 
+    # Template days: 1=Monday ... 7=Sunday
     def include_day?(date)
-      return true unless @weekdays_only
-
-      workday?(date)
+      @days.include?(iso_weekday(date))
     end
 
-    def workday?(date)
-      !date.saturday? && !date.sunday?
+    def iso_weekday(date)
+      date.wday.zero? ? 7 : date.wday
     end
 
     def day_intervals(date)
-      @workhours.map do |start_h, start_m, end_h, end_m|
+      @hours.map do |start_h, start_m, end_h, end_m|
         start_at = Time.local(date.year, date.month, date.day, start_h, start_m, 0)
         end_at = Time.local(date.year, date.month, date.day, end_h, end_m, 0)
         start_at = [@time_min, start_at].max
@@ -147,7 +147,6 @@ module FlycalCli
       return [] if rounded_start >= rounded_end
       return [] if (rounded_end - rounded_start) < @slot_duration_seconds
 
-      # One continuous free range (not sliding windows of fixed duration)
       [[rounded_start, rounded_end]]
     end
 

data/lib/flycal_cli/slot_formatter.rb

@@ -3,19 +3,20 @@
 module FlycalCli
   class SlotFormatter
     class << self
-      def format_header(from:, to:, duration:, calendars:, count:)
+      def format_header(from:, to:, duration:, calendars:, count:, template: nil)
         lines = []
         lines << Locale.t(
           "slots.header",
-          count: count,
+          count: underline(count),
           from: underline(Locale.format_long_date(from)),
           to: underline(Locale.format_long_date(to)),
-          duration: underline(duration)
+          duration: underline(duration),
+          template: underline(template.to_s)
         )
         calendars.each do |cal|
-          lines << cal[:name].to_s
+          lines << "- #{cal[:name]}"
         end
-        lines << google_calendar_day_url(from)
+        lines << "link: #{google_calendar_day_url(from)}"
         lines.join("\n")
       end
 
@@ -24,7 +25,7 @@ module FlycalCli
 
         slots_by_day.sort_by(&:first).each do |date, slots|
           lines << "" unless lines.empty?
-          lines << day_header(date)
+          lines << underline(day_header(date))
           slots.each do |start_at, end_at|
             lines << slot_range(start_at, end_at)
           end
@@ -33,6 +34,10 @@ module FlycalCli
         lines.join("\n")
       end
 
+      def strip_ansi(text)
+        text.to_s.gsub(/\e\[[0-9;]*m/, "")
+      end
+
       private
 
       def underline(str)
@@ -49,7 +54,7 @@ module FlycalCli
       end
 
       def slot_range(start_at, end_at)
-        "#{format_time(start_at)}-#{format_time(end_at)}"
+        "#{format_time(start_at)} - #{format_time(end_at)}"
       end
 
       def format_time(time)

data/lib/flycal_cli/version.rb

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

data/locales/en.json

@@ -31,7 +31,7 @@
   "slots": {
     "no_available": "No available slots found.",
     "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",
+    "header": "found %{count} slots\nfrom %{from} to %{to}\nwith duration %{duration}, template %{template}\nconsidering calendars",
     "copied_to_clipboard": "✓ Slot list copied to clipboard (pbcopy)"
   },
   "errors": {

data/locales/it.json

@@ -31,7 +31,7 @@
   "slots": {
     "no_available": "Nessuno slot disponibile.",
     "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",
+    "header": "trovati %{count} slot\nda %{from} a %{to}\ncon durata %{duration}, template %{template}\nconsiderando i calendari",
     "copied_to_clipboard": "✓ Lista slot copiata negli appunti (pbcopy)"
   },
   "errors": {

data/mcp/tools.json

@@ -17,18 +17,17 @@
     "credentials_path": "~/.flycal/credentials.json",
     "keys": {
       "calendar_default": {
-        "type": "string",
-        "description": "Default Google Calendar ID used by search and as slots fallback"
+        "type": ["string", "null"],
+        "description": "Default Google Calendar ID used by search and as slots fallback. YAML null (~) means unset."
       },
       "locale": {
         "type": "string",
         "enum": ["en", "it"],
         "description": "Default CLI locale"
       },
-      "slots.hours": {
-        "type": "array",
-        "items": { "type": "string" },
-        "description": "Slot search hour ranges, e.g. [\"9:30-13:00\", \"14:00-18:30\"]"
+      "slots.templates": {
+        "type": "object",
+        "description": "Named templates with days (1=Mon..7=Sun) and hours ranges. Default template is the first key (work)."
       },
       "slots.defaults.from": {
         "type": "string",
@@ -46,10 +45,6 @@
         "type": "string",
         "description": "Buffer after each slot; gaps must fit duration + free_after"
       },
-      "slots.weekdays_only": {
-        "type": "boolean",
-        "description": "When true, slots are searched Mon–Fri only"
-      },
       "slots.exclude_calendars": {
         "type": "array",
         "items": { "type": "string" },
@@ -256,7 +251,7 @@
     {
       "name": "flycal_slots",
       "title": "Find free time slots",
-      "description": "Find free slots within configured hours, subtracting busy events from slots.exclude_calendars (or calendar_default if that list is empty). Starts from --from (default: config slots.defaults.from or now) for a window of --in (default: 1 week). Duration defaults to slots.defaults.default_duration (45min). Respects free_before and free_after buffers from config. Output begins with a multi-line header, calendar names, a Google Calendar day link, then continuous free ranges (each at least as long as duration). Read-only.",
+      "description": "Find free slots using a config template (days + hours). Default template is the first one (work). Use --template dinner for evening hours. Subtracts busy events from slots.exclude_calendars. Starts from --from (default: now) for --in (default: 1 week). Duration defaults to 45min. Respects free_before/free_after. Output: header, template name, calendars, Google Calendar day link, continuous free ranges.",
       "interactive": false,
       "requires_auth": true,
       "command": {
@@ -266,18 +261,20 @@
           "duration": ["--duration", "{value}"],
           "from": ["--from", "{value}"],
           "in": ["--in", "{value}"],
+          "template": ["--template", "{value}"],
           "calendar": ["--calendar", "{value}"],
           "locale": ["--locale", "{value}"]
         },
         "examples": [
           ["flycal", "slots"],
-          ["flycal", "slots", "--duration", "1h"],
-          ["flycal", "slots", "--from", "2026-08-01", "--in", "2 weeks", "--duration", "1h"]
+          ["flycal", "slots", "--in", "5 days"],
+          ["flycal", "slots", "--in", "12 days", "--template", "dinner"],
+          ["flycal", "slots", "--duration", "1h"]
         ]
       },
       "output": {
         "format": "text/plain",
-        "example": "found 3 slots\nfrom wed 29 July 2026 to wed 5 August 2026\nwith duration 45min\nfor calendars\nWork\nhttps://calendar.google.com/calendar/r/day/2026/7/29\n\nfriday 15/7\n10-12\n13-15.30"
+        "example": "found 6 slots\nfrom sat 1 August 2026 to sat 8 August 2026\nwith duration 45min, template dinner\nconsidering calendars\n- Work\nlink: https://calendar.google.com/calendar/r/day/2026/8/1\n\nsaturday 1/8\n19 - 23"
       },
       "inputSchema": {
         "type": "object",
@@ -296,6 +293,10 @@
             "type": "string",
             "description": "Search window from --from. Default: 1 week. Examples: 3 days, 1 week, 48 hours (quote if spaces)."
           },
+          "template": {
+            "type": "string",
+            "description": "Template name from slots.templates (default: first template, usually work)."
+          },
           "calendar": {
             "type": "string",
             "description": "Fallback calendar name/ID when exclude_calendars is not configured."

metadata

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