calendar-assistant 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d3530bae8b1e8aac4260f546dd2fb2c3673b09c57d1c98e5f9e91bf91bdf5ed
-  data.tar.gz: e7c80eca297a7aa6ce37abfae434507368c54764c1af4d4175a346e7a4cbf9f4
+  metadata.gz: 71db4f83ef4cb314c49b308e9fbf752b958823bb320aa7db5d404665e23c3eb9
+  data.tar.gz: 8bd30697df26b5a3975e9a06add5de2c49be64344a3787a09576d3b081bbe121
 SHA512:
-  metadata.gz: b7dcd5d6d01422c2ee042f47f0fba9fad1886fa3b2d2d2b65c411289007d5b20d3c262b888d325036c1f4bb79bf4c4d405e47c206f467adcf1a02de77be26afc
-  data.tar.gz: 34a1c905b4c45e5562639001721eacc977a5c3511f8527b986b9de294249e590a0e8ec0cebe689d22d2ffb0a6066f4565532d729a22491240a25d6ee6c4425a6
+  metadata.gz: b1701eb120de9b9ebdb5065695762eeca199b043e26554386feac9eae62b9ad9cd2b2aa6abe63e7de90716c5e55b74a7fa4e80bcc0056ab29f98c4d4ff840d56
+  data.tar.gz: 0f5f584849f62313666931d943f0b070d0e34d3388f94df57d6ca2b7751db6c23f2ef9ed65b691980ddfda2f54a3ebbd255a356186aae25c0eab25c24abd57a8

data/README.md

@@ -9,6 +9,7 @@
 - see views on your calendar events for a date or time range
 - book (and re-book) one-on-ones and other meetings automatically
 
