flycal-cli 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8efca78d1d82f9e3310cbd90a29a95ad52fbf9fff714d3aada8321c999bfaa71
-  data.tar.gz: 749f5417dfd3cc780c78e55524aa0acabea9b8fc28f07614d8faa25e7920253b
+  metadata.gz: c7e777c9b4698b273770ea0d9a70edf232ffe70f2e6bd9d32ab65818ca0f5cb5
+  data.tar.gz: 5d62d5fede48b31930a6a652c8b4f165a0f82315eb85e3fb5be885e56ffc2ae7
 SHA512:
-  metadata.gz: be1d24bae7776ca94842c9edd5116544b750846ccc169bd57ba6720dc1b63904eaad92fb2f33ace8f668a8580352ea2ff530532c5262bbc83d44f4f92521b324
-  data.tar.gz: 2d89f80c2b486f102b8ad6edf178dd71126fd78549a49caecc17a5bc0254827f2d0ed07cb727e2cbc18c0b3bf19cc64bbca04846f8a72a00b82d7cb77495273c
+  metadata.gz: c1d95fcb97e10fa0c1144e15c7e205cb693d2c48847dc96569cb718c8899c5ecb3479504b4c19b3315dd8c74ecbcbc9510e99f2070a4c392ae206c51dba395dd
+  data.tar.gz: 6d9d08601b3d78d1aa8d3520b2f0102517b80be6ac708d0d036e3e5558d2548c1a57613f9b3121ebb12329f564a682b71843ac96b5c56a07cdf578f4dcab8f71

data/README.md

@@ -1,139 +1,156 @@
 # flycal-cli
 
-CLI per accedere ai calendari Google da riga di comando.
+A command-line tool to access and search Google Calendar events. Connect your Google account, choose a default calendar, and search events with flexible date ranges and text filters.
 
-## Installazione
+## Requirements
+
+- Ruby 3.1 or later
+- A Google Cloud project with Calendar API enabled
+
+## Installation
 
 ```bash
 gem install flycal-cli
 ```
 
-Oppure aggiungi al tuo Gemfile:
+Or add to your Gemfile:
 
 ```ruby
 gem "flycal-cli"
 ```
 
-## Configurazione iniziale
+Then run `bundle install`.
+
+## Setup
 
-Prima di usare flycal, devi creare credenziali OAuth nel Google Cloud Console:
+Before using flycal, you need OAuth credentials from Google Cloud Console:
 
