flycal-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8d00cb30384c0dedb985b343cbb058db6c93b6e77469d5df0d22a6ef9c62846
-  data.tar.gz: ec29bf46d64995422a4bbf8a470035de10473bc9ceeaf2646b566347e3551d06
+  metadata.gz: c6e56787081596ebef227a579b0667514fa493998875f613167acdade53a4899
+  data.tar.gz: a8776aded68f58ba58759adc27b3aeb2ca63eacf9797eb8bc161aeb2f96589ee
 SHA512:
-  metadata.gz: 0ed2b407b9b51840497fc68f2842703f03b99dfa283598d2dfe9b6f324484b4fe513ec5e3a66a99c672996afba1bfcfb3c362f6514eccff6db9c5fdf06773725
-  data.tar.gz: a8b666a01f5b52d59e7e63ed1bb2b8e894a860d27e16c7c63f66785fdc1da6f8e8fe3cf9ca4cfe0401c7f01124062ae8596ced033ce4d5380631a952c90c3ecd
+  metadata.gz: 0e0af4be4d8505aa21a63e4e6ed70f886419eddf971745154174ea55ec6348030cc0fdad3e40af926df128fa295a5741da84fe236930b2ec797259c2ba300219
+  data.tar.gz: d2021d42bc26dd9b82c4b7b672c923b137b2e83e1f983af96310b9c9d14e948c33cce752f99ba1f99e175d9071067484d2eb5b0763b5d8d63bf1ccb0d56085f4

data/README.md

@@ -1,139 +1,158 @@
 # 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`.
 
-Prima di usare flycal, devi creare credenziali OAuth nel Google Cloud Console:
+## Setup
 
-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:
+Before using flycal, you need OAuth credentials from Google Cloud Console:
+
+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.
+
+### logout
 
-Mostra la lista dei calendari disponibili e permette di selezionare il calendario di default. La selezione è scorrevole (usa le frecce per navigare).
+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
+For time frames longer than 7 days, a weekly breakdown is added (week number, start/end dates, hours, working days per week). For time frames longer than 30 days, a monthly breakdown is shown instead (month number, month name, hours, working days per month).
 
