calendar-assistant 0.10.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9acd200de6edb4b52d97c1994e25d657195e595c1042ef676c552ff6904d6c88
-  data.tar.gz: 59926908cc71682f6480d561323eebdc29aec95fdf351c8a73a6dddefed9f9fc
+  metadata.gz: 8e569594cdc40d761ee7eca41c960efc4d435508e7fa22571497f9693914a6c0
+  data.tar.gz: f8488f08e8db4e2b1e1a037a307781faf5c3dad73242fe206e9b70670ee16298
 SHA512:
-  metadata.gz: 9756ccc795a449ac0fde9707b5b87f6d03457b7ba22a7c802a9073e592c1c758d561223b873e7c2c6b71a336d80329998a0556545183a1ad536d3fab1f25b703
-  data.tar.gz: eb497928c8fd6ae16fad8ee0d2b093cd3417338457367c99a8c8efb94c3a8a48d467215e1f93eddfe0f0e4f147312defc7649d3431f8e0fe4f9e24f0e481d3d8
+  metadata.gz: 1a0c5da7676bca3b1f21f8793f42c75007f38f108e5f3a85145074d28e9eb3f508cdea487857ed239e8cdeb378cf0f94c9e7f26d9304b650d9bb482b185241cb
+  data.tar.gz: ac39130b3c7be61f0b6718cee82441deb9ffb00fefc7adb7db7c24ff0a303cb13466946a1656c3e6bb4a03d332e15f1733bfe8a5f4ecb0c5eed3b3b52c7a0876

data/README.md

@@ -10,9 +10,10 @@
 - 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)
