icalPal 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c9b8fd93d1ac78cdab300223b887c7f766454c060517bd23c3e22f8c09cd060
-  data.tar.gz: 405b482c623cbb92d3d1389d49712733bf23b9845e308140180d1be755a17666
+  metadata.gz: a4c83cdb34723fcb8765291ee5724c3a3521d32aa268649631b2ae6e0d597c13
+  data.tar.gz: 54c399338c62d6ee482ad5240ede35b0b86b7d796320ec95bc6076485e672365
 SHA512:
-  metadata.gz: 5c5806fe116be9c9f77757461c73aed31a2da0ceb242316cd3fee66c177a7e9e0292da09caaf1008a3bfe96678dd194b6fe1d0ce57fd10a1fb288115c0f20cad
-  data.tar.gz: 102075607d63a9d3a8ef209d26ad2e10882e81a4f796e8ac273ed014ff623ff758839dbb8d8fbf18199bc0237c46ce0bb2feb4b95b9c19d0259dfbc9de571d27
+  metadata.gz: d284b817b3c49f1db9ca67920ccced88a4b0c1247b3137a590568f388b60f9b5e79af493cc16f6384a7d7ae09de16f3e578851cf184df9bcc16e8bf8ab8bef53
+  data.tar.gz: 716a3c40617e47413ce661157e0bface4671b0b400b1fad3f4bdf0b084d1fc4a9c75f88dfb05a89928749355cce56984692c6e740fd196820a8cb03f06c643aa

data/README.md

@@ -181,7 +181,9 @@ to mimic icalBuddy as much as possible.
 CSV, Hash, JSON, and YAML print all fields for all items in their
 respective formats.  From that you can analyze the results any way you like.
 
-All other formats, ANSI, HTML, Markdown, RDoc, and TOC, use Ruby's
+Remind format uses a minimal implementation built in 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)
 framework to build and render the items.
 
@@ -207,5 +209,5 @@ objects, one for each of the item's properties:
 
 The document will also include a number of
 [RDoc::Markup::Verbatim](https://ruby-doc.org/stdlib-2.6.10/libdoc/rdoc/rdoc/RDoc/Markup/Verbatim.html)
-items.  The are not included in the output, but are used to pass
+items.  They are not included in the output, but are used to pass
 information about the item and property to the default formatter.

data/bin/icalPal

@@ -40,8 +40,10 @@ $log.info("Options: #{$opts}")
 # Add an item to the list
 #
 # @param item[Object]
+
 def add(item)
-  $log.debug("Adding #{item['UUID']} (#{item['title']})") if item['UUID']
+  $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['sdate']
   $items.push(item)
 end
@@ -117,6 +119,7 @@ end
 begin
   $items.sort_by! { |i| [ i[$opts[:sep]], i[$opts[:sort]], i['sdate'] ] }
   $items.reverse! if $opts[:reverse]
+  $items.uniq!
 rescue ArgumentError => e
   $log.warn("Sorting failed, results may be unexpected\n")
 end
@@ -143,19 +146,24 @@ 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
+       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
+       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

data/icalPal.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name	= "icalPal"
-  s.version	= "1.1.2"
+  s.version	= "1.1.4"
   s.summary	= "Command-line tool to query the macOS Calendar"
   s.description	= <<-EOF
 Inspired by icalBuddy and maintains close compatability.  Includes
@@ -10,12 +10,14 @@ EOF
   s.authors	= "Andy Rosen"
   s.email	= "ajr@corp.mlfs.org"
   s.homepage	= "https://github.com/ajrosen/#{s.name}"
-  s.licenses	= [ "GPL-3.0+" ]
+  s.licenses	= [ "GPL-3.0-or-later" ]
 
   s.files	= Dir[ "#{s.name}.gemspec", "bin/*", "lib/*.rb" ]
   s.executables	= [ "#{s.name}" ]
   s.extra_rdoc_files = [ "README.md" ]
 
+  s.add_runtime_dependency "sqlite3", "~> 1"
+
   s.bindir = 'bin'
   s.required_ruby_version = '>= 2.6.0'
 end

data/lib/ToICalPal.rb

@@ -67,7 +67,7 @@ class RDoc::Markup::ToICalPal < RDoc::Markup::Formatter
     rescue
     end
 
-    @res << "#{@opts[:bullet]} " unless @opts[:nb]
+    @res << "#{@opts[:bullet]} "
   end
 
   # Add a property name

data/lib/defaults.rb

@@ -1,12 +1,12 @@
 # Does anybody really know what time it is?
 $now = ICalPal::RDT.now
-$today = ICalPal::RDT.new(*$now.to_a[0..2])
+$today = ICalPal::RDT.new(*$now.to_a[0..2] + [0, 0, 0, $now.zone])
 
 # Defaults
 $defaults = {
   common: {
     aep: [],
-    b: '•',
+    bullet: '•',
     cf: "#{ENV['HOME']}/.icalPal",
     color: false,
     db: "#{ENV['HOME']}/Library/Calendars/Calendar.sqlitedb",
@@ -29,7 +29,7 @@ $defaults = {
     sp: false,
   },
   tasks: {
-    b: '!',
+    bullet: '!',
     iep: [ 'notes', 'due', 'priority' ],
     sort: 'priority',
   },

data/lib/event.rb

@@ -3,6 +3,11 @@ module ICalPal
   class Event
     include ICalPal
 
+    def []=(k, v)
+      @self[k] = v
+      @self['sday'] = ICalPal::RDT.new(*self['sdate'].to_a[0..2]) if k == 'sdate'
+    end
+
     # Standard accessor with special handling for +age+,
     # +availability+, +datetime+, +location+, +notes+, +status+,
     # +title+, and +uid+
@@ -35,6 +40,9 @@ module ICalPal
       when 'notes' then         # \n -> :nnr
         @self['notes']? @self['notes'].strip.gsub(/\n/, $opts[:nnr]) : nil
 
+      when 'sday' then        # pseudo-property
+        ICalPal::RDT.new(*@self['sdate'].to_a[0..2])
+
       when 'status' then        # Integer -> String
         EventKit::EKEventStatus.select { |k, v| v == @self['status'] }.keys[0]
 
@@ -77,14 +85,15 @@ module ICalPal
         @self["#{k[0]}date"] = RDT.new(*t.to_a.reverse[4..], t.zone) if t
       end
 
-      obj['type'] = EventKit::EKSourceType.find_index { |i| i[:name] == 'Subscribed' } if obj['subcal_url']
-      type = EventKit::EKSourceType[obj['type']]
-
       if @self['start_tz'] == '_float'
         @self['sdate'] = RDT.new(*(@self['sdate'].to_time - Time.zone_offset($now.zone())).to_a.reverse[4..], $now.zone)
         @self['edate'] = RDT.new(*(@self['edate'].to_time - Time.zone_offset($now.zone())).to_a.reverse[4..], $now.zone)
       end
 
+      # Type of calendar event is from
+      obj['type'] = EventKit::EKSourceType.find_index { |i| i[:name] == 'Subscribed' } if obj['subcal_url']
+      type = EventKit::EKSourceType[obj['type']]
+
       @self['symbolic_color_name'] ||= @self['color']
       @self['type'] = type[:name]
     end
@@ -130,7 +139,6 @@ module ICalPal
         unless @self['xdate'].any?(@self['sdate']) # Exceptions?
           o = get_occurrences(changes)
           o.each { |r| retval.push(r) if in_window?(r['sdate'], r['edate']) }
-
         end
 
         apply_frequency!
@@ -145,6 +153,9 @@ module ICalPal
 
     # @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
 
@@ -190,14 +201,14 @@ module ICalPal
             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(clone)
-          }) { |i| @self['sdate'].to_i == i['orig_date'] + ITIME }
+          }) { |i| @self['sday'] == i['sday'] }
       end
 
       # Check for changes
       changes.detect(
         proc {
           retval.push(clone)
-        }) { |i| @self['sdate'].to_i == i['orig_date'] + ITIME } unless retval.count.positive?
+        }) { |i| @self['sday'] == i['sday'] } unless retval.count.positive?
 
       retval
     end

data/lib/options.rb

@@ -23,7 +23,7 @@ module ICalPal
       @op = OptionParser.new
       @op.summary_width = 23
       @op.banner += " [-c] COMMAND"
-      @op.version = '1.0.2'
+      @op.version = '1.1.4'
 
       @op.accept(ICalPal::RDT) { |s| ICalPal::RDT.conv(s) }
 
@@ -134,7 +134,6 @@ module ICalPal
 
       @op.separator('')
       @op.on('-b', '--ab=STRING', String, 'Use STRING for bullets')
-      @op.on('--nb', 'Do not use bullets')
       @op.on('--nnr=SEPARATOR', String, 'Set replacement for newlines within notes')
 
       @op.separator('')
@@ -256,7 +255,7 @@ module ICalPal
     COMMANDS = %w{events eventsToday eventsNow calendars accounts stores}
 
     # Supported output formats
-    OUTFORMATS = %w{ansi csv default hash html json md rdoc toc yaml}
+    OUTFORMATS = %w{ansi csv default hash html json md rdoc toc yaml remind}
 
     private
 

