ogam 1.1.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01aa2307589a72f9316e069ea9d7980dccc74c52c2cc8deb87d5eea2a71da94f
-  data.tar.gz: fa83f2d5035bceae5b3f9d389f6b4ec9ccc65eb5d40316a0ee13d3b97dea3e94
+  metadata.gz: b41adf475cb00cb57164e2bbb0e330d3b7d0401abd7725cc4ddc39325e2e8e9f
+  data.tar.gz: 8519c7e4f82dfcdd87e2efde8fa0651841984d136fe6f4853bf85e042e1bdf1c
 SHA512:
-  metadata.gz: 8e55ca322c7c97c468a810ead4bd530d034a29151cb0a02b15923fcf658173f331124b26cae58e0271709bae70c6ef6f69e0b35385365e60abb2a87c62aaefdc
-  data.tar.gz: 3e8a1f8844d692da9093da34ac1a28c4bf82182df32ba8406ddcbd381c203490aa07d98ddb10055fef3148072fe1982453d73e08be3f15c4271dceeb8f987cf3
+  metadata.gz: 1d05195e69269c8700c50806953046a7676b9f380658d2168292795759c6b5be139b594362313fe2e378e192a6f4d2e8fd71efa6d43375fed08339b2ebdd1da6
+  data.tar.gz: 4ac972b6caf6c6b3f37f1ebd37f47fb8e76b12526394aa8c9d00bdd8ca6b58b4902b54be22780d7750a1f67de35e6d69bb8669363929edd8f168ff42d4fa1f71

data/.rubocop.yml

@@ -1,24 +1,21 @@
 inherit_from:
   - .rubocop_todo.yml
-  - .rubocop_metrics_todo.yml
 
 inherit_gem:
   rubocop-ogat:
     - config/default.yml
 
+inherit_mode:
+  merge:
+    - 'Include'
+
 AllCops:
   TargetRubyVersion: 2.6
-
-Layout/LineLength:
-  Max: 120
-
-Metrics/BlockLength:
+  Include:
+    - 'bin/ogam'
   Exclude:
-    - 'spec/**/*.rb'
-    - 'ogatstyle.gemspec'
-
-Rails/Output:
-  Enabled: false
+    - 'bin/console'
+    - 'vendor/bundle/**/*'
 
-Rails/SaveBang:
+Rails:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,7 +1,52 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --exclude-limit 1000 --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 0.80.0.
+# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 10000 --no-offense-counts --no-auto-gen-timestamp`
+# using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
+
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/AbcSize:
+  Exclude:
+    - 'spec/**/*'
+    - 'db/migrate/*'
+    - 'config/routes.rb'
+    - 'config/environments/*.rb'
+    - 'lib/ogam/group_assigner.rb'
+
+# Configuration parameters: CountComments, Max.
+Metrics/ClassLength:
+  Exclude:
+    - 'spec/**/*'
+    - 'db/migrate/*'
+    - 'config/routes.rb'
+    - 'config/environments/*.rb'
+    - 'lib/ogam/group_assigner.rb'
+
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'spec/**/*'
+    - 'db/migrate/*'
+    - 'config/routes.rb'
+    - 'config/environments/*.rb'
+    - 'lib/ogam/group_assigner.rb'
+
+# Configuration parameters: CountComments, Max, ExcludedMethods.
+Metrics/MethodLength:
+  Exclude:
+    - 'spec/**/*'
+    - 'db/migrate/*'
+    - 'config/routes.rb'
+    - 'config/environments/*.rb'
+    - 'lib/ogam/group_assigner.rb'
+
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'spec/**/*'
+    - 'db/migrate/*'
+    - 'config/routes.rb'
+    - 'config/environments/*.rb'
+    - 'lib/ogam/group_assigner.rb'

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 

data/bin/ogam

@@ -1,19 +1,19 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'ogam'
-require 'thor'
-require 'shellwords'
+require "bundler/setup"
+require "ogam"
+require "thor"
+require "shellwords"
 
 # Signature subcommand cli
 class SignatureCLI < Thor
-  desc('user EMAIL', 'Sets the signature for user with primary email EMAIL based on their name, job title, and org')
+  desc("user EMAIL", "Sets the signature for user with primary email EMAIL based on their name, job title, and org")
   def user(email)
     set_signatures(Ogam::User.active_by_email(email), pretend: parent_options[:pretend])
   end
 
