flycal-cli 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ee7fffad246d3a457d03eea4af9ace9bb6dfe59a067cc62bf2da08987a72a3
-  data.tar.gz: c9a5ae5776356185d80f6e87b368b6027122b27daeeb03378f01b6000486b16a
+  metadata.gz: 371b44577d9ce6befe5b01bc54768999844615943b982a6e9cd9cd8c9737d007
+  data.tar.gz: e3c6c00e03e38eccaea97ca045582a35d737916f1203963cc2c989ebf75de46b
 SHA512:
-  metadata.gz: dd15a9fc4be4bb6da73354dc17e600fdbcc19701c9e13668cbf504cdc99bd568a4f10a8d429a39e6ca41d9d4cb77a84501843e2c5820c959f1680a64384d1368
-  data.tar.gz: 708402193736049bc5b1ba476d765326ebf5d92d53eef48d12cb81f62b3d93b2a98db6913de535c8b9fdb26922b03f9b487f8e2192f18beb4037ad6c8cc423b3
+  metadata.gz: 35d47be3955556a98d3301782c2fc7deb7064134cb38792f128ade6c78807d5f28131696d14b3f2a72c7d7ae5acf9764b880d634ac52665accc6aa239c1026fe
+  data.tar.gz: da10a2548c8bdd03ebc94e990b58e7a3d30de98e2f759a927e777e08d8617006713abeafd9e220fac4fbbb6d9c1e0835a8e0cb8650f4ae30f4a00a355bb1f478

data/README.md

@@ -157,16 +157,18 @@ 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 --from monday --in "5 days"
+flycal slots --from "next monday" --in "5 days" --locale it
+flycal slots --from lunedi --in "5 days" --locale it
 flycal slots --in "12 days" --template dinner
-flycal slots --duration 1h
-flycal slots --from 2026-08-01 --in "2 weeks" --duration 1h
 ```
 
 **Options:**
 
 - `--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.
+- `--from` / `-f` — Start date/time. Default: `slots.defaults.from` in config (`now`). Accepts:
+  - absolute: `YYYY-MM-DD`, locale dates (`DD-MM-YYYY` / `MM-DD-YYYY`), optional time
+  - relative: `now`, `today`/`oggi`, `tomorrow`/`domani`, `monday`/`lunedi`, `next monday`/`prossimo lunedi`, `last friday`/`scorso venerdi`
 - `--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
@@ -174,18 +176,20 @@ flycal slots --from 2026-08-01 --in "2 weeks" --duration 1h
 **Output:**
 
 ```
-found 3 slots
-from wed 29 July 2026 to wed 5 August 2026
-with duration 45min
-for calendars
-template work
-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.

data/lib/flycal_cli/cli.rb

@@ -195,7 +195,7 @@ module FlycalCli
     option :in, type: :string, aliases: "-i", default: "1 week",
            desc: "Search window from --from (default: 1 week)"
     option :from, type: :string, aliases: "-f",
-           desc: "Start date/time (default from config: slots.defaults.from)"
+           desc: "Start (default: now). Dates, or relative: monday, next monday, tomorrow, lunedi..."
     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"
@@ -507,7 +507,7 @@ module FlycalCli
     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

data/lib/flycal_cli/date_time_parser.rb

@@ -12,16 +12,38 @@ module FlycalCli
   #   YYYY-MM-DD, YYYY/MM/DD
   #   YYYY-MM-DDTHH:MM, YYYY-MM-DD HH:MM(:SS)
   #
+  # Relative forms (en + it):
+  #   now, today/oggi, tomorrow/domani, yesterday/ieri
+  #   monday / lunedi, next monday / prossimo lunedi, last friday / scorso venerdi
+  #
   # 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
 
+    # Ruby Date#wday: 0=Sunday ... 6=Saturday
+    WEEKDAYS = {
+      "sunday" => 0, "sun" => 0, "domenica" => 0, "dom" => 0,
+      "monday" => 1, "mon" => 1, "lunedi" => 1, "lunedì" => 1, "lun" => 1,
+      "tuesday" => 2, "tue" => 2, "martedi" => 2, "martedì" => 2, "mar" => 2,
+      "wednesday" => 3, "wed" => 3, "mercoledi" => 3, "mercoledì" => 3, "mer" => 3,
+      "thursday" => 4, "thu" => 4, "giovedi" => 4, "giovedì" => 4, "gio" => 4,
+      "friday" => 5, "fri" => 5, "venerdi" => 5, "venerdì" => 5, "ven" => 5,
+      "saturday" => 6, "sat" => 6, "sabato" => 6, "sab" => 6
+    }.freeze
+
+    NEXT_WORDS = %w[next prossimo prossima].freeze
+    LAST_WORDS = %w[last scorso scorsa].freeze
+    THIS_WORDS = %w[this questo questa].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?
 
