icalPal 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da878f6bb6e44ced393b3e22f9198182876900ed7f6da719a89b940654c247d2
-  data.tar.gz: 6021823cafd2b926749fd48b7488467741bacd9f3b18d0ab2db309e0680563d6
+  metadata.gz: 8e7119ea4a0a4ab593fdaafd6a77b190afae0ee23cdb5977e1b013321d7b9ce7
+  data.tar.gz: 1fd3b99ff20db0a4f87adbdc3e8156b16509087f4f6c023023c0b1462327e724
 SHA512:
-  metadata.gz: f0a8978b868244d413b89bb314de069353eddd1e23aa6fe5dd65da772254a35e4f1dbe61fe69b780cba91942cb48ec075c99db02b9758d4a12afb4f7342d7e3b
-  data.tar.gz: 412a7ab706838e783901c416134a2ccee0df65076decf5bbfa93404bc11234e8f32debf7992e4eb2d54227cf7691874d05f31ed82e29aec8b9c11ec572776497
+  metadata.gz: 835e84ef0fb7d74bd74b064d0ee6f6a31ca9e6450d9beb49b3dc798b77526ca2bd6e9474d2425d0ccd4d35d60201c8bb54afc68cdc1956715285b7f4a259bd9d
+  data.tar.gz: 96b7de3c1fd55bd6acb3d070ef93c7599bb213b6a5dc20b4ecf294e02264a346390f142aad39c2c4ad394a716231405e00f1dc9f4203ed5812d0e193e567819c

data/README.md

