nora 0.9 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 575265c4cadad14393ba8736a3973ed7704d2e59
-  data.tar.gz: 97fc379e85cf8793ec121f4d3eccf33f07905ecc
+SHA256:
+  metadata.gz: eba54fcfe1ba7880878b3fb8f22a0a357d81ad08d1a037c162526d2989be84d2
+  data.tar.gz: 45314bb6328729955beed198f3606584d8275649b2352b835d1c9096b909ff3c
 SHA512:
-  metadata.gz: 714cdab8af8e284c2458ff1de4a55035be2f8fce1f80af89d51486364506846bf25eb5cef794051aacb043c79884ca87686be55fbc671d69f133088d3f0c1eb6
-  data.tar.gz: c1b39413b22b5e18247dc6cf1e2fb69165e6049ff484d4a98a964a901839f6f232179e1256a281f46b72dddf6e57e951a618c506b9aaf1d4f437b846cf594b22
+  metadata.gz: 9cf57358ca8f4a5f9a73b9dee65ade7f92627a87617c13a0b8ef1594540baf8ace3f2df01dc3c30104782f80fb3135b68a7cf0b197b129af39794b1cfbade4d3
+  data.tar.gz: 57df09cc016e551cc3d0c1b974e2208be62bc147647ba3194faa1086c0c794a978c0dba59209849b4dea929b7cf70fd1543d64a48ff451a6bf828f038022f9ae

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.5

data/lib/nora/core.rb

@@ -25,6 +25,7 @@ module Nora
     CREDENTIALS_PATH = "calendar-ruby-quickstart.yaml"
     SCOPE = Google::Apis::CalendarV3::AUTH_CALENDAR
 
+    CALENDAR_BATCH_SIZE = 250 # The maximum Google Calendar allows
     FREE_BUSY_QUERY_BATCH_SIZE = 5
 
     CONFIGURATION = JSON.parse(File.read("nora_configuration.json"))
@@ -65,13 +66,7 @@ module Nora
     def run!
       load_history! # Populate @history for load_calendars!
       load_calendars! # Outside the loop to reduce calls to Google API.
-      begin
-        shuffle_emails!
-        create_groups!
-      rescue SystemStackError
-        remove_oldest_pair!
-        retry
-      end
+      create_groups!
 
       send_emails(
         template_emails_for(
@@ -92,15 +87,8 @@ module Nora
       puts "Loading calendars..."
       @emails = CONFIGURATION["people"].map { |p| p["email"] }
 
-      emails_in_history = []
-      File.open(PAIRINGS_FILE).each do |line|
-        line.split(PAIRINGS_FILE_SEPARATOR).each do |email|
-          emails_in_history << email
-        end
-      end
-
       # Load all calendars that aren't in our history.
-      (@emails - emails_in_history).each do |email|
+      (Set.new(@emails) - @previously_loaded_emails).each do |email|
         puts "Loading calendar: #{email}"
         @service.insert_calendar_list(
           Google::Apis::CalendarV3::CalendarListEntry.new(id: email)
@@ -109,35 +97,39 @@ module Nora
       end
     end
 
-    def shuffle_emails!
-      puts "Shuffling emails..."
-      @emails = @emails.shuffle
-    end
-
-    def remove_oldest_pair!
-      puts "Removing oldest pair and retrying..."
-      File.open("past_pairings_tmp.txt", "w") do |file|
-        File.open(PAIRINGS_FILE).each.with_index(1) do |line, line_num|
-          file.puts(line) unless line_num == 1
-        end
-      end
-      FileUtils.mv("past_pairings_tmp.txt", PAIRINGS_FILE)
-    end
-
     def load_history!
       puts "Loading history..."
-      @history = Set.new
+      @past_pairing_counts = Hash.new { |h, k| h[k] = 0 }
+      @previously_loaded_emails = Set.new
       File.open(PAIRINGS_FILE).each do |line|
-        line.split(PAIRINGS_FILE_SEPARATOR).permutation.each do |emails|
-          @history << emails
+        line.split(PAIRINGS_FILE_SEPARATOR).each do |email|
+          @previously_loaded_emails << email
+        end.permutation.each do |emails|
+          @past_pairing_counts[group_key(emails: emails)] += 1
         end
       end
     end
 
+    def group_key(emails:)
+      emails.sort.join(",")
+    end
+
     def create_groups!
       puts "Creating groups..."
-      @emails.each_slice(group_size).each do |emails|
-        return create_groups! unless (@history & emails.combination(2)).empty?
+      unmatched_emails = Set.new(@emails)
+      @groups = []
+
+      while unmatched_emails.size >= group_size
+        @emails.shuffle.combination(group_size).each do |emails|
+          next unless emails.all? { |email| unmatched_emails.include?(email) }
+          key = group_key(emails: emails)
+          if @past_pairing_counts[key].zero?
+            @groups << emails
+            unmatched_emails.subtract(emails)
+          else
+            @past_pairing_counts[key] -= 1
+          end
+        end
       end
     end
 
@@ -148,7 +140,7 @@ module Nora
 
       meetings = []
 
-      @emails.each_slice(group_size) do |emails|
+      @groups.each do |emails|
         if emails.size < group_size
           puts "\nNot enough people in group: #{emails}\n"
           meetings << {
@@ -161,6 +153,14 @@ module Nora
           next
         end
 
+        unless @test
+          File.open(PAIRINGS_FILE, "a") do |file|
+            emails.combination(2) do |email_pair|
+              file.puts email_pair.join(PAIRINGS_FILE_SEPARATOR)
+            end
+          end
+        end
+
         time = availability_schedule.select do |_, ids|
           ids.superset? Set.new(emails)
         end.keys.sample
@@ -178,14 +178,6 @@ module Nora
           puts "#{time} => #{emails}"
           add_meeting(time: time, attendee_ids: emails)
 
-          unless @test
-            File.open(PAIRINGS_FILE, "a") do |file|
-              emails.combination(2) do |email_pair|
-                file.puts email_pair.join(PAIRINGS_FILE_SEPARATOR)
-              end
-            end
-          end
-
           meetings << {
             on: time,
             who: emails.map do |email|
@@ -342,9 +334,22 @@ module Nora
     memoize :email_name_map
 
     def calendars
-      @service.list_calendar_lists.items.select do |calendar|
-        @emails.include? calendar.id
+      output = []
+      lists = @service.list_calendar_lists(max_results: CALENDAR_BATCH_SIZE)
+      lists.items.each do |calendar|
+        output << calendar if @emails.include? calendar.id
+      end
+
+      while lists.next_page_token
+        lists = @service.list_calendar_lists(
+          max_results: CALENDAR_BATCH_SIZE,
+          page_token: lists.next_page_token
+        )
+        lists.items.each do |calendar|
+          output << calendar if @emails.include? calendar.id
+        end
       end
+      output
     end
     memoize :calendars
 

data/lib/nora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nora
-  VERSION = "0.9"
+  VERSION = "0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nora
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Bringing P-A-NORA-M-A together.