zoom_launcher 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 749f9399b1f7da6cec06469522d170acc99abd7a
-  data.tar.gz: 935e1023661e5321d3c83c9e0e596766ec55f851
+  metadata.gz: a97115f729c88166794dd66c165edef9f485dc55
+  data.tar.gz: '08c006a6948afc194ca8aed68764caeb101716a3'
 SHA512:
-  metadata.gz: cc441c828c94650ee851283209fc9a050e486c6fbed38d15336b401833aca3323b73ef6844d7148144714870459890e42f70b37c0439d71e96aff0047fd84f8d
-  data.tar.gz: ab7c2bd1a1b2b037d93fc0eb1a86eea60a0eb9cfbb596d2fcc0d34407c4ce064ac2ed1334f902085ab184ebaf59ccba3d35bc9ddb6369ab8a284dad5de7f3c4c
+  metadata.gz: ce8c748864d9bc5f73f9f56852f3b9d34922eef47d96e99e5de6a997aa74d3f271786465af723b1b78e17b47dd7babe6852721d74647b4a2877974639f05f6bb
+  data.tar.gz: 766228884541290465858cf0dacd87bd2e2834574e30bfd7974489984b202319b333943c65f4727e552aaea2aed09a461779cd2c3c9e16314187729634fdf08b

data/README.md

@@ -19,13 +19,22 @@ Oh, and here's the URL in case you need it: https://www.google.com/calendar/even
 
 ## Setup
 
-In order to use Zoom Launcher, you need to create an OAuth app and authorize it to access your calendar:
-
-1. Go to https://console.developers.google.com and create a new project (you may need to switch to your work account)
-2. Click "Credentials" on the left side and create a new OAuth credential with type "other" for that project
-3. Create a new OAuth credential, and download the resulting JSON file
-4. Move the file to `~/.config/google/client_secrets.json`
-5. Run `zoom auth` and follow the instructions to authorize the app
+In order to use Zoom Launcher, you need to create an OAuth app and authorize it to access your calendar. You can do it in four, not-so-easy steps:
+
+1. Create a new project
+    1. Go to https://console.developers.google.com
+    2. Switch to your work account if need be (top right)
+    3. Create a new project dropdown, top left next to your domain
+2. Grant the project Calendar API access
+    1. Click "Enable API"
+    2. Type "Calendar" in the search box
+    3. Click "Calendar API"
+    4. Click "Enable"
+3. Grab your creds
+    1. Click "Credentials" on the left side
+    2. Create a new OAuth credential with type "other"
+    3. Download the credential to `~/.config/google/client_secrets.json` (icon, right side)
+4. Run `zoom auth` and follow the instructions to authorize the app
 
 ## Project status
 

data/lib/google/apis/calendar_v3/event.rb

@@ -4,12 +4,19 @@ module Google
   module Apis
     module CalendarV3
       class Event
-        MEETING_URL_REGEX = %r{https://.*\.zoom\.us/j/\d+}
+        MEETING_URL_REGEX = %r{https://.*?\.zoom\.us/(?:j/(\d+)|my/(\S+))}
         include ActionView::Helpers::DateHelper
 
+        def meeting_id
+          @meeting_id ||= (matches[1] || matches[2])
+        end
+
         def meeting_url
-          matches = (location + description).match(MEETING_URL_REGEX)
-          matches[0] if matches
+          @meeting_url ||= URI(matches[0]) if matches
+        end
+
+        def zoom_url
+          "zoommtg://zoom.us/join?confno=#{meeting_id}" if meeting_id && !vanity_url?
         end
 
         def already_started?
@@ -28,6 +35,16 @@ module Google
             "in #{distance}".bold
           end
         end
+
+        private
+
+        def matches
+          @matches ||= "#{location} #{description}".match(MEETING_URL_REGEX)
+        end
+
+        def vanity_url?
+          meeting_id && meeting_id !~ /\A\d+\z/
+        end
       end
     end
   end

data/lib/zoom_launcher/cli.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'uri'
+
 module ZoomLauncher
   class CLI < GoogleAuth
     CALENDAR = 'primary'
@@ -22,15 +24,14 @@ module ZoomLauncher
         puts
 
         if next_event.more_than_five_minutes_from_now?
-          puts "Here's the Zoom URL: #{next_event.meeting_url.bold}"
+          puts "Here's the Zoom URL: #{next_event.meeting_url.to_s.bold}"
         else
-          puts "Opening #{next_event.meeting_url.bold}..."
-          `open #{next_event.meeting_url}`
-
+          puts "Opening #{next_event.meeting_url.to_s.bold}..."
+          `open #{next_event.zoom_url || next_event.meeting_url}`
         end
         puts "Oh, and here's the URL in case you need it: #{next_event.html_link}"
       else
-        puts "Can't find any upcomming Zoom meetings"
+        puts "Can't find any upcoming Zoom meetings"
       end
     end
 

data/lib/zoom_launcher/google_auth.rb

@@ -56,7 +56,7 @@ module ZoomLauncher
       end
 
       # Returns user credentials for the given scope. Requests authorization
-      # if requrired.
+      # if required.
       def user_credentials_for(scope)
         FileUtils.mkdir_p(File.dirname(token_store_path))
 

data/lib/zoom_launcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZoomLauncher
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/zoom_launcher.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['ben.balter@github.com']
 
   spec.summary       = 'A command line tool for joining your next Zoom meeting'
-  spec.homepage      = "https://github.com/benbalter/zoom-launcher"
+  spec.homepage      = 'https://github.com/benbalter/zoom-launcher'
   spec.license       = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zoom_launcher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview