terminal_cal 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd5fb9cde3b246549f7a44e1a068559164eeddb
-  data.tar.gz: 4b97366cce752dd4ac5d1b28ec9a621f47df2465
+  metadata.gz: 8b996754b80b621e130fc3a1cd0343cb8419cad4
+  data.tar.gz: 7dd79f18bd5a94eee395222cc8721e1d7ebf58e8
 SHA512:
-  metadata.gz: 06241aa95470a2f2bff3f31d8fc46a837d78a64be3f27d074318df6b4b9ad6516b43d98bc2880103f51ad0695bf98f99e15a51b5a6fa68eaae413d675263b73d
-  data.tar.gz: 0a9b669701c2ca9bc4b185eebc2eebbecc055d4853f84e273a6e6883fc0907e205ac1c184a21127f9439adf1252b304f8ad0870bbb9f09301c4f264032f9cf66
+  metadata.gz: ae22ceeae07527bfcfc507e3a9cdf90a62d3546ec319f6a4ecef211b479f196da50226e81673332a52ca77153dc8b10c347ff8fb891d67c4152254facb6dbd49
+  data.tar.gz: b9c38212b45de33e30c88e44d7b899cb8fbc51bce44863a3d8e0e8518d24e782ad4ef0e675fe2e2fe8325730712c62c0b0778a755eff9e1f4c3d99e21876d4b3

data/Gemfile.lock

@@ -2,16 +2,14 @@ PATH
   remote: .
   specs:
     terminal_cal (0.1.0)
