flycal-cli 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37255bed0559da07bd8fd9be434bc34c2c0104013081108a09039f2bb1cafab0
-  data.tar.gz: 9ac906db7b7a28fb6d45f1857064e1a6d091bade7a6b2e41b66e5f1a305ae164
+  metadata.gz: 980bab82020402b0031c0fc3d84a240626a8a26145cc8a86973390777b21db12
+  data.tar.gz: b26c8bc3fec6e7f68a291d4e6124fc41680c15e5204a1217d6331d5c097cdf91
 SHA512:
-  metadata.gz: a0274d01052be7d96e8e54442273c4657172623664ed5f4a163b5a465c2913878a520fc5225daf26a56111ad8de3602f528f2033f48dffc49d619fcff52d97a2
-  data.tar.gz: b8d596f0b8648843121bad848e80bc04d1b9c33f87eaf0c784b8ef86a50af2abed08b17e37f70dd87147bddf2b9de451bce56dd3f97bb8e004152cde0bbbe298
+  metadata.gz: bce52224114636c4a330ebcdd6740409add46791789544e42cd04380d080056d5b9dddabe8ad0a4a395448958c23631702c05864b3617d3e4ee9fe9eda616b3b
+  data.tar.gz: fa998fbf3213fabd004a58e4d709fd05f28eee1951b9efef4c7c9ccc17fcf903af73d8e9cf7e0345569b774c8369f6422cdf4f018cd7ca1dc92e5126f0730aa8

data/README.md

@@ -54,7 +54,7 @@ Connect to your Google account. Opens a browser for OAuth authentication when no
 flycal login
 ```
 
-If already connected, the command reports the current status and suggests running `flycal calendars` to set the default calendar.
+If already connected, the command reports the current status and suggests running `flycal config` to set the default calendar.
 
 ### logout
 
@@ -64,14 +64,55 @@ Disconnect from your Google account and remove stored tokens.
 flycal logout
 ```
 
+### update
+
+Update `flycal-cli` to the latest published gem version.
+
+```bash
+flycal update
+```
+
+### version
+
+Show the current installed `flycal-cli` version.
+
+```bash
+flycal version
+flycal --version
+flycal -v
+```
+
 ### calendars
 
-List available calendars and set the default one. Uses an interactive scrollable menu (arrow keys to navigate, type to filter).
+List available calendars with name and ID.
 
 ```bash
 flycal calendars
 ```
 
+Example output:
+
+```
+Work user@example.com
+Personal user@gmail.com
+```
+
+### config
+
+Interactive configuration menu.
+
+```bash
+flycal config
+```
+
+Options:
+
+- `calendar_default` — choose the default calendar and save it to `~/.flycal/config.yml`
+- `exclude_calendars` — multi-select one or more calendars whose events block free slots (default selection includes the current default calendar)
+- `edit config` — open `~/.flycal/config.yml` with `$EDITOR` (or `vi`)
+
+Press Ctrl+C during configuration to cancel without error (`config cancelled...`).
+
 The default calendar is used by the search command when no calendar is specified.
 
 ### search
@@ -90,7 +131,7 @@ flycal search -i 2months -d placeholder
 - `--from` / `-f` — Start date/time. Default: midnight of current day. Format: `2025-01-01` or `2025-01-01T09:00`
 - `--to` / `-t` — End date/time. Default: 23:59 of the 30th day from today. Format: same as `--from`
 - `--in` / `-i` — Duration from `--from`, overrides `--to`. Format: `30days`, `48hours`, `2months`, `1year` (no space). With space use quotes: `--in "30 days"`
-- `--calendar` / `-c` — Calendar name or ID. Default: calendar set via `flycal calendars`
+- `--calendar` / `-c` — Calendar name or ID. Default: calendar set via `flycal config`
 - `--description` / `-d` — Filter events by text. Matches events where the string appears in title or description (case-insensitive, contains)
 
 **Time range behavior:**