-1. Vai su [Google Cloud Console - Credenziali](https://console.cloud.google.com/apis/credentials)
-2. Crea un progetto (o usa uno esistente)
-3. Abilita l'**API Google Calendar** (API e servizi → Libreria → Cerca "Google Calendar API")
-4. Crea credenziali **Applicazione desktop** (OAuth 2.0 Client IDs)
-5. Aggiungi questo URI come redirect autorizzato:
+1. Go to [Google Cloud Console - Credentials](https://console.cloud.google.com/apis/credentials)
+2. Create a project or select an existing one
+3. Enable the **Google Calendar API** (APIs & Services → Library → search for "Google Calendar API")
+4. Create **Desktop app** credentials (OAuth 2.0 Client IDs)
+5. Add this URI as an authorized redirect:
    ```
    http://127.0.0.1:9292/oauth2callback
    ```
-6. Scarica il file JSON e salvalo come `~/.flycal/credentials.json`
+6. Download the JSON file and save it as `~/.flycal/credentials.json`
 
-## Comandi
+## Commands
 
-### `flycal login`
+### login
 
-Connetti al tuo account Google. Se non sei connesso, verrà generato un link da aprire nel browser per completare l'autenticazione OAuth.
+Connect to your Google account. Opens a browser for OAuth authentication when not yet connected.
 
 ```bash
 flycal login
 ```
 
-### `flycal calendars`
+If already connected, the command reports the current status and suggests running `flycal calendars` to set the default calendar.
 
-Mostra la lista dei calendari disponibili e permette di selezionare il calendario di default. La selezione è scorrevole (usa le frecce per navigare).
+### logout
+
+Disconnect from your Google account and remove stored tokens.
 
 ```bash
-flycal calendars
+flycal logout
 ```
 
-### `flycal logout`
+### calendars
 
-Disconnetti dall'account Google.
+List available calendars and set the default one. Uses an interactive scrollable menu (arrow keys to navigate, type to filter).
 
 ```bash
-flycal logout
+flycal calendars
 ```
 
-### `flycal search`
+The default calendar is used by the search command when no calendar is specified.
+
+### search
 
-Cerca eventi nei calendari.
+Search for events in your calendar(s). Supports flexible date ranges and text filtering.
 
 ```bash
-flycal search --from 2025-02-01 --to 2025-02-28
-flycal search -f 2025-02-01 -t 2025-02-28 --description "riunione"
-flycal search -f 2025-02-01T09:00 -t 2025-02-28T18:00 -c "Lavoro"
+flycal search
+flycal search --in 30days --description placeholder
+flycal search -f 2025-03-01 -t 2025-03-31 -c "Work"
+flycal search -i 2months -d placeholder
 ```
 
-Opzioni:
-- `-f, --from`: Data/ora inizio (es. `2025-01-01` o `2025-01-01T09:00`)
-- `-t, --to`: Data/ora fine
-- `-c, --calendar`: Nome o ID del calendario (default: calendario impostato con `flycal calendars`)
-- `-d, --description`: Filtra eventi per testo nella descrizione
+**Options:**
 
-## File di configurazione
+| Option | Short | Description |
+|--------|-------|-------------|
+| `--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 between number and unit). With space, use quotes: `--in "30 days"` |
+| `--calendar` | `-c` | Calendar name or ID. Default: calendar set via `flycal calendars` |
+| `--description` | `-d` | Filter events by text. Matches events where the string appears in the title or description (case-insensitive, contains) |
 
-I dati vengono salvati in `~/.flycal/`:
+**Time range behavior:**
 
-- `config.yml` - calendario di default (`calendar_default`)
-- `credentials.json` - credenziali OAuth (da creare manualmente)
-- `tokens.yml` - token di accesso (gestito automaticamente)
+- If neither `--from` nor `--to` is given: searches from today at midnight to 23:59 of the 30th day from today
+- If `--in` is given: `--to` is ignored; the end time is computed from `--from` plus the duration
+- Examples: `--in 30days`, `--in 48hours`, `--in 1months`, `--in 1year`
 
-## Pubblicazione su RubyGems
+**Output:**
 
-### Primo caricamento
+Each event is printed as: `Calendar | Start | End | Title`
 
-1. Crea un account su [rubygems.org](https://rubygems.org) se non ce l'hai
-2. Aggiorna `flycal-cli.gemspec` con i tuoi dati (autori, email, homepage)
-3. Build e push:
+The summary shows:
+- From and To dates used
+- Number of events found
+- Total time occupied (hours, minutes, and working days based on 8-hour days)
 
-```bash
-# Build della gem
-gem build flycal-cli.gemspec
+## Configuration
 
-# Push (ti chiederà email e password RubyGems)
-gem push flycal-cli-0.1.0.gem
-```
+Data is stored in `~/.flycal/`:
 
-### Versioni successive
+| File | Purpose |
+|------|---------|
+| `config.yml` | Default calendar ID and other settings |
+| `credentials.json` | OAuth credentials (created manually from Google Cloud Console) |
+| `tokens.yml` | Access tokens (managed automatically) |
 
-1. Aggiorna la versione in `lib/flycal_cli/version.rb`
-2. Commit e tag:
+## Publishing to RubyGems
 
-```bash
-git add .
-git commit -m "Release v0.2.0"
-git tag v0.2.0
-git push origin main
-git push origin v0.2.0
-```
+### First release
 
-3. Build e push:
+1. Create an account at [rubygems.org](https://rubygems.org) if needed
+2. Update `flycal-cli.gemspec` with your author, email, and homepage
+3. Build and push:
 
 ```bash
 gem build flycal-cli.gemspec
-gem push flycal-cli-0.2.0.gem
+gem push flycal-cli-0.1.0.gem
 ```
 
-### Usando `rake release` (raccomandato)
+### Subsequent releases
 
-Aggiungi al Rakefile:
+1. Update the version in `lib/flycal_cli/version.rb`
+2. Build and push:
 
-```ruby
-require "bundler/gem_tasks"
+```bash
+gem build flycal-cli.gemspec
+gem push flycal-cli-X.Y.Z.gem
 ```
 
-Poi:
+3. Optionally tag and push:
 
 ```bash
-# Per la prima release
-bundle exec rake release
+git tag vX.Y.Z
+git push origin vX.Y.Z
+```
 
-# Per release successive: aggiorna VERSION e poi
+### Using rake release
+
+With `bundler/gem_tasks` in your Rakefile:
+
+```bash
 bundle exec rake release
 ```
 
-`rake release` esegue: build, push su RubyGems, commit, tag e push su git.
+This builds the gem, pushes to RubyGems, and can handle git tagging and pushing.
 
-## Licenza
+## License
 
 MIT

data/lib/flycal_cli/auth.rb

@@ -43,9 +43,9 @@ module FlycalCli
       def login
         unless Config.credentials_exist?
           raise FlycalCli::Error,
-                "File credentials non trovato. Crea #{Config.credentials_path} con le credenziali OAuth dal Google Cloud Console.\n" \
-                "Vai su: https://console.cloud.google.com/apis/credentials\n" \
-                "Crea credenziali 'Desktop app' e scarica il JSON come credentials.json"
+                "Credentials file not found. Create #{Config.credentials_path} with OAuth credentials from Google Cloud Console.\n" \
+                "Go to: https://console.cloud.google.com/apis/credentials\n" \
+                "Create 'Desktop app' credentials and download the JSON as credentials.json"
         end
 
         token_store = Google::Auth::Stores::FileTokenStore.new(file: Config.tokens_path)
@@ -63,9 +63,9 @@ module FlycalCli
           return creds
         end
 
-        # Avvia server locale per ricevere il codice
+        # Start local server to receive the auth code
         code = start_redirect_server(authorizer)
-        raise FlycalCli::Error, "Autenticazione annullata o fallita" if code.nil? || code.empty?
+        raise FlycalCli::Error, "Authentication cancelled or failed" if code.nil? || code.empty?
 
         authorizer.get_and_store_credentials_from_code(
           user_id: "flycal_user",
@@ -104,12 +104,12 @@ module FlycalCli
 
           if params["error"]
             res.status = 400
-            res.body = "<h1>Errore</h1><p>#{params['error']}: #{params['error_description']}</p>"
+            res.body = "<h1>Error</h1><p>#{params['error']}: #{params['error_description']}</p>"
             auth_code = nil
           elsif params["code"]
             auth_code = params["code"]
             res.status = 200
-            res.body = "<h1>Autenticazione completata!</h1><p>Puoi chiudere questa finestra e tornare al terminale.</p>"
+            res.body = "<h1>Authentication complete!</h1><p>You can close this window and return to the terminal.</p>"
           end
 
           Thread.new { server.shutdown }
@@ -120,9 +120,9 @@ module FlycalCli
           state: state
         )
 
-        puts "\nApri questo link nel browser per autenticarti:\n\n"
+        puts "\nOpen this link in your browser to authenticate:\n\n"
         puts "  #{url}\n\n"
-        puts "Dopo l'autenticazione, tornerai qui automaticamente.\n\n"
+        puts "After authentication, you will be redirected back here automatically.\n\n"
 
         server.start
         auth_code

data/lib/flycal_cli/calendar_service.rb

@@ -45,12 +45,26 @@ module FlycalCli
     def list_all_events(calendar_ids, time_min:, time_max:, query: nil)
       all_events = []
 
+      # When --description is used: fetch all events and filter client-side to guarantee
+      # contains/like behavior. We do not use the API's q param so we can ensure we
+      # return all events where the string appears in summary or description (case-insensitive).
       calendar_ids.each do |cal_id|
         begin
-          events = list_events(cal_id, time_min: time_min, time_max: time_max, query: query)
+          events = list_events(cal_id, time_min: time_min, time_max: time_max, query: nil)
           events.each { |e| all_events << { calendar_id: cal_id, event: e } }
         rescue Google::Apis::Errors::Error => e
-          warn "Errore nel calendario #{cal_id}: #{e.message}"
+          warn "Error in calendar #{cal_id}: #{e.message}"
+        end
+      end
+
+      # Filter: only events where summary or description contains the search string (case-insensitive)
+      if query && !query.to_s.strip.empty?
+        q = query.strip.downcase
+        all_events.select! do |item|
+          event = item[:event]
+          summary = (event.summary || "").downcase
+          description = (event.description || "").downcase
+          summary.include?(q) || description.include?(q)
         end
       end
 

data/lib/flycal_cli/cli.rb

@@ -2,6 +2,7 @@
 
 require "thor"
 require "time"
+require "date"
 require "tty-prompt"
 require "tty-spinner"
 
@@ -13,70 +14,70 @@ module FlycalCli
       true
     end
 
-    desc "login", "Connetti al tuo account Google"
+    desc "login", "Connect to your Google account"
     def login
       if Auth.logged_in?
-        puts "✓ Sei già connesso al tuo account Google."
-        puts "\nEsegui 'flycal calendars' per impostare il calendario di default."
+        puts "✓ You are already connected to your Google account."
+        puts "\nRun 'flycal calendars' to set the default calendar."
         return
       end
 
       unless Config.credentials_exist?
-        puts "Errore: File credentials non trovato."
-        puts "\nPer configurare flycal:"
-        puts "1. Vai su https://console.cloud.google.com/apis/credentials"
-        puts "2. Crea credenziali 'Applicazione desktop' (Desktop app)"
-        puts "3. Scarica il JSON e salvalo come: #{Config.credentials_path}"
-        puts "\nAggiungi anche questo URI come redirect autorizzato:"
+        puts "Error: Credentials file not found."
+        puts "\nTo configure flycal:"
+        puts "1. Go to https://console.cloud.google.com/apis/credentials"
+        puts "2. Create 'Desktop app' credentials"
+        puts "3. Download the JSON and save it as: #{Config.credentials_path}"
+        puts "\nAlso add this URI as an authorized redirect:"
         puts "  http://127.0.0.1:9292/oauth2callback"
         return
       end
 
       begin
         Auth.login
-        puts "\n✓ Autenticazione completata con successo!"
-        puts "\nEsegui 'flycal calendars' per impostare il calendario di default."
+        puts "\n✓ Authentication completed successfully!"
+        puts "\nRun 'flycal calendars' to set the default calendar."
       rescue FlycalCli::Error => e
-        puts "Errore: #{e.message}"
+        puts "Error: #{e.message}"
         exit 1
       end
     end
 
-    desc "logout", "Disconnetti dall'account Google"
+    desc "logout", "Disconnect from Google account"
     def logout
       unless Auth.logged_in?
-        puts "Non sei connesso a nessun account Google."
+        puts "You are not connected to any Google account."
         return
       end
 
       Auth.logout
-      puts "✓ Disconnesso con successo."
+      puts "✓ Disconnected successfully."
     end
 
-    desc "calendars", "Mostra i calendari disponibili e imposta quello di default"
+    desc "calendars", "List available calendars and set the default one"
     def calendars
       unless Auth.logged_in?
-        puts "Non sei connesso. Esegui prima 'flycal login'."
+        puts "You are not connected. Run 'flycal login' first."
         exit 1
       end
 
       creds = Auth.credentials
       service = CalendarService.new(creds)
 
-      spinner = TTY::Spinner.new("Caricamento calendari... ", format: :dots)
+      spinner = TTY::Spinner.new("Loading calendars... ", format: :dots)
       spinner.auto_spin
       calendars = service.list_calendars
       spinner.stop("✓")
 
       if calendars.empty?
-        puts "Nessun calendario trovato."
+        puts "No calendars found."
         return
       end
 
-      # Costruisci lista per selezione (display => calendar_id)
+      # Build selection list (display => calendar_id)
       default_id = Config.calendar_default
       choices = calendars.to_h do |cal|
-        primary = cal.primary ? " (principale)" : ""
+        primary = cal.primary ? " (primary)" : ""
         default = (cal.id == default_id) ? " [default]" : ""
         summary = cal.summary || cal.id
         label = "#{summary}#{primary}#{default}"
@@ -85,7 +86,7 @@ module FlycalCli
 
       prompt = TTY::Prompt.new
       selected_id = prompt.select(
-        "Scegli il calendario di default:",
+        "Choose the default calendar:",
         choices,
         per_page: 15,
         filter: true
@@ -94,26 +95,52 @@ module FlycalCli
       calendar = calendars.find { |c| c.id == selected_id }
       if calendar
         Config.calendar_default = calendar.id
-        puts "\n✓ Calendario di default impostato: #{calendar.summary}"
+        puts "\n✓ Default calendar set to: #{calendar.summary}"
       end
     end
 
-    desc "search", "Cerca eventi nei calendari"
-    option :calendar, type: :string, aliases: "-c", desc: "Nome o ID del calendario (default: calendario default)"
-    option :from, type: :string, aliases: "-f", required: true, desc: "Data/ora inizio (es. 2025-01-01 o 2025-01-01T09:00)"
-    option :to, type: :string, aliases: "-t", required: true, desc: "Data/ora fine (es. 2025-01-31 o 2025-01-31T18:00)"
-    option :description, type: :string, aliases: "-d", desc: "Filtra per descrizione (testo)"
+    desc "search", "Search for events in calendars"
+    long_desc <<-LONGDESC
+      Search for events in your Google calendar(s).
+
+      Time range:
+        -f, --from DATE   Start (default: today midnight)
+        -t, --to DATE     End (default: 23:59 of day 30)
+        -i, --in DURATION Duration from --from, overrides --to.
+                          Format: 30days, 48hours, 2months, 1year (no space).
+                          With space use quotes: --in "30 days"
+
+      Examples:
+        flycal search
+        flycal search --in 30days -d placeholder
+        flycal search -i 1months --description placeholder
+        flycal search -f 2025-03-01 --in 2months
+    LONGDESC
+    option :calendar, type: :string, aliases: "-c", desc: "Calendar name or ID"
+    option :from, type: :string, aliases: "-f", desc: "Start (default: today midnight)"
+    option :to, type: :string, aliases: "-t", desc: "End (default: 23:59 of day 30)"
+    option :in, type: :string, aliases: "-i", desc: "Duration: 30days, 48hours, 2months, 1year (overrides --to)"
+    option :description, type: :string, aliases: "-d", desc: "Filter by text in event"
     def search
       unless Auth.logged_in?
-        puts "Non sei connesso. Esegui prima 'flycal login'."
+        puts "You are not connected. Run 'flycal login' first."
         exit 1
       end
 
-      time_min = parse_datetime(options[:from])
-      time_max = parse_datetime(options[:to], end_of_day: true)
+      time_min = options[:from].to_s.empty? ? Date.today.to_time : parse_datetime(options[:from])
+      begin
+        time_max = if options[:in].to_s.empty?
+          options[:to].to_s.empty? ? (Date.today + 30).to_time + 86400 - 1 : parse_datetime(options[:to], end_of_day: true)
+        else
+          parse_duration_in(options[:in], time_min)
+        end
+      rescue FlycalCli::Error => e
+        puts "Error: #{e.message}"
+        exit 1
+      end
 
       if time_min > time_max
-        puts "Errore: la data 'from' deve essere prima della data 'to'."
+        puts "Error: 'from' date must be before 'to' date."
         exit 1
       end
 
@@ -122,7 +149,7 @@ module FlycalCli
 
       calendar_ids = resolve_calendar_ids(service, options[:calendar])
       if calendar_ids.empty?
-        puts "Nessun calendario trovato."
+        puts "No calendars found."
         exit 1
       end
 
@@ -134,7 +161,7 @@ module FlycalCli
       )
 
       print_events(service, events)
-      print_summary(events)
+      print_summary(events, time_min: time_min, time_max: time_max)
     end
 
     default_task :help
@@ -149,7 +176,29 @@ module FlycalCli
       else
         d = Date.parse(str)
         t = d.to_time
-        end_of_day ? t + 86400 - 1 : t  # 23:59:59 per --to quando è solo data
+        end_of_day ? t + 86400 - 1 : t  # 23:59:59 for --to when date-only
+      end
+    end
+
+    def parse_duration_in(str, from_time)
+      # Support both "30days" and "30 days" (no space avoids shell splitting)
+      m = str.to_s.strip.match(/\A(\d+)\s*(day|days|d|hour|hours|h|month|months|m|year|years|y)\z/i)
+      raise FlycalCli::Error, "Invalid --in format. Use: 30days, 48hours, 2months, 1year (no space, or quote: --in \"30 days\")" unless m
+
+      n = m[1].to_i
+      unit = m[2].downcase
+
+      case unit
+      when "hour", "hours", "h"
+        from_time + n * 3600
+      when "day", "days", "d"
+        from_time + n * 86400
+      when "month", "months", "m"
+        (from_time.to_date >> n).to_time + (from_time.hour * 3600 + from_time.min * 60 + from_time.sec)
+      when "year", "years", "y"
+        (from_time.to_date >> (n * 12)).to_time + (from_time.hour * 3600 + from_time.min * 60 + from_time.sec)
+      else
+        raise FlycalCli::Error, "Invalid unit: #{unit}. Use: days, hours, months, years"
       end
     end
 
@@ -161,15 +210,15 @@ module FlycalCli
         if default_id
           return [default_id]
         end
-        # Usa calendario principale se disponibile
+        # Use primary calendar if available
         primary = calendar_lists.find(&:primary)
         return [primary.id] if primary
-        # Altrimenti primo calendario
+        # Otherwise first calendar
         return [calendar_lists.first.id] if calendar_lists.any?
         return []
       end
 
-      # Cerca per nome o ID
+      # Search by name or ID
       matches = calendar_lists.select do |cal|
         cal.id == calendar_name ||
           (cal.summary && cal.summary.downcase.include?(calendar_name.downcase))
@@ -179,7 +228,7 @@ module FlycalCli
     end
 
     def print_events(service, events)
-      # Usa lista calendari per i nomi (evita chiamate API extra)
+      # Use calendar list for names (avoids extra API calls)
       calendar_list = service.list_calendars
       calendar_names = calendar_list.to_h { |c| [c.id, c.summary || c.id] }
 
@@ -193,7 +242,7 @@ module FlycalCli
 
         start_str = format_datetime(start_time)
         end_str = format_datetime(end_time)
-        desc = event.summary || "(senza titolo)"
+        desc = event.summary || "(no title)"
         desc = event.description&.slice(0, 80) if event.summary.nil? && event.description
 
         puts "#{cal_name} | #{start_str} | #{end_str} | #{desc}"
@@ -210,7 +259,7 @@ module FlycalCli
       end
     end
 
-    def print_summary(events)
+    def print_summary(events, time_min:, time_max:)
       total_minutes = 0
 
       events.each do |item|
@@ -227,10 +276,15 @@ module FlycalCli
 
       hours = (total_minutes / 60).floor
       mins = (total_minutes % 60).round
+      total_working_days = (total_minutes / 60.0 / 8).round(1)
+
+      from_str = time_min.strftime("%Y-%m-%d %H:%M")
+      to_str = time_max.strftime("%Y-%m-%d %H:%M")
 
       puts "\n---"
-      puts "Eventi trovati: #{events.size}"
-      puts "Tempo totale occupato: #{hours}h #{mins}min"
+      puts "From: #{from_str} | To: #{to_str}"
+      puts "Events found: #{events.size}"
+      puts "Total time occupied: #{hours}h #{mins}min (#{total_working_days} working days)"
     end
   end
 end

data/lib/flycal_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlycalCli
-  VERSION = "0.1.0"
+  VERSION = '0.2.1'
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: flycal-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - flycal-cli
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -104,7 +104,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- exe/flycal
+- bin/flycal
 - lib/flycal_cli.rb
 - lib/flycal_cli/auth.rb
 - lib/flycal_cli/calendar_service.rb