icalPal 3.9.3 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4853d1f050b001c63c1890618f5393eaee86c812f86cacf8be8b9da483fc67d1
-  data.tar.gz: ae170e19546fc153bdfbcd6cd89e02ac91c694e2c393e6624e31d437a5b03a34
+  metadata.gz: a19cb126e559cf9684d82d4d47eebfefe1a058dadc63ca642693d1ac488a97b0
+  data.tar.gz: 562f98a62d93eda9a03de31a5d1a09a7ddf9841d97abe0ea7d335a0976625dc7
 SHA512:
-  metadata.gz: 3bf5728beb2504a19f2fae851413c26c6ee192fe2f09e066f8f9b1887e3eb16102eb9a89a4eb5e717e727564e8ca4a74bd09dc3d2743974cf2d33a24d7b25b5d
-  data.tar.gz: b60b90e37a562ca7df73c53e0e6ade623baa857b3f520a7faded502e7d588c7cbcb3ef2ee02bc9f486bd840f11b4e7638d92f769570e6b216e3bff9b2eaae5af
+  metadata.gz: 659550c0e455ff95a565dbc7d2af162872e14126b35f50f7c8cbaee43c154252d2ef45748421540ab2bc7bde89e50aba0135280a093d086a37e3df970adefd89
+  data.tar.gz: 941c218eef0998cc5356dac3e23cd91ea00046f6463b01e0bf6ebb651f008ce00c615d3c787945ec707a9fda35cdb25e733f10058464234ccb93d092213d727e

data/README.md

