icalPal 3.1.1 → 3.2.0

data/lib/rdt.rb

@@ -3,6 +3,7 @@ require 'date'
 module ICalPal
   # Child class of DateTime that adds support for relative dates (<em><b>R</b>elative<b>D</b>ate<b>T</b>ime</em>).
   class RDT < DateTime
+
     # Convert a String to an RDT
     #
     # @param str [String] can be +yesterday+, +today+, +tomorrow+,
@@ -14,8 +15,8 @@ module ICalPal
       when 'yesterday' then $today - 1
       when 'today' then $today
       when 'tomorrow' then $today + 1
-      when /^\+([0-9]+)/ then $today + $1.to_i
-      when /^\-([0-9]+)/ then $today - $1.to_i
+      when /^\+([0-9]+)/ then $today + Regexp.last_match(1).to_i
+      when /^-([0-9]+)/ then $today - Regexp.last_match(1).to_i
       else parse(str)
       end
     end
@@ -40,7 +41,7 @@ module ICalPal
     end
 
     alias inspect to_s
- 
+
     # @see Time.to_a
     #
     # @return [Array] Self as an array
@@ -56,8 +57,9 @@ module ICalPal
     # @see ICalPal::RDT.to_s
     #
     # @return [Boolean]
-    def ==(obj)
-      self.to_s == obj.to_s
+    def ==(other)
+      self.to_s == other.to_s
     end
+
   end
 end

data/lib/reminder.rb

@@ -8,13 +8,13 @@ module ICalPal
 
     def [](k)
       case k
-      when 'notes' then         # Skip empty notes
-        @self['notes'].length > 0? @self['notes'] : nil
+      when 'notes'              # Skip empty notes
+        (@self['notes'].empty?)? @self['notes'] : nil
 
-      when 'priority' then      # Integer -> String
-        EventKit::EKReminderProperty[@self['priority']] if @self['priority'] > 0
+      when 'priority'           # Integer -> String
+        EventKit::EKReminderProperty[@self['priority']] if @self['priority'].positive?
 
-      when 'sdate' then         # For sorting
+      when 'sdate'              # For sorting
         @self['title']
 
       else @self[k]
@@ -23,32 +23,34 @@ module ICalPal
 
     def initialize(obj)
       @self = {}
-      obj.keys.each { |k| @self[k] = obj[k] }
+      obj.each_key { |k| @self[k] = obj[k] }
 
       # Priority
+      # rubocop: disable Style/NumericPredicate
       @self['prio'] = 0 if @self['priority'] == 1 # high
       @self['prio'] = 1 if @self['priority'] == 5 # medium
       @self['prio'] = 2 if @self['priority'] == 9 # low
       @self['prio'] = 3 if @self['priority'] == 0 # none
+      # rubocop: enable Style/NumericPredicate
 
       @self['long_priority'] = LONG_PRIORITY[@self['prio']]
 
       # For sorting
-      @self['sdate'] = (@self['title'])? @self['title'] : ""
+      @self['sdate'] = (@self['title'])? @self['title'] : ''
 
       # Due date
       @self['due'] = RDT.new(*Time.at(@self['due_date'] + ITIME).to_a.reverse[4..]) if @self['due_date']
       @self['due_date'] = 0 unless @self['due_date']
 
       # Notes
-      @self['notes'] = "" unless @self['notes']
+      @self['notes'] = '' unless @self['notes']
 
       # Color
       @self['color'] = nil unless $opts[:palette]
 
-      if @self['color'] then
+      if @self['color']
         # Run command
-        stdin, stdout, stderr, e = Open3.popen3(PL_CONVERT)
+        stdin, stdout, _stderr, _e = Open3.popen3(PL_CONVERT)
 
         # Send color bplist
         stdin.write(@self['color'])
@@ -65,23 +67,21 @@ module ICalPal
       end
     end
 
-    private
-
-    DEFAULT_COLOR = '#1BADF8'
-    DEFAULT_SYMBOLIC_COLOR = 'blue'
+    DEFAULT_COLOR = '#1BADF8'.freeze
+    DEFAULT_SYMBOLIC_COLOR = 'blue'.freeze
 
     LONG_PRIORITY = [
-      "High priority",
-      "Medium priority",
-      "Low priority",
-      "No priority",
-    ]
+      'High priority',
+      'Medium priority',
+      'Low priority',
+      'No priority',
+    ].freeze
 