+[![Gem Version](https://badge.fury.io/rb/calendar-assistant.svg)](https://badge.fury.io/rb/calendar-assistant)
 [![Concourse CI](https://ci.nokogiri.org/api/v1/teams/calendar-assistants/pipelines/calendar-assistant/jobs/rake-spec/badge)](https://ci.nokogiri.org/teams/calendar-assistants/pipelines/calendar-assistant)
 [![Maintainability](https://api.codeclimate.com/v1/badges/3525792e1feeccfd8875/maintainability)](https://codeclimate.com/github/flavorjones/calendar-assistant/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/3525792e1feeccfd8875/test_coverage)](https://codeclimate.com/github/flavorjones/calendar-assistant/test_coverage)
@@ -119,10 +120,9 @@ Some commands, like `location-set`, will refer to you by nickname if you configu
 
 Set `nickname` to a string that would uniquely and briefly identify you to others, like "Mike D" or "JK".
 
-
 #### Location Emoji
 
-There is a `[settings]` key called `location-icons` that may be set to an array denoting all emoji that indicate a location event. The first icon in the array will be used as the default. The default emoji included are `["🗺 ", "🌎"]` with the map icon first
+There is a `[settings]` key called `location-icon` that may be set to an emoji denoting a location event. By default CalendarAssistant will use `"🌎"`, but you can change this.
 
 
 #### Command-Specific Preferences
@@ -131,10 +131,12 @@ If there are user preferences you'd like to set for just a single command (e.g.,
 
 ```toml
 [settings]
-visibility = default
+visibility = "default"
+nickname = "uniquely-me"
 
 [settings.location_set]
-visibility = public
+visibility = "public"
+calendars = ["teamcalendar@group.calendar.google.com","teamcalendar2@group.calendar.google.com"]
 ```
 
 
@@ -162,7 +164,8 @@ Description:
   API, and saving the credentials necessary to access the API on behalf of users.
 
   If you already have downloaded client credentials, you don't need to run this command. Instead,
-  rename the downloaded JSON file to `/home/user/.calendar-assistant.client`
+  rename the downloaded JSON file to
+  `/home/user/.calendar-assistant.client`
 </pre>
 
 
@@ -264,18 +267,18 @@ Usage:
   calendar-assistant availability [DATE | DATERANGE | TIMERANGE]
 
 Options:
-  -l, [--meeting-length=LENGTH]                    # [default 30m] find chunks of available time at least as long as LENGTH (which is a ChronicDuration string like '30m' or '2h')
-  -s, [--start-of-day=TIME]                        # [default 9am] find chunks of available time after TIME (which is a BusinessTime string like '9am' or '14:30')
-  -e, [--end-of-day=TIME]                          # [default 6pm] find chunks of available time before TIME (which is a BusinessTime string like '9am' or '14:30')
-  -a, [--attendees=ATTENDEE1[,ATTENDEE2[,...]]]    # [default 'me'] people (email IDs) to whom this command will be applied
-  -p, [--profile=PROFILE]                          # the profile you'd like to use (if different from default)
-  -l, [--local-store=FILENAME]                     # Load events from a local file instead of Google Calendar
-  -b, [--must-be=PROPERTY1[,PROPERTY2[,...]]]      # Event properties that must be true (see README)
-  -n, [--must-not-be=PROPERTY1[,PROPERTY2[,...]]]  # Event properties that must be false (see README)
-  -h, -?, [--help], [--no-help]                    
-          [--debug], [--no-debug]                  # how dare you suggest there are bugs
-  -f, [--formatting], [--no-formatting]            # Enable Text Formatting
-                                                   # Default: true
+  -l, [--meeting-length=LENGTH]                               # [default 30m] find chunks of available time at least as long as LENGTH (which is a ChronicDuration string like '30m' or '2h')
+  -s, [--start-of-day=TIME]                                   # [default 9am] find chunks of available time after TIME (which is a BusinessTime string like '9am' or '14:30')
+  -e, [--end-of-day=TIME]                                     # [default 6pm] find chunks of available time before TIME (which is a BusinessTime string like '9am' or '14:30')
+  -a, --attendees, [--calendars=CALENDAR1[,CALENDAR2[,...]]]  # [default 'me'] people (email IDs) to whom this command will be applied
+  -p, [--profile=PROFILE]                                     # the profile you'd like to use (if different from default)
+  -l, [--local-store=FILENAME]                                # Load events from a local file instead of Google Calendar
+  -b, [--must-be=PROPERTY1[,PROPERTY2[,...]]]                 # Event properties that must be true (see README)
+  -n, [--must-not-be=PROPERTY1[,PROPERTY2[,...]]]             # Event properties that must be false (see README)
+  -h, -?, [--help], [--no-help]                               
+          [--debug], [--no-debug]                             # how dare you suggest there are bugs
+  -f, [--formatting], [--no-formatting]                       # Enable Text Formatting
+                                                              # Default: true
 
 Show your availability for a date or range of dates (default 'today')
 </pre>
@@ -367,15 +370,17 @@ Usage:
   calendar-assistant location-set LOCATION [DATE | DATERANGE]
 
 Options:
-          [--visibility=VISIBILITY]                # [default is 'default'] Set the visbility of the event. Values are 'public', 'private', 'default'.
-  -p, [--profile=PROFILE]                          # the profile you'd like to use (if different from default)
-  -l, [--local-store=FILENAME]                     # Load events from a local file instead of Google Calendar
-  -b, [--must-be=PROPERTY1[,PROPERTY2[,...]]]      # Event properties that must be true (see README)
-  -n, [--must-not-be=PROPERTY1[,PROPERTY2[,...]]]  # Event properties that must be false (see README)
-  -h, -?, [--help], [--no-help]                    
-          [--debug], [--no-debug]                  # how dare you suggest there are bugs
-  -f, [--formatting], [--no-formatting]            # Enable Text Formatting
-                                                   # Default: true
+          [--force]                                           # will manage location across multiple calendars whether a nickname is set or not
+          [--visibility=VISIBILITY]                           # [default is 'default'] Set the visibility of the event. Values are 'public', 'private', 'default'.
+  -p, [--profile=PROFILE]                                     # the profile you'd like to use (if different from default)
+  -l, [--local-store=FILENAME]                                # Load events from a local file instead of Google Calendar
+  -b, [--must-be=PROPERTY1[,PROPERTY2[,...]]]                 # Event properties that must be true (see README)
+  -n, [--must-not-be=PROPERTY1[,PROPERTY2[,...]]]             # Event properties that must be false (see README)
+  -a, --attendees, [--calendars=CALENDAR1[,CALENDAR2[,...]]]  # [default 'me'] people (email IDs) to whom this command will be applied
+  -h, -?, [--help], [--no-help]                               
+          [--debug], [--no-debug]                             # how dare you suggest there are bugs
+  -f, [--formatting], [--no-formatting]                       # Enable Text Formatting
+                                                              # Default: true
 
 Set your location to LOCATION for a date or range of dates (default 'today')
 </pre>
@@ -444,16 +449,16 @@ Usage:
   calendar-assistant show [DATE | DATERANGE | TIMERANGE]
 
 Options:
-  -c, [--commitments], [--no-commitments]          # only show events that you've accepted with another person
-  -p, [--profile=PROFILE]                          # the profile you'd like to use (if different from default)
-  -l, [--local-store=FILENAME]                     # Load events from a local file instead of Google Calendar
-  -a, [--attendees=ATTENDEE1[,ATTENDEE2[,...]]]    # [default 'me'] people (email IDs) to whom this command will be applied
-  -b, [--must-be=PROPERTY1[,PROPERTY2[,...]]]      # Event properties that must be true (see README)
-  -n, [--must-not-be=PROPERTY1[,PROPERTY2[,...]]]  # Event properties that must be false (see README)
-  -h, -?, [--help], [--no-help]                    
-          [--debug], [--no-debug]                  # how dare you suggest there are bugs
-  -f, [--formatting], [--no-formatting]            # Enable Text Formatting
-                                                   # Default: true
+  -c, [--commitments], [--no-commitments]                     # only show events that you've accepted with another person
+  -p, [--profile=PROFILE]                                     # the profile you'd like to use (if different from default)
+  -l, [--local-store=FILENAME]                                # Load events from a local file instead of Google Calendar
+  -a, --attendees, [--calendars=CALENDAR1[,CALENDAR2[,...]]]  # [default 'me'] people (email IDs) to whom this command will be applied
+  -b, [--must-be=PROPERTY1[,PROPERTY2[,...]]]                 # Event properties that must be true (see README)
+  -n, [--must-not-be=PROPERTY1[,PROPERTY2[,...]]]             # Event properties that must be false (see README)
+  -h, -?, [--help], [--no-help]                               
+          [--debug], [--no-debug]                             # how dare you suggest there are bugs
+  -f, [--formatting], [--no-formatting]                       # Enable Text Formatting
+                                                              # Default: true
 
 Show your events for a date or range of dates (default 'today')
 </pre>
@@ -515,15 +520,15 @@ Usage:
   calendar-assistant lint [DATE | DATERANGE | TIMERANGE]
 
 Options:
-  -p, [--profile=PROFILE]                          # the profile you'd like to use (if different from default)
-  -l, [--local-store=FILENAME]                     # Load events from a local file instead of Google Calendar
-  -a, [--attendees=ATTENDEE1[,ATTENDEE2[,...]]]    # [default 'me'] people (email IDs) to whom this command will be applied
-  -b, [--must-be=PROPERTY1[,PROPERTY2[,...]]]      # Event properties that must be true (see README)
-  -n, [--must-not-be=PROPERTY1[,PROPERTY2[,...]]]  # Event properties that must be false (see README)
-  -h, -?, [--help], [--no-help]                    
-          [--debug], [--no-debug]                  # how dare you suggest there are bugs
-  -f, [--formatting], [--no-formatting]            # Enable Text Formatting
-                                                   # Default: true
+  -p, [--profile=PROFILE]                                     # the profile you'd like to use (if different from default)
+  -l, [--local-store=FILENAME]                                # Load events from a local file instead of Google Calendar
+  -a, --attendees, [--calendars=CALENDAR1[,CALENDAR2[,...]]]  # [default 'me'] people (email IDs) to whom this command will be applied
+  -b, [--must-be=PROPERTY1[,PROPERTY2[,...]]]                 # Event properties that must be true (see README)
+  -n, [--must-not-be=PROPERTY1[,PROPERTY2[,...]]]             # Event properties that must be false (see README)
+  -h, -?, [--help], [--no-help]                               
+          [--debug], [--no-debug]                             # how dare you suggest there are bugs
+  -f, [--formatting], [--no-formatting]                       # Enable Text Formatting
+                                                              # Default: true
 
 Lint your events for a date or range of dates (default 'today')
 </pre>
@@ -571,7 +576,6 @@ The output is TOML, which is suitable for dumping into `~/.calendar-assistant` a
 end-of-day = "6pm"
 location-icon = "🌎"
 meeting-length = "30m"
-profile = "work"
 start-of-day = "9am"
 </pre>
 

data/lib/calendar_assistant.rb

@@ -13,7 +13,7 @@ autoload :BusinessTime, "business_time"
 autoload :Chronic, "chronic"
 autoload :ChronicDuration, "chronic_duration"
 autoload :Google, "calendar_assistant/extensions/google_apis_extensions"
-autoload :Launchy, "launchy"
+autoload :Launchy, "calendar_assistant/extensions/launchy_extensions"
 autoload :TOML, "toml"
 autoload :Thor, "thor"
 require "calendar_assistant/extensions/rainbow_extensions" # Rainbow() doesn't trigger autoload
@@ -25,17 +25,22 @@ require "active_support/time" # Time doesn't trigger autoload
 require "calendar_assistant/calendar_assistant"
 
 class CalendarAssistant
-  autoload :VERSION,                "calendar_assistant/version"
-  autoload :Config,                 "calendar_assistant/config"
-  autoload :StringHelpers,          "calendar_assistant/string_helpers"
-  autoload :DateHelpers,            "calendar_assistant/date_helpers"
-  autoload :Event,                  "calendar_assistant/event"
-  autoload :EventRepository,        "calendar_assistant/event_repository"
-  autoload :EventRepositoryFactory, "calendar_assistant/event_repository_factory"
-  autoload :EventSet,               "calendar_assistant/event_set"
-  autoload :Scheduler,              "calendar_assistant/scheduler"
-  autoload :LocalService,           "calendar_assistant/local_service"
-  autoload :PredicateCollection,    "calendar_assistant/predicate_collection"
+  autoload :VERSION,                 "calendar_assistant/version"
+  autoload :Config,                  "calendar_assistant/config"
+  autoload :StringHelpers,           "calendar_assistant/string_helpers"
+  autoload :DateHelpers,             "calendar_assistant/date_helpers"
+  autoload :HasDuration,             "calendar_assistant/has_duration"
+  autoload :AvailableBlock,          "calendar_assistant/available_block"
+  autoload :Event,                   "calendar_assistant/event"
+  autoload :EventRepository,         "calendar_assistant/event_repository"
+  autoload :EventRepositoryFactory,  "calendar_assistant/event_repository_factory"
+  autoload :EventSet,                "calendar_assistant/event_set"
+  autoload :Scheduler,               "calendar_assistant/scheduler"
+  autoload :LocalService,            "calendar_assistant/local_service"
+  autoload :LocationEventRepository, "calendar_assistant/location_event_repository"
+  autoload :LintEventRepository,     "calendar_assistant/lint_event_repository"
+  autoload :PredicateCollection,     "calendar_assistant/predicate_collection"
+  autoload :LocationConfigValidator, "calendar_assistant/location_config_validator"
 end
 
 require "calendar_assistant/cli"

data/lib/calendar_assistant/available_block.rb

@@ -0,0 +1,12 @@
+class CalendarAssistant
+  class AvailableBlock
+    include HasDuration
+
+    attr_reader :start, :end
+
+    def initialize(**params)
+      @start = HasDuration.cast_datetime(params[:start]) if params[:start]
+      @end = HasDuration.cast_datetime(params[:end]) if params[:end]
+    end
+  end
+end

data/lib/calendar_assistant/calendar_assistant.rb

@@ -36,7 +36,7 @@ class CalendarAssistant
 
     @calendar = service.get_calendar Config::DEFAULT_CALENDAR_ID
     @event_repository_factory = event_repository_factory
-    @event_repositories = {} # calendar_id → event_repository
+    @event_repositories = {} # type, calendar_id → event_repository
     @event_predicates = PredicateCollection.build(config.must_be, config.must_not_be)
   end
 
@@ -56,16 +56,15 @@ class CalendarAssistant
   end
 
   def lint_events time_range
-    calendar_ids = config.attendees
+    calendar_ids = config.calendar_ids
     if calendar_ids.length > 1
       raise BaseException, "CalendarAssistant#lint_events only supports one person (for now)"
     end
-
-    event_repository(calendar_ids.first).find(time_range,  predicates: @event_predicates.merge({needs_action?: true}))
+    event_repository(calendar_ids.first, type: :lint).find(time_range,  predicates: @event_predicates)
   end
 
   def find_events time_range
-    calendar_ids = config.attendees
+    calendar_ids = config.calendar_ids
     if calendar_ids.length > 1
       raise BaseException, "CalendarAssistant#find_events only supports one person (for now)"
     end
@@ -73,7 +72,7 @@ class CalendarAssistant
   end
 
   def availability time_range
-    calendar_ids = config.attendees
+    calendar_ids = config.calendar_ids
     ers = calendar_ids.map do |calendar_id|
       event_repository calendar_id
     end
@@ -81,47 +80,30 @@ class CalendarAssistant
   end
 
   def find_location_events time_range
-    event_set = event_repository.find(time_range, predicates: @event_predicates)
-    event_set.new event_set.events.select { |e| e.location_event? }
+    event_repository(type: :location).find(time_range, predicates: @event_predicates)
   end
 
-  def create_location_event time_range, location
-    # find pre-existing events that overlap
-    existing_event_set = find_location_events time_range
-
-    # augment event end date appropriately
-    range = CalendarAssistant.date_range_cast time_range
-
-    deleted_events = []
-    modified_events = []
-
-    event = event_repository.create(
-      transparency: CalendarAssistant::Event::Transparency::TRANSPARENT,
-      start: range.first, end: range.last,
-      summary: "#{Event.location_event_prefix(@config)}#{location}"
-    )
-
-    existing_event_set.events.each do |existing_event|
-      if existing_event.start_date >= event.start_date && existing_event.end_date <= event.end_date
-        event_repository.delete existing_event
-        deleted_events << existing_event
-      elsif existing_event.start_date <= event.end_date && existing_event.end_date > event.end_date
-        event_repository.update existing_event, start: range.last
-        modified_events << existing_event
-      elsif existing_event.start_date < event.start_date && existing_event.end_date >= event.start_date
-        event_repository.update existing_event, end: range.first
-        modified_events << existing_event
-      end
+  def create_location_events time_range, location
+    LocationConfigValidator.valid?(config)
+
+    event_set = EventSet::Hash.new(event_repository,{})
+
+    unique_calendar_ids.each do |calendar_id|
+      event_set[calendar_id] = event_repository(calendar_id, type: :location).create(time_range, location, predicates: @event_predicates)
     end
 
-    response = {created: [event]}
-    response[:deleted] = deleted_events unless deleted_events.empty?
-    response[:modified] = modified_events unless modified_events.empty?
+    event_set
+  end
 
-    existing_event_set.new response
+  def event_repository calendar_id=Config::DEFAULT_CALENDAR_ID, type: :base
+    @event_repositories[type] ||= {}
+    @event_repositories[type][calendar_id] ||=
+      @event_repository_factory.new_event_repository(@service, calendar_id, config: config, type: type)
   end
 
-  def event_repository calendar_id=Config::DEFAULT_CALENDAR_ID
-    @event_repositories[calendar_id] ||= @event_repository_factory.new_event_repository(@service, calendar_id, config: config)
+  private
+
+  def unique_calendar_ids
+    @unique_calendar_ids ||= Array(config.calendar_ids) | [Config::DEFAULT_CALENDAR_ID]
   end
 end

data/lib/calendar_assistant/cli/commands.rb

@@ -27,12 +27,12 @@ class CalendarAssistant
                aliases: [ "-n" ]
       end
 
-      def self.has_attendees
-        option CalendarAssistant::Config::Keys::Options::ATTENDEES,
+      def self.has_multiple_calendars
+        option CalendarAssistant::Config::Keys::Options::CALENDARS,
                type: :string,
-               banner: "ATTENDEE1[,ATTENDEE2[,...]]",
+               banner: "CALENDAR1[,CALENDAR2[,...]]",
                desc: "[default 'me'] people (email IDs) to whom this command will be applied",
-               aliases: ["-a"]
+               aliases: ["-a", "--attendees"]
       end
 
       default_config = CalendarAssistant::CLI::Config.new options: options # used in option descriptions
@@ -139,7 +139,7 @@ class CalendarAssistant
       desc "lint [DATE | DATERANGE | TIMERANGE]",
            "Lint your events for a date or range of dates (default 'today')"
       will_create_a_service
-      has_attendees
+      has_multiple_calendars
 
       has_events
       def lint datespec = "today"
@@ -156,7 +156,7 @@ class CalendarAssistant
              desc: "only show events that you've accepted with another person",
              aliases: ["-c"]
       will_create_a_service
-      has_attendees
+      has_multiple_calendars
 
       has_events
       def show datespec = "today"
@@ -207,17 +207,21 @@ class CalendarAssistant
 
       desc "location-set LOCATION [DATE | DATERANGE]",
            "Set your location to LOCATION for a date or range of dates (default 'today')"
+      option CalendarAssistant::Config::Keys::Options::FORCE,
+             type: :boolean,
+             desc: "will manage location across multiple calendars whether a nickname is set or not"
       option CalendarAssistant::Config::Keys::Settings::VISIBILITY,
              type: :string,
              banner: "VISIBILITY",
-             desc: "[default is 'default'] Set the visbility of the event. Values are 'public', 'private', 'default'."
+             desc: "[default is 'default'] Set the visibility of the event. Values are 'public', 'private', 'default'."
       will_create_a_service
       has_events
+      has_multiple_calendars
       def location_set location = nil, datespec = "today"
         return help! if location.nil?
 
         calendar_assistant(datespec) do |ca, date, out|
-          event_set = ca.create_location_event date, location
+          event_set = ca.create_location_events date, location
           out.print_events ca, event_set
         end
       end
@@ -243,7 +247,7 @@ class CalendarAssistant
              desc: sprintf("[default %s] find chunks of available time before TIME (which is a BusinessTime string like '9am' or '14:30')",
                            default_config.setting(CalendarAssistant::Config::Keys::Settings::END_OF_DAY)),
              aliases: ["-e"]
-      has_attendees
+      has_multiple_calendars
       will_create_a_service
       has_events
       def availability datespec = "today"

data/lib/calendar_assistant/cli/printer.rb

@@ -1,6 +1,9 @@
+# coding: utf-8
 class CalendarAssistant
   module CLI
     class Printer
+      class LaunchUrlException < CalendarAssistant::BaseException ; end
+
 
       attr_reader :io
 
@@ -9,7 +12,11 @@ class CalendarAssistant
       end
 
       def launch url
-        Launchy.open url
+        begin
+          Launchy.open(url)
+        rescue Exception => e
+          raise LaunchUrlException.new(e)
+        end
       end
 
       def puts *args
@@ -32,13 +39,13 @@ class CalendarAssistant
         end
       end
 
-      def print_events ca, event_set, omit_title: false, presenter_class: CLI::EventSetPresenter
+      def print_events ca, event_set, presenter_class: CLI::EventSetPresenter
         puts presenter_class.new(event_set, config: ca.config).to_s
         puts
       end
 
       def print_available_blocks ca, event_set, omit_title: false
-        ers = ca.config.attendees.map {|calendar_id| ca.event_repository calendar_id}
+        ers = ca.config.calendar_ids.map {|calendar_id| ca.event_repository calendar_id}
         time_zones = ers.map {|er| er.calendar.time_zone}.uniq
 
         unless omit_title

data/lib/calendar_assistant/config.rb

@@ -33,13 +33,14 @@ class CalendarAssistant
       module Options
         COMMITMENTS = "commitments" # bool
         JOIN = "join"               # bool
-        ATTENDEES = "attendees"     # array of calendar ids (comma-delimited)
+        CALENDARS = "calendars"     # array of calendar ids (comma-delimited)
         LOCAL_STORE = "local-store" # filename
         DEBUG = "debug"             # bool
         FORMATTING = "formatting"   # Rainbow
         MUST_BE = "must-be"         # array of event predicates (comma-delimited)
         MUST_NOT_BE = "must-not-be" # array of event predicates (comma-delimited)
         CONTEXT = "context"         # symbol referring to command context
+        FORCE = "force"             # bool
       end
     end
 
@@ -50,7 +51,7 @@ class CalendarAssistant
       Keys::Settings::MEETING_LENGTH => "30m",            # ChronicDuration
       Keys::Settings::START_OF_DAY => "9am",              # BusinessTime
       Keys::Settings::END_OF_DAY => "6pm",                # BusinessTime
-      Keys::Options::ATTENDEES => [DEFAULT_CALENDAR_ID],  # array of calendar ids
+      Keys::Options::CALENDARS => [DEFAULT_CALENDAR_ID],  # array of calendar ids
       Keys::Options::FORMATTING => true,                  # Rainbow
     }
 
@@ -145,10 +146,10 @@ class CalendarAssistant
     end
 
     #
-    #  helper method for Keys::Options::ATTENDEES
+    #  helper method for Keys::Options::CALENDARS
     #
-    def attendees
-      split_if_array(Keys::Options::ATTENDEES)
+    def calendar_ids
+      split_if_array(Keys::Options::CALENDARS)
     end
 
     def must_be
@@ -190,32 +191,24 @@ class CalendarAssistant
     end
 
     def self.find_in_hash hash, keypath
-      current_val = hash
-      keypath = keypath.split(".") unless keypath.is_a?(Array)
-
-      keypath.each do |key|
-        if current_val.has_key?(key)
-          current_val = current_val[key]
-        else
-          current_val = nil
-          break
-        end
+      split_keypath(keypath).inject(hash) do |current_val, key|
+        break unless current_val.has_key?(key)
+        current_val[key]
       end
-
-      current_val
     end
 
     def self.set_in_hash hash, keypath, new_value
-      current_hash = hash
-      keypath = keypath.split(".") unless keypath.is_a?(Array)
-      *path_parts, key = *keypath
+      *path_parts, key = *split_keypath(keypath)
 
-      path_parts.each do |path_part|
-        current_hash[path_part] ||= {}
-        current_hash = current_hash[path_part]
+      current_hash = path_parts.inject(hash) do |current_val, path|
+        current_val[path] ||= {}
       end
 
       current_hash[key] = new_value
     end
+
+    def self.split_keypath(keypath)
+      keypath.is_a?(Array) ? keypath : keypath.split(".")
+    end
   end
 end

data/lib/calendar_assistant/event.rb

@@ -1,6 +1,7 @@
 class CalendarAssistant
   class Event < SimpleDelegator
-    #
+    include HasDuration
+
     #  constants describing enumerated attribute values
     #  see https://developers.google.com/calendar/v3/reference/events
     #
@@ -69,9 +70,6 @@ class CalendarAssistant
     #
     #  class methods
     #
-    def self.duration_in_seconds start_time, end_time
-      (end_time.to_datetime - start_time.to_datetime).days.to_i
-    end
 
     def self.location_event_prefix config
       icon = config[CalendarAssistant::Config::Keys::Settings::LOCATION_ICON]
@@ -98,30 +96,6 @@ class CalendarAssistant
       !! summary.try(:starts_with?, Event.location_event_prefix(@config))
     end
 
-    def all_day?
-      start.try(:date) || self.end.try(:date)
-    end
-
-    def past?
-      if all_day?
-        Date.today >= end_date
-      else
-        Time.now >= end_time
-      end
-    end
-
-    def current?
-      ! (past? || future?)
-    end
-
-    def future?
-      if all_day?
-        start_date > Date.today
-      else
-        start_time > Time.now
-      end
-    end
-
     def accepted?
       response_status == CalendarAssistant::Event::Response::ACCEPTED
     end
@@ -191,56 +165,6 @@ class CalendarAssistant
       gcsog.nil? ? true : !!gcsog
     end
 
-    def start_time
-      if all_day?
-        start_date.beginning_of_day
-      else
-        start.date_time
-      end
-    end
-
-    def start_date
-      if all_day?
-        start.to_date
-      else
-        start_time.to_date
-      end
-    end
-
-    def end_time
-      if all_day?
-        end_date.beginning_of_day
-      else
-        self.end.date_time
-      end
-    end
-
-    def end_date
-      if all_day?
-        self.end.to_date
-      else
-        end_time.to_date
-      end
-    end
-
-    def duration
-      if all_day?
-        days = (end_date - start_date).to_i
-        return "#{days}d"
-      end
-
-      p = ActiveSupport::Duration.build(duration_in_seconds).parts
-      s = []
-      s << "#{p[:hours]}h" if p.has_key?(:hours)
-      s << "#{p[:minutes]}m" if p.has_key?(:minutes)
-      s.join(" ")
-    end
-
-
-    def duration_in_seconds
-      Event.duration_in_seconds start_time, end_time
-    end
-
     def other_human_attendees
       return nil if attendees.nil?
       attendees.select { |a| ! a.resource  && ! a.self }
@@ -278,10 +202,5 @@ class CalendarAssistant
                     nil
                   end
     end
-
-    def contains? time
-      start_time <= time && time < end_time
-    end
-
   end
-end
+end

data/lib/calendar_assistant/event_repository.rb

@@ -1,5 +1,8 @@
 class CalendarAssistant
   class EventRepository
+    class CalendarNotFoundException < CalendarAssistant::BaseException;
+    end
+
     attr_reader :calendar, :calendar_id, :config
 
     def initialize(service, calendar_id, config: CalendarAssistant::Config.new)
@@ -8,7 +11,7 @@ class CalendarAssistant
       @calendar_id = calendar_id
       @calendar = @service.get_calendar @calendar_id
     rescue Google::Apis::ClientError => e
-      raise BaseException, "Calendar for #{@calendar_id} not found" if e.status_code == 404
+      raise CalendarNotFoundException, "Calendar for #{@calendar_id} not found" if e.status_code == 404
       raise
     end
 
@@ -46,6 +49,7 @@ class CalendarAssistant
 
     def delete event
       @service.delete_event @calendar_id,  event.id
+      event
     end
 
     def update(event, attributes)
@@ -54,15 +58,6 @@ class CalendarAssistant
       CalendarAssistant::Event.new(updated_event, config: config)
     end
 
-    def available_block start_time, end_time
-      e = Google::Apis::CalendarV3::Event.new(
-        start: Google::Apis::CalendarV3::EventDateTime.new(date_time: start_time.in_time_zone(calendar.time_zone).to_datetime),
-        end: Google::Apis::CalendarV3::EventDateTime.new(date_time: end_time.in_time_zone(calendar.time_zone).to_datetime),
-        summary: "available"
-      )
-      CalendarAssistant::Event.new e, config: config
-    end
-
     private
 
     def filter_by_predicates(events, predicates)

data/lib/calendar_assistant/event_repository_factory.rb

@@ -1,7 +1,16 @@
 class CalendarAssistant
   class EventRepositoryFactory
-    def self.new_event_repository service, calendar_id, config: CalendarAssistant::Config.new
-      EventRepository.new service, calendar_id, config: config
+    def self.new_event_repository service, calendar_id, config: CalendarAssistant::Config.new, type: :base
+      klass = case type
+              when :location
+                LocationEventRepository
+              when :lint
+                LintEventRepository
+              else
+                EventRepository
+              end
+
+      klass.new service, calendar_id, config: config
     end
   end
 end

data/lib/calendar_assistant/event_set.rb

@@ -8,6 +8,9 @@ class CalendarAssistant
   #
   class EventSet
     def self.new event_repository, events=nil
+      if events.is_a?(EventSet::Hash)
+        return EventSet::Hash.new event_repository, events.try(:events)
+      end
       if events.is_a?(::Hash)
         return EventSet::Hash.new event_repository, events
       end
@@ -55,6 +58,14 @@ class CalendarAssistant
         end
       end
 
+      def [] key
+        events[key] ||= []
+      end
+
+      def []= key, value
+        events[key] = value
+      end
+
       def available_blocks length: 1
         event_repository.in_tz do
           dates = events.keys.sort
@@ -76,15 +87,15 @@ class CalendarAssistant
               next if Time.before_business_hours?(e.end_time.to_time)
               next if Time.after_business_hours?(e.start_time.to_time)
 
-              if Event.duration_in_seconds(start_time, e.start_time) >= length
-                avail_time[date] << event_repository.available_block(start_time, e.start_time)
+              if HasDuration.duration_in_seconds(start_time, e.start_time) >= length
+                avail_time[date] << AvailableBlock.new(start: start_time, end: e.start_time)
               end
               start_time = [e.end_time, start_time].max
               break if ! start_time.during_business_hours?
             end
 
-            if Event.duration_in_seconds(start_time, end_time) >= length
-              avail_time[date] << event_repository.available_block(start_time, end_time)
+            if HasDuration.duration_in_seconds(start_time, end_time) >= length
+              avail_time[date] << AvailableBlock.new(start: start_time, end: end_time)
             end
 
             avail_time
@@ -106,8 +117,8 @@ class CalendarAssistant
                  event_b.contains?(event_a.end_time-1)
                 start_time = [event_a.start_time, event_b.start_time].max
                 end_time   = [event_a.end_time,   event_b.end_time  ].min
-                if Event.duration_in_seconds(start_time, end_time) >= length
-                  set.events[date] << event_repository.available_block(start_time, end_time)
+                if HasDuration.duration_in_seconds(start_time, end_time) >= length
+                  set.events[date] << AvailableBlock.new(start: start_time, end: end_time)
                 end
               end
             end

data/lib/calendar_assistant/extensions/launchy_extensions.rb

@@ -0,0 +1,44 @@
+require "launchy"
+
+#
+#  extend Launchy to handle zoom web URLs via the zoom commandline
+#  executable.
+#
+#  note this doesn't handle "personal links" like
+#
+#    "https://robin.zoom.us/my/usernamehere"
+#
+#  which depends on an http 302 redirect from the zoom site
+#
+class CalendarAssistant
+  class ZoomLaunchy < Launchy::Application::Browser
+    ZOOM_URI_REGEXP = %r(https?://\w+.zoom.us/j/(\d+))
+
+    def self.handles? uri
+      return true if ZOOM_URI_REGEXP.match(uri)
+    end
+
+    def darwin_app_list
+      [find_executable("open")]
+    end
+
+    def nix_app_list
+      [find_executable("xdg-open")]
+    end
+
+    def open uri, options={}
+      command = host_os_family.app_list(self).compact.first
+      if command.nil?
+        super uri, options
+      else
+        confno = ZOOM_URI_REGEXP.match(uri)[1]
+        url = "zoommtg://zoom.us/join?confno=#{confno}"
+        run command, [url]
+      end
+    end
+  end
+end
+
+# we need to be first so we get right of first refusal on `https?` URLs
+Launchy::Application.children.delete(CalendarAssistant::ZoomLaunchy)
+Launchy::Application.children.prepend(CalendarAssistant::ZoomLaunchy)

data/lib/calendar_assistant/has_duration.rb

@@ -0,0 +1,102 @@
+class CalendarAssistant
+  module HasDuration
+    def self.duration_in_seconds start_time, end_time
+      (end_time.to_datetime - start_time.to_datetime).days.to_i
+
+    end
+
+    def self.cast_datetime(datetime, time_zone = Time.zone.name)
+        return datetime if datetime.is_a?(Google::Apis::CalendarV3::EventDateTime)
+        Google::Apis::CalendarV3::EventDateTime.new(date_time: datetime.in_time_zone(time_zone).to_datetime)
+    end
+
+    def all_day?
+      start.try(:date) || self.end.try(:date)
+    end
+
+    def past?
+      if all_day?
+        Date.today >= end_date
+      else
+        Time.now >= end_time
+      end
+    end
+
+    def current?
+      !(past? || future?)
+    end
+
+    def future?
+      if all_day?
+        start_date > Date.today
+      else
+        start_time > Time.now
+      end
+    end
+
+    def cover?(event)
+      event.start_date >= start_date && event.end_date <= end_date
+    end
+
+    def overlaps_start_of?(event)
+      event.start_date <= end_date && event.end_date > end_date
+    end
+
+    def overlaps_end_of?(event)
+      event.start_date < start_date && event.end_date >= start_date
+    end
+
+    def start_time
+      if all_day?
+        start_date.beginning_of_day
+      else
+        start.date_time
+      end
+    end
+
+    def start_date
+      if all_day?
+        start.to_date
+      else
+        start_time.to_date
+      end
+    end
+
+    def end_time
+      if all_day?
+        end_date.beginning_of_day
+      else
+        self.end.date_time
+      end
+    end
+
+    def end_date
+      if all_day?
+        self.end.to_date
+      else
+        end_time.to_date
+      end
+    end
+
+    def duration
+      if all_day?
+        days = (end_date - start_date).to_i
+        return "#{days}d"
+      end
+
+      p = ActiveSupport::Duration.build(duration_in_seconds).parts
+      s = []
+      s << "#{p[:hours]}h" if p.has_key?(:hours)
+      s << "#{p[:minutes]}m" if p.has_key?(:minutes)
+      s.join(" ")
+    end
+
+    def duration_in_seconds
+      HasDuration.duration_in_seconds start_time, end_time
+    end
+
+    def contains? time
+      start_time <= time && time < end_time
+    end
+  end
+end

data/lib/calendar_assistant/lint_event_repository.rb

@@ -0,0 +1,7 @@
+class CalendarAssistant
+  class LintEventRepository < EventRepository
+    def find time, predicates: {}
+      super(time,  predicates: predicates.merge({needs_action?: true}))
+    end
+  end
+end

data/lib/calendar_assistant/location_config_validator.rb

@@ -0,0 +1,15 @@
+# coding: utf-8
+class CalendarAssistant
+  class LocationConfigValidator
+    class LocationConfigValidationException < CalendarAssistant::BaseException;
+    end
+
+    def self.valid?(config)
+      return if (config.calendar_ids - [ Config::DEFAULT_CALENDAR_ID ]).empty?
+      return if !!config[CalendarAssistant::Config::Keys::Settings::NICKNAME]
+      return if !!config[CalendarAssistant::Config::Keys::Options::FORCE]
+
+      raise LocationConfigValidationException, "Managing location across multiple calendars when a nickname is not set is not recommended, use --force to override"
+    end
+  end
+end

data/lib/calendar_assistant/location_event_repository.rb

@@ -0,0 +1,43 @@
+class CalendarAssistant
+  class LocationEventRepository < EventRepository
+    def find time, predicates: {}
+      event_set = super time, predicates: predicates
+      event_set.new event_set.events.select { |e| e.location_event? }
+    end
+
+    def create time, location, predicates: {}
+      # find pre-existing events that overlap
+      existing_event_set = find time, predicates: predicates
+
+      # augment event end date appropriately
+      range = CalendarAssistant.date_range_cast time
+
+
+      event = super(
+          transparency: CalendarAssistant::Event::Transparency::TRANSPARENT,
+          start: range.first, end: range.last,
+          summary: "#{Event.location_event_prefix(@config)}#{location}"
+      )
+
+      modify_location_events(event, existing_event_set)
+    end
+
+    private
+
+    def modify_location_events(event, existing_event_set)
+      response = existing_event_set.new({created: [event]})
+
+      existing_event_set.events.each do |existing_event|
+        if event.cover?(existing_event)
+          response[:deleted] << delete(existing_event)
+        elsif event.overlaps_start_of?(existing_event)
+        response[:modified] << update(existing_event, start: event.end_date)
+        elsif event.overlaps_end_of?(existing_event)
+          response[:modified] << update(existing_event, end: event.start_date)
+        end
+      end
+
+      response
+    end
+  end
+end

data/lib/calendar_assistant/version.rb

@@ -1,3 +1,3 @@
 class CalendarAssistant
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calendar-assistant
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mike Dalessio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -149,14 +149,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +285,7 @@ files:
 - Rakefile
 - bin/calendar-assistant
 - lib/calendar_assistant.rb
+- lib/calendar_assistant/available_block.rb
 - lib/calendar_assistant/calendar_assistant.rb
 - lib/calendar_assistant/cli.rb
 - lib/calendar_assistant/cli/authorizer.rb
@@ -305,8 +306,13 @@ files:
 - lib/calendar_assistant/event_repository_factory.rb
 - lib/calendar_assistant/event_set.rb
 - lib/calendar_assistant/extensions/google_apis_extensions.rb
+- lib/calendar_assistant/extensions/launchy_extensions.rb
 - lib/calendar_assistant/extensions/rainbow_extensions.rb
+- lib/calendar_assistant/has_duration.rb
+- lib/calendar_assistant/lint_event_repository.rb
 - lib/calendar_assistant/local_service.rb
+- lib/calendar_assistant/location_config_validator.rb
+- lib/calendar_assistant/location_event_repository.rb
 - lib/calendar_assistant/predicate_collection.rb
 - lib/calendar_assistant/scheduler.rb
 - lib/calendar_assistant/string_helpers.rb