icalPal 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd12b179a212d0582bd2740c8697f994f75d71fab58ab9ca28c8330e59e33b08
-  data.tar.gz: ab00df9c7f7b5fce00f8a247f346f5049f019d5336973eaec5e17d1970e773da
+  metadata.gz: f2549d35908833fd3fbb48d98187e3ee5618fb3c610dcb03659e8f41b67ac91d
+  data.tar.gz: b5999da17435b5eefbc1f19fe8822c45c5ffec0741f5cb58d7f64c313d700ca2
 SHA512:
-  metadata.gz: 5b2a5690bcf64c79fff82138dfeb27063dcc79d65ca29082e387cc396c7787d8beeec4beaf5ab56492bfb1739e1dcabfb2012ebceb34b899b90a118a8cf522b5
-  data.tar.gz: d65423b35e47f5287cb44406f618d8cb90825163d1d416e3dc2b1921483fa67ad6e62873c692fd25173a1485d8507a4f70c276a66e2a626cf0d4573e1e5571c8
+  metadata.gz: 64f542aa97dd5b66c28001b0f70ef289a447bc89b5272ed3a4916930a048ea2c2baed4c75b7fe71310611827b0e6e8b0a0dd13665807dba91816e72a6647b0d9
+  data.tar.gz: e229b5a9a3261c1f145f1692d4abeb26e653e2e8c7d086d1d0f3a900fe1dfe13a8c68477ddbb22538262d27d1f7fd9cdb7ad302693815e4cb721955c5c379e30

data/README.md

@@ -4,11 +4,27 @@
 
 ## Description
 