-      colorize (~> 0.8.1)
-      ics_parser (~> 0.0.3)
+      ics_parser (~> 0.0.4)
       table_print (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    colorize (0.8.1)
-    ics_parser (0.0.3)
+    ics_parser (0.0.4)
     method_source (0.9.2)
     minitest (5.11.3)
     pry (0.12.2)

data/exe/terminal_cal

@@ -2,4 +2,10 @@
 
 require "terminal_cal"
 
-TerminalCal::App.run
+begin
+  TerminalCal::App.run
+rescue TerminalCal::Errors::Error => error
+  puts error.message
+rescue TerminalCal::Errors::AppExit
+  puts 'Bye'
+end

data/lib/terminal_cal.rb

@@ -1,12 +1,15 @@
+require 'fileutils'
 require 'ics_parser'
 require 'open-uri'
 require 'table_print'
-require 'fileutils'
-require 'yaml'
 require 'tempfile'
-require 'colorize'
+require 'yaml'
 
-require 'terminal_cal/version'
+require 'terminal_cal/app'
+require 'terminal_cal/calendar'
+require 'terminal_cal/calendar_parsers/ics_parser_wrapper'
+require 'terminal_cal/calendar_parser_factory'
 require 'terminal_cal/config'
+require 'terminal_cal/errors/error'
 require 'terminal_cal/event'
-require 'terminal_cal/app'
+require 'terminal_cal/version'

data/lib/terminal_cal/app.rb

@@ -1,13 +1,10 @@
 module TerminalCal
   class App
-    DATE_FMT = '%m/%d'.freeze
-    TIME_FMT = '%I:%M %p'.freeze
-
-    def initialize
-      @config = Config.load
-      @today = Time.now.strftime(DATE_FMT)
-      @events = []
-      @parser = IcsParser
+    def initialize(options = {})
+      @config     = options[:config] || TerminalCal::Config.load
+      @now        = Time.now
+      @calendars  = []
+      @events     = []
     end
 
     def self.run
@@ -15,57 +12,33 @@ module TerminalCal
     end
 
     def run
-      config_check
+      load_calendars
       load_events
       print_events
+    rescue => error
+      raise TerminalCal::Errors::Error, error
     end
 
     private
 
-    def config_check
-      @ics = @config[:ics]
-
-      if @ics.to_s.empty?
-        puts "no ics path defined in #{Config::CONFIG_PATH}"
-        exit
+    def load_calendars
+      @calendars = @config[:calendars].to_a.map do |config|
+        TerminalCal::Calendar.new(config: config)
       end
     end
 
     def load_events
-      now = Time.now
-      events = @parser.from_string(read_cal_file).events
-
-      events.sort_by { |e| e.starts_at.to_i }.each do |event|
-        next unless event.starts_at.strftime(DATE_FMT) == @today
-
-          if (event.starts_at..event.ends_at).include?(now)
-            active = "==="
-          end
-
-
-          @events << Event.new(date: event.starts_at.strftime(DATE_FMT),
-                               start_time: event.starts_at.strftime(TIME_FMT),
-                               end_time: "#{event.ends_at.strftime(TIME_FMT)} #{active}",
-                               summary: event.summary)
-      #  end
+      @events = @calendars.map do |calendar|
+        calendar.todays_events
       end
     end
 
     def print_events
       unless @events.empty?
-        tp @events
+        tp @events.flatten
       else
         puts "No events scheduled yet."
       end
     end
-
-    def read_cal_file
-      cal = Tempfile.new
-      cal.write(open(@ics) { |f| f.read } )
-      cal.rewind
-      cal.read
-    ensure
-      cal.close
-    end
   end
 end

data/lib/terminal_cal/calendar.rb

@@ -0,0 +1,84 @@
+module TerminalCal
+  class Calendar
+    DATE_FMT = '%m/%d'.freeze
+    TIME_FMT = '%I:%M %p'.freeze
+
+    attr_reader :source, :name, :cache_life_minutes
+
+    def initialize(options = {})
+      @config = options[:config]
+      @parser = TerminalCal::CalendarParserFactory.new(options[:parser]).parser
+
+      @source = @config[:source]
+      @name   = @config[:name].to_s
+      @cache  = @config[:cache] || true
+      @cache_life_minutes = @config[:cache_life_minutes] || 10
+      @now    = Time.now
+      @today  = @now.strftime(DATE_FMT)
+
+      @content = ''
+    end
+
+    def cache?
+      return false unless [true, false].include?(@cache)
+      @cache
+    end
+
+    def update_cache?
+      return false unless cache?
+      return true unless File.exist?(cache_path)
+      (Time.now - File.atime(cache_path)) > (@cache_life_minutes * 60)
+    end
+
+    def events
+      content = 
+        if update_cache?
+          fetch_events_from_source
+        else
+          fetch_events_from_cache
+        end
+
+      @parser.events(content)
+    end
+
+    def fetch_events_from_source
+      source = @config[:source]
+      content = open(source) { |f| f.read } 
+
+      if cache?
+        cache!(content)
+      end
+
+      content
+    rescue ::SocketError => error
+      raise TerminalCal::Errors::Error, error.message
+    end
+
+    def fetch_events_from_cache
+      File.read(cache_path)
+    end
+
+    def cache_path
+      filename = "#{@config[:name]}-cached-.ics".downcase
+      File.join(TerminalCal::Config::APP_DIR, filename)
+    end
+
+    def cache!(content)
+      File.open(cache_path, 'w+') do |file|
+        file.write(content)
+      end
+    end
+
+    def todays_events
+      events.sort_by { |e| e.starts_at.to_i }.map do |event|
+        next unless event.starts_at.strftime(DATE_FMT) == @today
+        next if event.ends_at < @now
+
+        Event.new(date: event.starts_at.strftime(DATE_FMT),
+                  start_time: event.starts_at.strftime(TIME_FMT),
+                  end_time: event.ends_at.strftime(TIME_FMT),
+                  summary: event.summary)
+      end.compact
+    end
+  end
+end

data/lib/terminal_cal/calendar_parser_factory.rb

@@ -0,0 +1,11 @@
+module TerminalCal
+  class CalendarParserFactory
+    DEFAULT_PARSER = TerminalCal::CalendarParsers::IcsParserWrapper
+
+    attr_reader :parser
+
+    def initialize(parser)
+      @parser = parser || DEFAULT_PARSER
+    end
+  end
+end

data/lib/terminal_cal/calendar_parsers/ics_parser_wrapper.rb

@@ -0,0 +1,9 @@
+module TerminalCal
+  module CalendarParsers
+    class IcsParserWrapper
+      def self.events(content)
+        IcsParser.from_string(content).events
+      end
+    end
+  end
+end

data/lib/terminal_cal/config.rb

@@ -1,22 +1,28 @@
 module TerminalCal
   class Config
-    CONFIG_DIR = File.join(Dir.home, '.terminal_cal')
+    APP_DIR     = File.join(Dir.home, '.terminal_cal')
     CONFIG_FILE = 'config.yaml'.freeze
-    CONFIG_PATH = File.join(CONFIG_DIR, CONFIG_FILE)
+    CONFIG_PATH = File.join(APP_DIR, CONFIG_FILE)
 
     def self.load
       unless File.exist?(CONFIG_PATH)
-        FileUtils.mkdir_p(CONFIG_DIR)
+        FileUtils.mkdir_p(APP_DIR)
+        File.write(CONFIG_PATH, config_template)
         FileUtils.touch(CONFIG_PATH)
-      end
 
-      config = self.read
+        msg = <<~MSG
+          New config generated at #{CONFIG_PATH}
+          Please update config and then try again.
+        MSG
 
-      if config[:ics].to_s.empty?
-        self.write(:ics, '')
+        raise TerminalCal::Errors::AppExit, msg
       end
 
-      config
+      self.read
+    end
+
+    def self.read
+      YAML.load_file(CONFIG_PATH) || {}
     end
 
     def self.write(key, value)
@@ -25,8 +31,23 @@ module TerminalCal
       File.write(CONFIG_PATH, config.to_yaml)
     end
 
-    def self.read
-      YAML.load_file(CONFIG_PATH) || {}
+    def self.calendars
+      read[:calendars] || []
+    end
+
+    def self.clobber
+      File.delete(CONFIG_PATH)
+    end
+
+    def self.config_template
+      { calendars: [
+          { name: 'Some Calendar',
+            source: 'Some URL or file path',
+            cache: true,
+            cache_life_minutes: 30
+          }
+        ]
+      }.to_yaml
     end
   end
 end

data/lib/terminal_cal/errors/error.rb

@@ -0,0 +1,10 @@
+module TerminalCal
+  # Namespace for TerminalCal errors
+  module Errors
+    # General gem errors
+    class Error < StandardError; end
+
+    # Graceful application quitting
+    class AppExit < StandardError; end
+  end
+end

data/lib/terminal_cal/version.rb

@@ -1,3 +1,3 @@
 module TerminalCal
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/terminal_cal.gemspec

@@ -36,9 +36,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "ics_parser", "~> 0.0.3"
+  spec.add_dependency "ics_parser", "~> 0.0.4"
   spec.add_dependency "table_print", "~> 1.5"
-  spec.add_dependency "colorize", "~> 0.8.1"
 
   spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal_cal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roerig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ics_parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -129,13 +115,17 @@ files:
 - exe/terminal_cal
 - lib/terminal_cal.rb
 - lib/terminal_cal/app.rb
+- lib/terminal_cal/calendar.rb
+- lib/terminal_cal/calendar_parser_factory.rb
+- lib/terminal_cal/calendar_parsers/.gitignore
+- lib/terminal_cal/calendar_parsers/ics_parser_wrapper.rb
 - lib/terminal_cal/config.rb
+- lib/terminal_cal/errors/error.rb
 - lib/terminal_cal/event.rb
 - lib/terminal_cal/version.rb
 - terminal_cal.gemspec
 - vendor/cache/coderay-1.1.2.gem
-- vendor/cache/colorize-0.8.1.gem
-- vendor/cache/ics_parser-0.0.3.gem
+- vendor/cache/ics_parser-0.0.4.gem
 - vendor/cache/method_source-0.9.2.gem
 - vendor/cache/minitest-5.11.3.gem
 - vendor/cache/pry-0.12.2.gem