calendar-assistant 0.6.0 → 0.7.0

data/lib/calendar_assistant/event.rb

@@ -27,11 +27,6 @@ class CalendarAssistant
       PRIVATE = "private"
     end
 
-    #
-    #  constants describing behavior
-    #
-    LOCATION_EVENT_REGEX = /^#{CalendarAssistant::EMOJI_WORLDMAP}/
-
     #
     #  class methods
     #
@@ -42,13 +37,23 @@ class CalendarAssistant
     #
     #  instance methods
     #
+    attr_reader :location_event_regex
+
+    def initialize(obj, config: CalendarAssistant::Config.new)
+
+      super(obj)
+      @location_icons = config[CalendarAssistant::Config::Keys::Settings::LOCATION_ICONS]
+
+      @location_event_regex = /^#{@location_icons.join("|")}/
+    end
+
     def update **args
       update!(**args)
       self
     end
 
     def location_event?
-      !! (summary =~ LOCATION_EVENT_REGEX)
+      !! (summary =~ location_event_regex)
     end
 
     def all_day?
@@ -176,12 +181,6 @@ class CalendarAssistant
       end
     end
 
-    def view_summary
-      return "(private)" if private? && (summary.nil? || summary.blank?)
-      return "(no title)" if summary.nil? || summary.blank?
-      summary
-    end
-
     def duration
       if all_day?
         days = (end_date - start_date).to_i
@@ -200,6 +199,11 @@ class CalendarAssistant
       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 }
+    end
+
     def human_attendees
       return nil if attendees.nil?
       attendees.select { |a| ! a.resource }

data/lib/calendar_assistant/event_repository.rb

@@ -1,11 +1,15 @@
 class CalendarAssistant
   class EventRepository
-    attr_reader :calendar, :calendar_id
+    attr_reader :calendar, :calendar_id, :config
 
-    def initialize(service, calendar_id)
+    def initialize(service, calendar_id, config: CalendarAssistant::Config.new)
       @service = service
+      @config = config
       @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
     end
 
     def in_tz &block
@@ -14,7 +18,7 @@ class CalendarAssistant
       end
     end
 
-    def find time_range
+    def find time_range, predicates: {}
       events = @service.list_events(@calendar_id,
                                    time_min: time_range.first.iso8601,
                                    time_max: time_range.last.iso8601,
@@ -22,15 +26,20 @@ class CalendarAssistant
                                    single_events: true,
                                    max_results: 2000,
                                    )
-      if events.nil? || events.items.nil?
-        return CalendarAssistant::EventSet.new self, Array.new
+      events = events.items.map { |e| CalendarAssistant::Event.new(e, config: config) }
+
+      unless predicates.empty?
+        events = events.select do |event|
+          predicates.all? { |predicate, value| event.public_send(predicate) == value }
+        end
       end
-      CalendarAssistant::EventSet.new self, events.items.map { |e| CalendarAssistant::Event.new(e) }
+
+      CalendarAssistant::EventSet.new self, events
     end
 
     def new event_attributes
       event = Google::Apis::CalendarV3::Event.new DateHelpers.cast_dates(event_attributes)
-      CalendarAssistant::Event.new(event)
+      CalendarAssistant::Event.new(event, config: config)
     end
 
     def create event_attributes
@@ -46,7 +55,7 @@ class CalendarAssistant
     def update(event, attributes)
       event.update! DateHelpers.cast_dates(attributes)
       updated_event = @service.update_event @calendar_id, event.id, event
-      CalendarAssistant::Event.new(updated_event)
+      CalendarAssistant::Event.new(updated_event, config: config)
     end
 
     def available_block start_time, end_time
@@ -55,7 +64,7 @@ class CalendarAssistant
         end: Google::Apis::CalendarV3::EventDateTime.new(date_time: end_time.in_time_zone(calendar.time_zone).to_datetime),
         summary: "available"
       )
-      CalendarAssistant::Event.new e
+      CalendarAssistant::Event.new e, config: config
     end
   end
 end

data/lib/calendar_assistant/event_repository_factory.rb

@@ -1,7 +1,7 @@
 class CalendarAssistant
   class EventRepositoryFactory
-    def self.new_event_repository service, calendar_id
-      EventRepository.new service, calendar_id
+    def self.new_event_repository service, calendar_id, config: CalendarAssistant::Config.new
+      EventRepository.new service, calendar_id, config: config
     end
   end
 end

data/lib/calendar_assistant/version.rb

