icalPal 3.9.2 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 726009d217b28c21e4a35339eef172f033429792b68d4c36157e6234f6221cab
-  data.tar.gz: cf2ee63838a89a8acf25719154d03654e1bbf1fe47459481ddcb5e09f19a31f0
+  metadata.gz: 014f8b5179cd56cb757404df75a3d23145907d2f40b4186031ed5028ad5e92af
+  data.tar.gz: 8abe6a5c80c695fa61b0000ae20c52fcbd1fab29ab326fcb89fe1a4d469fae82
 SHA512:
-  metadata.gz: 7120724aaa3be333484a6feca64cb1cf5b6f5ded5e93b5a4f6c99ec6e247ddd659bcc7c4f3af70b7b3e81dc28b1221bebac88d29c70bc497a89f242689ae088b
-  data.tar.gz: b452c105b9ea954aa9c68a9b7a4088599b32b0b1b29e3f783804ec692eef65e8c7a1d916d3b9061c475ed880b950f9eebf31d870c8eda7751f33e4fd79bc9ae9
+  metadata.gz: 24bafd17756e9e4ccce28dc0b23ea421d334f3d9c58f3fe62dd07cf26777b47c56587a52e61c5995a730b823a3ad2f0ebc8bef460205ebcde981df3e0bd35108
+  data.tar.gz: a21caa7650b168542625a176909e05e0f87825c452015e7292f5297aa8b9d96863dc22c1f921a197a97769c9b3fb5db0a593adf1b22784b1874e03ecb05a8b34

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,18 +29,25 @@ Calendar or Reminders database.
 
 ## Installation
 
-As a system-wide Ruby gem:
+Install icalPal for all users:
 
 ```
 gem install icalPal
 ```
 
-or in your home diretory:
+For only you:
 
 ```
 gem install --user-install icalPal
 ```
 
+As a [Homebrew](https://brew.sh) formula:
+
+```
+brew tap ajrosen/tap
+brew install icalPal
+```
+
 ## Features
 
 ### Compatability with icalBuddy
@@ -57,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
@@ -72,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
@@ -91,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)
@@ -136,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
@@ -152,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
@@ -185,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()
@@ -200,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
@@ -224,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
@@ -254,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
 
@@ -288,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
 
@@ -334,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

@@ -13,7 +13,7 @@ def r(gem)
     $stderr.puts "FATAL: icalPal is missing a dependency: #{gem}"
     $stderr.puts e
     $stderr.puts
-    abort "Try installing with 'gem install --user-install #{gem}'"
+    abort "Try installing with 'gem install #{gem}'"
   end
 end
 
@@ -63,7 +63,7 @@ $items = []                     # Items to be printed
 ##################################################
 # All kids love log!
 
-$log.info("Options: #{$opts}")
+$log.info("Options:\n#{$opts.to_json}")
 
 
 ##################################################
@@ -90,39 +90,38 @@ $opts[:db].each do |db|
   $log.debug("Trying #{db}")
 
   if klass == ICalPal::Reminder
-    begin
-      # 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
+    # Load all .sqlite files
+    $log.debug("Loading *.sqlite in #{db}")
+    Dir.glob("#{db}/*.sqlite").each do |d|
+      success = true
 
-        sections = klass.load_data(d, klass::SECTIONS_QUERY)
-        $sections += sections
+      rows = klass.load_data(d, klass::QUERY)
+      $rows += rows
 
-        $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
-      rescue SQLite3::CantOpenException
-        # Non-fatal exception, try the next one
-      end
+      sections = klass.load_data(d, klass::SECTIONS_QUERY)
+      $sections += sections
 
-    rescue Errno::EPERM
-      # Probably need Full Disk Access
+      $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
     end
   else
     # Load database
-    begin
-      rows = ICalPal.load_data(db, klass::QUERY)
-      $rows += rows
+    rows = ICalPal.load_data(db, klass::QUERY)
+    $rows += rows
 
-      success = true
+    success = true
 
-      $log.info("Loaded #{rows.length} rows from #{db}")
-    rescue SQLite3::CantOpenException
-      # Non-fatal exception, try the next one
-    end
+    $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
@@ -153,6 +152,7 @@ unless success
   abort
 end
 
+$log.debug("Loaded #{$rows.length} #{klass} items")
 $log.info("Window is #{$opts[:from]} to #{$opts[:to]}") if $opts[:from]
 
 
@@ -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")
@@ -290,7 +290,7 @@ unless mu
        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] } }"
