nora 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2cbe310506ce1dbb0e53d86109c02e6cd01db00
-  data.tar.gz: b7bd143d5a26164da78bb59d372c24f2fe58691f
+  metadata.gz: fccab401ac7eb09b7078c9c8cb94e1be04e2b7bd
+  data.tar.gz: 5fb238bea537fc61cb54b57a27651d5f8d0dd7dc
 SHA512:
-  metadata.gz: 900c279ced7bf1575cbda007c8bc6280e4133ff9e9647bb57eae29e2a372ed724abaa4e725a629dce8ee65a1c39c3a341e60fdee06057f7e4f4514c181330306
-  data.tar.gz: 0aca7480d32709a3805ce862496a9806f7033a70efd4e4985faca1f81fb91acd0ca6e7d551b37f480cefc69e77e4ed9f91dbb52d797f5d8d096f38f38637dab3
+  metadata.gz: 674557ebf7c90291761f684d521713a44b746ffd8a0a600784807616f00f3a97fd130af2832f4e2e1923305b77ab359df6009e972f79028e38fb0d971068a79c
+  data.tar.gz: 88c5b8b0ca68a77046bf60ba91b79c4cc1dd7cf1867c1a74546b318666e6f4b7fbc92845ce6255c09e8297a1abb3ea0a04ec5c3825fa7733faaf0ff9734e3831

data/lib/nora/core.rb

@@ -65,15 +65,13 @@ module Nora
     end
 
     def run!
+      load_history! # Populate @history for load_calendars!
+      load_calendars! # Outside the loop to reduce calls to Google API.
       begin
-        load_history!
-        puts "Loading calendars..."
-        load_calendars!
-        puts "Creating groups..."
+        shuffle_emails!
         create_groups!
       rescue SystemStackError
         remove_oldest_pair!
-
         retry
       end
 
@@ -93,9 +91,9 @@ module Nora
     # calendar in the configuration file without us
     # having to manually add them in the UI.
     def load_calendars!
-      puts "Loading calendars"
-      @emails = CONFIGURATION["people"].map { |p| p["email"] }.shuffle
-      @emails.each do |email|
+      puts "Loading calendars..."
+      @emails = CONFIGURATION["people"].map { |p| p["email"] }
+      (Set.new(@emails) - @history).each do |email|
         puts "Loading calendar: #{email}"
         @service.insert_calendar_list(
           Google::Apis::CalendarV3::CalendarListEntry.new(id: email)
@@ -103,6 +101,11 @@ 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|
@@ -124,6 +127,7 @@ module Nora
     end
 
     def create_groups!
+      puts "Creating groups..."
       @emails.each_slice(group_size).each do |emails|
         return create_groups! unless (@history & emails.combination(2)).empty?
       end

data/lib/nora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nora
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler