icalPal 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e7119ea4a0a4ab593fdaafd6a77b190afae0ee23cdb5977e1b013321d7b9ce7
-  data.tar.gz: 1fd3b99ff20db0a4f87adbdc3e8156b16509087f4f6c023023c0b1462327e724
+  metadata.gz: 7c9b8fd93d1ac78cdab300223b887c7f766454c060517bd23c3e22f8c09cd060
+  data.tar.gz: 405b482c623cbb92d3d1389d49712733bf23b9845e308140180d1be755a17666
 SHA512:
-  metadata.gz: 835e84ef0fb7d74bd74b064d0ee6f6a31ca9e6450d9beb49b3dc798b77526ca2bd6e9474d2425d0ccd4d35d60201c8bb54afc68cdc1956715285b7f4a259bd9d
-  data.tar.gz: 96b7de3c1fd55bd6acb3d070ef93c7599bb213b6a5dc20b4ecf294e02264a346390f142aad39c2c4ad394a716231405e00f1dc9f4203ed5812d0e193e567819c
+  metadata.gz: 5c5806fe116be9c9f77757461c73aed31a2da0ceb242316cd3fee66c177a7e9e0292da09caaf1008a3bfe96678dd194b6fe1d0ce57fd10a1fb288115c0f20cad
+  data.tar.gz: 102075607d63a9d3a8ef209d26ad2e10882e81a4f796e8ac273ed014ff623ff758839dbb8d8fbf18199bc0237c46ce0bb2feb4b95b9c19d0259dfbc9de571d27

data/icalPal.gemspec

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

data/lib/ToICalPal.rb

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

data/lib/{Defaults.rb → defaults.rb}

@@ -6,7 +6,7 @@ $today = ICalPal::RDT.new(*$now.to_a[0..2])
 $defaults = {
   common: {
     aep: [],
-    bullet: '•',
+    b: '•',
     cf: "#{ENV['HOME']}/.icalPal",
     color: false,
     db: "#{ENV['HOME']}/Library/Calendars/Calendar.sqlitedb",
@@ -29,7 +29,7 @@ $defaults = {
     sp: false,
   },
   tasks: {
-    bullet: '!',
+    b: '!',
     iep: [ 'notes', 'due', 'priority' ],
     sort: 'priority',
   },

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

@@ -80,7 +80,11 @@ module ICalPal
       obj['type'] = EventKit::EKSourceType.find_index { |i| i[:name] == 'Subscribed' } if obj['subcal_url']
       type = EventKit::EKSourceType[obj['type']]
 
-      @self['sdate'] = @self['sdate'].new_offset(0) if @self['start_tz'] == '_float'
+      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
+
       @self['symbolic_color_name'] ||= @self['color']
       @self['type'] = type[:name]
     end
@@ -120,12 +124,13 @@ module ICalPal
 
       i = 1
       while self['sdate'] <= stop
+        return(retval) if self['count'].positive? && i > self['count']
+        i += 1
+
         unless @self['xdate'].any?(@self['sdate']) # Exceptions?
           o = get_occurrences(changes)
           o.each { |r| retval.push(r) if in_window?(r['sdate'], r['edate']) }
 
-          i += 1
-          return(retval) if self['count'].positive? && i > self['count']
         end
 
         apply_frequency!
@@ -140,8 +145,6 @@ 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
 

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

@@ -134,6 +134,7 @@ 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('')

data/lib/{RDT.rb → rdt.rb}

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Andy Rosen
@@ -33,7 +33,7 @@ cert_chain:
   PDmWrfNO9LeQhiYLyVsOQ1xuWKDF0acQFAVIZctRp4VuZZMVqis4FRmqMdZcB/R2
   HaQXi3DWVibRuVZ3N77DWUKG
   -----END CERTIFICATE-----
-date: 2023-03-05 00:00:00.000000000 Z
+date: 2023-04-06 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+