+             "MSG #{i['title'].gsub(/([[:cntrl:]])/) { |c| c.dump[1..-2] }}"
          }.join("\n")
        else abort "No formatter for #{$opts[:output]}"
        end
@@ -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/bin/icalpal

@@ -13,7 +13,7 @@ def r(gem)
     $stderr.puts "FATAL: icalPal is missing a dependency: #{gem}"
     $stderr.puts e
     $stderr.puts
-    abort "Try installing with 'gem install --user-install #{gem}'"
+    abort "Try installing with 'gem install #{gem}'"
   end
 end
 
@@ -63,7 +63,7 @@ $items = []                     # Items to be printed
 ##################################################
 # All kids love log!
 
-$log.info("Options: #{$opts}")
+$log.info("Options:\n#{$opts.to_json}")
 
 
 ##################################################
@@ -90,39 +90,38 @@ $opts[:db].each do |db|
   $log.debug("Trying #{db}")
 
   if klass == ICalPal::Reminder
-    begin
-      # 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
+    # Load all .sqlite files
+    $log.debug("Loading *.sqlite in #{db}")
+    Dir.glob("#{db}/*.sqlite").each do |d|
+      success = true
 
-        sections = klass.load_data(d, klass::SECTIONS_QUERY)
-        $sections += sections
+      rows = klass.load_data(d, klass::QUERY)
+      $rows += rows
 
-        $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
-      rescue SQLite3::CantOpenException
-        # Non-fatal exception, try the next one
-      end
+      sections = klass.load_data(d, klass::SECTIONS_QUERY)
+      $sections += sections
 
-    rescue Errno::EPERM
-      # Probably need Full Disk Access
+      $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
     end
   else
     # Load database
-    begin
-      rows = ICalPal.load_data(db, klass::QUERY)
-      $rows += rows
+    rows = ICalPal.load_data(db, klass::QUERY)
+    $rows += rows
 
-      success = true
+    success = true
 
-      $log.info("Loaded #{rows.length} rows from #{db}")
-    rescue SQLite3::CantOpenException
-      # Non-fatal exception, try the next one
-    end
+    $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
@@ -153,6 +152,7 @@ unless success
   abort
 end
 
+$log.debug("Loaded #{$rows.length} #{klass} items")
 $log.info("Window is #{$opts[:from]} to #{$opts[:to]}") if $opts[:from]
 
 
@@ -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")
@@ -290,7 +290,7 @@ unless mu
        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] } }"
+             "MSG #{i['title'].gsub(/([[:cntrl:]])/) { |c| c.dump[1..-2] }}"
          }.join("\n")
        else abort "No formatter for #{$opts[:output]}"
        end
@@ -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 timezone ]
+  dependencies = %w[ plist tzinfo ]
 
   if RUBY_VERSION >= '3.4'
     # bigdecimal is not part of the default gems starting from Ruby 3.4.0.
@@ -33,15 +33,15 @@ begin
     # So neither environment can install the other's sqlite3 gem.  We
     # must install sqlite3, but iff we are not building with macOS'
     # Ruby installation.
-    dependencies.push('sqlite3') 
+    dependencies.push('sqlite3')
   end
 
   di = Gem::DependencyInstaller.new(install_dir: gemdir)
   dependencies.each { |d| di.install(d) }
-rescue Exception => e
+rescue Exception
   exit(1)
-end 
+end
 
-File.write("Makefile", "clean:\n\ttrue\ninstall:\n\ttrue")
+File.write('Makefile', "clean:\n\ttrue\ninstall:\n\ttrue")
 
 exit(0)

data/lib/ToICalPal.rb

@@ -76,7 +76,7 @@ class RDoc::Markup::ToICalPal < RDoc::Markup::Formatter
   def accept_list_start(_arg)
     return if @opts[:nb] || @item['placeholder']
 
-    if @item['due_date'] && (@item['due_date']).between?(0, $now.to_i)
+    if @item['due_date'] && (@item['due_date']).between?(0, $nowto_i)
       # Use alert bullet for overdue items
       @res << "#{@opts[:ab]} "
     else

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

@@ -1,7 +1,8 @@
 # Does anybody really know what time it is?
