ogam 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4a72e5717ef8b802f79499f53fb603ddc9ba61dbd06fa166c9a3045d877b748
-  data.tar.gz: d4cf4b93af132811e4a6ba058e0440ddc60115a414a7c967bb96c0a34363ffbd
+  metadata.gz: 01aa2307589a72f9316e069ea9d7980dccc74c52c2cc8deb87d5eea2a71da94f
+  data.tar.gz: fa83f2d5035bceae5b3f9d389f6b4ec9ccc65eb5d40316a0ee13d3b97dea3e94
 SHA512:
-  metadata.gz: d4443a1c829534b5ebea13518d00e8d7d1b66dd8cfb2a2b095bbec52478392ac9f09cb8fc0d240482dfaa202e04ef210149e310ecc3a65316be51960a72440bf
-  data.tar.gz: 93d3527909a5d33d90f66cb70dcd170622ae9a947294548552431052005e3e2cd66235d6930cbe6e4e5f57a02952f09baa36cb9c3804bdad5672dcb42d0d986c
+  metadata.gz: 8e55ca322c7c97c468a810ead4bd530d034a29151cb0a02b15923fcf658173f331124b26cae58e0271709bae70c6ef6f69e0b35385365e60abb2a87c62aaefdc
+  data.tar.gz: 3e8a1f8844d692da9093da34ac1a28c4bf82182df32ba8406ddcbd381c203490aa07d98ddb10055fef3148072fe1982453d73e08be3f15c4271dceeb8f987cf3

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+Gemfile.lock

data/.travis.yml

@@ -3,6 +3,8 @@ language: ruby
 cache: bundler
 rvm:
   - 2.6.5
+before_install:
+  - gem install bundler -v '~> 2.1'
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
     > ./cc-test-reporter

data/bin/ogam

@@ -57,6 +57,11 @@ class CLI < Thor
     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')
+  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')
   def create_group(email, name)

data/lib/ogam/group.rb

@@ -14,7 +14,13 @@ module Ogam
 
     def self.create_shared_mailbox_command(email_address, name)
       <<~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 true members_can_post_as_the_group false allow_web_posting true send_message_deny_notification false reply_to reply_to_ignore message_moderation_level moderate_none who_can_contact_owner all_in_domain_can_contact who_can_leave_group all_members_can_leave who_can_add all_managers_can_add who_can_post_message anyone_can_post who_can_invite all_managers_can_invite who_can_view_group all_members_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 true members_can_post_as_the_group true allow_web_posting true send_message_deny_notification false reply_to reply_to_ignore message_moderation_level moderate_none who_can_contact_owner all_in_domain_can_contact who_can_leave_group all_members_can_leave who_can_add all_managers_can_add who_can_post_message anyone_can_post who_can_invite all_managers_can_invite who_can_view_group all_members_can_view show_in_group_directory false archive_only false spam_moderation_level moderate enable_collaborative_inbox true who_can_assist_content all_members
+      COMMAND
+    end
+
+    def self.create_exec_mailbox_command(email_address, name)
+      <<~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 true members_can_post_as_the_group true allow_web_posting true send_message_deny_notification false reply_to reply_to_ignore message_moderation_level moderate_none who_can_contact_owner all_members_can_contact who_can_leave_group none_can_leave who_can_add all_managers_can_add who_can_post_message anyone_can_post who_can_invite all_managers_can_invite who_can_view_group all_members_can_view show_in_group_directory false archive_only false spam_moderation_level moderate include_in_global_address_list true who_can_discover_group all_members_can_discover enable_collaborative_inbox true who_can_assist_content all_members
       COMMAND
     end
 

data/lib/ogam/group_assigner.rb

@@ -9,8 +9,8 @@ module Ogam
     SUBJECT_MAPPING = {
       'art-teachers' => ['Art'],
       'business-teachers' => ['Business Studies'],
-      'dance-teachers' => ['Performing Arts'],
-      'design-technology-teachers' => ['Technology'],
+      'dance-teachers' => ['Dance', 'Performing Arts'],
+      'design-technology-teachers' => %w[Technology Engineering],
       'drama-teachers' => ['Drama', 'Music & Drama', 'Performing Arts'],
       'english-teachers' => ['English'],
       'epq-teachers' => [],
@@ -24,7 +24,7 @@ module Ogam
       'mfl-teachers' => ['MFL'],
       'music-teachers' => ['Music', 'Music & Drama'],
       'pe-teachers' => ['PE'],
-      're-life-teachers' => ['Humanities'],
+      're-life-teachers' => ['Humanities', 'Religious Studies'],
       'science-teachers' => ['Science'],
       'social-sciences-teachers' => ['Social Sciences']
     }.freeze
@@ -75,7 +75,7 @@ module Ogam
       SUBJECT_MAPPING.each do |group_prefix, subject_words|
         has_subject =
           subject_words.any? do |subject|
-            SUBJECT_TEACHER_TITLES.any? { |title| job_title.ends_with? "#{title}#{subject}" }
+            SUBJECT_TEACHER_TITLES.any? { |title| job_title.include? "#{title}#{subject}" }
           end
         next unless has_subject
 

data/lib/ogam/version.rb

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

data/ogam.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   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.17.1'
+  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.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Elliot Bowes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.18.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.18.4
 description: 
 email:
 - e.bowes@outwood.com
@@ -138,7 +138,6 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console

data/Gemfile.lock

@@ -1,93 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ogam (1.0.0)
-      activesupport (~> 6.0.2)
-      attr_extras (~> 6.2.3)
-      thor (~> 1.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.0.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ast (2.4.0)
-    attr_extras (6.2.3)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.3.0)
-    minitest (5.14.0)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
-    rack (2.2.2)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.80.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-ogat (1.47.0)
-      rubocop (= 0.80.0)
-      rubocop-performance (= 1.5.2)
-      rubocop-rails (= 2.4.2)
-      rubocop-rspec (= 1.38.1)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.4.2)
-      rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
-    zeitwerk (2.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.1)
-  ogam!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop-ogat (~> 1.47.0)
-  simplecov (~> 0.17.1)
-
-BUNDLED WITH
-   2.1.4