Update build.yml

* Unescape \r and \n in chatmessage text so multiline messages can be created

* Bring gam report activity list up to date

.github/actions/linux-install.sh

@@ -1,10 +1,10 @@
 export distpath="dist/"
-export gampath="${distpath}"
+export gampath="${distpath}gam"
 rm -rf $gampath
 #mkdir -p $gampath
 #export gampath=$(readlink -e $gampath)
 $pip install wheel
-$python -OO -m PyInstaller --clean --noupx --strip --distpath $distpath gam.spec
+$python -OO -m PyInstaller --clean --noupx --strip --distpath $gampath gam.spec
 export gam="${gampath}/gam"
 export GAMVERSION=`$gam version simple`
 cp LICENSE $gampath

.github/actions/macos-install.sh

@@ -4,15 +4,10 @@ echo $macver
 echo "Xcode version:"
 xcodebuild -version
 export distpath="dist/"
-export gampath="${distpath}"
+export gampath="${distpath}gam"
 rm -rf $gampath
 export specfile="gam.spec"
-if [ "$macver" == "10.15.7" ]; then
-	youtoo=""
-else
-	youtoo=""
-fi
-$python -OO -m PyInstaller --clean --noupx --strip --distpath "${distpath}" $youtoo "${specfile}"
+$python -OO -m PyInstaller --clean --noupx --strip --distpath "${gampath}" --target-architecture $PLATFORM "${specfile}"
 export gam="${gampath}/gam"
 $gam version extended
 export GAMVERSION=`$gam version simple`

.github/actions/windows-install.sh

@@ -5,11 +5,11 @@ elif [[ "$PLATFORM" == "x86" ]]; then
 fi
 echo "compiling GAM with pyinstaller..."
 export distpath="dist/"
-export gampath="${distpath}"
+export gampath="${distpath}gam"
 rm -rf $gampath
 #mkdir -p $gampath
 #export gampath=$(readlink -e $gampath)
-pyinstaller --clean --noupx --distpath $distpath gam.spec
+pyinstaller --clean --noupx --distpath $gampath gam.spec
 export gam="${gampath}/gam"
 echo "running compiled GAM..."
 $gam version
@@ -19,8 +19,11 @@ cp LICENSE $gampath
 cp GamCommands.txt $gampath
 cp gam-setup.bat $gampath
 GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip
-/c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE $gampath -xr!.svn
-
+cwd=$(pwd)
+cd "${distpath}"
+/c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE gam -xr!.svn
+mv "${GAM_ARCHIVE}" "${cwd}"
+cd "${cwd}"
 echo "Running WIX candle $WIX_BITS..."
 /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch $WIX_BITS gam.wxs
 echo "Done with WIX candle..."

.github/workflows/build.yml

@@ -18,7 +18,7 @@ env:
   MIN_OPENSSL_VERSION: "1.1.1k"
   PATCHELF_VERSION: "0.12"
   # PYINSTALLER_VERSION can be full commit hash or version like v4.20
-  PYINSTALLER_VERSION: "416f42b548b513fc29219eb7b4210751938b8603"
+  PYINSTALLER_VERSION: "000275e409640320cdd995a7f077abfdece86749"
 
 jobs:
   build:
@@ -104,7 +104,7 @@ jobs:
           path: |
             ~/python
             ~/ssl
-          key: ${{ matrix.os }}-${{ matrix.jid }}-20210511
+          key: ${{ matrix.os }}-${{ matrix.jid }}-20210611
 
       - name: Set env variables
         env:
@@ -158,14 +158,19 @@ jobs:
              echo "Downloading ${url}"
              curl -o pyinstaller.tar.gz --compressed "${url}"
              tar xf pyinstaller.tar.gz