-# Push (ti chiederà email e password RubyGems)
-gem push flycal-cli-0.1.0.gem
-```
+## Configuration
 
-### Versioni successive
+Data is stored in `~/.flycal/`:
 
-1. Aggiorna la versione in `lib/flycal_cli/version.rb`
-2. Commit e tag:
+| 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) |
 
-```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
-```
+## Publishing to RubyGems
+
+### 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/cli.rb

@@ -3,6 +3,9 @@
 require "thor"
 require "time"
 require "date"
+require "active_support/core_ext/date"
+require "active_support/core_ext/integer"
+require "active_support/core_ext/time"
 require "tty-prompt"
 require "tty-spinner"
 
@@ -112,8 +115,8 @@ module FlycalCli
 
       Examples:
         flycal search
-        flycal search --in 30days -d meeting
-        flycal search -i 1months --description rappydrive
+        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"
@@ -130,10 +133,10 @@ module FlycalCli
       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
+                     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
@@ -161,13 +164,19 @@ module FlycalCli
       )
 
       print_events(service, events)
-      print_summary(events, time_min: time_min, time_max: time_max)
+      print_search_summary(events, time_min: time_min, time_max: time_max)
     end
 
     default_task :help
 
     private
 
+    HOURS_PER_WORKING_DAY = 8
+
+    def bold(str)
+      "\e[1m#{str}\e[0m"
+    end
+
     def parse_datetime(str, end_of_day: false)
       return nil if str.nil? || str.empty?
 
@@ -255,36 +264,112 @@ module FlycalCli
       if dt.is_a?(String)
         dt
       else
-        dt.strftime("%Y-%m-%d %H:%M")
+        dt.strftime("%a %Y-%m-%d %H:%M")
       end
     end
 
-    def print_summary(events, time_min:, time_max:)
-      total_minutes = 0
+    def format_date_with_day(dt)
+      return "-" if dt.nil?
 
-      events.each do |item|
-        event = item[:event]
-        start = event.start&.date_time || event.start&.date
-        end_dt = event.end&.date_time || event.end&.date
+      t = dt.respond_to?(:to_time) ? dt.to_time : dt
+      t.strftime("%a %Y-%m-%d")
+    end
 
-        next if start.nil? || end_dt.nil?
+    def print_search_summary(events, time_min:, time_max:)
+      event_ranges = extract_event_ranges(events)
+      total_minutes = event_ranges.sum { |s, e| (e - s) / 60 }
 
-        start = start.to_time if start.respond_to?(:to_time)
-        end_dt = end_dt.to_time if end_dt.respond_to?(:to_time)
-        total_minutes += (end_dt - start) / 60
+      from_str = time_min.strftime("%a %Y-%m-%d %H:%M")
+      to_str = time_max.strftime("%a %Y-%m-%d %H:%M")
+
+      puts "\n---"
+      puts "From: #{from_str} | To: #{to_str}"
+      puts "Events found: #{events.size}"
+      puts "Total time occupied: #{format_duration(total_minutes)}"
+
+      frame_days = (time_max - time_min) / 86400.0
+      if frame_days > 30
+        print_monthly_breakdown(event_ranges, time_min, time_max)
+      elsif frame_days > 7
+        print_weekly_breakdown(event_ranges, time_min, time_max)
       end
+    end
+
+    def extract_event_ranges(events)
+      events.filter_map do |item|
+        event = item[:event]
+        start_t = event.start&.date_time || event.start&.date
+        end_t = event.end&.date_time || event.end&.date
+        next if start_t.nil? || end_t.nil?
 
+        start_t = start_t.to_time if start_t.respond_to?(:to_time)
+        end_t = end_t.to_time if end_t.respond_to?(:to_time)
+        [start_t, end_t]
+      end
+    end
+
+    def format_duration(total_minutes)
       hours = (total_minutes / 60).floor
       mins = (total_minutes % 60).round
-      total_working_days = (total_minutes / 60.0 / 8).round(1)
+      working_days = (total_minutes / 60.0 / HOURS_PER_WORKING_DAY).round(1)
+      "#{bold(hours)}h #{bold(mins)}min (#{bold(working_days)} working days)"
+    end
 
-      from_str = time_min.strftime("%Y-%m-%d %H:%M")
-      to_str = time_max.strftime("%Y-%m-%d %H:%M")
+    def format_hours_and_days(hours, working_days)
+      "#{bold(hours)}h (#{bold(working_days)} working days)"
+    end
 
-      puts "\n---"
-      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)"
+    def minutes_in_period(event_ranges, period_start, period_end)
+      event_ranges.sum do |ev_start, ev_end|
+        overlap_start = [ev_start, period_start].max
+        overlap_end = [ev_end, period_end].min
+        overlap_sec = overlap_end - overlap_start
+        overlap_sec > 0 ? overlap_sec / 60.0 : 0
+      end
+    end
+
+    def print_weekly_breakdown(event_ranges, time_min, time_max)
+      puts "\nBy week:"
+      week_num = 1
+      current = time_min.to_date.beginning_of_week(:monday)
+      while current.to_time < time_max
+        week_start = [current.to_time, time_min].max
+        week_end_date = current.end_of_week(:monday)
+        week_end = [week_end_date.to_time + 1.day, time_max].min
+        mins = minutes_in_period(event_ranges, week_start, week_end)
+        hours = (mins / 60).round(1)
+        working_days = (mins / 60.0 / HOURS_PER_WORKING_DAY).round(1)
+        start_str = format_date_with_day(week_start)
+        end_str = format_date_with_day(week_end_date)
+        puts "  #{bold(week_num)}. #{start_str} - #{end_str}: #{format_hours_and_days(hours, working_days)}"
+        week_num += 1
+        current = current + 7.days
+      end
+    end
+
+    def print_monthly_breakdown(event_ranges, time_min, time_max)
+      puts "\nBy month:"
+      month_num = 1
+      current = time_min.to_date.beginning_of_month
+      end_date = time_max.to_date
+
+      while current <= end_date
+        month_start = current.beginning_of_month.to_time
+        month_end = (current.end_of_month + 1.day).to_time
+        period_start = [month_start, time_min].max
+        period_end = [month_end, time_max].min
+
+        mins = minutes_in_period(event_ranges, period_start, period_end)
+        hours = (mins / 60).round(1)
+        working_days = (mins / 60.0 / HOURS_PER_WORKING_DAY).round(1)
+        month_name = current.strftime("%B %Y")
+        start_str = format_date_with_day(period_start)
+        last_day = (period_end.to_date - 1.day)
+        end_str = format_date_with_day(last_day)
+        puts "  #{month_num}. #{month_name} (#{start_str} - #{end_str}): #{format_hours_and_days(hours, working_days)}"
+        month_num += 1
+        current = current.next_month.beginning_of_month
+      end
     end
   end
 end

data/lib/flycal_cli/version.rb

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

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: flycal-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - flycal-cli
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -79,6 +79,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +118,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