-  desc('domain DOMAIN', 'Sets the signature for all users @DOMAIN based on their name, job title, and org')
+  desc("domain DOMAIN", "Sets the signature for all users @DOMAIN based on their name, job title, and org")
   def domain(domain)
     set_signatures(Ogam::User.active_for_domain(domain), pretend: parent_options[:pretend])
   end
@@ -32,38 +32,38 @@ class CLI < Thor
   class_option :pretend, type: :boolean, default: false
 
   desc(
-    'assign_to_standard_groups DOMAIN_OR_EMAIL',
-    'Assigns users at DOMAIN (e.g. newbold.outwood.com) or EMAIL address to standard groups based on their job title'
+    "assign_to_standard_groups DOMAIN_OR_EMAIL",
+    "Assigns users at DOMAIN (e.g. newbold.outwood.com) or EMAIL address to standard groups based on their job title"
   )
   def assign_to_standard_groups(domain_or_email)
-    method = domain_or_email.include?('@') ? :for_user : :for_domain
+    method = domain_or_email.include?("@") ? :for_user : :for_domain
     Ogam::GroupAssigner.public_send(method, domain_or_email, pretend: options[:pretend])
   end
 
   desc(
-    'populate_titles_and_orgs PATH_TO_CSV',
-    'Populates job titles and organisation names from a CSV with columns primary_email, job_title, organisation'
+    "populate_titles_and_orgs PATH_TO_CSV",
+    "Populates job titles and organisation names from a CSV with columns primary_email, job_title, organisation"
   )
   def populate_titles_and_orgs(csv_path)
     Ogam::Execute.csv_command(
       csv_path,
-      'gam update user ~primary_email organization name ~organisation title ~job_title primary',
+      "gam update user ~primary_email organization name ~organisation title ~job_title primary",
       pretend: options[:pretend]
     )
   end
 
-  desc('create_shared_mailbox EMAIL NAME', 'Create a shared mailbox')
+  desc("create_shared_mailbox EMAIL NAME", "Create a shared mailbox")
   def create_shared_mailbox(email, name)
     Ogam::Execute.single(Ogam::Group.create_shared_mailbox_command(email, name), pretend: options[:pretend])
   end
 
-  desc('create_exec_mailbox EMAIL NAME', 'Create an Exec mailbox')
+  desc("create_exec_mailbox EMAIL NAME", "Create an Exec mailbox")
   def create_exec_mailbox(email, name)
     Ogam::Execute.single(Ogam::Group.create_exec_mailbox_command(email, name), pretend: options[:pretend])
   end
 
   option :moderated, type: :boolean, default: false
