icalPal 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4b7182e130e10193863e5b5b524977b5d373aa13a6a9db809e67249e8b04ce6
-  data.tar.gz: 65caec1dde0005f62256ac196de8f5a20fcf62aa16cbef37a43a249a08f31a5b
+  metadata.gz: 363dff45c52135dcb0a151539ff513cc92f6ad086daacf8b7df141e52ca1aa1c
+  data.tar.gz: 0677a50a89478e2986d2f9cb896b6e970d647e50be60f65ca6a7f02458ca882e
 SHA512:
-  metadata.gz: 7ad00fb2a168c77de262d4f121f9a08b628e398c831da59cda5fb33e9b37cecfc122b309eb65d9c2d964902c9f55e5a3a9b5bea7a8f4aa76ff84cae5d99e98c5
-  data.tar.gz: fa60df16a0afd9de3c1385406bddd2c1ea6ec868d6fd0ace59b7ae2e5a58c866f7301b4629ced941984a7652c13b4d7646cb2d442d05d524b8cce60fd26d0ece
+  metadata.gz: 2562a1fd8f801c53efdc39a07b03a9506006e662732addb831070bfd0c02e56a3a5bd34aef940185f3878ea8af91295ac8d06e12822c3cc33fc06e61a1a71acb
+  data.tar.gz: 112c795e08d74e0a1b85506b14eef161b1c26682e6f1f77b1c2699f8f15d6cfb85d1a57f47b578c2561e90e99b984e3a8190d722486e19478b897f4e722b3169

data/bin/icalPal

@@ -72,7 +72,7 @@ $log.info("Options:\n#{$opts.to_json}")
 # @param item[Object]
 
 def add(item)
-  $log.debug("Adding #{item.dump} #{item['UUID']} (#{item['title']})") if item['UUID']
+  $log.debug("Adding #{item.dump} #{item['UUID']} (#{item['title']})") if item['UUID'] if $log.level <= Logger::DEBUG
 
   $items.push(item)
 end
@@ -137,7 +137,7 @@ unless success
     # Use a real open to get a useful error
     File.open(db).close
   rescue Exception => e
-    $log.fatal("#{e.class}: #{db}")
+    $log.fatal("#{e}: #{db}")
 
     eperm = 1 if e.instance_of?(Errno::EPERM)
   end
@@ -304,7 +304,7 @@ doc = RDoc::Markup::Document.new
 section = nil
 
 items.each_with_index do |i, j|
-  $log.debug("Print #{j}: #{i.inspect}")
+  $log.debug("Print #{j}: #{i.inspect}") if $log.level <= Logger::DEBUG
 
   # --li
   break if $opts[:li].positive? && j >= $opts[:li]
@@ -316,7 +316,7 @@ items.each_with_index do |i, j|
 
   # Sections
   if $opts[:sep] && section != i[$opts[:sep]]
-    $log.debug("New section '#{$opts[:sep]}': #{i[$opts[:sep]]}")
+    $log.debug("New section '#{$opts[:sep]}': #{i[$opts[:sep]]}") if $log.level <= Logger::DEBUG
 
     doc << RDoc::Markup::Raw.new($opts[:sep])
 
@@ -340,7 +340,7 @@ items.each_with_index do |i, j|
     next if value.is_a?(Array) && !value[0]
     next if value.is_a?(String) && value.empty?
 
-    $log.debug("#{prop}: #{value}")
+    $log.debug("#{prop}: #{value}") if $log.level <= Logger::DEBUG
 
     # Use Raw to save the property
     props << RDoc::Markup::Raw.new(prop)

data/ext/extconf.rb

@@ -9,10 +9,11 @@ begin
   # Dependencies common to all environments
   dependencies = %w[ plist ]
 
-  # All dependencies are included with the installation of Ruby in
-  # macOS. Adding these dependencies anyway will cause errors that
-  # prevent icalPal from being installed.
-  unless RUBY_VERSION >= '2.6'
+  # All other dependencies are included with the installation of Ruby
+  # in macOS. Adding these dependencies anyway will cause errors that
+  # prevent icalPal from being installed, so we need to be more
+  # granular.
+  if RUBY_VERSION >= '3.0'
     dependencies.push('logger')
     dependencies.push('csv')
     dependencies.push('json')
@@ -23,8 +24,9 @@ begin
 
   di = Gem::DependencyInstaller.new(install_dir: gemdir)
   dependencies.each { |d| di.install(d) }
-rescue Exception
-  exit(1)
+
+rescue Exception => e
+  abort(e)
 end
 
 File.write('Makefile', "clean:\n\ttrue\ninstall:\n\ttrue")

data/lib/event.rb

@@ -225,7 +225,7 @@ module ICalPal
         when 'M' then dom = j[1].split(',')
         when 'O' then moy = j[1].split(',')
         when 'S' then nth = j[1].to_i
-        else $log.warn("Unknown specifier: #{k}")
+        else $log.warn("Unknown specifier: #{k}") if $log.level <= Logger::WARN
         end
       end
 
@@ -294,7 +294,7 @@ module ICalPal
         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']}")
+        else $log.error("Unknown frequency: #{self['frequency']}") if $log.level <= Logger::ERROR
         end
 
         # Create a new Time object in case we crossed a daylight saving change
@@ -312,17 +312,17 @@ module ICalPal
     def in_window?(s, e)
       if $opts[:now]
         if $nowto_i.between?(s.to_i, e.to_i)
-          $log.debug("now: #{s} to #{e} vs. #{$now}")
+          $log.debug("now: #{s} to #{e} vs. #{$now}") if $log.level <= Logger::DEBUG
           true
         else
-          $log.debug("not now: #{s} to #{e} vs. #{$now}")
+          $log.debug("not now: #{s} to #{e} vs. #{$now}") if $log.level <= Logger::DEBUG
           false
         end
       elsif (s < $opts[:to] && [ s, e ].max >= $opts[:from])
-        $log.debug("#{@self['title']} in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
+        $log.debug("#{@self['title']} in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}") if $log.level <= Logger::DEBUG
         true
       else
-        $log.debug("not in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
+        $log.debug("not in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}") if $log.level <= Logger::DEBUG
         false
       end
     end

data/lib/rdt.rb

@@ -66,7 +66,7 @@ module ICalPal
       return strftime($opts[:df]) if $opts && $opts[:df] && $opts[:nrd]
       return super unless $today && $opts
 
-      case (self - $today).round
+      case (self - $today).floor
       when -2 then 'day before yesterday'
       when -1 then 'yesterday'
       when 0 then 'today'

data/lib/reminder.rb

@@ -63,6 +63,9 @@ module ICalPal
       when 'name', 'reminder', 'task' # Aliases
         @self['title']
 
+      when 'UUID'               # For consistency with other commands
+        @self['id']
+
       else super
       end
     end
@@ -85,8 +88,9 @@ module ICalPal
         s = $sections.select { |i| i['id'] == j[0]['groupID'] } if j[0]
         @self['section'] = s[0]['name'] if s && s[0]
 
+        # Drop the internal membership scratch but keep `id` (zckIdentifier),
+        # which downstream consumers rely on for joins/dedup.
         @self.delete('members')
-        @self.delete('id')
       end
 
       # Priority

data/lib/version.rb

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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Andy Rosen
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-04-26 00:00:00.000000000 Z
 dependencies: []
 description: |
   Inspired by icalBuddy and maintains close compatability.  Includes
@@ -61,7 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Command-line tool to query the macOS Calendar and Reminders
 test_files: []