-    PL_CONVERT = '/usr/bin/plutil -convert xml1 -o - -'
+    PL_CONVERT = '/usr/bin/plutil -convert xml1 -o - -'.freeze
 
-    DB_PATH = "#{Dir::home}/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores"
+    DB_PATH = "#{Dir.home}/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores".freeze
 
-    QUERY = <<~SQL
+    QUERY = <<~SQL.freeze
 SELECT DISTINCT
 
 zremcdReminder.zAllday as all_day,

data/lib/store.rb

@@ -3,7 +3,7 @@ module ICalPal
   class Store
     include ICalPal
 
-    QUERY = <<~SQL
+    QUERY = <<~SQL.freeze
 SELECT DISTINCT
 
 Store.name AS account,

data/lib/version.rb

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

metadata

@@ -1,43 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Andy Rosen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: nokogiri-plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri-plist
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '2'
 description: |
   Inspired by icalBuddy and maintains close compatability.  Includes
   many additional features for querying, filtering, and formatting.
@@ -50,7 +49,6 @@ extra_rdoc_files:
 files:
 - README.md
 - bin/icalPal
-- bin/icalpal
 - icalPal.gemspec
 - lib/EventKit.rb
 - lib/ToICalPal.rb
@@ -67,7 +65,6 @@ homepage: https://github.com/ajrosen/icalPal
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,8 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Command-line tool to query the macOS Calendar
 test_files: []

data/bin/icalpal