-  desc('create_group EMAIL NAME [--moderated]', 'Create a distribution list group, optionally moderated')
+  desc("create_group EMAIL NAME [--moderated]", "Create a distribution list group, optionally moderated")
   def create_group(email, name)
     Ogam::Execute.single(
       Ogam::Group.create_distribution_list_command(email, name, options[:moderated]), pretend: options[:pretend]
@@ -72,8 +72,8 @@ class CLI < Thor
 
   option :organisation, type: :string
   desc(
-    'set_job_title EMAIL TITLE [--organisation ORG_NAME]',
-    'Sets job title for a user, and updates their signature, groups, and organisation name. Optionally override org.'
+    "set_job_title EMAIL TITLE [--organisation ORG_NAME]",
+    "Sets job title for a user, and updates their signature, groups, and organisation name. Optionally override org."
   )
   def set_job_title(email, title)
     validate_job_title!(title)
@@ -85,8 +85,33 @@ class CLI < Thor
     set_title_and_org_and_make_changes(email, title, org, pretend: options[:pretend])
   end
 
-  desc('set_signature user/domain EMAIL/DOMAIN', 'Set email signatures for users/domains based on user attributes')
-  subcommand 'set_signature', SignatureCLI
+  desc(
+    "add_send_as USER GROUP NAME TITLE ORG_NAME",
+    "Adds a sendas address to USER to be able to send as GROUP, and sets the NAME, and signature for sending"
+  )
+  def add_send_as(user, group, name, title, org_name)
+    signature_html = Ogam::Signature.signature_html(name, title, org_name)
+    Ogam::Execute.single(Ogam::Group.add_send_as_command(user, group, name, signature_html), pretend: options[:pretend])
+  end
+
+  desc("set_signature user/domain EMAIL/DOMAIN", "Set email signatures for users/domains based on user attributes")
+  subcommand "set_signature", SignatureCLI
+
+  desc("delicense_suspended_ou", "De-licenses GSEfE from all users under /Suspended")
+  def delicense_suspended_ou
+    Ogam::Execute.single('gam ou "/Suspended" delete license 1010310002', pretend: options[:pretend])
+  end
+
+  desc("offboard USER", "Suspends a user, moves them to /Suspended, removes from groups, and delicenses GSEfE")
+  def offboard(user)
+    Ogam::Execute.single(
+      "gam update user #{user} suspended on org \"/Suspended\"", pretend: options[:pretend]
+    )
+    Ogam::Execute.single("gam user #{user} delete groups", pretend: options[:pretend])
+    puts "Waiting 5 seconds before delicensing..."
+    sleep(5)
+    Ogam::Execute.single("gam user #{user} delete license 1010310002", pretend: options[:pretend])
+  end
 
   private
 
@@ -99,7 +124,7 @@ class CLI < Thor
   end
 
   def validate_organisation!(org, approved_organisations)
-    org.split(' / ').each do |org_part|
+    org.split(" / ").each do |org_part|
       unless approved_organisations.value?(org_part)
         raise ArgumentError, "'#{org_part}' is not an approved organisation name."
       end
@@ -109,7 +134,7 @@ class CLI < Thor
   def infer_organisation_if_necessary(org, email, approved_organisations)
     return org if org.present?
 
-    approved_organisations.fetch(email.split('@').last, '')
+    approved_organisations.fetch(email.split("@").last, "")
   end
 
   def set_title_and_org_and_make_changes(email, title, org, pretend: true)

data/lib/ogam.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'active_support/all'
-require 'attr_extras'
-require 'ogam/version'
-require 'ogam/execute'
-require 'ogam/group'
-require 'ogam/job_title'
-require 'ogam/user'
-require 'ogam/group_assigner'
-require 'ogam/signature'
-require 'ogam/organisation'
+require "active_support/all"
+require "attr_extras"
+require "ogam/version"
+require "ogam/execute"
+require "ogam/group"
+require "ogam/job_title"
+require "ogam/user"
+require "ogam/group_assigner"
+require "ogam/signature"
+require "ogam/organisation"
 
 module Ogam
   class Error < StandardError; end

data/lib/ogam/execute.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
-require 'csv'
-require 'tempfile'
-require 'English'
+require "csv"
+require "tempfile"
+require "English"
 
 module Ogam
   # Methods to execute GAM commands
   class Execute
     def self.single(command, pretend: true)
-      puts "#{pretend ? '[PRETEND] ' : nil}Executing #{command}"
+      puts "#{pretend ? "[PRETEND] " : nil}Executing #{command}"
       return if pretend
 
-      system("~/bin/gam/#{command}", exception: true)
+      system("~/bin/gam/#{command.strip}", exception: true)
     end
 
     def self.fetch(command, pretend: true)
-      puts "#{pretend ? '[PRETEND] ' : nil}Fetching results from #{command}"
+      puts "#{pretend ? "[PRETEND] " : nil}Fetching results from #{command}"
       return if pretend
 
-      `~/bin/gam/#{command}`
+      `~/bin/gam/#{command.strip}`
     end
 
     def self.fetch_csv(command, pretend: true)
@@ -29,22 +29,25 @@ module Ogam
     end
 
     def self.csv_command(csv_path, command, pretend: true)
-      single("gam csv #{Shellwords.escape(csv_path)} #{command}", pretend: pretend)
+      single("gam csv #{Shellwords.escape(csv_path)} #{command.strip}", pretend: pretend)
     end
 
+    # rubocop:disable Metrics/MethodLength
     def self.multiple(commands, pretend: true)
       return if commands.empty?
 
-      puts "#{pretend ? '[PRETEND] ' : nil}Executing multiple commands:"
+      puts "#{pretend ? "[PRETEND] " : nil}Executing multiple commands:"
       commands.each do |command|
         puts "\t#{command}"
       end
       return if pretend
 
-      Tempfile.create do |f|
-        commands.each { |command| f.puts command }
-        single("gam batch #{f.path}", pretend: pretend)
-      end
+      f = Tempfile.new
+      commands.each { |command| f.puts command.strip }
+      f.close
+      single("gam batch #{f.path}", pretend: pretend)
+      f.unlink
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/ogam/group.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'shellwords'
+require "shellwords"
 module Ogam
   # Methods relating to groups
   class Group
     def self.groups_for_domain(domain)
-      Ogam::Execute.fetch_csv("gam print groups domain #{domain}", pretend: false).map { |r| r['Email'] }
+      Ogam::Execute.fetch_csv("gam print groups domain #{domain}", pretend: false).map { |r| r["Email"] }
     end
 
     def self.add_group_member_command(user:, group:)
-      "gam update group #{group} add member user #{user}"
+      "gam update group #{group} add member user #{Shellwords.escape(user)}"
     end
 
     def self.create_shared_mailbox_command(email_address, name)
@@ -26,7 +26,13 @@ module Ogam
 
     def self.create_distribution_list_command(email_address, name, moderated)
       <<~COMMAND
-        gam create group #{email_address} name #{Shellwords.escape(name)} allow_external_members false who_can_join invited_can_join primary_language en-GB who_can_view_membership all_in_domain_can_view include_in_global_address_list true is_archived false members_can_post_as_the_group false allow_web_posting false send_message_deny_notification true reply_to reply_to_sender message_moderation_level #{moderated ? 'moderate_all_messages' : 'moderate_none'} who_can_contact_owner all_managers_can_contact who_can_leave_group none_can_leave who_can_add none_can_add who_can_post_message all_in_domain_can_post who_can_invite none_can_invite who_can_view_group all_managers_can_view show_in_group_directory true archive_only false spam_moderation_level moderate
+        gam create group #{email_address} name #{Shellwords.escape(name)} allow_external_members false who_can_join invited_can_join primary_language en-GB who_can_view_membership all_in_domain_can_view include_in_global_address_list true is_archived false members_can_post_as_the_group false allow_web_posting false send_message_deny_notification true reply_to reply_to_sender message_moderation_level #{moderated ? "moderate_all_messages" : "moderate_none"} who_can_contact_owner all_managers_can_contact who_can_leave_group none_can_leave who_can_add none_can_add who_can_post_message all_in_domain_can_post who_can_invite none_can_invite who_can_view_group all_managers_can_view show_in_group_directory true archive_only false spam_moderation_level moderate
+      COMMAND
+    end
+
+    def self.add_send_as_command(user_email, group_email, name, signature_html)
+      <<~COMMAND
+        gam user #{user_email} sendas #{group_email} #{Shellwords.escape(name)} treatasalias false signature "#{signature_html}"
       COMMAND
     end
   end

data/lib/ogam/group_assigner.rb

@@ -5,28 +5,28 @@ module Ogam
   class GroupAssigner
     static_facade :call, :users, :domain, [pretend: true]
 
-    SUBJECT_TEACHER_TITLES = ['Teacher of ', 'Head of ', 'Second in ', 'Third in '].freeze
+    SUBJECT_TEACHER_TITLES = ["Teacher of ", "Head of ", "Second in ", "Third in "].freeze
     SUBJECT_MAPPING = {
-      'art-teachers' => ['Art'],
-      'business-teachers' => ['Business Studies'],
-      'dance-teachers' => ['Dance', 'Performing Arts'],
-      'design-technology-teachers' => %w[Technology Engineering],
-      'drama-teachers' => ['Drama', 'Music & Drama', 'Performing Arts'],
-      'english-teachers' => ['English'],
-      'epq-teachers' => [],
-      'geography-teachers' => ['Humanities'],
-      'guidance-teachers' => [],
-      'health-social-care-teachers' => ['Health & Social Care'],
-      'history-teachers' => %w[Humanities History],
-      'ict-teachers' => ['Computer Science'],
-      'law-teachers' => ['Law'],
-      'maths-teachers' => ['Maths'],
-      'mfl-teachers' => ['MFL'],
-      'music-teachers' => ['Music', 'Music & Drama'],
-      'pe-teachers' => ['PE'],
-      're-life-teachers' => ['Humanities', 'Religious Studies'],
-      'science-teachers' => ['Science'],
-      'social-sciences-teachers' => ['Social Sciences']
+      "art-teachers" => ["Art", "Creative Arts"],
+      "business-teachers" => ["Business Studies", "Business & IT"],
+      "dance-teachers" => ["Dance", "Performing Arts", "Creative Arts"],
+      "design-technology-teachers" => %w[Technology Engineering],
+      "drama-teachers" => ["Drama", "Music & Drama", "Performing Arts", "Creative Arts"],
+      "english-teachers" => ["English"],
+      "epq-teachers" => [],
+      "geography-teachers" => ["Humanities"],
+      "guidance-teachers" => [],
+      "health-social-care-teachers" => ["Health & Social Care"],
+      "history-teachers" => %w[Humanities History],
+      "ict-teachers" => ["Computer Science", "Business & IT"],
+      "law-teachers" => ["Law"],
+      "maths-teachers" => ["Maths"],
+      "mfl-teachers" => ["MFL"],
+      "music-teachers" => ["Music", "Music & Drama", "Creative Arts"],
+      "pe-teachers" => ["PE"],
+      "re-life-teachers" => ["Humanities", "Religious Studies"],
+      "science-teachers" => ["Science"],
+      "social-sciences-teachers" => ["Social Sciences"]
     }.freeze
 
     def self.for_domain(domain, pretend: true)
@@ -34,37 +34,38 @@ module Ogam
     end
 
     def self.for_user(email, pretend: true)
-      call(User.active_by_email(email), email.split('@').last, pretend: pretend)
+      call(User.active_by_email(email), email.split("@").last, pretend: pretend)
     end
 
     def self.groups_for_job_title(job_title, entry, domain)
       groups_domain = "groups.#{domain}"
 
       groups = groups_from_entry(entry, groups_domain)
-      groups += subject_groups(job_title, groups_domain) if entry['Teaching']
+      groups += subject_groups(job_title, groups_domain) if entry["Teaching"]
 
-      groups << "heads-of-departments@#{groups_domain}" if entry['Teaching'] && job_title.include?('Head of ')
-      groups << "principal@#{groups_domain}" if entry['SLT'] && ['Principal', 'Acting Principal'].include?(job_title)
+      groups << "heads-of-departments@#{groups_domain}" if entry["Teaching"] && job_title.include?("Head of ")
+      groups << "principal@#{groups_domain}" if entry["SLT"] && ["Principal", "Acting Principal"].include?(job_title)
 
-      groups << "learning-managers@#{groups_domain}" if job_title.include?('Learning Manager')
-      groups << "academy-council@#{groups_domain}" if job_title.include?('Academy Council')
-      groups << 'business-managers@trust-wide.outwood.com' if job_title == 'Business Manager'
+      groups << "learning-managers@#{groups_domain}" if job_title.include?("Learning Manager")
+      groups << "academy-council@#{groups_domain}" if job_title.include?("Academy Council")
+      groups << "learning-support@#{groups_domain}" if job_title.include?("Teaching Assistant")
+      groups << "business-managers@trust-wide.outwood.com" if job_title == "Business Manager"
 
       groups
     end
 
     def self.groups_from_entry(entry, groups_domain)
-      groups = []
-      groups << "teaching-staff@#{groups_domain}" if entry['Teaching']
-      groups << "support-staff@#{groups_domain}" if entry['Support']
-      if entry['SLT']
+      groups = ["all-staff-direct@trust-wide.outwood.com"]
+      groups << "teaching-staff@#{groups_domain}" if entry["Teaching"]
+      groups << "support-staff@#{groups_domain}" if entry["Support"]
+      if entry["SLT"]
         groups << "slt@#{groups_domain}"
         groups << "leadership-team@#{groups_domain}"
       end
-      groups << 'finance@trust-wide.outwood.com' if entry['Finance']
-      groups << 'data-exams@trust-wide.outwood.com' if entry['Data and Exams']
-      groups << 'human-resources@trust-wide.outwood.com' if entry['HR']
-      groups << 'ict-support@trust-wide.outwood.com' if entry['ICT Support']
+      groups << "finance@trust-wide.outwood.com" if entry["Finance"]
+      groups << "data-exams@trust-wide.outwood.com" if entry["Data and Exams"]
+      groups << "human-resources@trust-wide.outwood.com" if entry["HR"]
+      groups << "ict-support@trust-wide.outwood.com" if entry["ICT Support"]
       groups
     end
 
@@ -74,9 +75,9 @@ module Ogam
       groups = []
       SUBJECT_MAPPING.each do |group_prefix, subject_words|
         has_subject =
-          subject_words.any? do |subject|
+          subject_words.any? { |subject|
             SUBJECT_TEACHER_TITLES.any? { |title| job_title.include? "#{title}#{subject}" }
-          end
+          }
         next unless has_subject
 
         groups << "#{group_prefix}@#{groups_domain}"
@@ -97,7 +98,7 @@ module Ogam
     end
 
     def valid_groups
-      @valid_groups ||= Group.groups_for_domain("groups.#{domain}") + Group.groups_for_domain('trust-wide.outwood.com')
+      @valid_groups ||= Group.groups_for_domain("groups.#{domain}") + Group.groups_for_domain("trust-wide.outwood.com")
     end
 
     def generate_group_assignments
@@ -110,7 +111,7 @@ module Ogam
 
     def group_assignments_for_user(user)
       group_assignments = []
-      email = user['primaryEmail']
+      email = user["primaryEmail"]
       User.job_titles_for_user(user).each do |job_title|
         entry = approved_job_titles.fetch(job_title, nil)
         if entry.nil?

data/lib/ogam/job_title.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require 'open-uri'
-require 'csv'
+require "open-uri"
+require "csv"
 
 module Ogam
   # Allows working with a list of approved job titles
   class JobTitle
     static_facade :all
 
-    CSV_URL = 'https://docs.google.com/spreadsheets/d/12nl5OBGSmOSsWilzWfflmAHO-8EyfCjVXYLeUDqjB60/export?format=csv&id=12nl5OBGSmOSsWilzWfflmAHO-8EyfCjVXYLeUDqjB60&gid=1604665254'
+    CSV_URL = "https://docs.google.com/spreadsheets/d/12nl5OBGSmOSsWilzWfflmAHO-8EyfCjVXYLeUDqjB60/export?format=csv&id=12nl5OBGSmOSsWilzWfflmAHO-8EyfCjVXYLeUDqjB60&gid=1604665254"
 
     def self.job_titles(str)
       return [] if str.blank?
 
-      str.split(' / ')
+      str.split(" / ")
     end
 
     def all
@@ -23,16 +23,16 @@ module Ogam
     private
 
     def download
-      puts 'Fetching list of accepted job titles'
+      puts "Fetching list of accepted job titles"
       URI.parse(CSV_URL).read
     end
 
     def parse(str)
       data = {}
       CSV.parse(str, headers: true).each do |row|
-        next if row['Job Title'].blank?
+        next if row["Job Title"].blank?
 
-        data[row['Job Title']] = entry_for_row(row)
+        data[row["Job Title"]] = entry_for_row(row)
       end
 
       data
@@ -40,8 +40,8 @@ module Ogam
 
     def entry_for_row(row)
       entry = {}
-      (row.headers - ['Job Title']).each do |col|
-        entry[col] = row[col] == 'TRUE'
+      (row.headers - ["Job Title"]).each do |col|
+        entry[col] = row[col] == "TRUE"
       end
       entry
     end

data/lib/ogam/organisation.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'open-uri'
-require 'csv'
+require "open-uri"
+require "csv"
 
 module Ogam
   # Allows working with a list of approved organisations
   class Organisation
     static_facade :all
 
-    CSV_URL = 'https://docs.google.com/spreadsheets/d/12nl5OBGSmOSsWilzWfflmAHO-8EyfCjVXYLeUDqjB60/export?format=csv&id=12nl5OBGSmOSsWilzWfflmAHO-8EyfCjVXYLeUDqjB60&gid=46181347'
+    CSV_URL = "https://docs.google.com/spreadsheets/d/12nl5OBGSmOSsWilzWfflmAHO-8EyfCjVXYLeUDqjB60/export?format=csv&id=12nl5OBGSmOSsWilzWfflmAHO-8EyfCjVXYLeUDqjB60&gid=46181347"
 
     def all
       @all ||= parse(download)
@@ -17,16 +17,16 @@ module Ogam
     private
 
     def download
-      puts 'Fetching list of accepted organisations'
+      puts "Fetching list of accepted organisations"
       URI.parse(CSV_URL).read
     end
 
     def parse(str)
       data = {}
       CSV.parse(str, headers: true).each do |row|
-        next if row['Domain'].blank?
+        next if row["Domain"].blank?
 
-        data[row['Domain'].strip] = row['Organisation Name'].strip
+        data[row["Domain"].strip] = row["Organisation Name"].strip
       end
 
       data

data/lib/ogam/signature.rb

@@ -4,11 +4,11 @@ module Ogam
   # Methods relating to signatures
   class Signature
     def self.update_signature_command(user)
-      email = user.fetch('primaryEmail')
+      email = user.fetch("primaryEmail")
       html = signature_html(
-        user.fetch('name.fullName', nil),
-        user.fetch('organizations.0.title', nil),
-        user.fetch('organizations.0.name', nil)
+        user.fetch("name.fullName", nil),
+        user.fetch("organizations.0.title", nil),
+        user.fetch("organizations.0.name", nil)
       )
 
       "gam user #{email} signature \"#{html}\""
@@ -16,7 +16,7 @@ module Ogam
 
     def self.signature_html(name, job_title, organisation)
       parts = [name, job_title, organisation].reject(&:blank?)
-      "<p>#{parts.join('<br />')}</p><hr color=#5b3293 />"
+      "<p>#{parts.join("<br />")}</p><hr color=#5b3293 />"
     end
   end
 end

data/lib/ogam/user.rb

@@ -15,7 +15,7 @@ module Ogam
     end
 
     def self.job_titles_for_user(user)
-      JobTitle.job_titles(user['organizations.0.title'])
+      JobTitle.job_titles(user["organizations.0.title"])
     end
   end
 end

data/lib/ogam/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ogam
-  VERSION = '1.1.0'
+  VERSION = "1.3.2"
 end

data/ogam.gemspec

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ogam/version'
+require "ogam/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'ogam'
-  spec.version       = Ogam::VERSION
-  spec.authors       = ['Elliot Bowes']
-  spec.email         = ['e.bowes@outwood.com']
+  spec.name = "ogam"
+  spec.version = Ogam::VERSION
+  spec.authors = ["Elliot Bowes"]
+  spec.email = ["e.bowes@outwood.com"]
 
-  spec.summary       = "Wrapper around GAM for common tasks with OGAT's G Suite instance."
+  spec.summary = "Wrapper around GAM for common tasks with OGAT's G Suite instance."
   # spec.description   = %q{TODO: Write a longer description or delete this line.}
-  spec.homepage      = 'https://github.com/Outwood/ogam'
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/Outwood/ogam'
+  spec.homepage = "https://github.com/Outwood/ogam"
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/Outwood/ogam"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -22,17 +22,17 @@ Gem::Specification.new do |spec|
     Dir.chdir(File.expand_path(__dir__)) do
       `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
     end
-  spec.bindir = 'bin'
-  spec.executables << 'ogam'
-  spec.require_paths = ['lib']
+  spec.bindir = "bin"
+  spec.executables << "ogam"
+  spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activesupport', '~> 6.0.2'
-  spec.add_runtime_dependency 'attr_extras', '~> 6.2.3'
-  spec.add_runtime_dependency 'thor', '~> 1.0.1'
+  spec.add_runtime_dependency "activesupport", "~> 6.0.2"
+  spec.add_runtime_dependency "attr_extras", "~> 6.2.3"
+  spec.add_runtime_dependency "thor", "~> 1.0.1"
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop-ogat', '~> 1.47.0'
-  spec.add_development_dependency 'simplecov', '~> 0.18.4'
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop-ogat", "~> 2.6.0"
+  spec.add_development_dependency "simplecov", "~> 0.18.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ogam
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Elliot Bowes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.47.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.47.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_metrics_todo.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
 - ".travis.yml"

data/.rubocop_metrics_todo.yml

@@ -1,59 +0,0 @@
-Metrics/AbcSize:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-    - lib/ogam/group_assigner.rb
-
-Metrics/BlockLength:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-
-Metrics/BlockNesting:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-
-Metrics/ClassLength:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-    - lib/ogam/group_assigner.rb
-
-Metrics/CyclomaticComplexity:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-    - lib/ogam/group_assigner.rb
-
-Metrics/MethodLength:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-    - lib/ogam/group_assigner.rb
-
-Metrics/ModuleLength:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-
-Metrics/ParameterLists:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-
-Metrics/PerceivedComplexity:
-  Exclude:
-    - db/**/*
-    - spec/**/*
-    - config/routes.rb
-    - lib/ogam/group_assigner.rb
-