data/lib/rdt.rb

@@ -29,7 +29,9 @@ module ICalPal
     def to_s
       return strftime($opts[:df]) if $opts[:nrd] && $opts[:df]
 
-      case Integer(RDT.new(year, month, day) - $today)
+      d1 = RDT.new(year, month, day)
+
+      case Integer(d1 - $today)
       when -2 then 'day before yesterday'
       when -1 then 'yesterday'
       when 0 then 'today'
@@ -40,7 +42,7 @@ module ICalPal
     end
 
     alias inspect to_s
- 
+
     # @see Time.to_a
     #
     # @return [Array] Self as an array

metadata

@@ -1,40 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Andy Rosen
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIID/jCCAmagAwIBAgIBBDANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBphanIv
-  REM9Y29ycC9EQz1tbGZzL0RDPW9yZzAeFw0yMzAyMjMyMDEzMjBaFw0yNDAyMjMy
-  MDEzMjBaMCUxIzAhBgNVBAMMGmFqci9EQz1jb3JwL0RDPW1sZnMvREM9b3JnMIIB
-  ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAqQ2xCUJ4wY8WujSzYd3OGTbj
-  JDMeU44pXOTLc49Rs8ydukGfd0YBvYMzifmiVRj6depGx2+Ln28Y2mT6IB+zHq8X
-  s1lrMdFCReztJjQ7OYS16YcZ6pmLkYClnHN3VNqayk1lQEJGCr8aawMeroSB01om
-  d5wqDATnKEG3x4bnlxFJb3LHzUG1CgNuVCuNREi8zN/uYdm2MGe1fTJguy4/vzBQ
-  /FnAMt1mr3LtM6YZRGaitIlOKBV/08v7fjH31KRmSMMHPq6A+WyWKRNKnK3tHpSN
-  JbnFW7mFQGtBpfh8zY8OCQ76Aw8cb5bEIPTI+Hd4FoJLPKnexTI28endSLigOUCF
-  76kLOiVOVOjdqZ8vEdSgWVugEAzIC30xW5b8yD6N7GdT7n3ktgoZu7jZMUW3D6PQ
-  wS6BaABVsXbeVtFrzK2tQ65EwLfRluRLTfbnQ7qvMIYCwC3Ib9DTMLavCiOot1vc
-  RBWXIrDex0tt3EN0dDIxP9O+7ciDgM4zPe6BvaF/AgMBAAGjOTA3MAkGA1UdEwQC
-  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRDowzw+kmcX6FV7T9BkQsUgmzLZjAN
-  BgkqhkiG9w0BAQsFAAOCAYEAV5j0cxPzFyLXyohgiT0DsruPVcNuICp+gcZ1xSeF
-  8z1Sp3Nv8IYOpTc11nDoNCtKHMffd+tKH0nIvp3lGaYfVYJsCfuT56pqmgZiR50S
-  QmlfH+EPXjTlrtg6VJPFzxflqrb4kl+Eaxt67RYbOgVgviXfue2ytKywxnyWGML6
-  EeA+y656Lalvu5XfjLuuqYLIUDJ+jyZDjTsDbUkzPbC/y1i0z4KycRnzETCSryvN
-  HI40svbvW9H+OT3D381Hvk760soXcLgrLA1hz5XQwDBFs7N/U7PeztxuurOw4NOb
-  ctKe1VpldN1JTHdz6u7TAGy0NjC86DF05fvAsEn1baKVZz5P+2OG2FEc+4NWa8/T
-  +v11ZpnzUfxx2TyCM1hTTaphxjAWEYeeylK+ozjZCopJLNkw6uXuni6TrUUQWRAs
-  PDmWrfNO9LeQhiYLyVsOQ1xuWKDF0acQFAVIZctRp4VuZZMVqis4FRmqMdZcB/R2
-  HaQXi3DWVibRuVZ3N77DWUKG
-  -----END CERTIFICATE-----
-date: 2023-04-06 00:00:00.000000000 Z
-dependencies: []
+cert_chain: []
+date: 2024-02-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: |
   Inspired by icalBuddy and maintains close compatability.  Includes
   many additional features for querying, filtering, and formatting.
@@ -59,9 +48,9 @@ files:
 - lib/store.rb
 homepage: https://github.com/ajrosen/icalPal
 licenses:
-- GPL-3.0+
+- GPL-3.0-or-later
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,8 +65,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.5.4
+signing_key:
 specification_version: 4
 summary: Command-line tool to query the macOS Calendar
 test_files: []