+[![Test suite](https://github.com/flavorjones/calendar-assistant/actions/workflows/test-suite.yml/badge.svg)](https://github.com/flavorjones/calendar-assistant/actions/workflows/test-suite.yml)
 [![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)
+[![Join the chat at https://gitter.im/flavorjones/calendar-assistant](https://badges.gitter.im/flavorjones/calendar-assistant.svg)](https://gitter.im/flavorjones/calendar-assistant?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Contents
 
@@ -161,8 +162,8 @@ Options:
                                          # Default: true
 
 Description:
-  This command will walk you through setting up a Google Cloud Project, enabling the Google Calendar API, and saving the
-  credentials necessary to access the API on behalf of users.
+  This command will walk you through setting up a Google Cloud Project, enabling the Google Calendar 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`
@@ -184,11 +185,11 @@ Options:
 Description:
   Create and authorize a named profile (e.g., "work", "home", "flastname@company.tld") to access your calendar.
 
-  When setting up a profile, you'll be asked to visit a URL to authenticate, grant authorization, and generate and persist
-  an access token.
+  When setting up a profile, you'll be asked to visit a URL to authenticate, grant authorization, and generate and
+  persist an access token.
 
-  In order for this to work, you'll need to have set up your API client credentials. Run `calendar-assistant help setup`
-  for instructions.
+  In order for this to work, you'll need to have set up your API client credentials. Run `calendar-assistant help
+  setup` for instructions.
 </pre>
 
 
@@ -571,7 +572,6 @@ The output is TOML, which is suitable for dumping into `~/.calendar-assistant` a
 
 <pre>
 <b>$</b> calendar-assistant config
-
 [settings]
 end-of-day = "6pm"
 location-icon = "🌎"
@@ -619,7 +619,7 @@ bundle exec rake          # Default task runs both feature and non feature tests
 
 ### Continuous Integration
 
-CI is running in a [Concourse](https://concourse-ci.org) pipeline at [https://ci.nokogiri.org](https://ci.nokogiri.org/teams/calendar-assistants/pipelines/calendar-assistant).
+CI is running in [Github Actions](https://github.com/flavorjones/calendar-assistant/actions/workflows/test-suite.yml).
 
 
 ### Code Quality

data/Rakefile

@@ -1,15 +1,9 @@
 #require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "concourse"
 require "license_finder"
 require "tempfile"
 require "rainbow"
 
-#
-#  concourse
-#
-Concourse.new("calendar-assistant", fly_target: "calendar-assistants").create_tasks!
-
 #
 #  spec tasks
 #
@@ -53,15 +47,17 @@ end
 
 #
 # docker docker docker
+# keep in mind that we have a Github Action to generate this weekly
 #
+CALENDAR_ASSISTANT_TEST_IMAGE = "ghcr.io/flavorjones/calendar-assistant-test"
 desc "Build a docker image for testing"
 task "docker:build" do
-  sh "docker build -t flavorjones/calendar-assistant-test -f concourse/images/Dockerfile ."
+  sh "docker build -t #{CALENDAR_ASSISTANT_TEST_IMAGE} -f ci/Dockerfile ."
 end
 
 desc "Push a docker image for testing"
 task "docker:push" do
-  sh "docker push flavorjones/calendar-assistant-test"
+  sh "docker push #{CALENDAR_ASSISTANT_TEST_IMAGE}"
 end
 
 desc "Build and push a docker image for testing"
@@ -79,4 +75,8 @@ end
 #  default
 #
 desc "Run unit specs, feature specs, license finder, and check the README"
-task "default" => ["spec", "license_finder", "readme:check"]
+task "default" => [
+       "spec",
+       "readme:check",
+       "license_finder", # last because it modifies bundle env
+     ]

data/bin/calendar-assistant

@@ -8,6 +8,7 @@ Encoding.default_internal = Encoding::UTF_8
 Rainbow.enabled = true
 
 begin
+  require "calendar_assistant/cli"
   CalendarAssistant::CLI::Commands.start ARGV
 rescue Google::Apis::AuthorizationError, CalendarAssistant::BaseException => e
   printf "ERROR: %s\n", e

data/lib/calendar_assistant.rb

@@ -14,7 +14,7 @@ autoload :Chronic, "chronic"
 autoload :ChronicDuration, "chronic_duration"
 autoload :Google, "calendar_assistant/extensions/google_apis_extensions"
 autoload :Launchy, "calendar_assistant/extensions/launchy_extensions"
-autoload :TOML, "toml"
+autoload :TomlRB, "toml-rb"
 autoload :Thor, "thor"
 require "calendar_assistant/extensions/rainbow_extensions" # Rainbow() doesn't trigger autoload
 require "active_support/time" # Time doesn't trigger autoload
@@ -42,5 +42,3 @@ class CalendarAssistant
   autoload :PredicateCollection, "calendar_assistant/predicate_collection"
   autoload :LocationConfigValidator, "calendar_assistant/location_config_validator"
 end
-
-require "calendar_assistant/cli"

data/lib/calendar_assistant/cli/commands.rb

@@ -66,7 +66,8 @@ class CalendarAssistant
       def config
         return if handle_help_args
         settings = CalendarAssistant::CLI::Config.new.settings
-        command_service.out.puts TOML::Generator.new({ CalendarAssistant::Config::Keys::SETTINGS => settings }).body
+        filtered_settings = settings.reject { |k, v| v.nil? }
+        command_service.out.puts TomlRB.dump({ CalendarAssistant::Config::Keys::SETTINGS => filtered_settings })
       end
 
       desc "setup",

data/lib/calendar_assistant/cli/config.rb

@@ -18,9 +18,9 @@ class CalendarAssistant
         user_config = if File.exist? config_file_path
                         begin
                           FileUtils.chmod 0600, config_file_path
-                          TOML.load_file config_file_path
+                          TomlRB.load_file config_file_path
                         rescue Exception => e
-                          raise TomlParseFailure, "could not parse #{config_file_path}: #{e}"
+                          raise TomlParseFailure, "could not parse TOML file '#{config_file_path}': #{e}"
                         end
                       else
                         Hash.new
@@ -39,7 +39,7 @@ class CalendarAssistant
           raise NoConfigFileToPersist, "Cannot persist config when there's no config file"
         end
 
-        content = TOML::Generator.new(user_config).body
+        content = TomlRB.dump(user_config)
 
         File.open(config_file_path, "w") do |f|
           f.write content

data/lib/calendar_assistant/event.rb

@@ -192,6 +192,10 @@ class CalendarAssistant
 
     def av_uri
       @av_uri ||= begin
+        if conference_data && conference_data.conference_solution.name == "Zoom Meeting"
+          return conference_data.entry_points.detect{|d| d.entry_point_type == "video" }.uri
+        end
+
         description_link = CalendarAssistant::StringHelpers.find_uri_for_domain(description, "zoom.us")
         return description_link if description_link
 

data/lib/calendar_assistant/event_repository.rb

@@ -35,7 +35,7 @@ class CalendarAssistant
     end
 
     def new(event_attributes)
-      event = Google::Apis::CalendarV3::Event.new DateHelpers.cast_dates(event_attributes)
+      event = Google::Apis::CalendarV3::Event.new(**DateHelpers.cast_dates(event_attributes))
       event.visibility ||= config.event_visibility
       CalendarAssistant::Event.new(event, config: config)
     end
@@ -52,7 +52,7 @@ class CalendarAssistant
     end
 
     def update(event, attributes)
-      event.update! DateHelpers.cast_dates(attributes)
+      event.update!(**DateHelpers.cast_dates(attributes))
       updated_event = @service.update_event @calendar_id, event.id, event
       CalendarAssistant::Event.new(updated_event, config: config)
     end

data/lib/calendar_assistant/extensions/launchy_extensions.rb

@@ -12,7 +12,7 @@ require "launchy"
 #
 class CalendarAssistant
   class ZoomLaunchy < Launchy::Application::Browser
-    ZOOM_URI_REGEXP = %r(https?://\w+.zoom.us/j/(\d+))
+    ZOOM_URI_REGEXP = %r(https?://\w+.zoom.us/j/(\d+)(\?(.*))?)
 
     def self.handles?(uri)
       return true if ZOOM_URI_REGEXP.match(uri)
@@ -31,8 +31,11 @@ class CalendarAssistant
       if command.nil?
         super uri, options
       else
-        confno = ZOOM_URI_REGEXP.match(uri)[1]
+        matches = ZOOM_URI_REGEXP.match(uri)
+        confno = matches[1]
+        params = matches[3]
         url = "zoommtg://zoom.us/join?confno=#{confno}"
+        url += "&#{params}" if params
         run command, [url]
       end
     end

data/lib/calendar_assistant/version.rb

@@ -1,3 +1,3 @@
 class CalendarAssistant
-  VERSION = "0.10.0"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calendar-assistant
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Mike Dalessio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: business_time
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -68,25 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-calendar_v3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -121,126 +115,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: toml
+  name: toml-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: thor_repl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: concourse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: license_finder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -275,14 +255,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.21'
 description: A command-line tool to help manage your Google Calendar.
 email:
 - mike.dalessio@gmail.com
@@ -350,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A command-line tool to help manage your Google Calendar.