@@ -124,24 +165,28 @@ flycal slots --in "48 hours" --duration 1hour -c Work
 
 - `--duration` — Minimum slot length. Examples: `1h`, `1 hour`, `30 minutes`, `90min`
 - `--in` / `-i` — Search window from now. Examples: `3 days`, `1 week`, `48 hours` (use quotes when the value contains a space)
-- `--calendar` / `-c` — Calendar name or ID (optional; uses default calendar)
+- `--calendar` / `-c` — Calendar name or ID used as fallback when `exclude_calendars` is not configured
 
 Slot search windows are configured in `~/.flycal/config.yml`:
 
 ```yaml
 slots:
+  exclude_calendars:
+    - user@example.com
+    - user@gmail.com
   workhours:
     - 9:30-13:00
     - 14:00-18:30
-  weekdays-only: true
+  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.
 
+- `exclude_calendars` lists calendars whose events block free slots; if empty or not set, events from `calendar_default` are used
 - `workhours` 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
+- `weekdays_only: true` limits slots to Monday-Friday
+- `weekdays_only: false` includes weekends
 - `locale` supports `en` and `it` (default is `en`)
 
 **Output example:**

data/config/defaults.yml

@@ -1,6 +1,7 @@
 locale: en
 slots:
+  exclude_calendars: []
   workhours:
     - 9:30-13:00
     - 14:00-18:30
-  weekdays-only: true
+  weekdays_only: true

data/lib/flycal_cli/cli.rb

@@ -23,7 +23,7 @@ module FlycalCli
       apply_locale_override
       if Auth.logged_in?
         puts "✓ You are already connected to your Google account."
-        puts "\nRun 'flycal calendars' to set the default calendar."
+        puts "\nRun 'flycal config' to set the default calendar."
         return
       end
 
@@ -41,7 +41,7 @@ module FlycalCli
       begin
         Auth.login
         puts "\n✓ Authentication completed successfully!"
-        puts "\nRun 'flycal calendars' to set the default calendar."
+        puts "\nRun 'flycal config' to set the default calendar."
       rescue FlycalCli::Error => e
         puts "Error: #{e.message}"
         exit 1
@@ -60,49 +60,51 @@ module FlycalCli
       puts "✓ Disconnected successfully."
     end
 
-    desc "calendars", "List available calendars and set the default one"
+    desc "calendars", "List available calendars"
     def calendars
       apply_locale_override
       unless Auth.logged_in?
-        puts "You are not connected. Run 'flycal login' first."
+        puts Locale.t("errors.not_connected")
         exit 1
       end
 
-      creds = Auth.credentials
-      service = CalendarService.new(creds)
-
-      spinner = TTY::Spinner.new("Loading calendars... ", format: :dots)
-      spinner.auto_spin
-      calendars = service.list_calendars
-      spinner.stop("✓")
+      calendars = load_calendars
+      return if calendars.nil?
 
-      if calendars.empty?
-        puts "No calendars found."
-        return
-      end
-
-      # Build selection list (display => calendar_id)
-      default_id = Config.calendar_default
-      choices = calendars.to_h do |cal|
-        primary = cal.primary ? " (primary)" : ""
-        default = (cal.id == default_id) ? " [default]" : ""
+      calendars.each do |cal|
         summary = cal.summary || cal.id
-        label = "#{summary}#{primary}#{default}"
-        [label, cal.id]
+        puts "#{summary} #{cal.id}"
       end
+    end
 
-      prompt = TTY::Prompt.new
-      selected_id = prompt.select(
-        "Choose the default calendar:",
-        choices,
-        per_page: 15,
-        filter: true
-      )
+    desc "config", "Configure flycal settings"
+    def config
+      apply_locale_override
+      unless Auth.logged_in?
+        puts Locale.t("errors.not_connected")
+        exit 1
+      end
 
-      calendar = calendars.find { |c| c.id == selected_id }
-      if calendar
-        Config.calendar_default = calendar.id
-        puts "\n✓ Default calendar set to: #{calendar.summary}"
+      with_config_interrupt_handling do
+        prompt = TTY::Prompt.new
+        choice = prompt.select(
+          Locale.t("config.prompt"),
+          {
+            Locale.t("config.options.calendar_default") => :calendar_default,
+            Locale.t("config.options.exclude_calendars") => :exclude_calendars,
+            Locale.t("config.options.edit_config") => :edit_config
+          },
+          per_page: 10
+        )
+
+        case choice
+        when :calendar_default
+          config_calendar_default
+        when :exclude_calendars
+          config_exclude_calendars
+        when :edit_config
+          config_edit
+        end
       end
     end
 
@@ -198,7 +200,7 @@ module FlycalCli
         time_max = DurationParser.add_to_time(options[:in], time_min)
         slot_cfg = Config.slots_config
         workhours = parse_workhours(slot_cfg["workhours"])
-        weekdays_only = !!slot_cfg["weekdays-only"]
+        weekdays_only = !!slot_cfg["weekdays_only"]
       rescue FlycalCli::Error => e
         puts "Error: #{e.message}"
         exit 1
@@ -212,17 +214,22 @@ module FlycalCli
       creds = Auth.credentials
       service = CalendarService.new(creds)
 
-      calendar_id = resolve_single_calendar_id(service, options[:calendar])
-      if calendar_id.nil?
+      exclude_calendar_ids = resolve_slots_exclude_calendar_ids(service, slot_cfg, options[:calendar])
+      if exclude_calendar_ids.empty?
         puts Locale.t("slots.no_calendar")
         exit 1
       end
 
-      events = service.list_events(
-        calendar_id,
-        time_min: time_min,
-        time_max: time_max
-      )
+      events = exclude_calendar_ids.flat_map do |calendar_id|
+        service.list_events(
+          calendar_id,
+          time_min: time_min,
+          time_max: time_max
+        )
+      rescue Google::Apis::Errors::Error => e
+        warn Locale.t("errors.calendar_fetch", calendar: calendar_id, message: e.message)
+        []
+      end
 
       finder = SlotFinder.new(
         events: events,
@@ -237,6 +244,23 @@ module FlycalCli
       puts output.empty? ? Locale.t("slots.no_available") : output
     end
 
+    desc "update", "Update flycal-cli to the latest gem version"
+    def update
+      apply_locale_override
+      puts "Updating flycal-cli..."
+      success = system("gem", "update", "flycal-cli")
+      return if success
+
+      puts "Error: failed to update flycal-cli."
+      exit 1
+    end
+
+    desc "version", "Show current flycal-cli version"
+    def version
+      apply_locale_override
+      puts "flycal #{FlycalCli::VERSION}"
+    end
+
     default_task :help
 
     private
@@ -247,10 +271,154 @@ module FlycalCli
       "\e[1m#{str}\e[0m"
     end
 
+    def bold_underline(str)
+      "\e[1;4m#{str}\e[0m"
+    end
+
     def apply_locale_override
       Locale.override!(options[:locale])
     end
 
+    def with_config_interrupt_handling
+      yield
+    rescue Interrupt
+      puts "\nconfig cancelled..."
+      exit 0
+    end
+
+    def load_calendars
+      creds = Auth.credentials
+      service = CalendarService.new(creds)
+
+      spinner = TTY::Spinner.new("#{Locale.t('common.loading_calendars')} ", format: :dots)
+      spinner.auto_spin
+      calendars = service.list_calendars
+      spinner.stop("✓")
+
+      if calendars.empty?
+        puts Locale.t("errors.no_calendars")
+        return nil
+      end
+
+      calendars
+    end
+
+    def calendar_choices(calendars, highlight_ids: [])
+      highlights = Array(highlight_ids).compact
+      calendars.to_h do |cal|
+        primary = cal.primary ? " (primary)" : ""
+        summary = cal.summary || cal.id
+        label = "#{summary}#{primary}"
+        label = bold_underline(label) if highlights.include?(cal.id)
+        [label, cal.id]
+      end
+    end
+
+    def choice_labels_for_ids(choices, calendar_ids)
+      ids = Array(calendar_ids).compact
+      choices.select { |_label, id| ids.include?(id) }.keys
+    end
+
+    def config_calendar_default
+      calendars = load_calendars
+      return if calendars.nil?
+
+      prompt = TTY::Prompt.new
+      default_id = Config.calendar_default
+      selected_id = prompt.select(
+        Locale.t("config.calendar_default.prompt"),
+        calendar_choices(calendars, highlight_ids: [default_id]),
+        per_page: 15,
+        filter: true
+      )
+
+      calendar = calendars.find { |c| c.id == selected_id }
+      return unless calendar
+
+      Config.calendar_default = calendar.id
+      puts Locale.t("config.calendar_default.saved", name: calendar.summary || calendar.id)
+    end
+
+    def config_exclude_calendars
+      calendars = load_calendars
+      return if calendars.nil?
+
+      prompt = TTY::Prompt.new
+      default_id = Config.calendar_default
+      configured = Config.exclude_calendars
+      current_ids = resolve_calendar_refs(calendars, configured)
+      preselected_ids = current_ids.empty? && default_id ? [default_id] : current_ids
+      choices = calendar_choices(calendars, highlight_ids: current_ids)
+      preselected_labels = choice_labels_for_ids(choices, preselected_ids)
+
+      selected_ids = prompt.multi_select(
+        Locale.t("config.exclude_calendars.prompt"),
+        choices,
+        default: preselected_labels,
+        min: 1,
+        per_page: 15,
+        filter: true
+      )
+
+      Config.exclude_calendars = selected_ids
+      names = selected_ids.map do |id|
+        calendars.find { |c| c.id == id }&.summary || id
+      end
+      puts Locale.t("config.exclude_calendars.saved", names: names.join(", "))
+    end
+
+    def config_edit
+      editor = ENV["EDITOR"].to_s.strip
+      editor = "vi" if editor.empty?
+
+      success = system(editor, Config.config_file)
+      puts Locale.t("config.edit.failed", editor: editor) unless success
+    end
+
+    def resolve_calendar_refs(calendars, refs)
+      Array(refs).filter_map do |ref|
+        resolve_calendar_ref(calendars, ref)
+      end.uniq
+    end
+
+    def resolve_calendar_ref(calendars, ref)
+      ref = ref.to_s.strip
+      return nil if ref.empty?
+
+      exact = calendars.find { |cal| cal.id == ref }
+      return exact.id if exact
+
+      matches = calendars.select do |cal|
+        cal.id == ref ||
+          (cal.summary && cal.summary.downcase.include?(ref.downcase))
+      end
+
+      matches.first&.id
+    end
+
+    def resolve_slots_exclude_calendar_ids(service, slot_cfg, calendar_override)
+      configured = slot_cfg["exclude_calendars"]
+      calendars = service.list_calendars
+
+      refs = if configured.nil? || (configured.is_a?(Array) && configured.empty?)
+               fallback = calendar_override || Config.calendar_default
+               fallback ? [fallback] : []
+             else
+               configured
+             end
+
+      ids = resolve_calendar_refs(calendars, refs)
+      return ids unless ids.empty?
+
+      fallback = calendar_override || Config.calendar_default
+      if fallback
+        resolve_calendar_refs(calendars, [fallback])
+      else
+        primary = calendars.find(&:primary)
+        primary ? [primary.id] : calendars.first(1).map(&:id)
+      end
+    end
+
     def parse_datetime(str, end_of_day: false)
       return nil if str.nil? || str.empty?
 
@@ -354,22 +522,6 @@ module FlycalCli
       matches.map(&:id)
     end
 
-    def resolve_single_calendar_id(service, calendar_name)
-      if calendar_name && !calendar_name.empty?
-        ids = resolve_calendar_ids(service, calendar_name)
-        return ids.first
-      end
-
-      default_id = Config.calendar_default
-      return default_id if default_id
-
-      calendars = service.list_calendars
-      primary = calendars.find(&:primary)
-      return primary.id if primary
-
-      calendars.first&.id
-    end
-
     def print_events(service, events)
       # Use calendar list for names (avoids extra API calls)
       calendar_list = service.list_calendars

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,45 @@ 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
+
+        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/version.rb

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

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,33 @@
       "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."
   },
   "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,33 @@
       "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."
   },
   "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}"
   }
 }

metadata

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