new menu depending on whether online or not

Author: btskinner

grm/__info__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.6'
+__version__ = '0.2.0'
 __gh = 'https://github.com/btskinner/'
 __nm = 'grm'
 __rp = '{}{}'.format(__gh, __nm)

grm/__init__.py

@@ -14,24 +14,34 @@ def main():
 
     def __menu():
 
+        # update GitRoom Objects if cycling through program
+        connect_code = gr.getGitRoomObjs()
+
+        # main prompt
         prompt = 'What would you like to do?'
-        opts = ['Initialize class',
-                'Add students to class',
-                'Add new administrator',
-                'Clone repositories',
-                'Update student remote repositories with local master',
-                'Pull down from remote student repositories',
-                'Push from local student repositories to remotes',
-                'Grade student assignments',
-                '<< Exit Program >>']
+
+        fullopts = ['Initialize class',
+                    'Add students to class',
+                    'Add new administrator',
+                    'Clone repositories',
+                    'Update student remote repositories with local master',
+                    'Pull down from remote student repositories',
+                    'Push from local student repositories to remotes',
+                    'Grade student assignments',
+                    '<< Exit Program >>']
+
+        shortopts = [fullopts[i] for i in [len(fullopts) - 2, len(fullopts) - 1]]
+
+        opts = shortopts if connect_code != 0 else fullopts
+                       
         choice = pickOpt(prompt, opts)
 
         # exit program
         if choice == len(opts) - 1:
             return
 
-        # update GitRoom Objects if cycling through program
-        gr.getGitRoomObjs()
+        if connect_code != 0:
+            choice += len(fullopts) - len(shortopts)
 
         # (1) Initialize class
         if choice == 0:
@@ -72,10 +82,11 @@ def __menu():
         else:
             grader = Grader(gr.lgo)
             grader.main()
-            prompt = 'Do you want to push comments to student remotes?'
-            choice = pickOpt(prompt, ['Yes','No'])
-            if choice == 0:
-                gr.pushGR()
+            if connect_code == 0:
+                prompt = 'Do you want to push comments to student remotes?'
+                choice = pickOpt(prompt, ['Yes','No'])
+                if choice == 0:
+                    gr.pushGR()
 
         prompt = 'Do you have other tasks or wish to exit GitRoom Manager?'
         choice = pickOpt(prompt, ['I have another task', 'Exit'])

grm/gr.py

@@ -88,9 +88,17 @@ def _initGitRoom(self, github_login = None, token_file = None,
                 else:
                     progExit()
 
+        try:
+            self.rgo.getMembers()
+
+        except requests.exceptions.ConnectionError:
+            errorMessage('Not able to connect to remote.')
+            return 1
+
         self.rgo.getMembers()
         self.rgo.getTeams()
         self.rgo.getRepos()
+        return 0
 
     def _readGitRoomInfo(self, init_file_path):
 
@@ -107,12 +115,13 @@ def _readGitRoomInfo(self, init_file_path):
                 except KeyError:
                     info[k] = None               
 
-            self._initGitRoom(github_login = info['github_login'],
-                              token_file = info['github_token_file'],
-                              orgname = info['organization_name'],
-                              roster_file = info['roster_file'],
-                              master_repo = info['master_repo'],
-                              student_repo_dir = info['student_repo_dir'])
+            connect_code = self._initGitRoom(github_login = info['github_login'],
+                                             token_file = info['github_token_file'],
+                                             orgname = info['organization_name'],
+                                             roster_file = info['roster_file'],
+                                             master_repo = info['master_repo'],
+                                             student_repo_dir = info['student_repo_dir'])
+            return connect_code
 
     def getGitRoomObjs(self):
         if self.rgo and self.lgo:
@@ -128,8 +137,8 @@ def getGitRoomObjs(self):
                     prompt = 'Please give path to GitRoom JSON file: '
                     grjson = os.path.expanduser(input(prompt).strip())
                     if os.path.isfile(grjson):
-                        self._readGitRoomInfo(grjson)
-                        break
+                        connect_code = self._readGitRoomInfo(grjson)
+                        return connect_code
                     else:
                         errorMessage('Not a file!')
                         continue

setup.py

@@ -14,12 +14,12 @@ def readme():
 
 setup(name=info['__nm'],
       version=info['__version__'],
-      description='GitHub classroom manager',
+      description='GitRoom Manager: A command line GitHub classroom manager',
       long_description=readme(),
       classifiers=[
-          'Development Status :: 3 - Alpha',
+          'Development Status :: 4 - Beta',
           'License :: OSI Approved :: MIT License',
-          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3',
       ],
       keywords='github organization classroom manager',
       url=info['__rp'],