-now = Time.now
-$now = ICalPal::RDT.from_time(now)
-$today = ICalPal::RDT.new(*$now.to_a[0..2] + [ 0, 0, 0 ])
+$now = Time.now
+$nowto_i = $now.to_i
+$nowrdt = ICalPal::RDT.from_time($now)
+$today = $nowrdt.day_start
 
 # Defaults
 $defaults = {
@@ -48,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

@@ -1,5 +1,3 @@
-r 'timezone'
-
 module ICalPal
   # Class representing items from the <tt>CalendarItem</tt> table
   class Event
@@ -13,19 +11,19 @@ module ICalPal
     def []=(k, v)
       @self[k] = v
 
-      @self['sctime'] = Time.at(@self['sdate'].to_i, in: '+00:00') if k == 'sdate'
-      @self['ectime'] = Time.at(@self['edate'].to_i, in: '+00:00') if k == 'edate'
+      @self['sctime'] = Time.at(@self['sdate'].to_i) if k == 'sdate'
+      @self['ectime'] = Time.at(@self['edate'].to_i) if k == 'edate'
     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
@@ -50,17 +48,17 @@ module ICalPal
         (@self['notes'])? @self['notes'].strip.gsub("\n", $opts[:nnr]) : nil
 
       when 'sday'               # pseudo-property
-        RDT.new(*@self['sdate'].to_a[0..2])
+        @self['sdate'].day_start(0)
 
       when 'status'             # Integer -> String
         EventKit::EKEventStatus.select { |_k, v| v == @self['status'] }.keys[0]
 
-      when 'event', 'name', 'title' # title[ (age N)]
-        @self['title'] + ((@self['calendar'] == 'Birthdays')? " (age #{self['age']})" : '')
-
       when 'uid'                # for icalBuddy
         @self['UUID']
 
+      when 'event', 'name', 'title' # title[ (age N)]
+        @self['title'] + ((@self['calendar'] == 'Birthdays')? " (age #{self['age']})" : '')
+
       else @self[k]
       end
     end
@@ -78,7 +76,7 @@ module ICalPal
         'sdate' => obj,
         'placeholder' => true,
         'title' => 'Nothing.',
-      } if obj.is_a?(DateTime)
+      } if $opts[:sed] && obj.is_a?(DateTime)
 
       super
 
@@ -92,17 +90,17 @@ module ICalPal
       obj.keys.select { |i| i.end_with? '_date' }.each do |k|
         next unless obj[k]
 
-        begin
-          zone = Timezone.fetch(obj['start_tz'])
-        rescue Timezone::Error::InvalidZone
-          zone = '+00:00'
-        end
+        zone = nil
+        zone = '+00:00' if obj['all_day'].positive?
 
         # Save as seconds, Time, RDT
         ctime = obj[k] + ITIME
+        ctime -= Time.at(ctime).utc_offset if obj["#{k}_tz"] == '_float' && !zone
+        ttime = Time.at(ctime, in: zone)
+
         @self["#{k[0]}seconds"] = ctime
-        @self["#{k[0]}ctime"] = Time.at(ctime)
-        @self["#{k[0]}date"] = RDT.from_time(Time.at(ctime, in: zone))
+        @self["#{k[0]}ctime"] = ttime
+        @self["#{k[0]}date"] = RDT.from_time(ttime)
       end
 
       @self.delete('unique_identifier')
@@ -122,14 +120,14 @@ module ICalPal
       return events if nDays > 100_000
 
       # If multi-day, each (unique) day needs to end at 23:59:59
-      self['edate'] = RDT.new(*@self['sdate'].to_a[0..2] + [ 23, 59, 59 ]) if nDays.positive?
+      self['edate'] = RDT.new(*@self['sdate'].to_a[0..2] + [ 23, 59, 59 ], @self['sdate'].zone) if nDays.positive?
 
       # Repeat for multi-day events
       (nDays + 1).times do |i|
-        break if self['sdate'] > $opts[:to]
+        break unless $opts[:now] || @self['sdate'] <= $opts[:to]
 
-        if in_window?(self['sdate'], self['edate'])
-          self['daynum'] = i + 1 if nDays.positive?
+        if in_window?(@self['sdate'], @self['edate'])
+          @self['daynum'] = i + 1 if nDays.positive?
           events.push(clone)
         end
 
@@ -156,7 +154,7 @@ module ICalPal
       changes = [ { orig_date: -1 } ]
       changes += $rows.select { |r| r['orig_item_id'] == self['ROWID'] }
 
-      while self['sdate'] <= stop
+      while @self['sdate'] <= stop
         # count
         break if self['count'].positive? && count > self['count']
 