@@ -1,3 +1,3 @@
 class CalendarAssistant
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calendar-assistant
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mike Dalessio
@@ -9,22 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+- !ruby/object:Gem::Dependency
+  name: business_time
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -54,33 +68,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '0.24'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '0.24'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.28'
 - !ruby/object:Gem::Dependency
-  name: business_time
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -96,19 +116,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: toml
   requirement: !ruby/object:Gem::Requirement
@@ -124,19 +144,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
-  type: :runtime
+        version: '0.14'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: concourse
   requirement: !ruby/object:Gem::Requirement
@@ -152,47 +186,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: license_finder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -213,28 +247,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: license_finder
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: '0.16'
 description: A command-line tool to help manage your Google Calendar.
 email:
 - mike.dalessio@gmail.com
@@ -251,10 +285,17 @@ files:
 - Rakefile
 - bin/calendar-assistant
 - lib/calendar_assistant.rb
-- lib/calendar_assistant/authorizer.rb
 - lib/calendar_assistant/calendar_assistant.rb
 - lib/calendar_assistant/cli.rb
-- lib/calendar_assistant/cli_helpers.rb
+- lib/calendar_assistant/cli/authorizer.rb
+- lib/calendar_assistant/cli/commands.rb
+- lib/calendar_assistant/cli/config.rb
+- lib/calendar_assistant/cli/event_presenter.rb
+- lib/calendar_assistant/cli/event_set_presenter.rb
+- lib/calendar_assistant/cli/helpers.rb
+- lib/calendar_assistant/cli/linter_event_presenter.rb
+- lib/calendar_assistant/cli/linter_event_set_presenter.rb
+- lib/calendar_assistant/cli/printer.rb
 - lib/calendar_assistant/config.rb
 - lib/calendar_assistant/config/token_store.rb
 - lib/calendar_assistant/date_helpers.rb
@@ -287,8 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A command-line tool to help manage your Google Calendar.

data/lib/calendar_assistant/authorizer.rb

@@ -1,86 +0,0 @@
-#
-# code in this file is inspired by
-#
-#   https://github.com/gsuitedevs/ruby-samples/blob/master/calendar/quickstart/quickstart.rb
-#
-# Copyright 2018 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class CalendarAssistant
-  class Authorizer
-    class NoCredentials < CalendarAssistant::BaseException ; end
-    class UnauthorizedError < CalendarAssistant::BaseException ; end
-
-    OOB_URI = 'urn:ietf:wg:oauth:2.0:oob'.freeze
-    APPLICATION_NAME = "Flavorjones Calendar Assistant".freeze
-    CREDENTIALS_PATH = File.join ENV["HOME"], ".calendar-assistant.client"
-    SCOPE = Google::Apis::CalendarV3::AUTH_CALENDAR
-
-    attr_reader :profile_name, :config_token_store
-
-    def initialize profile_name, config_token_store
-      @profile_name = profile_name
-      @config_token_store = config_token_store
-    end
-
-    def authorize
-      credentials || prompt_user_for_authorization
-    end
-
-    def service
-      if credentials.nil?
-        raise UnauthorizedError, "Not authorized. Please run `calendar-assistant authorize #{profile_name}`"
-      end
-
-      Google::Apis::CalendarV3::CalendarService.new.tap do |service|
-        service.client_options.application_name = APPLICATION_NAME
-        service.authorization = credentials
-      end
-    end
-
-  private
-
-    def credentials
-      @credentials ||= authorizer.get_credentials profile_name
-    end
-
-    def prompt_user_for_authorization
-      url = authorizer.get_authorization_url(base_url: OOB_URI)
-
-      puts Rainbow("Please open this URL in your browser:").bold
-      puts
-      puts "  " + url
-      puts
-
-      puts Rainbow("Then authorize '#{APPLICATION_NAME}' to manage your calendar and copy/paste the resulting code here:").bold
-      puts
-      print "> "
-      code = STDIN.gets
-
-      authorizer.get_and_store_credentials_from_code(user_id: profile_name, code: code, base_url: OOB_URI)
-    end
-
-    def authorizer
-      @authorizer ||= begin
-                        if ! File.exists?(CREDENTIALS_PATH)
-                          raise NoCredentials, "No credentials found. Please run `calendar-assistant help setup` for instructions"
-                        end
-
-                        FileUtils.chmod 0600, CREDENTIALS_PATH
-                        client_id = Google::Auth::ClientId.from_file(CREDENTIALS_PATH)
-                        Google::Auth::UserAuthorizer.new(client_id, SCOPE, config_token_store)
-                      end
-    end
-  end
-end