@@ -1,327 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'logger'
-
-  require 'csv'
-  require 'json'
-  require 'rdoc'
-  require 'sqlite3'
-  require 'yaml'
-
-  require_relative '../lib/icalpal'
-  require_relative '../lib/options'
-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}'"
-
-  exit
-end
-
-
-##################################################
-# Load options
-
-# 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" :
-    "[%-5s] %s [%s] - %s\n" %
-    [ s, t.strftime('%H:%M:%S.%L'), caller(4, 1)[0].split('/')[-1], m ]
-end
-
-$opts = ICalPal::Options.new.parse_options
-
-$rows = []                      # Rows from the database
-$items = []                     # Items to be printed
-
-
-##################################################
-# All kids love log!
-
-$log.info("Options: #{$opts}")
-
-
-##################################################
-# Add an item to the list
-#
-# @param item[Object]
-
-def add(item)
-  $log.info("Adding #{item.inspect} #{item['UUID']} (#{item['title']})") if item['UUID']
-
-  item['sday'] = ICalPal::RDT.new(*item['sdate'].to_a[0..2]) if item === ICalPal::Event && item['sdate']
-  $items.push(item)
-end
-
-
-##################################################
-# Load the data
-
-# What are we getting?
-klass = ICalPal::($opts[:cmd])
-
-# Get it
-$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")
-
-
-##################################################
-# 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']}")
-
-  # --es/--is
-  if $opts[:es].any? row['account'] then
-    $log.debug(":es")
-    next
-  end
-
-  unless $opts[:is].empty? or $opts[:is].any? row['account']
-    $log.debug(":is");
-    next
-  end
-
-  # --ec/--ic
-  unless klass == ICalPal::Store or !row['calendar']
-    if $opts[:ec].any? row['calendar'] then
-      $log.debug(":ec")
-      next
-    end
-
-    unless $opts[:ic].empty? or $opts[:ic].any? row['calendar']
-      $log.debug(":ic")
-      next
-    end
-  end
-
-  # Instantiate an item
-  item = klass.new(row)
-
-  # --et/--it
-  if $opts[:et].any? item['type'] then
-    $log.debug(":et")
-    next
-  end
-
-  unless $opts[:it].empty? or $opts[:it].any? item['type']
-    $log.debug(":it")
-    next
-  end
-
-  # --el/--il
-  if $opts[:el].any? item['list_name'] then
-    $log.debug(":el")
-    next
-  end
-
-  unless $opts[:il].empty? or $opts[:il].any? item['list_name']
-    $log.debug(":il")
-    next
-  end
-
-  # --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)) then
-        $log.debug(":match")
-        next
-      end
-    end
-  end
-
-  if ICalPal::Event === item
-    # Check for all-day and cancelled events
-    if $opts[:ea] && item['all_day'].positive? then
-      $log.debug(":ea")
-      next
-    end
-
-    if $opts[:ia] && !item['all_day'].positive? then
-      $log.debug(":ia")
-      next
-    end
-
-    if item['status'] == :canceled then
-      $log.debug(":canceled")
-      next
-    end
-
-    (item['has_recurrences'].positive?)?
-      item.recurring.each { |i| add(i) } :
-      item.non_recurring.each { |i| add(i) }
-  else
-    # Check for dated reminders
-    if ICalPal::Reminder === item then
-      if $opts[:dated] == 1 and item['due_date'] > 0 then
-        $log.debug(":undated")
-        next
-      end
-
-      if $opts[:dated] == 2 and item['due_date'] == 0 then
-        $log.debug(":dated")
-        next
-      end
-    end
-
-    add(item)
-  end
-end
-
-# Add placeholders for empty days
-if $opts[:sed] && $opts[:sd] && klass == ICalPal::Event
-  days = $items.collect { |i| i['sday'] }.uniq.sort
-
-  $opts[:days].times do |n|
-    day = $opts[:from] + n
-    $items.push(klass.new(day)) unless days.any? { |i| i.to_s == day.to_s }
-  end
-end
-
-# Sort the rows
-begin
-  $log.info("Sorting/uniqing #{$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
-
-$log.debug("#{$items.count} items remain")
-
-# Configure formatting
-mu = case $opts[:output]
-     when 'ansi' then RDoc::Markup::ToAnsi.new
-     when 'default' then RDoc::Markup::ToICalPal.new($opts)
-     when 'html' then
-       rdoc = RDoc::Options.new
-       rdoc.pipe = true
-       rdoc.output_decoration = false
-       RDoc::Markup::ToHtml.new(rdoc)
-     when 'md' then RDoc::Markup::ToMarkdown.new
-     when 'rdoc' then RDoc::Markup::ToRdoc.new
-     when 'toc' then RDoc::Markup::ToTableOfContents.new
-     end
-
-
-##################################################
-# Print the data
-
-items = $items[0..$opts[:li] - 1]
-
-unless mu
-  $log.debug("Output in #{$opts[:output]} format")
-
-  puts case $opts[:output]
-       when 'csv' then
-         # Get all headers
-         headers = []
-         items.each { |i| headers += i.keys }
-         headers.uniq!
-
-         # Populate a CSV::Table
-         table = CSV::Table.new([], headers: headers)
-         items.each { |i| table << i.to_csv(headers) }
-
-         table
-       when 'hash' then items.map { |i| i.self }
-       when 'json' then items.map { |i| i.self }.to_json
-       when 'xml' then
-         xml = items.map { |i| "<#{$opts[:cmd].chomp("s")}>#{i.to_xml}</#{$opts[:cmd].chomp("s")}>" }
-         "<#{$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')} " +
-                              "DURATION #{((i['edate'] - i['sdate']).to_f * 1440).to_i } " +
-                              "MSG #{i['title']}"
-                          }.join("\n")
-       else abort "No formatter for #{$opts[:output]}"
-       end
-
-  exit
-end
-
-$log.debug("Formatting with #{mu.inspect}")
-
-doc = RDoc::Markup::Document.new
-section = nil
-
-items.each_with_index do |i, j|
-  $log.debug("Print #{j}: #{i.inspect}")
-
-  # --li
-  break if $opts[:li].positive? && j >= $opts[:li]
-
-  # Use RDoc::Markup::Verbatim to save the item
-  v = RDoc::Markup::Verbatim.new
-  v.format = i
-  doc << v
-
-  # Sections
-  if $opts[:sep] && section != i[$opts[:sep]]
-    $log.debug("New section '#{$opts[:sep]}': #{i[$opts[:sep]]}")
-
-    doc << RDoc::Markup::Raw.new($opts[:sep])
-
-    doc << RDoc::Markup::BlankLine.new if j.positive?
-    doc << RDoc::Markup::Heading.new(1, i[$opts[:sep]].to_s)
-    doc << RDoc::Markup::Rule.new(0)
-
-    section = i[$opts[:sep]]
-  end
-
-  # Item
-  props = RDoc::Markup::List.new(:BULLET)
-
-  # Properties
-  $opts[:props].each_with_index do |prop, k|
-    value = i[prop]
-
-    next unless value
-    next if Array === value && !value[0]
-    next if String === value && value.length == 0
-
-    $log.debug("#{prop}: #{value}")
-
-    # Use Raw to save the property
-    props << RDoc::Markup::Raw.new(prop)
-
-    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
-  props << RDoc::Markup::BlankLine.new unless props.empty?
-
-  doc << props
-end
-
-print doc.accept(mu)