@@ -178,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
@@ -240,8 +238,8 @@ module ICalPal
         m = mo.to_i
 
         # Set dates to the first of <m>
-        nsdate = RDT.new(self['sdate'].year, m, 1, self['sdate'].hour, self['sdate'].minute, self['sdate'].second)
-        nedate = RDT.new(self['edate'].year, m, 1, self['edate'].hour, self['edate'].minute, self['edate'].second)
+        nsdate = RDT.new(@self['sdate'].year, m, 1, @self['sdate'].hour, @self['sdate'].min, @self['sdate'].sec, @self['sdate'].zone)
+        nedate = RDT.new(@self['edate'].year, m, 1, @self['edate'].hour, @self['edate'].min, @self['edate'].sec, @self['edate'].zone)
 
         # ...but not in the past
         nsdate >>= 12 if nsdate.month < m
@@ -266,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['sdate'].wday
+              diff += 7 if diff.negative?
 
-            c['sdate'] += diff
-            c['edate'] += diff
+              t1 = Time.at(c[d].to_time)
+              t2 = Time.at(t1.to_i + (diff * 86_400))
+              t2 += (t1.gmt_offset - t2.gmt_offset)
+
+              c[d] = RDT.from_time(t2)
+            end
           end
 
           o.push(clone(c)) if in_window?(c['sdate'], c['edate'])
@@ -282,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
 
@@ -305,15 +308,15 @@ module ICalPal
     # @return [Boolean]
     def in_window?(s, e)
       if $opts[:now]
-        if ($now >= s && $now < e)
+        if $nowto_i.between?(s.to_i, e.to_i)
           $log.debug("now: #{s} to #{e} vs. #{$now}")
           true
         else
           $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]}")
@@ -340,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

@@ -40,6 +40,8 @@ module ICalPal
 
       # Prepare the query
       stmt = db.prepare(q)
+
+      # Check for "list" and "all" pseudo-properties
       abort(stmt.columns.sort.join(' ')) if $opts[:props].any? 'list'
       $opts[:props] = stmt.columns - $opts[:eep] if $opts[:props].any? 'all'
 
@@ -50,21 +52,6 @@ module ICalPal
       # Close the database
       db.close
       $log.debug("Closed #{db_file}")
-
-    rescue SQLite3::BusyException => e
-      $log.error("Non-fatal error closing database #{db.filename}")
-      raise e
-
-    rescue SQLite3::CantOpenException => e
-      $log.debug("Can't open #{db_file}")
-      raise e
-
-    rescue SQLite3::SQLException => e
-      $log.info("#{db_file}: #{e}")
-      raise e
-
-    rescue SQLite3::Exception => e
-      abort("#{db_file}: #{e}")
     end
 
     rows
@@ -123,7 +110,7 @@ module ICalPal
   def self.nth(n, dow, m)
     # Get the number of days in the month by advancing to the first of
     # the next month, then going back one day
-    a = [ RDT.new(m.year, m.month, 1, m.hour, m.minute, m.second) ]
+    a = [ RDT.new(m.year, m.month, 1, m.hour, m.min, m.sec, m.zone) ]
     a[1] = (a[0] >> 1) - 1
 
     # Reverse it if going backwards
@@ -137,7 +124,7 @@ module ICalPal
     end
   end
 
-  # Epoch + 31 years
+  # Epoch + 31 years (Mon Jan  1 00:00:00 UTC 2001)
   ITIME = 978_307_200
 
   # Days of the week abbreviations used in recurrence rules
@@ -162,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

@@ -239,7 +239,7 @@ module ICalPal
 
           @op.parse!(o, into: cf)
         rescue StandardError
-        end unless cli[:norc]
+        end unless cli[:norc] && !cli[:cf]
 
         # Find command
         cli[:cmd] ||= @op.default_argv[0]
@@ -254,22 +254,43 @@ module ICalPal
         cli[:cmd] = cli[:cmd].sub('reminders', 'tasks')
         cli[:cmd] = cli[:cmd].sub('datedReminders', 'datedTasks')
 
-        # Parse eventsNow and eventsToday commands
-        cli[:cmd].match('events(Now|Today|Remaining)(\+[0-9]+)?') do |m|
-          cli[:now] = true if m[1] == 'Now'
-          cli[:days] = (m[1] == 'Today')? m[2].to_i : 1
+        # Handle events command variants
+        cli[:cmd].match('events(?<v>Now|Today|Remaining)(?<n>\+[0-9]+)?') do |m|
+          cli[:cmd] = 'events'
+
+          case m.named_captures['v']
+          when 'Now'
+            cli[:now] = true
 