@@ -16,8 +16,6 @@ gem install icalPal
 icalPal events
 ```
 
-A [Homebrew](https://brew.sh) formula is in the works.
-
 ## Features
 
 ### Compatability with [icalBuddy](https://github.com/ali-rantakari/icalBuddy)

data/bin/icalPal

@@ -124,7 +124,6 @@ end
 # Configure formatting
 mu = case $opts[:output]
      when 'ansi' then RDoc::Markup::ToAnsi.new
-     when 'csv' then proc { |f| f.respond_to?(:gsub)? f.gsub(/\n/, '\n') : f }
      when 'default' then RDoc::Markup::ToICalPal.new($opts)
      when 'html' then
        rdoc = RDoc::Options.new
@@ -140,65 +139,76 @@ mu = case $opts[:output]
 ##################################################
 # Print the data
 
+items = $items[0..$opts[:li] - 1]
+
+unless mu
+  puts case $opts[:output]
+  when 'csv' then
+    o = {
+      headers: items[0].keys,
+      write_converters: proc { |f| f.respond_to?(:gsub)? f.gsub(/\n/, '\n') : f },
+      write_headers: true,
+    }
+
+    CSV.generate(o) { |k| items.each { |i| k << i.values.map { |v| v.to_s } } }
+  when 'hash' then items.map { |i| i.self }
+  when 'json' then items.map { |i| i.self }.to_json
+  when 'yaml' then items.map { |i| i.self }.to_yaml
+  else abort "No formatter for #{$opts[:output]}"
+  end
+
+  exit
+end
+
 section = nil if $opts[:sep]
 
-$items.each_with_index do |i, j|
+items.each_with_index do |i, j|
   # --li
   break if $opts[:li].positive? && j >= $opts[:li]
 
-  case $opts[:output]
-  when 'csv' then
-    values = i.values.map { |v| v.to_s }
-    puts CSV.generate(write_converters: mu) { |k| k << i.keys } unless j.positive?
-    puts CSV.generate(write_converters: mu) { |k| k << values }
-  when 'hash' then p i.self
-  when 'json' then puts i.self.to_json
-  when 'yaml' then puts i.self.to_yaml
-  else
-    doc = RDoc::Markup::Document.new
+  doc = RDoc::Markup::Document.new
 
-    # Sections
-    if $opts[:sep] && section != i[$opts[:sep]]
-      $log.debug("Section: #{i[$opts[:sep]]}")
+  # Sections
+  if $opts[:sep] && section != i[$opts[:sep]]
+    $log.debug("Section: #{i[$opts[:sep]]}")
 
-      v = RDoc::Markup::Verbatim.new
-      v.format = { item: i, prop: $opts[:sep] }
-      doc << v
+    v = RDoc::Markup::Verbatim.new
+    v.format = { item: i, prop: $opts[:sep] }
+    doc << v
 
-      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)
+    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
+    section = i[$opts[:sep]]
+  end
 
-    # Item
-    props = RDoc::Markup::List.new(:BULLET)
+  # Item
+  props = RDoc::Markup::List.new(:BULLET)
 
-    # Properties
-    $opts[:props].each_with_index do |prop, k|
-      next unless i[prop]
-      next if Array === i[prop] && !i[prop][0]
+  # Properties
+  $opts[:props].each_with_index do |prop, k|
+    next unless i[prop]
+    next if Array === i[prop] && !i[prop][0]
 
-      $log.debug("#{prop}: #{i[prop]}")
+    $log.debug("#{prop}: #{i[prop]}")
 
-      v = RDoc::Markup::Verbatim.new
-      v.format = { item: i, prop: prop }
-      props << v
+    v = RDoc::Markup::Verbatim.new
+    v.format = { item: i, prop: prop }
+    props << v
 
-      unless k.positive?
-        # First property, value only
-        props << RDoc::Markup::Heading.new(2, i[prop].to_s)
-      else
-        props << RDoc::Markup::BlankLine.new unless (i['placeholder'] || $opts[:ps])
-        props << RDoc::Markup::ListItem.new(prop, RDoc::Markup::Paragraph.new(i[prop]))
-      end
+    unless k.positive?
+      # First property, value only
+      props << RDoc::Markup::Heading.new(2, i[prop].to_s)
+    else
+      props << RDoc::Markup::BlankLine.new unless (i['placeholder'] || $opts[:ps])
+      props << RDoc::Markup::ListItem.new(prop, RDoc::Markup::Paragraph.new(i[prop]))
     end
+  end
 
-    # Print it
-    unless props.empty?
-      doc << props
-      puts doc.accept(mu)
-    end
+  # Print it
+  unless props.empty?
+    doc << props
+    puts doc.accept(mu)
   end
 end

data/icalPal.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name	= "icalPal"
-  s.version	= "1.0.1"
+  s.version	= "1.1.0"
   s.summary	= "Command-line tool to query the macOS Calendar"
   s.description	= <<-EOF
 Inspired by icalBuddy and maintains close compatability.  Includes

data/lib/{event.rb → Event.rb}

@@ -95,8 +95,10 @@ module ICalPal
 
       # Repeat for multi-day events
       ((self['duration'] / 86400).to_i + 1).times do |i|
-        retval.push(Marshal.load(Marshal.dump(self))) if in_window?(self['sdate'])
+        self['daynum'] = i + 1
+        retval.push(clone) if in_window?(self['sdate'])
         self['sdate'] += 1
+        self['edate'] += 1
       end
 
       retval
@@ -136,6 +138,13 @@ module ICalPal
 
     # @!visibility public
 
+    # @return a deep clone of self
+    def clone()
+      self['stime'] = self['sdate'].to_i
+      self['etime'] = self['edate'].to_i
+      Marshal.load(Marshal.dump(self))
+    end
+
     # Get next occurences of a recurring event
     #
     # @param changes [Array] Recurrence changes for the event
@@ -177,14 +186,14 @@ module ICalPal
           proc {
             self['sdate'] = RDT.new(*ndate.to_a[0..2], *self['sdate'].to_a[3..])
             self['edate'] = RDT.new(*ndate.to_a[0..2], *self['edate'].to_a[3..])
-            retval.push(Marshal.load(Marshal.dump(self)))
+            retval.push(clone)
           }) { |i| @self['sdate'].to_i == i['orig_date'] + ITIME }
       end
 
       # Check for changes
       changes.detect(
         proc {
-          retval.push(Marshal.load(Marshal.dump(self)))
+          retval.push(clone)
         }) { |i| @self['sdate'].to_i == i['orig_date'] + ITIME } unless retval.count.positive?
 
       retval
@@ -238,6 +247,7 @@ CalendarItem.availability,
 CalendarItem.conference_url_detected,
 CalendarItem.description AS notes,
 CalendarItem.has_recurrences,
+CalendarItem.invitation_status,
 CalendarItem.orig_item_id,
 CalendarItem.rowid,
 CalendarItem.start_tz,
@@ -258,7 +268,9 @@ Recurrence.count,
 CAST(Recurrence.end_date AS INT) AS rend_date,
 Recurrence.frequency,
 Recurrence.interval,
-Recurrence.specifier
+Recurrence.specifier,
+
+min(Alarm.trigger_interval) AS trigger_interval
 
 FROM Store
 
@@ -268,7 +280,7 @@ JOIN CalendarItem ON CalendarItem.calendar_id = Calendar.rowid
 LEFT OUTER JOIN Location ON Location.rowid = CalendarItem.location_id
 LEFT OUTER JOIN Recurrence ON Recurrence.owner_id = CalendarItem.rowid
 LEFT OUTER JOIN ExceptionDate ON ExceptionDate.owner_id = CalendarItem.rowid
-
+LEFT OUTER JOIN Alarm ON Alarm.calendaritem_owner_id = CalendarItem.rowid
 LEFT OUTER JOIN Participant ON Participant.owner_id = CalendarItem.rowid
 LEFT OUTER JOIN Identity ON Identity.rowid = Participant.identity_id
 

data/lib/{options.rb → Options.rb}

@@ -23,7 +23,7 @@ module ICalPal
       @op = OptionParser.new
       @op.summary_width = 23
       @op.banner += " [-c] COMMAND"
-      @op.version = '1.0'
+      @op.version = '1.0.2'
 
       @op.accept(ICalPal::RDT) { |s| ICalPal::RDT.conv(s) }
 
@@ -171,9 +171,11 @@ module ICalPal
         @op.parse!(into: cli)
         @op.parse!(ENV['ICALPAL'].split, into: env) rescue nil
         cli[:cf] ||= ENV['ICALPAL_CONFIG'] || $defaults[:common][:cf]
-        @op.parse!(IO.read(File.expand_path(cli[:cf])).split, into: cf) rescue nil
+        @op.parse!(File.read(File.expand_path(cli[:cf])).split, into: cf) rescue nil
 
         cli[:cmd] ||= @op.default_argv[0]
+        cli[:cmd] ||= env[:cmd] if env[:cmd]
+        cli[:cmd] ||= cf[:cmd] if cf[:cmd]
         cli[:cmd] = 'stores' if cli[:cmd] == 'accounts'
 
         # Parse eventsNow and eventsToday commands

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andy Rosen
@@ -33,7 +33,7 @@ cert_chain:
   PDmWrfNO9LeQhiYLyVsOQ1xuWKDF0acQFAVIZctRp4VuZZMVqis4FRmqMdZcB/R2
   HaQXi3DWVibRuVZ3N77DWUKG
   -----END CERTIFICATE-----
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies: []
 description: |
   Inspired by icalBuddy and maintains close compatability.  Includes
@@ -48,15 +48,15 @@ files:
 - README.md
 - bin/icalPal
 - icalPal.gemspec
+- lib/Calendar.rb
+- lib/Defaults.rb
+- lib/Event.rb
 - lib/EventKit.rb
+- lib/ICalPal.rb
+- lib/Options.rb
+- lib/RDT.rb
+- lib/Store.rb
 - lib/ToICalPal.rb
-- lib/calendar.rb
-- lib/defaults.rb
-- lib/event.rb
-- lib/icalPal.rb
-- lib/options.rb
-- lib/rdt.rb
-- lib/store.rb
 homepage: https://github.com/ajrosen/icalPal
 licenses:
 - GPL-3.0+