Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 02, 2012
@brosner brosner Bumped version for next release 9323f0f
@brosner brosner Fixed auth.password bugs
1.1+ no longer uses password and there was some code left around causing
problems.
fa0a089
@brosner brosner Added check for site key
Check for existence of a site key before trying to run gondor commands.
b4a0104
Commits on Jul 05, 2012
@brosner brosner Merge branch '1.1.X' e9c02a0
View
10 CHANGELOG.rst
@@ -2,8 +2,14 @@
CHANGELOG
=========
-1.1 (dev)
-=========
+1.1.1
+=====
+
+ * fixed auth.password bugs (password is no longer used in 1.1+.)
+ * added check for site key existence
+
+1.1
+===
* added --upgrade to init to perform a configuration upgrade
* changed configuration format from INI to YAML (~/.gondor can remain in INI format)
View
2  gondor/__init__.py
@@ -1 +1 @@
-__version__ = "1.1"
+__version__ = "1.1.1"
View
14 gondor/__main__.py
@@ -989,12 +989,14 @@ def main():
except OSError:
error("unable to find a %s directory.\n" % vcs_dir)
- if (config["auth.username"] is None and (config["auth.password"] is None or config["auth.key"] is None)):
- message = "you must set your credentials in %s" % os.path.expanduser("~/.gondor")
- if "project_root" in env:
- message += " or %s" % os.path.join(env["project_root"], config_file)
- message += "\n"
- error(message)
+ if config["auth.username"] is None or config["auth.key"] is None:
+ error(
+ "you must provide a username and API key in %s or set it in "
+ "the environment.\n" % os.path.expanduser("~/.gondor")
+ )
+
+ if config["gondor.site_key"] is None:
+ error("no site key found in configuration or environment.\n")
{
"init": cmd_init,
View
5 gondor/api.py
@@ -14,9 +14,6 @@ def make_api_call(config, url, params=None, extra_handlers=None):
request = urllib2.Request(url, params)
request.add_unredirected_header(
"Authorization",
- "Basic %s" % base64.b64encode("%s:%s" % (
- config["auth.username"],
- config["auth.key"] or config["auth.password"]
- )).strip()
+ "Basic %s" % base64.b64encode("%s:%s" % (config["auth.username"], config["auth.key"])).strip()
)
return opener.open(request)

No commit comments for this range

Something went wrong with that request. Please try again.