Removed status icon.

bin/prspy

@@ -8,12 +8,9 @@ import time
 import gtk
 import glib
 
-from prspy.utils import get_yes_no
 from prspy import config
-from prspy.gui.component import StatusIcon
-from prspy.github_util import GithubConnect
 from prspy.gui.controllers import MainViewController
-from prspy.config import NotConfiguredError, PRSpyConfig, ConfigBuilder
+from prspy.config import NotConfiguredError, PRSpyConfig
 
 
 class PRSpyError(Exception):
@@ -28,29 +25,10 @@ class PRSpy():
             print "An error occurred reading the PRSpy config file:"
             print "    %s" % e.message
             print ""
-            if get_yes_no("Would you like to (re)configure PRSpy?"):
-                config = ConfigBuilder().build()
-            else:
-                sys.exit(0)
-
-
-        self.status_icon = StatusIcon()
-        self.status_icon.connect('activate', self._on_activate)
-        self.status_icon.connect('force_clicked', self._update)
-        self.status_icon.connect('quit_clicked', self._exit_app)
-
+            sys.exit(1)
 
         self.main_view_controller = MainViewController(config)
-
-    def _on_activate(self, icon):
         self.main_view_controller.show_main_view()
-        self.status_icon.reset_icon_state()
-
-    def _update(self, icon):
-        self.main_view_controller.refresh_model()
-
-    def _exit_app(self, icon):
-        gtk.main_quit()
 
 
 if __name__ == "__main__":
@@ -63,7 +41,7 @@ if __name__ == "__main__":
 
     try:
         PRSpy()
-        gtk.main()
+        sys.exit(gtk.main() or 0)
     except PRSpyError, e:
         print e.message
         sys.exit(1)

src/prspy/config.py

@@ -93,51 +93,3 @@ def _validate(self, section, option):
         if not self.parser.has_option(section, option):
             raise ConfigurationError("Missing option for % section: %s" % (section, option))
 
-
-class ConfigBuilder(object):
-
-    def build(self):
-        auth_token, org_id = self._get_config_values()
-        parser = ConfigParser.SafeConfigParser()
-        parser.add_section("github")
-        parser.set("github", "auth_token", auth_token)
-        parser.set("github", "org_id", org_id)
-        parser.write(file(CONFIG_FILE, "w"))
-        config = PRSpyConfig()
-        print "PRSpy was properly configured."
-        print "Launching PRSpy..."
-        return config
-
-    def _get_config_values(self):
-        print "PRSpy requires an Oauth token to communicate to the github API."
-        username = get_input("Github Username: ")
-        password = getpass("Github Password")
-        key_note = get_input("Short Token Description: ")
-        auth = "%s:%s" % (username, password)
-        auth = auth.encode("base64").rstrip()
-
-        headers = {
-            "Authorization": "Basic %s" % auth,
-            "Content-Type": "application/json",
-            'User-Agent': "PRSpy"
-        }
-
-        body = '{"scopes":["public_repo", "repo"], "note":"%s"}' % key_note
-
-        conn = httplib.HTTPSConnection("api.github.com")
-        conn.request("POST", "/authorizations", body, headers)
-        response = conn.getresponse()
-        if response.status != 201:
-            print "Could not create github API token."
-            sys.exit(1)
-
-        auth_json = simplejson.loads(response.read())
-        if not 'token' in auth_json:
-            print "Unable to create Github API token in response."
-            sys.exit(1)
-
-        api_auth_token = auth_json['token']
-
-        org = get_input("Which organization would you like to track? ")
-        return (api_auth_token, org)
-