flycal-cli 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91347372adf44296db16d6e06a90a327a2b1dd3709137dc207dc4eadaab3a472
-  data.tar.gz: 0ec160527a68a2dee05f466626c28ee8bedd750a05928978a1f77991ae3be779
+  metadata.gz: a9b15a5f08efcc922a2088d9a4c47fb852794932b4261406312f262905664c09
+  data.tar.gz: 114f71e6f2ca779315908015cf0b772f374b0e9de04e5775b220f8c3278aa5e5
 SHA512:
-  metadata.gz: 7b8eaa8bdc8e56fbb6f865d77811e017ab239bd800b8e507bbe3477a4513663335dc74ca9f28b3111eeff38fe37cc5aa010dea81d4339074bd38e9ec2c7cf7f0
-  data.tar.gz: faf3a5c3bad9ebf2b966b9ca66f1b924d619496cde86b4c8d1b3246a8af2488a12dc6a5b23cbf2f7be147e1cc09e96ed99b6aa23d7d74ab6e5ce9f2e97ed69b3
+  metadata.gz: 1545a6259e5a710d4db52267909e7bbbff350aba2e75d617c9e6e2cbb722bb77f9663b5ca8e08483a5606f8030642952c7b1f5c170c4550de706503d15db3fd8
+  data.tar.gz: 6a63614ed3c9cd16ad5d1cf01b358e49edd5fc46ef285b986e181973ef0c660e9353f40e38ae130265bc470073730314d31fce48639ba3942338989a371042c5

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
@@ -190,7 +192,7 @@ monday 3/8
 19 - 23
 ```
 
-If `pbcopy` is available (macOS), the slot list without the header is also copied to the clipboard.
+If a clipboard tool is available (`pbcopy` on macOS, `wl-copy`/`xclip` on Linux, `clip` on Windows), the slot list without the header is also copied to the clipboard.
 
 Slot search windows are configured in `~/.flycal/config.yml`:
 

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"
@@ -505,17 +505,11 @@ module FlycalCli
     end
 
     def copy_slots_to_clipboard(text)
-      return unless pbcopy_available?
+      tool = Clipboard.copy(SlotFormatter.strip_ansi(text))
+      return unless tool
 
-      IO.popen("pbcopy", "w") { |io| io.write(SlotFormatter.strip_ansi(text)) }
       puts ""
-      puts Locale.t("slots.copied_to_clipboard")
-    rescue StandardError
-      nil
-    end
-
-    def pbcopy_available?
-      system("which", "pbcopy", out: File::NULL, err: File::NULL)
+      puts Locale.t("slots.copied_to_clipboard", tool: tool)
     end
 
     def parse_hour_minute(value)

data/lib/flycal_cli/clipboard.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module FlycalCli
+  # Cross-platform clipboard helper.
+  # Prefers: pbcopy (macOS) → wl-copy (Wayland) → xclip (X11) → clip (Windows).
+  module Clipboard
+    module_function
+
+    TOOLS = [
+      { name: :pbcopy, command: %w[pbcopy] },
+      { name: :wl_copy, command: %w[wl-copy] },
+      { name: :xclip, command: %w[xclip -selection clipboard] },
+      { name: :clip, command: %w[clip] }
+    ].freeze
+
+    def copy(text)
+      tool = available_tool
+      return nil unless tool
+
+      IO.popen(tool[:command], "w") { |io| io.write(text.to_s) }
+      return nil unless $?.success?
+
+      tool[:name].to_s
+    rescue StandardError
+      nil
+    end
+
+    def available?
+      !available_tool.nil?
+    end
+
+    def available_tool
+      TOOLS.find { |tool| command_exists?(tool[:command].first) }
+    end
+
+    def command_exists?(name)
+      exts =
+        if Gem.win_platform?
+          ENV.fetch("PATHEXT", ".EXE;.BAT;.CMD").split(";").reject(&:empty?)
+        else
+          [""]
+        end
+
+      ENV.fetch("PATH", "").split(File::PATH_SEPARATOR).any? do |dir|
+        next false if dir.to_s.empty?
+
+        exts.any? do |ext|
+          path = File.join(dir, "#{name}#{ext}")
+          File.file?(path) && File.executable?(path)
+        end
+      end
+    end
+  end
+end

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/version.rb

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

data/lib/flycal_cli.rb

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

data/locales/en.json

@@ -32,7 +32,7 @@
     "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}, template %{template}\nconsidering calendars",
-    "copied_to_clipboard": "✓ Slot list copied to clipboard (pbcopy)"
+    "copied_to_clipboard": "✓ Slot list copied to clipboard (%{tool})"
   },
   "errors": {
     "not_connected": "You are not connected. Run 'flycal login' first.",

data/locales/it.json

@@ -32,7 +32,7 @@
     "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}, template %{template}\nconsiderando i calendari",
-    "copied_to_clipboard": "✓ Lista slot copiata negli appunti (pbcopy)"
+    "copied_to_clipboard": "✓ Lista slot copiata negli appunti (%{tool})"
   },
   "errors": {
     "not_connected": "Non sei connesso. Esegui prima 'flycal login'.",

data/mcp/tools.json

@@ -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.1
+  version: 0.7.3
 platform: ruby
 authors:
 - flycal-cli
@@ -138,6 +138,7 @@ files:
 - lib/flycal_cli/auth.rb
 - lib/flycal_cli/calendar_service.rb
 - lib/flycal_cli/cli.rb
+- lib/flycal_cli/clipboard.rb
 - lib/flycal_cli/config.rb
 - lib/flycal_cli/date_time_parser.rb
 - lib/flycal_cli/duration_parser.rb