-          if m[1] == 'Remaining'
-            cli[:n] = true
-            cli[:days] = 0
+          when 'Today'
+            cli[:from] = $today
+            cli[:days] = (m.named_captures['n'])? m.named_captures['n'].to_i : 1
+
+          when 'Remaining'
+            cli[:from] = RDT.from_time($now)
+            cli[:to] = $today.day_end(0)
+            cli[:days] = 1
           end
+        end
 
-          cli[:from] = $today
-          cli[:to] = $today + cli[:days] if cli[:days]
-          cli[:days] = Integer(cli[:to] - cli[:from])
+        # Handle tasks command variants
+        if cli[:cmd] =~ /tasks/i
+          case cli[:cmd]
+          when 'undatedTasks'
+            cli[:dated] = 1
 
-          cli[:cmd] = 'events'
-        end if cli[:cmd]
+          when 'datedTasks'
+            cli[:dated] = 2
+
+          when 'tasksDueBefore'
+            cli[:dated] = 3
+            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
 
         # Must have a valid command
         raise(OptionParser::InvalidArgument, "Unknown COMMAND #{cli[:cmd]}") unless (COMMANDS.any? cli[:cmd])
@@ -281,13 +302,6 @@ module ICalPal
           .merge(env)
           .merge(cli)
 
-        # Other tasks commands
-        if opts[:cmd] == 'tasksDueBefore'
-          opts.delete(:days) unless opts[:days]
-          opts[:from] = RDT.from_epoch(0) unless opts[:from]
-        end
-        opts[:cmd] = 'tasks' if %w[ datedTasks undatedTasks tasksDueBefore ].include? opts[:cmd]
-
         # Make sure opts[:db] and opts[:tasks] are Arrays
         opts[:db] = [ opts[:db] ] unless opts[:db].is_a?(Array)
         opts[:tasks] = [ opts[:tasks] ] unless opts[:db].is_a?(Array)
@@ -310,11 +324,19 @@ module ICalPal
         opts[:days] -= 1 if opts[:days]
 
         if opts[:from]
+          # -n
+          opts[:from] = RDT.from_time($now) if opts[:n]
+
+          # Default :to is :from + 1 day
+          # --days overrides
           opts[:to] ||= opts[:from] + 1 if opts[:from]
           opts[:to] = opts[:from] + opts[:days] if opts[:days]
-          opts[:to] = RDT.new(*opts[:to].to_a[0..2] + [ 23, 59, 59 ])
+
+          # Make :to be end of day
+          opts[:to] = opts[:to].day_end
+
+          # Calculate days unless specified
           opts[:days] ||= Integer(opts[:to] - opts[:from])
-          opts[:from] = $now if opts[:n]
         end
 
         # Sorting
@@ -348,7 +370,9 @@ module ICalPal
     end
 
     # Commands that can be run
-    COMMANDS = %w[events eventsToday eventsNow eventsRemaining tasks datedTasks undatedTasks tasksDueBefore calendars accounts].freeze
+    COMMANDS = %w[events eventsToday eventsNow eventsRemaining
+                  tasks datedTasks undatedTasks tasksDueBefore
+                  calendars accounts].freeze
 
     # Supported output formats
     OUTFORMATS = %w[ansi csv default hash html json md rdoc remind toc xml yaml].freeze

data/lib/rdt.rb

@@ -4,7 +4,7 @@ module ICalPal
 
     # Create a new RDT from a Time object
     def self.from_time(t)
-      new(*t.to_a[0..5].reverse)
+      new(*t.to_a[0..5].reverse, (t.gmt_offset / 3600).to_s)
     end
 
     # Create a new RDT from seconds since epoch
@@ -42,8 +42,9 @@ module ICalPal
     #  today.
     def to_s
       return strftime($opts[:df]) if $opts && $opts[:nrd] && $opts[:df]
+      return super unless $today && $opts
 
-      case Integer(RDT.new(year, month, day) - $today)
+      case Integer(RDT.new(*ymd, month, day) - $today)
       when -2 then 'day before yesterday'
       when -1 then 'yesterday'
       when 0 then 'today'
@@ -67,17 +68,31 @@ module ICalPal
       to_time.to_i
     end
 