-icalPal is a command-line tool to query a macOS Calendar and Reminders
+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)
+- [Features](#features)
+  - [Compatability with icalBuddy](#compatability-with-icalbuddy)
+  - [Additional commands](#additional-commands)
+  - [Additional options](#additional-options)
+- [Usage](#usage)
+- [Output formats](#output-formats)
+- [History](#history)
+
+<!-- markdown-toc end -->
+
+
 ## Installation
 
 As a system-wide Ruby gem:
@@ -23,20 +39,14 @@ or in your home diretory:
 gem install --user-install icalPal
 ```
 
-As a Homebrew formula:
-
-```
-brew tap ajrosen/icalPal
-brew install icalPal
-```
-
 ## Features
 
-### Compatability with [icalBuddy](https://github.com/ali-rantakari/icalBuddy)
+### Compatability with icalBuddy
 
-icalPal tries to be compatible with icalBuddy for command-line options
-and for output.  There are a some important differences to be aware
-of.
+icalPal tries to be compatible with
+[icalBuddy](https://github.com/ali-rantakari/icalBuddy) for
+command-line options and for output.  There are a some important
+differences to be aware of.
 
 * Options require two hyphens, except for single-letter options that require one hyphen
 * *eventsFrom* is not supported.  Instead there is *--from*, *--to*, and *--days*
@@ -50,7 +60,8 @@ of.
 
 ```icalPal accounts```
 
-Shows a list of enabled Calendar accounts.  Internally they are known as *Stores*; you can run ```icalPal stores``` instead.
+Shows a list of enabled Calendar accounts.  Internally they are known
+as *Stores*; you can run ```icalPal stores``` instead.
 
 ```icalPal datedTasks```
 
@@ -62,7 +73,7 @@ Shows only reminders that have a due date.
 * The ```-c``` part is optional, but you cannot abbreviate the command if you leave it off.
 * Use ```-o``` to print the output in different formats.  CSV or JSON are intertesting choices.
 * Copy your Calendar database file and use ```--db``` on it.
-* ```--it``` and ```--et``` will filter by Calendar *type*.  Types are **Local**, **Exchange**, **CalDAV**, **MobileMe**, **Subscribed**, and **Birthdays**
+* ```--it``` and ```--et``` will filter by Calendar *type*.  Types are **Local**, **Exchange**, **CalDAV**, **MobileMe**, **Subscribed**, **Birthdays**, and **Reminders**
 * ```--il``` and ```-el``` will filter by Reminder list
 * ```--ia``` includes *only* all-day events (opposite of ```--ea```)
 * ```--aep``` is like ```--iep```, but *adds* to the default property list instead of replacing it.
@@ -70,7 +81,9 @@ Shows only reminders that have a due date.
 * ```--color``` uses a wider color palette.  Calendar colors are what you have chosen in the Calendar app.  Not supported in all terminals, but looks great in [iTerm2](https://iterm2.com/).
 * ```--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 version of Ruby (2.6.10) included with macOS.
+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 version
+of Ruby (2.6.10) included with macOS.
 
 ## Usage
 
@@ -93,10 +106,12 @@ COMMAND must be one of the following:
 Global options:
 ```
     -c, --cmd=COMMAND       Command to run
-        --db=DB             Use DB file instead of Calendar (default: /Users/ajr/Library/Calendars/Calendar.sqlitedb)
+        --db=DB             Use DB file instead of Calendar
+                            (default: ["/Users/user/Library/Group Containers/group.com.apple.calendar/Calendar.sqlitedb", "/Users/user/Library/Calendars/Calendar.sqlitedb"]
                             For the tasks commands this should be a directory containing .sqlite files
-                            (default: /Users/ajr/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores)
-        --cf=FILE           Set config file path (default: /Users/ajr/.icalpal)
+                            (default: /Users/user/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores)
+        --cf=FILE           Set config file path (default: /Users/user/.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]
 ```
@@ -200,7 +215,9 @@ Environment variables:
 ```
     ICALPAL                 Additional arguments
     ICALPAL_CONFIG          Additional arguments from a file
-                            (default: /Users/ajr/.icalpal)
+                            (default: /Users/user/.icalpal)
+
+    Do not quote or escape values.  Options set in ICALPAL override ICALPAL_CONFIG.  Options on the command line override ICALPAL.
 ```
 
 ## Output formats
@@ -212,7 +229,8 @@ CSV, Hash, JSON, XML, and YAML print all fields for all items in their
 respective formats.  From that you can analyze the results any way you
 like.
 
-[Remind](https://dianne.skoll.ca/projects/remind/) format uses a minimal implementation built in icalPal.
+[Remind](https://dianne.skoll.ca/projects/remind/) format uses a
+minimal implementation built into icalPal.
 
 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)
@@ -221,7 +239,8 @@ 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 <em>separate by</em> options, a section header is added first.  The section contains:
+When using one of the <em>separate by</em> 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)
@@ -248,9 +267,10 @@ information about the item and property to the default formatter.
 ## History
 
 I used icalBuddy for many years.  It's great for scripting,
-automation, and as a desktop widget for apps like
-[GeekTool](https://www.tynsoe.org/geektool/) and
-[Übersicht](https://tracesof.net/uebersicht/).
+automation, and as a widget for apps like
+[Übersicht](https://tracesof.net/uebersicht/),
+[GeekTool](https://www.tynsoe.org/geektool/), and
+[SketchyBar](https://felixkratz.github.io/SketchyBar/).
 
 As with many applications, I started to run into some limitations in
 icalBuddy.  The biggest being that active development ended in 2014.
@@ -259,7 +279,7 @@ 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.  Using Ruby meant
-there is *much* less code; about 1,800 lines vs. 7,000.  It also means
+there is *much* less code; less than 2,000 lines vs. 7,000.  It also means
 icalPal is multi-platform.
 
 I won't pretend to understand **why** you would want to run this on

data/bin/icalPal

@@ -10,6 +10,7 @@ begin
   require 'yaml'
 
   require_relative '../lib/icalpal'
+  require_relative '../lib/defaults'
   require_relative '../lib/options'
   require_relative '../lib/utils'
 rescue LoadError => e
@@ -29,14 +30,14 @@ end
 # All kids love log!
 $log = Logger.new(STDERR, { level: $defaults[:common][:debug] })
 $log.formatter = proc do |s, t, _p, m| # Severity, time, progname, msg
-  ($log.level.positive?)? "#{s}: #{m}\n" :
-    format("[%-5<sev>s] %<time>s [%<caller>s] - %<message>s\n",
-           {
-             sev: s,
-             time: t.strftime('%H:%M:%S.%L'),
-             caller: caller(4, 1)[0].split('/')[-1],
-             message: m
-           })
+  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
@@ -57,9 +58,8 @@ $log.info("Options: #{$opts}")
 # @param item[Object]
 
 def add(item)
-  $log.info("Adding #{item.inspect} #{item['UUID']} (#{item['title']})") if item['UUID']
+  $log.debug("Adding #{item.dump} #{item['UUID']} (#{item['title']})") if item['UUID']
 
-  item['sday'] = ICalPal::RDT.new(*item['sdate'].to_a[0..2]) if ICalPal::Event === item && item['sdate']
   $items.push(item)
 end
 
@@ -128,108 +128,58 @@ unless success
 end
 
 $log.info("Loaded #{$rows.count} #{klass} rows")
+$log.info("Window is #{$opts[:from]} to #{$opts[:to]}")
 
 
 ##################################################
 # Process the data
 
 # Add rows
-$rows.each_with_index do |row, i|
-  $log.debug("Row #{i}: #{row['ROWID']}:#{row['UUID']} - #{row['account']}/#{row['calendar']}/#{row['title']}")
-
+$rows.each do |row|
   # --es/--is
-  if $opts[:es].any? row['account']
-    $log.debug(':es')
-    next
-  end
-
-  unless $opts[:is].empty? || ($opts[:is].any? row['account'])
-    $log.debug(':is')
-    next
-  end
+  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']
-    if $opts[:ec].any? row['calendar']
-      $log.debug(':ec')
-      next
-    end
-
-    unless $opts[:ic].empty? || ($opts[:ic].any? row['calendar'])
-      $log.debug(':ic')
-      next
-    end
+    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
-  if $opts[:et].any? item['type']
-    $log.debug(':et')
-    next
-  end
-
-  unless $opts[:it].empty? || ($opts[:it].any? item['type'])
-    $log.debug(':it')
-    next
-  end
+  next if $opts[:et].any? item['type']
+  next unless $opts[:it].empty? || ($opts[:it].any? item['type'])
 
   # --el/--il
-  if $opts[:el].any? item['list_name']
-    $log.debug(':el')
-    next
-  end
-
-  unless $opts[:il].empty? || ($opts[:il].any? item['list_name'])
-    $log.debug(':il')
-    next
-  end
+  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)
-      unless item[r[0]].to_s.match(Regexp.new(r[1].to_s, Regexp::IGNORECASE))
-        $log.debug(':match')
-        next
-      end
+      next unless item[r[0]].to_s =~ Regexp.new(r[1], Regexp::IGNORECASE)
     end
   end
 
   if ICalPal::Event === item
     # Check for all-day and cancelled events
-    if $opts[:ea] && item['all_day'].positive?
-      $log.debug(':ea')
-      next
-    end
-
-    if $opts[:ia] && !item['all_day'].positive?
-      $log.debug(':ia')
-      next
-    end
-
-    if item['status'] == :canceled
-      $log.debug(':canceled')
-      next
-    end
+    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 { |i| add(i) } :
-      item.non_recurring.each { |i| add(i) }
+      item.recurring.each { |j| add(j) } :
+      item.non_recurring.each { |j| add(j) }
   else
     # Check for dated reminders
     if ICalPal::Reminder === item
-      if $opts[:dated] == 1 && item['due_date'].positive?
-        $log.debug(':undated')
-        next
-      end
-
-      if $opts[:dated] == 2 && item['due_date'].zero?
-        $log.debug(':dated')
-        next
-      end
+      next if $opts[:dated] == 1 && item['due_date'].positive?
+      next if $opts[:dated] == 2 && item['due_date'].zero?
     end
 
     add(item)
@@ -248,11 +198,10 @@ end
 
 # Sort the rows
 begin
-  $log.info("Sorting/uniqing #{$items.count} items by #{[ $opts[:sep], $opts[:sort], 'sdate' ]}, reverse #{$opts[:reverse].inspect}")
+  $log.info("Sorting #{$items.count} items by #{[ $opts[:sep], $opts[:sort], 'sdate' ]}, reverse #{$opts[:reverse].inspect}")
 
   $items.sort_by! { |i| [ i[$opts[:sep]], i[$opts[:sort]], i['sdate'] ] }
   $items.reverse! if $opts[:reverse]
-  $items.uniq!
 rescue Exception => e
   $log.info("Sorting failed: #{e}\n")
 end
@@ -298,7 +247,7 @@ unless mu
        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]}>"
+         "<#{$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')} " +
@@ -363,14 +312,6 @@ items.each_with_index do |i, j|
       # First property, value only
       props << RDoc::Markup::Heading.new(2, value.to_s)
     end
-
-    # unless k.positive?
-    #   # First property, value only
-    #   props << RDoc::Markup::Heading.new(2, value.to_s)
-    # else
-    #   props << RDoc::Markup::BlankLine.new unless (i['placeholder'] || $opts[:ps])
-    #   props << RDoc::Markup::ListItem.new(prop, RDoc::Markup::Paragraph.new(value)) unless (i['placeholder'])
-    # end
   end
 
   # Print it

data/bin/icalpal

@@ -10,6 +10,7 @@ begin
   require 'yaml'
 
   require_relative '../lib/icalpal'
+  require_relative '../lib/defaults'
   require_relative '../lib/options'
   require_relative '../lib/utils'
 rescue LoadError => e
@@ -29,14 +30,14 @@ end
 # All kids love log!
 $log = Logger.new(STDERR, { level: $defaults[:common][:debug] })
 $log.formatter = proc do |s, t, _p, m| # Severity, time, progname, msg
-  ($log.level.positive?)? "#{s}: #{m}\n" :
-    format("[%-5<sev>s] %<time>s [%<caller>s] - %<message>s\n",
-           {
-             sev: s,
-             time: t.strftime('%H:%M:%S.%L'),
-             caller: caller(4, 1)[0].split('/')[-1],
-             message: m
-           })
+  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
@@ -57,9 +58,8 @@ $log.info("Options: #{$opts}")
 # @param item[Object]
 
 def add(item)
-  $log.info("Adding #{item.inspect} #{item['UUID']} (#{item['title']})") if item['UUID']
+  $log.debug("Adding #{item.dump} #{item['UUID']} (#{item['title']})") if item['UUID']
 
-  item['sday'] = ICalPal::RDT.new(*item['sdate'].to_a[0..2]) if ICalPal::Event === item && item['sdate']
   $items.push(item)
 end
 
@@ -128,108 +128,58 @@ unless success
 end
 
 $log.info("Loaded #{$rows.count} #{klass} rows")
+$log.info("Window is #{$opts[:from]} to #{$opts[:to]}")
 
 
 ##################################################
 # Process the data
 
 # Add rows
-$rows.each_with_index do |row, i|
-  $log.debug("Row #{i}: #{row['ROWID']}:#{row['UUID']} - #{row['account']}/#{row['calendar']}/#{row['title']}")
-
+$rows.each do |row|
   # --es/--is
-  if $opts[:es].any? row['account']
-    $log.debug(':es')
-    next
-  end
-
-  unless $opts[:is].empty? || ($opts[:is].any? row['account'])
-    $log.debug(':is')
-    next
-  end
+  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']
-    if $opts[:ec].any? row['calendar']
-      $log.debug(':ec')
-      next
-    end
-
-    unless $opts[:ic].empty? || ($opts[:ic].any? row['calendar'])
-      $log.debug(':ic')
-      next
-    end
+    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
-  if $opts[:et].any? item['type']
-    $log.debug(':et')
-    next
-  end
-
-  unless $opts[:it].empty? || ($opts[:it].any? item['type'])
-    $log.debug(':it')
-    next
-  end
+  next if $opts[:et].any? item['type']
+  next unless $opts[:it].empty? || ($opts[:it].any? item['type'])
 
   # --el/--il
-  if $opts[:el].any? item['list_name']
-    $log.debug(':el')
-    next
-  end
-
-  unless $opts[:il].empty? || ($opts[:il].any? item['list_name'])
-    $log.debug(':il')
-    next
-  end
+  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)
-      unless item[r[0]].to_s.match(Regexp.new(r[1].to_s, Regexp::IGNORECASE))
-        $log.debug(':match')
-        next
-      end
+      next unless item[r[0]].to_s =~ Regexp.new(r[1], Regexp::IGNORECASE)
     end
   end
 
   if ICalPal::Event === item
     # Check for all-day and cancelled events
-    if $opts[:ea] && item['all_day'].positive?
-      $log.debug(':ea')
-      next
-    end
-
-    if $opts[:ia] && !item['all_day'].positive?
-      $log.debug(':ia')
-      next
-    end
-
-    if item['status'] == :canceled
-      $log.debug(':canceled')
-      next
-    end
+    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 { |i| add(i) } :
-      item.non_recurring.each { |i| add(i) }
+      item.recurring.each { |j| add(j) } :
+      item.non_recurring.each { |j| add(j) }
   else
     # Check for dated reminders
     if ICalPal::Reminder === item
-      if $opts[:dated] == 1 && item['due_date'].positive?
-        $log.debug(':undated')
-        next
-      end
-
-      if $opts[:dated] == 2 && item['due_date'].zero?
-        $log.debug(':dated')
-        next
-      end
+      next if $opts[:dated] == 1 && item['due_date'].positive?
+      next if $opts[:dated] == 2 && item['due_date'].zero?
     end
 
     add(item)
@@ -248,11 +198,10 @@ end
 
 # Sort the rows
 begin
-  $log.info("Sorting/uniqing #{$items.count} items by #{[ $opts[:sep], $opts[:sort], 'sdate' ]}, reverse #{$opts[:reverse].inspect}")
+  $log.info("Sorting #{$items.count} items by #{[ $opts[:sep], $opts[:sort], 'sdate' ]}, reverse #{$opts[:reverse].inspect}")
 
   $items.sort_by! { |i| [ i[$opts[:sep]], i[$opts[:sort]], i['sdate'] ] }
   $items.reverse! if $opts[:reverse]
-  $items.uniq!
 rescue Exception => e
   $log.info("Sorting failed: #{e}\n")
 end
@@ -298,7 +247,7 @@ unless mu
        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]}>"
+         "<#{$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')} " +
@@ -363,14 +312,6 @@ items.each_with_index do |i, j|
       # First property, value only
       props << RDoc::Markup::Heading.new(2, value.to_s)
     end
-
-    # unless k.positive?
-    #   # First property, value only
-    #   props << RDoc::Markup::Heading.new(2, value.to_s)
-    # else
-    #   props << RDoc::Markup::BlankLine.new unless (i['placeholder'] || $opts[:ps])
-    #   props << RDoc::Markup::ListItem.new(prop, RDoc::Markup::Paragraph.new(value)) unless (i['placeholder'])
-    # end
   end
 
   # Print it

data/icalPal.gemspec

@@ -16,33 +16,35 @@ EOF
   s.licenses	= [ 'GPL-3.0-or-later' ]
 
   s.metadata = {
-    'bug_tracker_uri' => "https://github.com/ajrosen/#{s.name}/issues"
+    'bug_tracker_uri' => "https://github.com/ajrosen/#{s.name}/issues",
+    'rubygems_mfa_required' => 'true'
   }
 
   s.files	= Dir["#{s.name}.gemspec", 'bin/*', 'lib/*.rb']
   s.executables	= [ "#{s.name}" ]
   s.extra_rdoc_files = [ 'README.md' ]
 
-  s.add_dependency 'nokogiri-plist', '~> 0.5.0'
-  s.add_dependency 'sqlite3', '~> 2.6.0' unless s.rubygems_version == `/usr/bin/gem --version`.strip
-
   # The macOS and Homebrew versions of rubygems have incompatible
   # requirements for sqlite3.
-  # 
+  #
   # macOS comes with version 1.3.13, so it does not need to be added
   # as a dependency, but it cannot install anything newer:
-  # 
+  #
   # requires Ruby version >= 3.0, < 3.4.dev. The current ruby version is 2.6.10.
-  # 
+  #
   # Homebrew's Ruby formula does not come with sqlite3, so it does
   # need to be added as a dependency, but it cannot install version
   # 1.3.13:
-  # 
+  #
   # error: call to undeclared function
-  # 
+  #
   # So we must call add_dependency, but iff we are not building with
   # macOS' Ruby installation.
 
+  s.add_dependency 'nokogiri-plist', '~> 0.5.0'
+  s.add_dependency 'sqlite3', '~> 2.6.0' unless s.rubygems_version == `/usr/bin/gem --version`.strip
+  s.add_dependency 'timezone', '>= 0.99', '~> 1.3.0'
+
   s.bindir = 'bin'
   s.required_ruby_version = '>= 2.6.0'