Skip to content

Commit

Permalink
docs: update references to .bugwarriorrc
Browse files Browse the repository at this point in the history
Just call the file by its basename.
  • Loading branch information
mathstuf committed Feb 7, 2015
1 parent feda099 commit 07148bc
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions bugwarrior/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
def pull(dry_run):
""" Pull down tasks from forges and add them to your taskwarrior tasks.
Relies on configuration in ~/.bugwarriorrc
Relies on configuration in bugwarriorrc
"""
twiggy.quickSetup()
try:
Expand Down Expand Up @@ -93,7 +93,7 @@ def targets():
@vault.command()
def list():
pws = lst(targets())
print "%i @oracle:use_keyring passwords in .bugwarriorrc" % len(pws)
print "%i @oracle:use_keyring passwords in bugwarriorrc" % len(pws)
for section in pws:
print "-", section

Expand Down
7 changes: 5 additions & 2 deletions bugwarrior/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def load_example_rc():

error_template = """
*************************************************
* There was a problem with your ~/.bugwarriorrc *
* There was a problem with your bugwarriorrc *
* {msg}
* Here's an example template to help: *
*************************************************
Expand Down Expand Up @@ -132,7 +132,10 @@ def validate_config(config):

def load_config():
config = ConfigParser({'log.level': "DEBUG", 'log.file': None})
path = os.path.join(BaseDirectory.load_first_config('bugwarrior'), 'bugwarriorrc')
path = None
first_path = BaseDirectory.load_first_config('bugwarrior')
if first_path is not None:
path = os.path.join(first_path, 'bugwarriorrc')
old_path = os.path.expanduser("~/.bugwarriorrc")
if path is None or not os.path.exists(path):
if os.path.exists(old_path):
Expand Down
2 changes: 1 addition & 1 deletion bugwarrior/docs/common_configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ regardless of what project was assigned by the service itself::
Password Management
-------------------

You need not store your password in plain text in your `~/.bugwarriorrc` file;
You need not store your password in plain text in your `bugwarriorrc` file;
you can enter the following values to control where to gather your password
from:

Expand Down
2 changes: 1 addition & 1 deletion bugwarrior/docs/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Example Configuration
::

# Example ~/.bugwarriorrc
# Example bugwarriorrc
# General stuff.
[general]
Expand Down
2 changes: 1 addition & 1 deletion bugwarrior/docs/using.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ It's ideal to create a cron task like::
*/15 * * * * /usr/bin/bugwarrior-pull

Bugwarrior can emit desktop notifications when it adds or completes issues
to and from your local ``~/.task/`` db. If your ``~/.bugwarriorrc`` file has
to and from your local ``~/.task/`` db. If your ``bugwarriorrc`` file has
notifications turned on, you'll also need to tell cron which display to use by
adding the following to your crontab::

Expand Down
2 changes: 1 addition & 1 deletion bugwarrior/services/activecollab2.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def get_issue_generator(self, user_id, project_id, project_name):
"""
Approach:
1. Get user ID from .bugwarriorrc file
1. Get user ID from bugwarriorrc file
2. Get list of tickets from /user-tasks for a given project
3. For each ticket/task returned from #2, get ticket/task info and
check if logged-in user is primary (look at `is_owner` and
Expand Down

0 comments on commit 07148bc

Please sign in to comment.