icalPal 3.9.2 → 3.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 726009d217b28c21e4a35339eef172f033429792b68d4c36157e6234f6221cab
-  data.tar.gz: cf2ee63838a89a8acf25719154d03654e1bbf1fe47459481ddcb5e09f19a31f0
+  metadata.gz: 4853d1f050b001c63c1890618f5393eaee86c812f86cacf8be8b9da483fc67d1
+  data.tar.gz: ae170e19546fc153bdfbcd6cd89e02ac91c694e2c393e6624e31d437a5b03a34
 SHA512:
-  metadata.gz: 7120724aaa3be333484a6feca64cb1cf5b6f5ded5e93b5a4f6c99ec6e247ddd659bcc7c4f3af70b7b3e81dc28b1221bebac88d29c70bc497a89f242689ae088b
-  data.tar.gz: b452c105b9ea954aa9c68a9b7a4088599b32b0b1b29e3f783804ec692eef65e8c7a1d916d3b9061c475ed880b950f9eebf31d870c8eda7751f33e4fd79bc9ae9
+  metadata.gz: 3bf5728beb2504a19f2fae851413c26c6ee192fe2f09e066f8f9b1887e3eb16102eb9a89a4eb5e717e727564e8ca4a74bd09dc3d2743974cf2d33a24d7b25b5d
+  data.tar.gz: b60b90e37a562ca7df73c53e0e6ade623baa857b3f520a7faded502e7d588c7cbcb3ef2ee02bc9f486bd840f11b4e7638d92f769570e6b216e3bff9b2eaae5af

data/README.md

@@ -32,12 +32,19 @@ As a system-wide Ruby gem:
 gem install icalPal
 ```
 
-or in your home diretory:
+In your home directory:
 
 ```
 gem install --user-install icalPal
 ```
 
+As a [Homebrew](https://brew.sh) formula:
+
+```
+brew tap ajrosen/tap
+brew install icalPal
+```
+
 ## Features
 
 ### Compatability with icalBuddy

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
+    # 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
+      rows = klass.load_data(d, klass::QUERY)
+      $rows += rows
 
-        sections = klass.load_data(d, klass::SECTIONS_QUERY)
-        $sections += sections
+      sections = klass.load_data(d, klass::SECTIONS_QUERY)
+      $sections += sections
 
-        $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
-      rescue SQLite3::CantOpenException
-        # Non-fatal exception, try the next one
-      end
-
-    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]
 
 
@@ -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

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
+    # 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
+      rows = klass.load_data(d, klass::QUERY)
+      $rows += rows
 
-        sections = klass.load_data(d, klass::SECTIONS_QUERY)
-        $sections += sections
+      sections = klass.load_data(d, klass::SECTIONS_QUERY)
+      $sections += sections
 
-        $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
-      rescue SQLite3::CantOpenException
-        # Non-fatal exception, try the next one
-      end
-
-    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]
 
 
@@ -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

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/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 = {

data/lib/event.rb

@@ -1,5 +1,3 @@
-r 'timezone'
-
 module ICalPal
   # Class representing items from the <tt>CalendarItem</tt> table
   class Event
@@ -13,8 +11,8 @@ 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+,
@@ -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
 
       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 obj.is_a?(DateTime) && $opts[:sed]
 
       super
 
@@ -92,17 +90,14 @@ 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
-
         # Save as seconds, Time, RDT
         ctime = obj[k] + ITIME
+        ctime -= $now.utc_offset if obj['start_tz'] == '_float'
+        ttime = Time.at(ctime)
+
         @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 +117,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 +151,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']
 
@@ -240,8 +235,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
@@ -305,7 +300,7 @@ 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

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

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,31 @@ 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'
 
-          if m[1] == 'Remaining'
-            cli[:n] = true
-            cli[:days] = 0
-          end
+          case m.named_captures['v']
+          when 'Now'
+            cli[:now] = true
 
-          cli[:from] = $today
-          cli[:to] = $today + cli[:days] if cli[:days]
-          cli[:days] = Integer(cli[:to] - cli[:from])
+          when 'Today'
+            cli[:from] = $today
+            cli[:days] = (m.named_captures['n'])? m.named_captures['n'].to_i : 1
 
-          cli[:cmd] = 'events'
-        end if cli[:cmd]
+          when 'Remaining'
+            cli[:from] = RDT.from_time($now)
+            cli[:to] = $today.day_end
+            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]
+        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])
@@ -281,13 +290,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 +312,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 +358,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,19 @@ module ICalPal
       to_time.to_i
     end
 
-    # @return [Array] Only the year, month and day of self
-    def ymd
-      [ year, month, day ]
+    # @return [RDT] Self at 00:00:00
+    def day_start
+      RDT.new(year, month, day, 0, 0, 0, zone)
     end
 
-    # @see ICalPal::RDT.to_s
-    #
-    # @return [Boolean]
-    def ==(other)
-      self.to_s == other.to_s
+    # @return [RDT] Self at 23:59:59
+    def day_end
+      RDT.new(year, month, day, 23, 59, 59, zone)
     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)
@@ -91,8 +97,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
 
@@ -169,15 +175,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 +189,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 +197,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 +205,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 +223,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/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.9.3
 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: []