icalPal 3.5.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2549d35908833fd3fbb48d98187e3ee5618fb3c610dcb03659e8f41b67ac91d
-  data.tar.gz: b5999da17435b5eefbc1f19fe8822c45c5ffec0741f5cb58d7f64c313d700ca2
+  metadata.gz: b6dbdc21833e53b6318750c5e1035ffaf995b9afa11eda811eb92f8ec39e7890
+  data.tar.gz: 4ce4e4166ddae0fac1c35d0e3b50ce25d3e1dc948205c6655775da6ae47c4a6e
 SHA512:
-  metadata.gz: 64f542aa97dd5b66c28001b0f70ef289a447bc89b5272ed3a4916930a048ea2c2baed4c75b7fe71310611827b0e6e8b0a0dd13665807dba91816e72a6647b0d9
-  data.tar.gz: e229b5a9a3261c1f145f1692d4abeb26e653e2e8c7d086d1d0f3a900fe1dfe13a8c68477ddbb22538262d27d1f7fd9cdb7ad302693815e4cb721955c5c379e30
+  metadata.gz: e23aea3695d7554dd3a2d38f52852e33979b0892384ae2cef565620031e036d495a1b489d0893e2426b6d2066d3075cea958c579140be798fec3bb576f5185e0
+  data.tar.gz: e769f0bd0164a71129a135cb82555c872bac9938ceac2301c7845355da2c9aceb37c05a67c97c10a293db07f9f5e62666b2137e02bca7156d2a31273367c52d6

data/README.md

@@ -82,8 +82,9 @@ Shows only reminders that have a due date.
 * ```--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.
+you can run it just about anywhere.  It's been tested with the
+versions of Ruby included with macOS Sequoia (2.6.10) and
+[Homebrew](https://brew.sh/) (3.4.4).
 
 ## Usage
 
@@ -99,6 +100,7 @@ COMMAND must be one of the following:
     eventsToday             Print events occurring today
     eventsToday+NUM         Print events occurring between today and NUM days into the future
     eventsNow               Print events occurring at present time
+    eventsRemaining         Print events occurring between present time and midnight
     datedTasks              Print tasks with a due date
     undatedTasks            Print tasks with no due date
 ```

data/bin/icalPal

@@ -1,28 +1,37 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'logger'
-
-  require 'csv'
-  require 'json'
-  require 'rdoc'
-  require 'sqlite3'
-  require 'yaml'
-
-  require_relative '../lib/icalpal'
-  require_relative '../lib/defaults'
-  require_relative '../lib/options'
-  require_relative '../lib/utils'
-rescue LoadError => e
-  dep = e.message[/-- (.*)/, 1]
-
-  $stderr.puts "FATAL: icalpal is missing a dependency: #{dep}"
-  $stderr.puts
-  $stderr.puts "Install with 'gem install --user-install #{dep}'"
+# 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 --user-install #{gem}'"
+  end
+end
 
-  exit
+# 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
 
+%w[ logger csv json rdoc sqlite3 yaml ].each { |g| r g }
+%w[ icalPal defaults options utils ].each { |l| rr l }
+
 
 ##################################################
 # Load options

data/bin/icalpal

@@ -1,28 +1,37 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'logger'
-
-  require 'csv'
-  require 'json'
-  require 'rdoc'
-  require 'sqlite3'
-  require 'yaml'
-
-  require_relative '../lib/icalpal'
-  require_relative '../lib/defaults'
-  require_relative '../lib/options'
-  require_relative '../lib/utils'
-rescue LoadError => e
-  dep = e.message[/-- (.*)/, 1]
-
-  $stderr.puts "FATAL: icalpal is missing a dependency: #{dep}"
-  $stderr.puts
-  $stderr.puts "Install with 'gem install --user-install #{dep}'"
+# 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 --user-install #{gem}'"
+  end
+end
 
-  exit
+# 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
 
+%w[ logger csv json rdoc sqlite3 yaml ].each { |g| r g }
+%w[ icalPal defaults options utils ].each { |l| rr l }
+
 
 ##################################################
 # Load options

data/ext/extconf.rb