@@ -1,15 +1,18 @@
-[![Gem Version](https://badge.fury.io/rb/icalPal.svg)](https://badge.fury.io/rb/icalPal)
+![GitHub Release](https://img.shields.io/github/v/release/ajrosen/icalPal?display_name=tag&logo=rubygems&label=gem%20version)
+[![Downloads](https://img.shields.io/gem/dtv/icalPal?label=downloads)](https://badge.fury.io/rb/icalPal.svg?icon=si%3Arubygems&icon_color=%23ff0000)
+[![Downloads](https://img.shields.io/gem/dt/icalPal?label=total%20downloads)](https://badge.fury.io/rb/icalPal.svg?icon=si%3Arubygems&icon_color=%23ff0000)
 
 # icalPal
 
 ## Description
 
-icalPal is a command-line tool to query macOS Calendar and Reminders
-databases for accounts, calendars, events, and tasks.  It can be run
-on any system with [Ruby](https://www.ruby-lang.org/) and access to a
-Calendar or Reminders database.
+icalPal is a command-line tool to query macOS *Calendar* and
+*Reminders* databases for accounts, calendars, events, and tasks.  It
+can be run on any system with [Ruby](https://www.ruby-lang.org/) and
+access to a Calendar or Reminders database.
 
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
+
 **Table of Contents**
 
 - [Installation](#installation)
@@ -26,13 +29,13 @@ Calendar or Reminders database.
 
 ## Installation
 
-As a system-wide Ruby gem:
+Install icalPal for all users:
 
 ```
 gem install icalPal
 ```
 
-In your home directory:
+For only you:
 
 ```
 gem install --user-install icalPal
@@ -64,6 +67,8 @@ differences to be aware of.
 
 ### Additional commands
 
+icalPal also supports additional commands.
+
 ```icalPal accounts```
 
 Shows a list of enabled Calendar accounts.  Internally they are known
@@ -79,7 +84,7 @@ Shows only reminders that have a due date.
 *remindersDueBefore* can be used instead of *tasks*
 
 Reminders can also be viewed in the *Scheduled Reminders* calendar,
-using the *tasks* commands.  Repeating reminders are treated the same
+using the *events* commands.  Repeating reminders are treated the same
 as repeating events.
 
 ### Additional options
@@ -98,39 +103,35 @@ as repeating events.
 * ```--color``` uses a wider color palette.  Colors are what you have chosen in the Calendar and Reminders apps, including custom colors
 * ```--match``` lets you filter the results of any command to items where a *FIELD* matches a regular expression.  Eg., ```--match notes=zoom.us``` to show only Zoom meeetings
 
-Because icalPal is written in Ruby, and not a native Mac application,
-you can run it just about anywhere.  It's been tested with the
-versions of Ruby included with macOS Sequoia and Tahoe (2.6.10) and
-[Homebrew](https://brew.sh/) (3.4.x).
-
 ### Additional properties
 
 Several additional properties are available for each command.
 
 * Accounts
   * account
+  * delegations
   * notes
   * owner
   * type
-  * delegations
 
 * Calendar
   * account
-  * shared\_owner_name, shared\_owner_address
+  * locale
+  * notes
+  * published_URL
   * self\_identity_email, owner\_identity_email
+  * shared\_owner_name, shared\_owner_address
+  * sharees
   * subcal_account_id, subcal_url
-  * published_URL
-  * notes
-  * locale
 
 * Tasks
-	* id
-	* grocery
+	* assignee
 	* completed
+	* grocery
 	* group
+	* id
 	* section
 	* tags
-	* assignee
 	* timezone
 	* Notifications
 	  * due (due_date formatted with --df and --tf options)
@@ -143,7 +144,7 @@ Several additional properties are available for each command.
 icalPal: Usage: icalPal [options] [-c] COMMAND
 
 COMMAND must be one of the following:
-```
+
     events                  Print events
     tasks                   Print tasks
     calendars               Print calendars
@@ -159,29 +160,27 @@ COMMAND must be one of the following:
 
     stores can be used instead of accounts
     reminders can be used instead of tasks
-```
 
 Global options:
-```
+
     -c, --cmd=COMMAND       Command to run
         --db=DB             Use DB file instead of Calendar
-                            (default: ["$HOME/Library/Group Containers/group.com.apple.calendar/Calendar.sqlitedb", $HOME/Library/Calendars/Calendar.sqlitedb]
+                            (default: ["$HOME/Library/Group Containers/group.com.apple.calendar/Calendar.sqlitedb", "$HOME/Library/Calendars/Calendar.sqlitedb"]
                             For the tasks commands this should be a directory containing .sqlite files
-                            (default: "$HOME/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores")
+                            (default: ["$HOME/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores"])
         --cf=FILE           Set config file path (default: $HOME/.icalpal)
         --norc              Ignore ICALPAL and ICALPAL_CONFIG environment variables
     -o, --output=FORMAT     Print as FORMAT (default: default)
                             [ansi, csv, default, hash, html, json, md, rdoc, remind, toc, xml, yaml]
-```
 
-Including/excluding accounts, calendars, reminders and items:
-```
+Including/excluding accounts, calendars, items:
+
         --is=ACCOUNTS       List of accounts to include
         --es=ACCOUNTS       List of accounts to exclude
 
         --it=TYPES          List of calendar types to include
         --et=TYPES          List of calendar types to exclude
-                            [Local, Exchange, CalDAV, MobileMe, Subscribed, Birthdays]
+                            [Local, Exchange, CalDAV, MobileMe, Subscribed, Birthdays, Reminders]
 
         --ic=CALENDARS      List of calendars to include
         --ec=CALENDARS      List of calendars to exclude
@@ -192,11 +191,10 @@ Including/excluding accounts, calendars, reminders and items:
         --id                Include completed reminders
         --ed                Exclude uncompleted reminders
 
-        --match=FIELD=REGEX Include only items whose FIELD matches REGEXP (ignoring case)
-```
+        --match=FIELD=REGEX Include only items whose FIELD matches REGEX (ignoring case)
 
 Choosing dates:
-```
+
         --from=DATE         List events starting on or after DATE
         --to=DATE           List events starting on or before DATE
                             DATE can be yesterday, today, tomorrow, +N, -N, or anything accepted by DateTime.parse()
@@ -207,10 +205,9 @@ Choosing dates:
         --sed               Show empty dates with --sd
         --ia                Include only all-day events
         --ea                Exclude all-day events
-```
 
 Choose properties to include in the output:
-```
+
         --iep=PROPERTIES    List of properties to include
         --eep=PROPERTIES    List of properties to exclude
         --aep=PROPERTIES    List of properties to include in addition to the default list
@@ -231,10 +228,9 @@ Choose properties to include in the output:
 
     Use 'all' for PROPERTIES to include all available properties (except any listed in --eep)
     Use 'list' for PROPERTIES to list all available properties and exit
-```
 
 Formatting the output:
-```
+
         --li=N              Show at most N items (default: 0 for no limit)
 
         --sc                Separate by calendar
@@ -261,24 +257,21 @@ Formatting the output:
 
     -f                      Format output using standard ANSI colors
         --color             Format output using a larger color palette
-```
 
 Help:
-```
+
     -h, --help              Show this message
-    -V, -v, --version       Show version and exit (3.9.1)
+    -V, -v, --version       Show version and exit (3.10.0)
     -d, --debug=LEVEL       Set the logging level (default: warn)
                             [debug, info, warn, error, fatal]
-```
 
 Environment variables:
-```
+
     ICALPAL                 Additional arguments
     ICALPAL_CONFIG          Additional arguments from a file
                             (default: $HOME/.icalpal)
 
     Do not quote or escape values.  Options set in ICALPAL override ICALPAL_CONFIG.  Options on the command line override ICALPAL.
-```
 
 ## Output formats
 
@@ -295,35 +288,9 @@ properly formatted.
 
 Other formats such as ANSI, HTML, Markdown, RDoc, and TOC, use Ruby's
 [RDoc::Markup](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup.html)
-framework to build and render the items.
-
-Each item to be printed is a new
-[RDoc::Markup::Document](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/Document.html).
-
-When using one of the _separate by_ options, a section header is added
-first.  The section contains:
-
-* [RDoc::Markup::BlankLine](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/BlankLine.html)
-  (unless this is the first section)
-* RDoc::Markup::Heading (level 1)
-* [RDoc::Markup::Rule](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/Rule.html)
-
-The rest of the document is a series of
-[RDoc::Markup::List](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/List.html)
-objects, one for each of the item's properties:
-
-* [RDoc::Markup::List](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/List.html)
-* RDoc::Markup::Heading (level 2)
-* [RDoc::Markup::BlankLine](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/BlankLine.html)
-* [RDoc::Markup::ListItem](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/ListItem.html)
-* [RDoc::Markup::Paragraph](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/Paragraph.html)
-
-The document will also include a number of
-[RDoc::Markup::Verbatim](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/Verbatim.html)
-and
-[RDoc::Markup::Raw](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/Raw.html)
-items.  They are not included in the output, but are used to pass
-information about the item and property to the default formatter.
+framework to build and render the items.  See
+[RDoc](https://github.com/ajrosen/icalPal/blob/main/RDoc.md) for a
+breakdown of how icalPal uses RDoc::Markup.
 
 ## History
 
@@ -341,9 +308,14 @@ Lawton](https://github.com/jimlawton) that it even compiles anymore.
 Instead of trying to understand and extend the existing code, I chose
 to start anew using my language of choice:
 [Ruby](https://www.ruby-lang.org).  Using Ruby meant there is *much*
-less code; a little over 2,000 lines vs. 7,000.  It also means icalPal
+less code; a little over 2,200 lines vs. 7,000.  It also means icalPal
 is multi-platform.
 
+Because icalPal is written in Ruby, and not a native Mac application,
+you can run it just about anywhere.  It's been tested with the
+versions of Ruby included with macOS Sequoia and Tahoe (2.6.10) and
+[Homebrew](https://brew.sh/) (3.4.x).
+
 I won't pretend to understand **why** you would want to run this on
 Linux or Windows.  But since icalPal is written in Ruby and gets its
 data directly from the Calendar and Reminders database files instead

data/bin/icalPal

@@ -206,10 +206,10 @@ $rows.each do |row|
       next if $opts[:ed] && item['completed'].zero?
       next unless $opts[:id] || item['completed'].zero?
 
-      next if $opts[:dated] == 1 && item['due_date'] && item['due_date'].positive?
-      next if $opts[:dated] == 2 && (!item['due_date'] || item['due_date'].zero?)
+      next if $opts[:dated] == 'undatedTasks' && item['due_date'] && item['due_date'].positive?
+      next if $opts[:dated] == 'datedTasks' && (!item['due_date'] || item['due_date'].zero?)
 
-      if $opts[:dated] == 3
+      if $opts[:dated] == 'tasksDueBefore'
         next unless item['due_date']
         next unless item['due_date'].between?($opts[:from].to_i, $opts[:to].to_i)
       end
@@ -231,14 +231,14 @@ end
 
 # Sort the rows
 begin
-  sort = []
-  sort.push $opts[:sep] if $opts[:sep]
-  sort.push $opts[:sort] if $opts[:sort]
-  sort.push 'sdate'
+  $sort_attrs = []
+  $sort_attrs.push $opts[:sep] if $opts[:sep]
+  $sort_attrs.push $opts[:sort] if $opts[:sort]
+  $sort_attrs.push 'sdate'
 
-  $log.info("Sorting #{$items.count} items by #{sort}, reverse #{$opts[:reverse].inspect}")
+  $log.info("Sorting #{$items.count} items by #{$sort_attrs}, reverse #{$opts[:reverse].inspect}")
 
-  $items.sort_by! { |i| [ i[sort[0]], i[sort[1]], i[sort[2]] ] }
+  $items.sort!
   $items.reverse! if $opts[:reverse]
 rescue Exception => e
   $log.info("Sorting failed: #{e}\n")
@@ -321,8 +321,10 @@ items.each_with_index do |i, j|
     doc << RDoc::Markup::Raw.new($opts[:sep])
 
     doc << RDoc::Markup::BlankLine.new if j.positive?
-    doc << RDoc::Markup::Heading.new(1, i[$opts[:sep]].to_s)
-    doc << RDoc::Markup::Rule.new(0)
+    if i[$opts[:sep]]
+      doc << RDoc::Markup::Heading.new(1, i[$opts[:sep]].to_s)
+      doc << RDoc::Markup::Rule.new(0)
+    end
 
     section = i[$opts[:sep]]
   end

data/ext/extconf.rb

@@ -7,7 +7,7 @@ begin
   Gem.path.each { |p| gemdir = p if File.writable? p }
 
   # Dependencies common to all environments
-  dependencies = %w[ plist tzinfo ]
+  dependencies = %w[ plist ]
 
   if RUBY_VERSION >= '3.4'
     # bigdecimal is not part of the default gems starting from Ruby 3.4.0.

data/lib/ToICalPal.rb

@@ -97,7 +97,7 @@ class RDoc::Markup::ToICalPal < RDoc::Markup::Formatter
 
   # Add a blank line
   #
-  # @param *_arg [Array] Ignored
+  # @param _arg [Array] Ignored
   def accept_blank_line(*_arg)
     @res << "\n"
   end

data/lib/calendar.rb

@@ -12,6 +12,12 @@ module ICalPal
       end
     end
 
+    def initialize(obj)
+      super
+
+      @self['sharees'] = JSON.parse(obj['sharees'])
+    end
+
     QUERY = <<~SQL.freeze
 SELECT DISTINCT
 
@@ -23,6 +29,8 @@ c1.title AS calendar,
 c1.shared_owner_name,
 c1.shared_owner_address,
 
+json_group_array(i1.display_name) AS sharees,
+
 c1.published_URL,
 c1.self_identity_email,
 c1.owner_identity_email,
@@ -34,10 +42,14 @@ c1.locale
 FROM #{self.name.split('::').last} c1
 
 JOIN Store s1 ON c1.store_id = s1.rowid
+LEFT OUTER JOIN Sharee s2 ON c1.rowid = s2.owner_id
+LEFT OUTER JOIN Identity i1 ON s2.identity_id = i1.rowid
 
 WHERE s1.disabled IS NOT 1
 AND s1.display_order IS NOT -1
 AND c1.flags IS NOT 519
+
+GROUP BY c1.title
 SQL
 
   end

data/lib/defaults.rb

@@ -49,31 +49,6 @@ $defaults = {
     sort: 'prio',
   },
 
-  undatedTasks: {
-    dated: 1,
-    db: [ ICalPal::Reminder::DB_PATH ],
-    iep: %w[ title notes due priority ],
-    ps: [ "\n    " ],
-    sort: 'prio',
-  },
-
-  datedTasks: {
-    dated: 2,
-    db: [ ICalPal::Reminder::DB_PATH ],
-    iep: %w[ title notes due priority ],
-    ps: [ "\n    " ],
-    sort: 'prio',
-  },
-
-  tasksDueBefore: {
-    dated: 3,
-    db: [ ICalPal::Reminder::DB_PATH ],
-    iep: %w[ title notes due priority ],
-    ps: [ "\n    " ],
-    sort: 'prio',
-    to: $today,
-  },
-
   accounts: {
     iep: %w[ account type ],
     sort: 'account',

data/lib/event.rb

@@ -16,14 +16,14 @@ module ICalPal
     end
 
     # Standard accessor with special handling for +age+,
-    # +availability+, +datetime+, +location+, +notes+, +status+,
-    # +title+, and +uid+
+    # +availability+, +datetime+, +location+, +notes+, +sday+,
+    # +status+, +uid+, and +event+/+name+/+title+
     #
     # @param k [String] Key/property name
     def [](k)
       case k
       when 'age'                # pseudo-property
-        @self['sdate'].year - @self['edate'].year
+        @self['sdate'].year - Time.at(@self['start_date'] + ITIME).year
 
       when 'availability'       # Integer -> String
         EventKit::EKEventAvailability.select { |_k, v| v == @self['availability'] }.keys
@@ -48,7 +48,7 @@ module ICalPal
         (@self['notes'])? @self['notes'].strip.gsub("\n", $opts[:nnr]) : nil
 
       when 'sday'               # pseudo-property
-        @self['sdate'].day_start
+        @self['sdate'].day_start(0)
 
       when 'status'             # Integer -> String
         EventKit::EKEventStatus.select { |_k, v| v == @self['status'] }.keys[0]
@@ -76,7 +76,7 @@ module ICalPal
         'sdate' => obj,
         'placeholder' => true,
         'title' => 'Nothing.',
-      } if obj.is_a?(DateTime) && $opts[:sed]
+      } if $opts[:sed] && obj.is_a?(DateTime)
 
       super
 
@@ -90,10 +90,13 @@ module ICalPal
       obj.keys.select { |i| i.end_with? '_date' }.each do |k|
         next unless obj[k]
 
+        zone = nil
+        zone = '+00:00' if obj['all_day'].positive?
+
         # Save as seconds, Time, RDT
         ctime = obj[k] + ITIME
-        ctime -= $now.utc_offset if obj['start_tz'] == '_float'
-        ttime = Time.at(ctime)
+        ctime -= Time.at(ctime).utc_offset if obj["#{k.split('_')[0]}_tz"] == '_float' && !zone
+        ttime = Time.at(ctime, in: zone)
 
         @self["#{k[0]}seconds"] = ctime
         @self["#{k[0]}ctime"] = ttime
@@ -173,7 +176,7 @@ module ICalPal
             skip = true if codate == odate
           end
 
-          events.push(clone(occurrence)) if in_window?(occurrence['sdate'], occurrence['edate']) && !skip
+          events.push(clone(occurrence)) if !skip && in_window?(occurrence['sdate'], occurrence['edate'])
         end
 
         # Handle frequency and interval
@@ -261,11 +264,16 @@ module ICalPal
             c['sdate'] = ICalPal.nth(nth, day, nsdate)
             c['edate'] = ICalPal.nth(nth, day, nedate)
           else
-            diff = day - c['sdate'].wday
-            diff += 7 if diff.negative?
+            %w[ sdate edate ].each do |d|
+              diff = day - c[d].wday
+              diff += 7 if diff.negative?
+
+              t1 = Time.at(c[d].to_time)
+              t2 = Time.at(t1.to_i + (diff * 86_400))
+              t2 += (t1.gmt_offset - t2.gmt_offset)
 
-            c['sdate'] += diff
-            c['edate'] += diff
+              c[d] = RDT.from_time(t2)
+            end
           end
 
           o.push(clone(c)) if in_window?(c['sdate'], c['edate'])
@@ -277,18 +285,18 @@ module ICalPal
 
     # Apply frequency and interval
     def apply_frequency!
-      # Leave edate alone for birthdays to compute age
-      dates = [ 'sdate' ]
-      dates << 'edate' unless self['calendar'].include?('Birthday')
-
-      dates.each do |d|
+      %w[ sdate edate ].each do |d|
         case EventKit::EKRecurrenceFrequency[self['frequency'] - 1]
-        when 'daily'   then self[d] +=  self['interval']
-        when 'weekly'  then self[d] +=  self['interval'] * 7
-        when 'monthly' then self[d] >>= self['interval']
-        when 'yearly'  then self[d] >>= self['interval'] * 12
+        when 'daily'   then nd = self[d] + self['interval']
+        when 'weekly'  then nd = self[d] + (self['interval'] * 7)
+        when 'monthly' then nd = self[d] >> self['interval']
+        when 'yearly'  then nd = self[d] >> (self['interval'] * 12)
         else $log.error("Unknown frequency: #{self['frequency']}")
         end
+
+        # Create a new Time object in case we crossed a daylight saving change
+        t = Time.parse("#{nd.year}-#{nd.month}-#{nd.day} #{nd.hour}:#{nd.min}:#{nd.sec}")
+        self[d] = RDT.from_time(t)
       end
     end
 
@@ -307,8 +315,8 @@ module ICalPal
           $log.debug("not now: #{s} to #{e} vs. #{$now}")
           false
         end
-      elsif ([ s, e ].max >= $opts[:from] && s < $opts[:to])
-        $log.debug("in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
+      elsif (s < $opts[:to] && [ s, e ].max >= $opts[:from])
+        $log.debug("#{@self['title']} in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
         true
       else
         $log.debug("not in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
@@ -335,6 +343,7 @@ CalendarItem.all_day,
 CalendarItem.availability,
 CalendarItem.conference_url_detected,
 CalendarItem.description AS notes,
+CalendarItem.end_tz,
 CalendarItem.has_recurrences,
 CalendarItem.invitation_status,
 CalendarItem.orig_item_id,

data/lib/icalPal.rb

@@ -149,6 +149,25 @@ module ICalPal
     @self.values
   end
 
+  # @see Array.<=>
+  #
+  # If either self or other is nil, but not both, the nil object is
+  # always less than
+  def <=>(other)
+    $sort_attrs.each do |s|
+      next if self[s] == other[s]
+
+      # nil is always less than
+      return -1 if other[s].nil?
+      return 1 if self[s].nil?
+
+      return -1 if self[s] < other[s]
+      return 1 if self[s] > other[s]
+    end
+
+    0
+  end
+
   # Like inspect, but easier for humans to read
   #
   # @return [Array<String>] @self as a key=value array, sorted by key

data/lib/options.rb

@@ -268,17 +268,23 @@ module ICalPal
 
           when 'Remaining'
             cli[:from] = RDT.from_time($now)
-            cli[:to] = $today.day_end
+            cli[:to] = $today.day_end(0)
             cli[:days] = 1
           end
         end
 
         # Handle tasks command variants
-        if cli[:cmd] == 'tasksDueBefore'
-          cli.delete(:days) unless cli[:days]
-          cli[:from] = RDT.from_epoch(0) unless cli[:from]
+        if cli[:cmd] =~ /tasks/i
+          cli[:dated] = cli[:cmd]
+
+          if cli[:dated] == 'tasksDueBefore'
+            cli.delete(:days) unless cli[:days]
+            cli[:from] = RDT.from_epoch(0) unless cli[:from]
+            cli[:to] = $today unless cli[:to]
+          end
+
+          cli[:cmd] = 'tasks'
         end
-        cli[:cmd] = 'tasks' if %w[ datedTasks undatedTasks tasksDueBefore ].include? cli[:cmd]
 
         # Must have a valid command
         raise(OptionParser::InvalidArgument, "Unknown COMMAND #{cli[:cmd]}") unless (COMMANDS.any? cli[:cmd])

data/lib/rdt.rb

@@ -25,15 +25,25 @@ module ICalPal
     # @return [RDT] a new RDT
     def self.conv(str)
       case str
-      when 'yesterday' then $today - 1
+      when 'yesterday' then $today.add(-1)
       when 'today' then $today
-      when 'tomorrow' then $today + 1
+      when 'tomorrow' then $today.add(1)
       when /^\+([0-9]+)/ then $today + Regexp.last_match(1).to_i
       when /^-([0-9]+)/ then $today - Regexp.last_match(1).to_i
       else parse(str)
       end
     end
 
+    # Add a number of days accounting for daylight saving time changes
+    #
+    # @param days [Integer] Number of days to add
+    # @return [RDT] A new RDT
+    def add(days)
+      n = self + days
+      t = Time.parse("#{n.year}-#{n.month}-#{n.day} #{n.hour}:#{n.min}:#{n.sec}")
+      RDT.from_time(t)
+    end
+
     # Values can be +day before yesterday+, +yesterday+,
     # +today+, +tomorrow+, +day after tomorrow+, or the result from
     # strftime
@@ -41,10 +51,10 @@ module ICalPal
     # @return [String] A string representation of self relative to
     #  today.
     def to_s
-      return strftime($opts[:df]) if $opts && $opts[:nrd] && $opts[:df]
+      return strftime($opts[:df]) if $opts && $opts[:df] && $opts[:nrd]
       return super unless $today && $opts
 
-      case Integer(RDT.new(*ymd, month, day) - $today)
+      case (self - $today).round
       when -2 then 'day before yesterday'
       when -1 then 'yesterday'
       when 0 then 'today'
@@ -68,19 +78,27 @@ module ICalPal
       to_time.to_i
     end
 
+    # @param z [Integer] Optional UTC offset
     # @return [RDT] Self at 00:00:00
-    def day_start
-      RDT.new(year, month, day, 0, 0, 0, zone)
+    def day_start(z = zone)
+      RDT.new(year, month, day, 0, 0, 0, z)
     end
 
+    # @param z [Integer] Optional UTC offset
     # @return [RDT] Self at 23:59:59
-    def day_end
-      RDT.new(year, month, day, 23, 59, 59, zone)
+    def day_end(z = zone)
+      RDT.new(year, month, day, 23, 59, 59, z)
     end
 
     # @return [Array] Only the year, month and day of self
     def ymd
       [ year, month, day ]
     end
+
+    # @return [Array] Only the hour, min and sec of self
+    def hms
+      [ hour, min, sec ]
+    end
+
   end
 end

data/lib/reminder.rb

@@ -1,5 +1,3 @@
-r 'tzinfo'
-
 module ICalPal
   # Class representing items from the <tt>Reminders</tt> database
   class Reminder
@@ -56,6 +54,12 @@ module ICalPal
       when 'sdate'              # For sorting
         @self['due_date']
 
+      when 'sday'
+        @self['due'].day_start(0) if @self['due']
+
+      when 'section'
+        (@self['section'])? @self['section'] : 'Others'
+
       when 'name', 'reminder', 'task' # Aliases
         @self['title']
 
@@ -67,11 +71,13 @@ module ICalPal
       super
 
       # Convert JSON arrays to Arrays
-      @self['tags'] = JSON.parse(obj['tags']) if obj['tags']
-      @self['location'] = JSON.parse(obj['location']).compact.uniq[0] if obj['location']
-      @self['proximity'] = JSON.parse(obj['proximity']).compact.uniq[0] if obj['proximity']
-      @self['radius'] = JSON.parse(obj['radius']).compact.uniq[0] if obj['radius']
-      @self['assignee'] = JSON.parse(obj['assignee']) if obj['assignee']
+      %w[ assignee tags ].each do |a|
+        @self[a] = JSON.parse(obj[a]) if obj[a]
+      end
+
+      %w[ location proximity radius ].each do |a|
+        @self[a] = JSON.parse(obj[a]).compact.uniq[0] if obj[a]
+      end
 
       # Section
       if @self['members']
@@ -95,14 +101,9 @@ module ICalPal
 
       # Due date
       if @self['due_date']
-        begin
-          @self['due_date'] += ITIME
-          zone = TZInfo::Timezone.get(@self['timezone'])
-        rescue TZInfo::InvalidTimezoneIdentifier
-          zone = '+00:00'
-        end
-
-        @self['due'] = RDT.from_time(Time.at(@self['due_date'], in: zone))
+        @self['due_date'] += ITIME
+        @self['due_date'] -= obj['utc_offset'] if obj['utc_offset']
+        @self['due'] = RDT.from_time(Time.at(@self['due_date']))
       end
 
       # Notes
@@ -141,6 +142,30 @@ module ICalPal
       @self['messaging'] = messaging
     end
 
+    # @see ICalPal.<=>
+    #
+    # When comparing sections, "Others" always goes last
+    def <=>(other)
+      $sort_attrs.each do |s|
+        next if self[s] == other[s]
+
+        # nil is always less than
+        return -1 if other[s].nil?
+        return 1 if self[s].nil?
+
+        if s == 'section'
+          # Section "Others" always goes last
+          return -1 if other[s] == 'Others'
+          return 1 if self[s] == 'Others'
+        end
+
+        return -1 if self[s] < other[s]
+        return 1 if self[s] > other[s]
+      end
+
+      0
+    end
+
     DEFAULT_COLOR = '#1BADF8'.freeze
     DEFAULT_SYMBOLIC_COLOR = 'blue'.freeze
 
@@ -164,9 +189,9 @@ r1.zNotes as notes,
 r1.zPriority as priority,
 r1.zContactHandles as messaging,
 r1.zDueDateDeltaAlertsData as alert,
-r1.zTimezone as timezone,
 r1.zckIdentifier as id,
 r1.zCompleted as completed,
+r1.zDisplayDateUpdatedForSecondsFromGMT as utc_offset,
 
 bl1.zBadgeEmblem as badge,
 bl1.zColor as color,

data/lib/store.rb

@@ -37,8 +37,6 @@ s1.type,
 
 FROM #{self.name.split('::').last} s1
 
-WHERE s1.delegated_account_owner_store_id IS NULL
-
 SQL
 
   end

data/lib/version.rb

@@ -1,4 +1,4 @@
 module ICalPal
   NAME = 'icalPal'.freeze
-  VERSION = '3.9.3'.freeze
+  VERSION = '3.10.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 3.9.3
+  version: 3.10.2
 platform: ruby
 authors:
 - Andy Rosen
@@ -22,7 +22,6 @@ extra_rdoc_files:
 files:
 - README.md
 - bin/icalPal
-- bin/icalpal
 - ext/extconf.rb
 - icalPal.gemspec
 - lib/EventKit.rb
@@ -62,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Command-line tool to query the macOS Calendar and Reminders
 test_files: []

data/bin/icalpal

@@ -1,361 +0,0 @@
-#!/usr/bin/env ruby
-
-# rubocop: disable Style/RedundantBegin
-
-# require a gem
-#
-# @param gem [String] The gem
-def r(gem)
-  begin
-    # puts "require \"#{gem}\""
-    require gem
-  rescue LoadError => e
-    $stderr.puts "FATAL: icalPal is missing a dependency: #{gem}"
-    $stderr.puts e
-    $stderr.puts
-    abort "Try installing with 'gem install #{gem}'"
-  end
-end
-
-# require_relative a library
-#
-# @param library [String] The library
-def rr(library)
-  begin
-    # puts "require_relative \"../lib/#{library}\""
-    require_relative "../lib/#{library}"
-  rescue LoadError => e
-    $stderr.puts "FATAL: Could not load library: #{library}"
-    $stderr.puts
-    abort e.message
-  end
-end
-
-# rubocop: enable Style/RedundantBegin
-
-%w[ logger csv json rdoc sqlite3 yaml ].each { |g| r g }
-%w[ icalPal defaults options utils ].each { |l| rr l }
-
-
-##################################################
-# Load options
-
-# All kids love log!
-$log = Logger.new(STDERR, { level: $defaults[:common][:debug] })
-$log.formatter = proc do |s, t, _p, m| # Severity, time, progname, msg
-  format("[%-5<sev>s] %<time>s [%<file>s:%<line>5s] - %<message>s\n",
-         {
-           sev: s,
-           time: t.strftime('%H:%M:%S.%L'),
-           file: caller(4, 1)[0].split('/')[-1].split(':')[0],
-           line: caller(4, 1)[0].split('/')[-1].split(':')[1],
-           message: m
-         })
-end
-
-$opts = ICalPal::Options.new.parse_options
-
-$rows = []                      # Rows from the database
-$sections = []                  # Calendar list sections
-$items = []                     # Items to be printed
-
-
-##################################################
-# All kids love log!
-
-$log.info("Options:\n#{$opts.to_json}")
-
-
-##################################################
-# Add an item to the list
-#
-# @param item[Object]
-
-def add(item)
-  $log.debug("Adding #{item.dump} #{item['UUID']} (#{item['title']})") if item['UUID']
-
-  $items.push(item)
-end
-
-
-##################################################
-# Load the data
-
-# What are we getting?
-klass = ICalPal.call($opts[:cmd])
-success = false
-
-# Get it
-$opts[:db].each do |db|
-  $log.debug("Trying #{db}")
-
-  if klass == ICalPal::Reminder
-    # Load all .sqlite files
-    $log.debug("Loading *.sqlite in #{db}")
-    Dir.glob("#{db}/*.sqlite").each do |d|
-      success = true
-
-      rows = klass.load_data(d, klass::QUERY)
-      $rows += rows
-
-      sections = klass.load_data(d, klass::SECTIONS_QUERY)
-      $sections += sections
-
-      $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
-    end
-  else
-    # Load database
-    rows = ICalPal.load_data(db, klass::QUERY)
-    $rows += rows
-
-    success = true
-
-    $log.info("Loaded #{rows.length} rows from #{db}")
-  end
-
-rescue Errno::EPERM
-  # Probably need Full Disk Access
-
-rescue SQLite3::CantOpenException
-  # Non-fatal exception, try the next one
-
-rescue StandardError => e
-  # Log the error and (try to) continue
-  $log.error("#{db}: #{e.message}")
-end
-
-# Make sure we opened at least one database
-unless success
-  $log.fatal('Could not open database')
-
-  # SQLite3 does not return useful error messages.  If any databases
-  # failed because of EPERM (operation not permitted), our parent
-  # process might need Full Disk Access, and we should suggest that.
-  eperm = 0
-
-  $opts[:db].each do |db|
-    # Use a real open to get a useful error
-    File.open(db).close
-  rescue Exception => e
-    $log.fatal("#{e.class}: #{db}")
-
-    eperm = 1 if e.instance_of?(Errno::EPERM)
-  end
-
-  if eperm.positive?
-    $stderr.puts
-    $stderr.puts "Does #{ancestor} have Full Disk Access in System Settings?"
-    $stderr.puts
-    $stderr.puts "Try running: open 'x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles'"
-  end
-
-  abort
-end
-
-$log.debug("Loaded #{$rows.length} #{klass} items")
-$log.info("Window is #{$opts[:from]} to #{$opts[:to]}") if $opts[:from]
-
-
-##################################################
-# Process the data
-
-# Add rows
-$rows.each do |row|
-  # --es/--is
-  next if $opts[:es].any? row['account']
-  next unless $opts[:is].empty? || ($opts[:is].any? row['account'])
-
-  # --ec/--ic
-  unless klass == ICalPal::Store || !row['calendar']
-    next if $opts[:ec].any? row['calendar']
-    next unless $opts[:ic].empty? || ($opts[:ic].any? row['calendar'])
-  end
-
-  # Instantiate an item
-  item = klass.new(row)
-
-  # --et/--it
-  next if $opts[:et].any? item['type']
-  next unless $opts[:it].empty? || ($opts[:it].any? item['type'])
-
-  # --el/--il
-  next if $opts[:el].any? item['list_name']
-  next unless $opts[:il].empty? || ($opts[:il].any? item['list_name'])
-
-  # --match
-  if $opts[:match]
-    r = $opts[:match].split('=')
-
-    if item[r[0]].to_s.respond_to?(:match)
-      next unless item[r[0]].to_s =~ Regexp.new(r[1], Regexp::IGNORECASE)
-    end
-  end
-
-  if item.is_a?(ICalPal::Event)
-    # Check for all-day and cancelled events
-    next if $opts[:ea] && item['all_day'].positive?
-    next if $opts[:ia] && !item['all_day'].positive?
-    next if item['status'] == :canceled
-
-    (item['has_recurrences'].positive?)?
-      item.recurring.each { |j| add(j) } :
-      item.non_recurring.each { |j| add(j) }
-  else
-    # Check for completed or dated reminders
-    if item.is_a?(ICalPal::Reminder)
-      next if $opts[:ed] && item['completed'].zero?
-      next unless $opts[:id] || item['completed'].zero?
-
-      next if $opts[:dated] == 1 && item['due_date'] && item['due_date'].positive?
-      next if $opts[:dated] == 2 && (!item['due_date'] || item['due_date'].zero?)
-
-      if $opts[:dated] == 3
-        next unless item['due_date']
-        next unless item['due_date'].between?($opts[:from].to_i, $opts[:to].to_i)
-      end
-    end
-
-    add(item)
-  end
-end
-
-# Add placeholders for empty days
-if $opts[:sed] && $opts[:sd] && klass == ICalPal::Event
-  days = $items.collect { |i| i['sday'] }.uniq.sort
-
-  $opts[:days].times do |n|
-    day = $opts[:from] + n
-    $items.push(klass.new(day)) unless days.any? { |i| i.to_s == day.to_s }
-  end
-end
-
-# Sort the rows
-begin
-  sort = []
-  sort.push $opts[:sep] if $opts[:sep]
-  sort.push $opts[:sort] if $opts[:sort]
-  sort.push 'sdate'
-
-  $log.info("Sorting #{$items.count} items by #{sort}, reverse #{$opts[:reverse].inspect}")
-
-  $items.sort_by! { |i| [ i[sort[0]], i[sort[1]], i[sort[2]] ] }
-  $items.reverse! if $opts[:reverse]
-rescue Exception => e
-  $log.info("Sorting failed: #{e}\n")
-end
-
-$log.debug("#{$items.count} items remain")
-
-# Configure formatting
-mu = case $opts[:output]
-     when 'ansi' then RDoc::Markup::ToAnsi.new
-     when 'default' then RDoc::Markup::ToICalPal.new($opts)
-     when 'html'
-       rdoc = RDoc::Options.new
-       rdoc.pipe = true
-       rdoc.output_decoration = false
-       RDoc::Markup::ToHtml.new(rdoc)
-     when 'md' then RDoc::Markup::ToMarkdown.new
-     when 'rdoc' then RDoc::Markup::ToRdoc.new
-     when 'toc' then RDoc::Markup::ToTableOfContents.new
-     end
-
-
-##################################################
-# Print the data
-
-items = $items[0..($opts[:li] - 1)]
-
-unless mu
-  $log.debug("Output in #{$opts[:output]} format")
-
-  puts case $opts[:output]
-       when 'csv'
-         # Get all headers
-         headers = []
-         items.each { |i| headers += i.keys }
-         headers.uniq!
-
-         # Populate a CSV::Table
-         table = CSV::Table.new([], headers: headers)
-         items.each { |i| table << i.to_csv(headers) }
-
-         table
-       when 'hash' then items.map { |i| i.self }
-       when 'json' then items.map { |i| i.self }.to_json
-       when 'xml'
-         xml = items.map { |i| "<#{$opts[:cmd].chomp('s')}>#{i.to_xml}</#{$opts[:cmd].chomp('s')}>" }
-         "<#{$opts[:cmd]}>\n#{xml.join}</#{$opts[:cmd]}>"
-       when 'yaml' then items.map { |i| i.self }.to_yaml
-       when 'remind' then items.map { |i|
-           "REM #{i['sdate'].strftime('%F AT %R')} " +
-             "DURATION #{((i['edate'] - i['sdate']).to_f * 1440).to_i} " +
-             "MSG #{i['title'].gsub(/([[:cntrl:]])/) { |c| c.dump[1..-2] }}"
-         }.join("\n")
-       else abort "No formatter for #{$opts[:output]}"
-       end
-
-  exit
-end
-
-$log.debug("Formatting with #{mu.inspect}")
-
-doc = RDoc::Markup::Document.new
-section = nil
-
-items.each_with_index do |i, j|
-  $log.debug("Print #{j}: #{i.inspect}")
-
-  # --li
-  break if $opts[:li].positive? && j >= $opts[:li]
-
-  # Use RDoc::Markup::Verbatim to save the item
-  v = RDoc::Markup::Verbatim.new
-  v.format = i
-  doc << v
-
-  # Sections
-  if $opts[:sep] && section != i[$opts[:sep]]
-    $log.debug("New section '#{$opts[:sep]}': #{i[$opts[:sep]]}")
-
-    doc << RDoc::Markup::Raw.new($opts[:sep])
-
-    doc << RDoc::Markup::BlankLine.new if j.positive?
-    doc << RDoc::Markup::Heading.new(1, i[$opts[:sep]].to_s)
-    doc << RDoc::Markup::Rule.new(0)
-
-    section = i[$opts[:sep]]
-  end
-
-  # Item
-  props = RDoc::Markup::List.new(:BULLET)
-
-  # Properties
-  $opts[:props].each_with_index do |prop, k|
-    value = i[prop]
-
-    next unless value
-    next if value.is_a?(Array) && !value[0]
-    next if value.is_a?(String) && value.empty?
-
-    $log.debug("#{prop}: #{value}")
-
-    # Use Raw to save the property
-    props << RDoc::Markup::Raw.new(prop)
-
-    if k.positive?
-      props << RDoc::Markup::BlankLine.new unless (i['placeholder'] || $opts[:ps])
-      props << RDoc::Markup::ListItem.new(prop, RDoc::Markup::Paragraph.new(value)) unless (i['placeholder'])
-    else
-      # First property, value only
-      props << RDoc::Markup::Heading.new(2, value.to_s)
-    end
-  end
-
-  # Print it
-  props << RDoc::Markup::BlankLine.new unless props.empty?
-
-  doc << props
-end
-
-print doc.accept(mu)