-             cd "pyinstaller-${PYINSTALLER_VERSION}/bootloader"
-             if [ "${PLATFORM}" == "x86" ]; then
-               TARGETARCH="--target-arch=32bit"
-             else
-               TARGETARCH=""
+             cd "pyinstaller-${PYINSTALLER_VERSION}/"
+             if [ $GAMOS == "windows" ]; then
+               # remove pre-compiled bootloaders so we fail if bootloader compile fails
+               rm -rf PyInstaller/bootloader/*bit
+               cd bootloader
+               if [ "${PLATFORM}" == "x86" ]; then
+                 TARGETARCH="--target-arch=32bit"
+               else
+                 TARGETARCH=""
+               fi
+               $python ./waf all $TARGETARCH
+               cd ..
              fi
-             #$python ./waf all $TARGETARCH
-             cd ..
              $python setup.py install
              #$pip install pyinstaller
 

src/GamCommands.txt

@@ -158,6 +158,7 @@ If an item contains spaces, it should be surrounded by ".
 <CalendarColorIndex> ::= <Number in range 1-24>
 <CalendarItem> ::= <EmailAddress>|<String>
 <ChatRoom> ::= <String>
+<ChatSpace> ::= <String>
 <ClientID> ::= <String>
 <ColorValue> ::= <ColorName>|<ColorHex>
 <CollaboratorItem> ::= <EmailAddress>|<UniqueID>|<String>
@@ -895,23 +896,27 @@ gam delete resoldsubscription <CustomerID> <SKUID> cancel|downgrade|transfer_to_
 gam info resoldsubscriptions <CustomerID> [customer_auth_token <String>]
 
 <ActivityApplicationName> ::=
-	access|accesstransparency|
+	access_transparency|
 	admin|
-	calendar|calendars|
+	calendar|
 	chat|
-	drive|doc|docs|
-	enterprisegroups|groupsenterprise|
+	chrome|
+	context_aware_access|
+	data_studio|
+	drive|
 	gcp|
-	google+|gplus|
-	group|groups|
-	hangoutsmeet|meet|
+	gplus|
+	groups|
+	groups_enterprise|
 	jamboard|
-	login|logins|
+	keep|
+	login|
+	meet|
 	mobile|
-	oauthtoken|token|tokens|
 	rules|
 	saml|
-	useraccounts
+	token|
+	user_accounts
 
 <ReportsApp> ::=
 	accounts|
@@ -1167,6 +1172,14 @@ gam print browsertokens [todrive]
 	[fields <BrowserTokenFieldNameList>]
 	[sortheaders]
 
+gam print chatspaces [todrive]
+gam print chatmembers space <ChatSpace> [todrive]
+gam create chatmessage space <ChatSpace> [thread <String>]
+	(text <String>)|(textfile <FileName> [charset <CharSet>])
+gam delete chatmessage name <String>
+gam update chatmessage name <String>
+	(text <String>)|(textfile <FileName> [charset <CharSet>])
+
 <CrOSAction> ::=
 	deprovision_same_model_replace|
 	deprovision_different_model_replace|

src/gam.wxs

@@ -41,7 +41,7 @@
     <ComponentGroup
         Id="ProductComponents"
         Directory="INSTALLFOLDER"
-	Source="dist">
+	Source="dist/gam">
       <Component Id="gam_exe" Guid="886abc07-73c5-4acc-9f71-58daf62aabc1">
         <File Name="gam.exe" KeyPath="yes" />
         <Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="yes" Part="last" Action="set" System="yes" />

src/gam/__init__.py

@@ -797,7 +797,7 @@ def doGAMVersion(checkForArgs=True):
                 'passlib',
                 'python-dateutil',
                 'yubikey-manager',
-                'yomama']
+                ]
         for lib in libs:
             try:
                 print(f'{lib} {lib_version(lib)}')

src/gam/gapi/chat.py

@@ -53,7 +53,7 @@ def print_spaces():
     try:
         spaces = gapi.get_all_pages(chat.spaces(), 'list', 'spaces', throw_reasons=THROW_REASONS)
     except googleapiclient.errors.HttpError as err:
-        _chat_error_handler(chat, err) 
+        _chat_error_handler(chat, err)
     if not spaces:
         print('Bot not added to any Chat rooms or users yet.')
     else:
@@ -77,6 +77,9 @@ def print_members():
             i += 1
         else:
             controlflow.invalid_argument_exit(myarg, "gam print chatmembers")
+    if not space:
+        controlflow.system_error_exit(2,
+                                      'space <ChatSpace> is required.')
     try:
         results = gapi.get_all_pages(chat.spaces().members(), 'list', 'memberships', parent=space)
     except googleapiclient.errors.HttpError as err:
@@ -99,7 +102,7 @@ def create_message():
     while i < len(sys.argv):
       myarg = sys.argv[i].lower()
       if myarg == 'text':
-          body['text'] = sys.argv[i+1]
+          body['text'] = sys.argv[i+1].replace('\\r', '\r').replace('\\n', '\n')
           i += 2
       elif myarg == 'textfile':
           filename = sys.argv[i + 1]
@@ -115,6 +118,12 @@ def create_message():
           i += 2
       else:
           controlflow.invalid_argument_exit(myarg, "gam create chat")
+    if not space:
+        controlflow.system_error_exit(2,
+                                      'space <ChatSpace> is required.')
+    if 'text' not in body:
+        controlflow.system_error_exit(2,
+                                      'text <String> or textfile <FileName> is required.')
     if len(body['text']) > 4096:
         body['text'] = body['text'][:4095]
         print('WARNING: trimmed message longer than 4k to be 4k in length.')
@@ -143,6 +152,9 @@ def delete_message():
             i += 2
         else:
           controlflow.invalid_argument_exit(myarg, "gam delete chat")
+    if not name:
+        controlflow.system_error_exit(2,
+                                      'name <String> is required.')
     try:
         gapi.call(chat.spaces().messages(),
                   'delete',
@@ -160,7 +172,7 @@ def update_message():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower()
         if myarg == 'text':
-            body['text'] = sys.argv[i+1]
+            body['text'] = sys.argv[i+1].replace('\\r', '\r').replace('\\n', '\n')
             i += 2
         elif myarg == 'textfile':
             filename = sys.argv[i + 1]
@@ -171,6 +183,12 @@ def update_message():
             i += 2
         else:
           controlflow.invalid_argument_exit(myarg, "gam update chat")
+    if not name:
+        controlflow.system_error_exit(2,
+                                      'name <String> is required.')
+    if 'text' not in body:
+        controlflow.system_error_exit(2,
+                                      'text <String> or textfile <FileName> is required.')
     if len(body['text']) > 4096:
         body['text'] = body['text'][:4095]
         print('WARNING: trimmed message longer than 4k to be 4k in length.')

src/gam/var.py

@@ -8,7 +8,7 @@ import platform
 import re
 
 GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
-GAM_VERSION = '6.03'
+GAM_VERSION = '6.06'
 GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = 'https://git.io/gam'
@@ -1520,7 +1520,7 @@ USER_EXTERNALID_TYPES = [
 ]
 USER_GENDER_TYPES = ['female', 'male', 'unknown']
 USER_IM_TYPES = ['home', 'work', 'other']
-USER_KEYWORD_TYPES = ['occupation', 'outlook']
+USER_KEYWORD_TYPES = ['occupation', 'outlook', 'mission']
 USER_LOCATION_TYPES = ['default', 'desk']
 USER_ORGANIZATION_TYPES = ['domain_only', 'school', 'unknown', 'work']
 USER_PHONE_TYPES = [
@@ -1535,7 +1535,7 @@ USER_RELATION_TYPES = [
 ]
 USER_WEBSITE_TYPES = [
     'app_install_page', 'blog', 'ftp', 'home', 'home_page', 'other', 'profile',
-    'reservations', 'work'
+    'reservations', 'resume', 'work'
 ]
 
 WEBCOLOR_MAP = {