gnu-remind 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8302802a937430ef1ad975d6616ec60e3426f571ab67362f618396623184469
-  data.tar.gz: bab3dbb5c8cec7b55e84caa4e30bb7f31fccf60feb9ebfec9232c796d98cc438
+  metadata.gz: 6e19a29ab03bfa83dfcb3fcf0e55a656a46d3bc5a208f13e4328208603ff89d2
+  data.tar.gz: 2f28f2c9cbb5f6be6f651b237eee7388fd0ccc8ec6fcc7fc18c61796c2ecbd81
 SHA512:
-  metadata.gz: 432e323c67bb3b876db61bc967bb2dedabee7ff5ed2f73a3fce029f9c2f1efb00b28464c7ebf6d4a64827fa8345ce1da5b3163e81956cca1fb796c7c999b9921
-  data.tar.gz: f7757d9b561d015faa63880d888447739b2a6317e462cc1b65a9f794309e81ebe11f8ff45fba35b76b519ae4e0fa35fe9e0949ee1c687cf5440e8a3252d80927
+  metadata.gz: 0f01038165073462f41b21fa90f2c8d7cd04c9930aedc4b75d7da3e7ecf26a11fe92303f762a13488276aecf4943fd15615b4e79edb80e899ffa218b35eb4b7f
+  data.tar.gz: 48deb1c49d4524cc6abd9b2e22a2fc802fdadf7b799a48adf2bc7ecc0edbbdd5f645386171fa3b19507a69e1739946f23d6cd706dac6e240e4f5e3ee5d62d317

data/lib/remind/event.rb

