icalPal 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a711f9e4887a81dafccbc57e0a2fa84530dc8cee81e58f0d5df6041783bec2
-  data.tar.gz: 698a498065687f7a7d06e6c316d1937bfc3b1a58d7a661b612bb8d39b5429318
+  metadata.gz: a0297e64a63dc4d2b65d99486da581c29a6358ba608fdcba131264645510fd70
+  data.tar.gz: d74cd82384fcfbeb340f3047c94e492ab6374d39d9d4e17a75c9e4e35b9429db
 SHA512:
-  metadata.gz: 9cf18231c95a94b663e1a41ecd16326f447fb038864677ad05ba2a6fa5f684ae999732401ff30b9df1b0739ff31f78f7b0385e3f7774d5260b9cfbc37a6d2680
-  data.tar.gz: d3aaf37df004da104518e80463c2bc6933ba87277fc9c913bb73a4653055a93417694fb1de655d1c3776f3d47d45afaf241b5ba59361894bafa7ebd1bf253c29
+  metadata.gz: 2ac7ff052d9007bde1d72c246545d35604293b4e6d60e994cf8c0c668749c694c72595fa61116021457c3a4031c31be70612c32a37ef50dbd17b8e7d85e272c2
+  data.tar.gz: b062c855186dc5e9624a2aa1a63e625263a7e355ac117b4b09271c377840126c31a4ff9568d71d416c2f4654627b5adadd8963df71089ea24f60a3e515f89b63

data/bin/icalPal

@@ -65,12 +65,19 @@ end
 klass = ICalPal::($opts[:cmd])
 
 # Get it
-if klass == ICalPal::Reminder then
-  # Load all .sqlite files
-  Dir.glob("#{$opts[:db]}/*.sqlite").each { |db| $rows += ICalPal.load_data(db, klass::QUERY) }
-else
-  # Load database
-  $rows += ICalPal.load_data($opts[:db], klass::QUERY)
+$opts[:db].each do |db|
+    $log.debug("Trying #{db}")
+
+    if klass == ICalPal::Reminder then
+      # Load all .sqlite files
+      $log.debug("Loading *.sqlite in #{db}")
+      Dir.glob("#{db}/*.sqlite").each { |d| $rows += ICalPal.load_data(d, klass::QUERY) }
+    else
+      # Load database
+      begin
+        $rows += ICalPal.load_data(db, klass::QUERY)
+      end
+  end
 end
 
 $log.info("Loaded #{$rows.count} #{klass} rows")

data/bin/icalpal

@@ -65,12 +65,19 @@ end
 klass = ICalPal::($opts[:cmd])
 
 # Get it
-if klass == ICalPal::Reminder then
-  # Load all .sqlite files
-  Dir.glob("#{$opts[:db]}/*.sqlite").each { |db| $rows += ICalPal.load_data(db, klass::QUERY) }
-else
-  # Load database
-  $rows += ICalPal.load_data($opts[:db], klass::QUERY)
+$opts[:db].each do |db|
+    $log.debug("Trying #{db}")
+
+    if klass == ICalPal::Reminder then
+      # Load all .sqlite files
+      $log.debug("Loading *.sqlite in #{db}")
+      Dir.glob("#{db}/*.sqlite").each { |d| $rows += ICalPal.load_data(d, klass::QUERY) }
+    else
+      # Load database
+      begin
+        $rows += ICalPal.load_data(db, klass::QUERY)
+      end
+  end
 end
 
 $log.info("Loaded #{$rows.count} #{klass} rows")

data/lib/defaults.rb

@@ -10,7 +10,10 @@ $defaults = {
     bullet: '•',
     cf: "#{ENV['HOME']}/.icalpal",
     color: false,
-    db: "#{ENV['HOME']}/Library/Calendars/Calendar.sqlitedb",
+    db: [
+      "#{ENV['HOME']}/Library/Group Containers/group.com.apple.calendar/Calendar.sqlitedb",
+      "#{ENV['HOME']}/Library/Calendars/Calendar.sqlitedb",
+    ],
     debug: Logger::WARN,
     df: '%b %-d, %Y',
     ec: [],
@@ -36,19 +39,19 @@ $defaults = {
   },
   tasks: {
     dated: 0,
-    db: ICalPal::Reminder::DB_PATH,
+    db: [ ICalPal::Reminder::DB_PATH ],
     iep: [ 'title', 'notes', 'due', 'priority' ],
     sort: 'prio',
   },
   undatedTasks: {
     dated: 1,
-    db: ICalPal::Reminder::DB_PATH,
+    db: [ ICalPal::Reminder::DB_PATH ],
     iep: [ 'title', 'notes', 'due', 'priority' ],
     sort: 'prio',
   },
   datedTasks: {
     dated: 2,
-    db: ICalPal::Reminder::DB_PATH,
+    db: [ ICalPal::Reminder::DB_PATH ],
     iep: [ 'title', 'notes', 'due', 'priority' ],
     sort: 'prio',
   },

data/lib/icalPal.rb

@@ -58,6 +58,9 @@ module ICalPal
     rescue SQLite3::BusyException => e
       $log.error("Non-fatal error closing database #{db.filename}")
 
+    rescue SQLite3::CantOpenException => e
+      $log.debug("Can't open #{db_file}")
+
     rescue SQLite3::SQLException => e
       $log.info("#{db_file}: #{e}")
 

data/lib/options.rb

@@ -29,7 +29,7 @@ module ICalPal
       @op.accept(ICalPal::RDT) { |s| ICalPal::RDT.conv(s) }
 
       # head
-      @op.on("\nCOMMAND must be one of the following:\n\n")
+      @op.on_head("\nCOMMAND must be one of the following:\n\n")
 
       @op.on("%s%s %sPrint events" % pad('events'))
       @op.on("%s%s %sPrint tasks" % pad('tasks'))
@@ -47,7 +47,8 @@ module ICalPal
       @op.separator("\nGlobal options:\n\n")
 
       @op.on('-c=COMMAND', '--cmd=COMMAND', COMMANDS, 'Command to run')
-      @op.on('--db=DB', "Use DB file instead of Calendar (default: #{$defaults[:common][:db]})",
+      @op.on('--db=DB', "Use DB file instead of Calendar",
+             "(default: #{$defaults[:common][:db]}",
              '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]})")
@@ -220,6 +221,10 @@ module ICalPal
         opts[:cmd] = "tasks" if opts[:cmd] == "datedTasks"
         opts[:cmd] = "tasks" if opts[:cmd] == "undatedTasks"
 
+        # 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)
+
         # All kids love log!
         $log.level = opts[:debug]
 

data/lib/version.rb

@@ -1,4 +1,4 @@
 module ICalPal
   NAME = 'icalPal'
-  VERSION = '3.0.0'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Andy Rosen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Command-line tool to query the macOS Calendar