@@ -0,0 +1,47 @@
+begin
+  require 'mkmf'
+  require 'rubygems/dependency_installer'
+
+  # Search Gem paths for one that is writable.
+  gemdir = nil
+  Gem.path.each { |p| gemdir = p if File.writable? p }
+
+  # Dependencies common to all environments
+  dependencies = %w[ plist timezone ]
+
+  if RUBY_VERSION >= '3.4'
+    # bigdecimal is not part of the default gems starting from Ruby 3.4.0.
+    # csv is not part of the default gems starting from Ruby 3.4.0.
+    dependencies.push('bigdecimal')
+    dependencies.push('csv')
+
+    # The macOS and Homebrew versions of rubygems have incompatible
+    # requirements for sqlite3.
+    #
+    # macOS 15.5 (Sequoia) comes with version 1.3.13, so it does not
+    # need to be added as a dependency, and 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 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') 
+  end
+
+  di = Gem::DependencyInstaller.new(install_dir: gemdir)
+  dependencies.each { |d| di.install(d) }
+rescue Exception => e
+  exit(1)
+end 
+
+File.write("Makefile", "clean:\n\ttrue\ninstall:\n\ttrue")
+
+exit(0)

data/icalPal.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name	= ICalPal::NAME
   s.version	= ICalPal::VERSION
 
-  s.summary	= 'Command-line tool to query the macOS Calendar'
+  s.summary	= 'Command-line tool to query the macOS Calendar and Reminders'
   s.description	= <<-EOF
 Inspired by icalBuddy and maintains close compatability.  Includes
 many additional features for querying, filtering, and formatting.
@@ -20,30 +20,13 @@ EOF
     'rubygems_mfa_required' => 'true'
   }
 
-  s.files	= Dir["#{s.name}.gemspec", 'bin/*', 'lib/*.rb']
+  s.files	= Dir["#{s.name}.gemspec", 'bin/*', 'ext/*.rb', 'lib/*.rb']
   s.executables	= [ "#{s.name}" ]
   s.extra_rdoc_files = [ 'README.md' ]
 
-  # 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'
+  # Some installation settings cannot be handled at build time.
+  # Handle everything at installation time.
+  s.extensions << 'ext/extconf.rb'
 
   s.bindir = 'bin'
   s.required_ruby_version = '>= 2.6.0'

data/lib/defaults.rb