+        relative = parse_relative(value, end_of_day: end_of_day)
+        return relative if relative
+
         loc = (locale || Locale.current_locale).to_s
         formats = formats_for(loc)
 
@@ -33,7 +55,6 @@ module FlycalCli
           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
@@ -56,6 +77,76 @@ module FlycalCli
 
       private
 
+      def parse_relative(value, end_of_day:)
+        normalized = value.downcase.strip
+        normalized = normalized.tr("àèéìòù", "aeeiou")
+
+        case normalized
+        when "now", "adesso", "ora"
+          return Time.now
+        when "today", "oggi"
+          return time_for_date(Date.today, end_of_day: end_of_day)
+        when "tomorrow", "domani"
+          return time_for_date(Date.today + 1, end_of_day: end_of_day)
+        when "yesterday", "ieri"
+          return time_for_date(Date.today - 1, end_of_day: end_of_day)
+        end
+
+        weekday = parse_weekday_phrase(normalized)
+        return nil unless weekday
+
+        time_for_date(weekday, end_of_day: end_of_day)
+      end
+
+      def parse_weekday_phrase(normalized)
+        tokens = normalized.split(/\s+/)
+        return nil if tokens.empty?
+
+        qualifier = nil
+        day_token = nil
+
+        if tokens.length == 1
+          day_token = tokens[0]
+        elsif tokens.length == 2
+          qualifier = tokens[0]
+          day_token = tokens[1]
+        else
+          return nil
+        end
+
+        wday = WEEKDAYS[day_token]
+        return nil unless wday
+
+        today = Date.today
+
+        if qualifier.nil? || THIS_WORDS.include?(qualifier)
+          next_weekday(today, wday, inclusive: true)
+        elsif NEXT_WORDS.include?(qualifier)
+          next_weekday(today, wday, inclusive: false)
+        elsif LAST_WORDS.include?(qualifier)
+          previous_weekday(today, wday, inclusive: false)
+        end
+      end
+
+      def next_weekday(from, wday, inclusive:)
+        delta = (wday - from.wday) % 7
+        delta = 7 if delta.zero? && !inclusive
+        from + delta
+      end
+
+      def previous_weekday(from, wday, inclusive:)
+        delta = (from.wday - wday) % 7
+        delta = 7 if delta.zero? && !inclusive
+        from - delta
+      end
+
+      def time_for_date(date, end_of_day:)
+        return end_of_day_for(date) if end_of_day
+        return [date.to_time, Time.now].max if date == Date.today
+
+        date.to_time
+      end
+
       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]],
@@ -98,10 +189,7 @@ module FlycalCli
         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
+          return time_for_date(date, end_of_day: end_of_day)
         end
 
         Time.local(year, month, day, hour, min || 0, sec || 0)
@@ -119,9 +207,9 @@ module FlycalCli
 
       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."
+          "Data non valida: #{str.inspect}. Usa YYYY-MM-DD, DD-MM-YYYY, oggi/domani, lunedi, prossimo lunedi, ecc."
         else
-          "Invalid date: #{str.inspect}. Use YYYY-MM-DD, MM-DD-YYYY (also with /), or with time."
+          "Invalid date: #{str.inspect}. Use YYYY-MM-DD, MM-DD-YYYY, today/tomorrow, monday, next monday, etc."
         end
       end
     end

data/lib/flycal_cli/slot_formatter.rb

@@ -7,16 +7,16 @@ module FlycalCli
         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)
         )
-        lines << Locale.t("slots.template", name: template) if template && !template.to_s.empty?
         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
 
@@ -25,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
@@ -34,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)

data/lib/flycal_cli/version.rb

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

data/locales/en.json

@@ -31,8 +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",
-    "template": "template %{name}",
+    "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,8 +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",
-    "template": "template %{name}",
+    "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

@@ -274,7 +274,7 @@
       },
       "output": {
         "format": "text/plain",
-        "example": "found 3 slots\nfrom wed 29 July 2026 to wed 5 August 2026\nwith duration 45min\nfor calendars\ntemplate work\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",
@@ -287,7 +287,7 @@
           },
           "from": {
             "type": "string",
-            "description": "Start date/time. Default: now. YYYY-MM-DD always; with locale it also DD-MM-YYYY; with locale en also MM-DD-YYYY. Separators - or /. Optional time."
+            "description": "Start date/time. Default: now. Absolute dates, or relative: monday, next monday, tomorrow, lunedi, prossimo lunedi, etc."
           },
           "in": {
             "type": "string",

metadata

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