@@ -0,0 +1,37 @@
+module EVENT
+  class E
+    def initialize i
+      @event = Nickel.parse i
+      puts %[EVENT::E: #{@event}]
+      if event?
+        @message = @event.message
+      else
+        t = Time.now.utc
+        @message = i
+      end
+    end
+    def event?
+      if %[#{@event.message}].length > 0 && @event.occurrences.length > 0
+        return true
+      else
+        return false
+      end
+    end
+    def each &b
+      @event.occurrences.each { |e|
+        h = {
+          message: @message,
+          date: e.start_date.to_date.strftime("%-d %b %Y"),
+          hour: e.start_time.to_time.strftime("%k"),
+          minute: e.start_time.to_time.strftime("%M") 
+        }
+        puts %[each message: #{h}]
+        b.call(h, e)
+      }
+      return nil
+    end
+  end
+  def self.[] k
+    E.new(k)
+  end
+end

data/lib/remind/remind.rb

@@ -1,83 +1,76 @@
-
-class E 
-  def initialize k
-    @id = k
-    @r = Hash.new { |h,k| h[k] = R.new(k) }
-    clear!
-  end
-  def id; @id; end
-  
-  def [] k
-    @rem << k
-    @r[k]
-  end
-
-  def agenda
-    `remind -t1 rem/#{@id}.rem`.split("\n\n")
-  end
-
-  def clear!
-    @rem = []
-  end
-  
-  def to_rem
-    a = [];
-    @rem.each { |e| a << @r[e].to_rem }
-    return a.join("\n")
-  end
-  
-  def to_rem!
-    if !Dir.exist? "rem"
-      Dir.mkdir("rem")
+module REM
+  class E 
+    def initialize k
+      @id = k
+      @r = Hash.new { |h,k| h[k] = R.new(k) }
+      clear!
     end
-    File.open("rem/#{@id}.rem",'w') { |f| f.write(to_rem); }
-  end
-end
-
-
-class R
-
-  attr_accessor :attr
-  
-  def initialize k
-    @id = k
-    @attr = {}
-  end
-  
-  def id; @id; end
-
-  def to_rem
-    a, i = [], [ @id ]
-    if @attr.has_key? :date
-      a << %[#{@attr[:date]}]
-      if @attr.has_key? :lead
-        a << %[++#{@attr[:lead]}]
-      end
-      if @attr.has_key? :repeat
-        a << %[*#{@attr[:repeat]}]
-      end
-      if @attr.has_key? :until
-        a << %[UNTIL #{@attr[:until]}]
-      end
+    def id; @id; end
+    
+    def [] k
+      @rem << k
+      @rem.uniq
+      @r[k]
+    end
+    
+    def get a 
+      `remind #{a} rem/#{@id}.rem`.split("\n\n")
+    end
+    
+    def clear!
+      @rem = []
     end
-    if @attr.has_key? :hour
-      if @attr.has_key? :minute
-        a << %[AT #{@attr[:hour]}:#{@attr[:minute]}]
+    
+    def to_rem
+      a = [];
+      @rem.each { |e| a << @r[e].to_rem }
+      return a.join("\n")
+    end
+    
+    def to_rem! h={}
+      if !Dir.exist? "rem"
+        Dir.mkdir("rem")
+      end
+      if h[:append] == true
+        File.open("rem/#{@id}.rem",'a') { |f| f.write(to_rem); }
       else
-        a << %[AT #{@attr[:hour]}:00]
+        File.open("rem/#{@id}.rem",'w') { |f| f.write(to_rem); }
       end
     end
-    if @attr.has_key? :duration
-      i << %[for #{@attr[:duration]} hours]
+  end
+  
+  
+  class R
+    
+    attr_accessor :attr
+    
+    def initialize k
+      @id = k
+      @attr = {}
     end
-    if @attr.has_key? :at
-      i << %[at #{@attr[:at]}]
+    
+    def id; @id; end
+    
+    def to_rem
+      puts %[R[#{@id}] #{@attr}]
+      a, i = [], [ @id ]
+      if @attr.has_key? :date
+        a << %[#{@attr[:date]}]
+        if @attr.has_key? :lead
+          a << %[++#{@attr[:lead]}]
+        end
+      end
+      if @attr.has_key? :hour
+        if @attr.has_key? :minute
+          a << %[AT #{@attr[:hour]}:#{@attr[:minute]}]
+        else
+          a << %[AT #{@attr[:hour]}:00]
+        end
+      end
+      return %[REM #{a.join(" ")} MSG #{i.join(" ")}\n]
     end
-    return %[REM #{a.join(" ")} MSG #{i.join(" ")}]
   end
-end
-
-module REM
+  
   @@REM = Hash.new { |h,k| h[k] = E.new(k) }
   def self.[] k
     @@REM[k]
@@ -86,4 +79,3 @@ module REM
     @@REM.keys
   end
 end
-

data/lib/remind/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Remind
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/lib/remind.rb

@@ -1,80 +1,77 @@
 # frozen_string_literal: true
 
+require 'erb'
+
 require 'faraday'
 
 require 'icalendar'
 
+require 'nickel'
+
 require_relative "remind/version"
 
 require_relative "remind/remind"
 
 require_relative "remind/calendar"
 
+require_relative "remind/event"
+
 module Remind
   class Error < StandardError; end
+
   @@REM = REM['reminders']
+  
   @@INIT = []
-  @@URL = []
   def self.init h={}
     @@INIT << h
   end
   
+  @@URL = []
   def self.url u
     @@URL << u
   end
   
+  @@SRC = []
+  def self.src k
+    @@SRC << k
+  end
+  
   def self.rebuild!
     @@REM.clear!
+    
     [@@INIT].flatten.each do |x|
+      puts %[rebuild! x: #{x}]
       @@REM[x[:what]].attr = { date: x[:when] }
     end
+    
     @@URL.each do |u|
+      puts %[rebuild! u: #{u}]
       CAL.from_url(u).each do |e|
         d = e.when[:begin].to_time.localtime.strftime("%Y/%m/%d-%R")
-        h = {
-          date: e.when[:begin].to_time.localtime.strftime("%-d %b %Y"),
-          hour: e.when[:begin].to_time.localtime.strftime("%k"),
-          minute: e.when[:begin].to_time.localtime.strftime("%M"),
-          at: e.where,
-          type: e.who,
-          lead: 1
-        }
+        h = { date: e.when[:begin].to_time.localtime.strftime("%-d %b %Y"), hour: e.when[:begin].to_time.localtime.strftime("%k"), minute: e.when[:begin].to_time.localtime.strftime("%M"), lead: 1 }
         k = %[#{e.what} #{h[:type]} #{d}]
         @@REM[k].attr = h
       end
     end
-  end
-
-  def self.remote x, u
-    r = REM[x]
-    r.clear!
-    Remind.rebuild!
-    CAL.from_url(u).each do |e|
-      d = e.when[:begin].to_time.localtime.strftime("%Y/%m/%d-%R")
-      h = {
-        date: e.when[:begin].to_time.localtime.strftime("%-d %b %Y"),
-        hour: e.when[:begin].to_time.localtime.strftime("%k"),
-        minute: e.when[:begin].to_time.localtime.strftime("%M"),
-        at: e.where,
-        type: e.who
-      }
-      
-      k = %[#{e.what} #{h[:type]} #{d}]
-      puts "#{k}: #{h}"
-      r[k].attr = h
-      @@REM[k].attr = h
-    end
-    r.to_rem!
+    
     @@REM.to_rem!
-    return nil
-  end
+  end  
   
-  def self.[] k
-    REM[k].agenda[1..-1]
+  def self.remind k, *src
+    REM[k].clear!
+    [src].flatten.each do |e|
+      EVENT[e].each do |ee|
+        REM[k][%[#{ee[:message]} #{ee[:date]}]].attr = { date: ee[:date], hour: ee[:hour], minute: ee[:minute], lead: 1 }
+      end
+    end
+    REM[k].to_rem! append: true
   end
 
-  def self.all
-    @@REM.to_rem!
-    @@REM.agenda[1..-1]
+  def self.get k, h={}
+    REM[k].get(h[:args] || '-t1')[1..-1]
+  end
+  
+  def self.get! h={}
+    @@REM.get(h[:args] || '-t1')[1..-1]
   end
 end

data/remind.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "faraday"
   spec.add_dependency "icalendar"
+  spec.add_dependency "nickel"
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnu-remind
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Erik Olson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-18 00:00:00.000000000 Z
+date: 2024-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nickel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A wrapper around gnu remind leveraging ics files via url or locally.
 email:
 - xorgnak@gmail.com
@@ -52,6 +66,7 @@ files:
 - Rakefile
 - lib/remind.rb
 - lib/remind/calendar.rb
+- lib/remind/event.rb
 - lib/remind/remind.rb
 - lib/remind/version.rb
 - remind.gemspec