@@ -8,6 +8,7 @@ $defaults = {
   common: {
     ab: '!',
     aep: [],
+    atp: [],
     bullet: '•',
     cf: "#{Dir.home}/.icalpal",
     color: false,
@@ -19,6 +20,7 @@ $defaults = {
     df: '%b %-d, %Y',
     ec: [],
     eep: [],
+    etp: [],
     el: [],
     es: [],
     et: [],
@@ -43,26 +45,26 @@ $defaults = {
   tasks: {
     dated: 0,
     db: [ ICalPal::Reminder::DB_PATH ],
-    iep: %w[ title notes due priority ],
+    itp: %w[ title notes due priority ],
     sort: 'prio',
   },
 
   undatedTasks: {
     dated: 1,
     db: [ ICalPal::Reminder::DB_PATH ],
-    iep: %w[ title notes due priority ],
+    itp: %w[ title notes due priority ],
     sort: 'prio',
   },
 
   datedTasks: {
     dated: 2,
     db: [ ICalPal::Reminder::DB_PATH ],
-    iep: %w[ title notes due priority ],
+    itp: %w[ title notes due priority ],
     sort: 'prio',
   },
 
   stores: {
-    iep: %w[ account type ],
+    itp: %w[ account type ],
     sort: 'account',
   },
 

data/lib/event.rb

@@ -1,4 +1,4 @@
-require 'timezone'
+r 'timezone'
 
 module ICalPal
   # Class representing items from the <tt>CalendarItem</tt> table
@@ -13,8 +13,8 @@ module ICalPal
     def []=(k, v)
       @self[k] = v
 
-      @self['sctime'] = Time.at(@self['sdate'].to_i, in: 'UTC') if k == 'sdate'
-      @self['ectime'] = Time.at(@self['edate'].to_i, in: 'UTC') if k == 'edate'
+      @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'
     end
 
     # Standard accessor with special handling for +age+,
@@ -96,7 +96,7 @@ module ICalPal
         begin
           zone = Timezone.fetch(obj['start_tz'])
         rescue Timezone::Error::InvalidZone
-          zone = 'UTC'
+          zone = '+00:00'
         end
 
         ctime = obj[k] + ITIME
@@ -177,7 +177,7 @@ module ICalPal
           skip = false
 
           changes[1..].each do |change|
-            codate = Time.at(change['orig_date'] + ITIME).to_a[3..5].reverse
+            codate = Time.at(change['orig_date'] + ITIME, in: '+00:00').to_a[3..5].reverse
             odate = occurrence['sdate'].ymd
 
             skip = true if codate == odate

data/lib/icalPal.rb

@@ -1,10 +1,4 @@
-require_relative 'EventKit'
-require_relative 'ToICalPal'
-require_relative 'calendar'
-require_relative 'event'
-require_relative 'rdt'
-require_relative 'reminder'
-require_relative 'store'
+%w[ EventKit ToICalPal calendar event rdt reminder store ].each { |l| rr l }
 
 # Encapsulate the _Store_ (accounts), _Calendar_ and _CalendarItem_
 # tables of a Calendar database, and the _Reminder_ table of a

data/lib/options.rb

@@ -42,6 +42,7 @@ module ICalPal
       @op.on('%s%s %sPrint events occurring today' % pad('eventsToday'))
       @op.on('%s%s %sPrint events occurring between today and NUM days into the future' % pad('eventsToday+NUM'))
       @op.on('%s%s %sPrint events occurring at present time' % pad('eventsNow'))
+      @op.on('%s%s %sPrint events occurring between present time and midnight' % pad('eventsRemaining'))
       @op.on('%s%s %sPrint tasks with a due date' % pad('datedTasks'))
       @op.on('%s%s %sPrint tasks with no due date' % pad('undatedTasks'))
 
@@ -238,10 +239,15 @@ module ICalPal
         cli[:cmd] = 'stores' if cli[:cmd] == 'accounts'
 
         # Parse eventsNow and eventsToday commands
-        cli[:cmd].match('events(Now|Today)(\+[0-9]+)?') do |m|
+        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
 
+          if m[1] == 'Remaining'
+            cli[:n] = true
+            cli[:days] = 0
+          end
+
           cli[:from] = $today
           cli[:to] = $today + cli[:days] if cli[:days]
           cli[:days] = Integer(cli[:to] - cli[:from])
@@ -276,10 +282,9 @@ module ICalPal
         opts[:version] = @op.version
 
         # From the Department of Redundancy Department
-        opts[:iep] += opts[:itp] if opts[:itp]
-        opts[:eep] += opts[:etp] if opts[:etp]
-        opts[:aep] += opts[:atp] if opts[:atp]
-        opts[:props] = (opts[:iep] + opts[:aep] - opts[:eep]).uniq
+        (opts[:cmd].include? 'tasks')?
+          opts[:props] = (opts[:itp] + opts[:atp] - opts[:etp]).uniq :
+          opts[:props] = (opts[:iep] + opts[:aep] - opts[:eep]).uniq
 
         # From, to, days
         if opts[:from]
@@ -320,7 +325,7 @@ module ICalPal
     end
 
     # Commands that can be run
-    COMMANDS = %w[events eventsToday eventsNow tasks datedTasks undatedTasks calendars accounts stores].freeze
+    COMMANDS = %w[events eventsToday eventsNow eventsRemaining tasks datedTasks undatedTasks calendars accounts stores].freeze
 
     # Supported output formats
     OUTFORMATS = %w[ansi csv default hash html json md rdoc remind toc xml yaml].freeze

data/lib/reminder.rb

@@ -1,5 +1,5 @@
-require 'open3'
-require 'nokogiri-plist'
+r 'open3'
+r 'plist'
 
 module ICalPal
   # Class representing items from the <tt>Reminders</tt> database
@@ -9,7 +9,7 @@ module ICalPal
     def [](k)
       case k
       when 'notes'              # Skip empty notes
-        (@self['notes'].empty?)? @self['notes'] : nil
+        (@self['notes'].empty?)? nil : @self['notes']
 
       when 'priority'           # Integer -> String
         EventKit::EKReminderProperty[@self['priority']] if @self['priority'].positive?
@@ -57,7 +57,7 @@ module ICalPal
         stdin.close
 
         # Read output
-        plist = Nokogiri::PList(stdout.read)['$objects']
+        plist = Plist.parse_xml(stdout.read)['$objects']
 
         @self['color'] = plist[3]
         @self['symbolic_color_name'] = (plist[2] == 'custom')? plist[4] : plist[2]

data/lib/version.rb

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

metadata

@@ -1,75 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Andy Rosen
 bindir: bin
 cert_chain: []
-date: 2025-05-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri-plist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: timezone
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.99'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.99'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+date: 2025-05-20 00:00:00.000000000 Z
+dependencies: []
 description: |
   Inspired by icalBuddy and maintains close compatability.  Includes
   many additional features for querying, filtering, and formatting.
 email: ajr@corp.mlfs.org
 executables:
 - icalPal
-extensions: []
+extensions:
+- ext/extconf.rb
 extra_rdoc_files:
 - README.md
 files:
 - README.md
 - bin/icalPal
 - bin/icalpal
+- ext/extconf.rb
 - icalPal.gemspec
 - lib/EventKit.rb
 - lib/ToICalPal.rb
@@ -110,6 +64,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.6
 specification_version: 4
-summary: Command-line tool to query the macOS Calendar
+summary: Command-line tool to query the macOS Calendar and Reminders
 test_files: []
 ...