+    # @param [Integer] Optional UTC offset
+    # @return [RDT] Self at 00:00:00
+    def day_start(z = zone)
+      RDT.new(year, month, day, 0, 0, 0, z)
+    end
+
+    # @param [Integer] Optional UTC offset
+    # @return [RDT] Self at 23:59:59
+    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
 
-    # @see ICalPal::RDT.to_s
-    #
-    # @return [Boolean]
-    def ==(other)
-      self.to_s == other.to_s
+    # @return [Array] Only the hour, min and sec of self
+    def hms
+      [ hour, min, sec ]
     end
 
+    # @return [Array] Only the year, month and day of self
+    def ymd
+      [ year, month, day ]
+    end
   end
 end

data/lib/reminder.rb

@@ -1,4 +1,4 @@
-r 'timezone'
+r 'tzinfo'
 
 module ICalPal
   # Class representing items from the <tt>Reminders</tt> database
@@ -8,6 +8,12 @@ module ICalPal
     def self.load_data(db_file, q)
       # Load items
       ICalPal.load_data(db_file, q)
+
+    rescue SQLite3::SQLException => e
+      # Data-local.sqlite does not have zremcdBaseList
+      raise e unless e.message =~ /no such table/
+
+      []
     end
 
     def [](k)
@@ -50,6 +56,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']
 
@@ -61,11 +73,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']
@@ -91,8 +105,8 @@ module ICalPal
       if @self['due_date']
         begin
           @self['due_date'] += ITIME
-          zone = Timezone.fetch(@self['timezone'])
-        rescue Timezone::Error::InvalidZone
+          zone = TZInfo::Timezone.get(@self['timezone'])
+        rescue TZInfo::InvalidTimezoneIdentifier
           zone = '+00:00'
         end
 
@@ -135,6 +149,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
 
@@ -169,15 +207,12 @@ bl1.zParentList as parent,
 bl1.zSharingStatus as shared,
 bl1.zShouldCategorizeGroceryItems as grocery,
 
--- section members
 json(bl1.ZMembershipsOfRemindersInSectionsAsData) -> '$.memberships' AS members,
 
--- group
 (SELECT zName
  FROM zremcdBaseList bl2
  WHERE bl2.z_pk = bl1.zParentList) AS 'group',
 
--- location
 (SELECT json_group_array(zremcdObject.zTitle)
 FROM zremcdObject
 WHERE zremcdObject.z_pk IN (
@@ -186,7 +221,6 @@ WHERE zremcdObject.z_pk IN (
  WHERE zremcdObject.zReminder = r1.z_pk
 )) AS location,
 
--- proximity
 (SELECT json_group_array(zremcdObject.zProximity)
  FROM zremcdObject
  WHERE zremcdObject.z_pk IN (
@@ -195,7 +229,6 @@ WHERE zremcdObject.z_pk IN (
   WHERE zremcdObject.zReminder = r1.z_pk
  )) AS proximity,
 
--- radius
 (SELECT json_group_array(zremcdObject.zRadius)
  FROM zremcdObject
  WHERE zremcdObject.z_pk IN (
@@ -204,17 +237,15 @@ WHERE zremcdObject.z_pk IN (
   WHERE zremcdObject.zReminder = r1.z_pk
  )) AS radius,
 
--- tags
 (SELECT json_group_array(zName)
  FROM zremcdHashtagLabel
  WHERE zremcdHashtagLabel.z_pk IN (
 	SELECT zremcdObject.zHashtagLabel
 	FROM zremcdObject
-	JOIN zremcdreminder ON zremcdObject.zReminder3 = r1.z_pk
+	JOIN zremcdReminder ON zremcdObject.zReminder3 = r1.z_pk
 	WHERE zremcdObject.zReminder3 = r1.z_pk
  )) AS tags,
 
--- assignee
 (SELECT
  json_array(zNickname, zFirstName, zLastName, zAddress1)
  FROM zremcdObject
@@ -224,7 +255,6 @@ WHERE zremcdObject.z_pk IN (
   WHERE zReminder1 = r1.z_pk
 )) AS assignee,
 
--- url
 (SELECT zURL
  FROM zremcdObject
  WHERE zReminder2 = r1.z_pk) AS url

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.2'.freeze
+  VERSION = '3.10.0'.freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.10.0
 platform: ruby
 authors:
 - Andy Rosen
 bindir: bin
 cert_chain: []
-date: 2025-08-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   Inspired by icalBuddy and maintains close compatability.  Includes
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Command-line tool to query the macOS Calendar and Reminders
 test_files: []