icalPal 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a74d33ac1b8d65466f6ef4820813ad983c7bb539438c11d12eb61daaa2af83f
-  data.tar.gz: 3c2790143a7b5abde6304312099988de264cc767fde30c34dd8b7682a80bd782
+  metadata.gz: f2549d35908833fd3fbb48d98187e3ee5618fb3c610dcb03659e8f41b67ac91d
+  data.tar.gz: b5999da17435b5eefbc1f19fe8822c45c5ffec0741f5cb58d7f64c313d700ca2
 SHA512:
-  metadata.gz: 031fae41c01699e5eb757dd0f838e702fccd0d65fb3ab1aca3a6dde20083ed5ec43c88a1bc2c43e11e0a77399aea21e860d3f13f7590d90a00f912d3d87bff1b
-  data.tar.gz: 9e1cfa76f56f735406553d40d13e16ce786461ab331eea9cc0757ffe0858e92ef3c9bae843934f9a55098ec1a28d6e03852aed3ce3bc244a56de362b584de5bd
+  metadata.gz: 64f542aa97dd5b66c28001b0f70ef289a447bc89b5272ed3a4916930a048ea2c2baed4c75b7fe71310611827b0e6e8b0a0dd13665807dba91816e72a6647b0d9
+  data.tar.gz: e229b5a9a3261c1f145f1692d4abeb26e653e2e8c7d086d1d0f3a900fe1dfe13a8c68477ddbb22538262d27d1f7fd9cdb7ad302693815e4cb721955c5c379e30

data/README.md

@@ -43,9 +43,10 @@ gem install --user-install icalPal
 
 ### Compatability with icalBuddy
 
-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.
+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*
@@ -59,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```
 
@@ -79,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
 
@@ -102,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]
 ```
@@ -209,7 +215,7 @@ 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.
 ```
@@ -223,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 into 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)
@@ -232,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)
@@ -259,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.
@@ -270,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

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

data/lib/defaults.rb

@@ -27,6 +27,7 @@ $defaults = {
     is: [],
     it: [],
     li: 0,
+    norc: false,
     output: 'default',
     ps: [ "\n  " ],
     r: false,
@@ -38,32 +39,38 @@ $defaults = {
     sp: false,
     tf: '%-I:%M %p',
   },
+
   tasks: {
     dated: 0,
     db: [ ICalPal::Reminder::DB_PATH ],
     iep: %w[ title notes due priority ],
     sort: 'prio',
   },
+
   undatedTasks: {
     dated: 1,
     db: [ ICalPal::Reminder::DB_PATH ],
     iep: %w[ title notes due priority ],
     sort: 'prio',
   },
+
   datedTasks: {
     dated: 2,
     db: [ ICalPal::Reminder::DB_PATH ],
     iep: %w[ title notes due priority ],
     sort: 'prio',
   },
+
   stores: {
     iep: %w[ account type ],
     sort: 'account',
   },
+
   calendars: {
     iep: %w[ calendar type UUID ],
     sort: 'calendar',
   },
+
   events: {
     days: nil,
     ea: false,

data/lib/event.rb

@@ -177,10 +177,10 @@ module ICalPal
           skip = false
 
           changes[1..].each do |change|
-            cdate = Time.at(change['start_date'] + ITIME).to_a[3..5].reverse
+            codate = Time.at(change['orig_date'] + ITIME).to_a[3..5].reverse
             odate = occurrence['sdate'].ymd
 
-            skip = true if cdate == odate
+            skip = true if codate == odate
           end
 
           events.push(clone(occurrence)) if in_window?(occurrence['sdate'], occurrence['edate']) && !skip

data/lib/options.rb

@@ -1,8 +1,7 @@
 # rubocop: disable Style/FormatString, Style/FormatStringToken
 
-require 'optparse'
+autoload(:OptionParser, 'optparse')
 
-require_relative 'defaults'
 require_relative 'version'
 
 module ICalPal
@@ -55,6 +54,7 @@ module ICalPal
              'For the tasks commands this should be a directory containing .sqlite files',
              "(default: #{$defaults[:tasks][:db]})")
       @op.on('--cf=FILE', "Set config file path (default: #{$defaults[:common][:cf]})")
+      @op.on('--norc', 'Ignore ICALPAL and ICALPAL_CONFIG environment variables')
       @op.on('-o', '--output=FORMAT', OUTFORMATS,
              "Print as FORMAT (default: #{$defaults[:common][:output]})", "[#{OUTFORMATS.join(', ')}]")
 
@@ -211,7 +211,7 @@ module ICalPal
           end
 
           @op.parse!(o, into: env)
-        end if ENV['ICALPAL']
+        end if ENV['ICALPAL'] && !cli[:norc]
 
         # Configuration file needs special parsing for the same reason
         begin
@@ -230,7 +230,7 @@ module ICalPal
 
           @op.parse!(o, into: cf)
         rescue StandardError
-        end
+        end unless cli[:norc]
 
         cli[:cmd] ||= @op.default_argv[0]
         cli[:cmd] ||= env[:cmd] if env[:cmd]
@@ -240,10 +240,10 @@ module ICalPal
         # Parse eventsNow and eventsToday commands
         cli[:cmd].match('events(Now|Today)(\+[0-9]+)?') do |m|
           cli[:now] = true if m[1] == 'Now'
-          cli[:days] = (m[1] == 'Today')? m[2].to_i + 1 : 1
+          cli[:days] = (m[1] == 'Today')? m[2].to_i : 1
 
           cli[:from] = $today
-          cli[:to] = $today + cli[:days]
+          cli[:to] = $today + cli[:days] if cli[:days]
           cli[:days] = Integer(cli[:to] - cli[:from])
 
           cli[:cmd] = 'events'
@@ -330,7 +330,9 @@ module ICalPal
     # Pad non-options to align with options
     #
     # @param t [String] Text on the left side
-    # @return [String] Text indented by summary_indent, and padded according to summary_width
+    #
+    # @return [Array<String>] Array containing +summary_indent+, +t+,
+    # a number of spaces equal to (+summary_width+ - +t.length+)
     def pad(t)
       [ @op.summary_indent, t, ' ' * (@op.summary_width - t.length) ]
     end

data/lib/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Andy Rosen
 bindir: bin
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri-plist