Skip to content

Commit

Permalink
Upgrade alfred-workflow to fix issues, prep v1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
lukewaite committed Oct 20, 2017
1 parent 8666ed3 commit a108cf8
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 17 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [v1.0.2] (2017-10-20)
* Bump alfred-workflow to 1.28.1 to fix issues

## [v1.0.1] (2017-10-20)
* Fix readme reference to public GitLab API

## [v1.0.0] (2017-10-20)

* Initial implementaiton of alfred-gitlab workflow

[Unreleased]: https://github.com/lukewaite/alfred-gitlab/compare/v1.0.1...HEAD
[Unreleased]: https://github.com/lukewaite/alfred-gitlab/compare/v1.0.2...HEAD
[v1.0.0]: https://github.com/lukewaite/alfred-gitlab/compare/v1.0.1...v1.0.2
[v1.0.0]: https://github.com/lukewaite/alfred-gitlab/compare/v1.0.0...v1.0.1
[v1.0.0]: https://github.com/lukewaite/alfred-gitlab/compare/90b63639ac1d06f9a52c37afd3f9c1da37d6ebd2...v1.0.0
Binary file removed GitLab-1.0.0.alfredworkflow
Binary file not shown.
Binary file removed GitLab-1.0.1.alfredworkflow
Binary file not shown.
Binary file added GitLab-1.0.2.alfredworkflow
Binary file not shown.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Quickly navigate to GitLab projects in [Alfred 3][alfred].
## Notes
By default, we will only show projects which you are a member of.

## TODOs
* Optionally, allow you to search for non-membership repos
* Background the API Fetch updates, so you don't have to wait for them after initial fetch
* Add alfred-workflow updater notifications
* Clean up

# Thanks, License, Copyright

- The [Alfred-Workflow][alfred-workflow] library is used heavily, and it's wonderful documentation was key in building the plugin.
Expand Down
2 changes: 1 addition & 1 deletion src/gitlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import argparse
from workflow import Workflow, ICON_WEB, ICON_WARNING, web, PasswordNotFound

__version__ = '1.0.1'
__version__ = '1.0.2'

log = None

Expand Down
2 changes: 1 addition & 1 deletion src/info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
</dict>
</dict>
<key>version</key>
<string>1.0.1</string>
<string>1.0.2</string>
<key>webaddress</key>
<string>https://lukewaite.ca</string>
</dict>
Expand Down
8 changes: 4 additions & 4 deletions src/workflow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
import os

# Workflow objects
from workflow import Workflow, manager
from .workflow import Workflow, manager
from .workflow3 import Variables, Workflow3

# Exceptions
from workflow import PasswordNotFound, KeychainError
from .workflow import PasswordNotFound, KeychainError

# Icons
from workflow import (
from .workflow import (
ICON_ACCOUNT,
ICON_BURN,
ICON_CLOCK,
Expand All @@ -47,7 +47,7 @@
)

# Filter matching rules
from workflow import (
from .workflow import (
MATCH_ALL,
MATCH_ALLCHARS,
MATCH_ATOM,
Expand Down
4 changes: 2 additions & 2 deletions src/workflow/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
from __future__ import print_function, unicode_literals

import os
import tempfile
import re
import subprocess
import tempfile

import workflow
from workflow import web
import web

# __all__ = []

Expand Down
13 changes: 6 additions & 7 deletions src/workflow/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@

import atexit
import binascii
from contextlib import contextmanager
import cPickle
from copy import deepcopy
import errno
import json
import logging
Expand All @@ -38,10 +41,6 @@
import sys
import time
import unicodedata
from contextlib import contextmanager
from copy import deepcopy

import cPickle

try:
import xml.etree.cElementTree as ET
Expand Down Expand Up @@ -887,7 +886,7 @@ def _validate_lockfile(self):
except ValueError:
return self.release()

from workflow.background import _process_exists
from background import _process_exists
if not _process_exists(pid):
self.release()

Expand Down Expand Up @@ -2512,7 +2511,7 @@ def check_update(self, force=False):
# version = self._update_settings['version']
version = str(self.version)

from workflow.background import run_in_background
from background import run_in_background

# update.py is adjacent to this file
update_script = os.path.join(os.path.dirname(__file__),
Expand Down Expand Up @@ -2552,7 +2551,7 @@ def start_update(self):
if not update.check_update(github_slug, version, self.prereleases):
return False

from workflow.background import run_in_background
from background import run_in_background

# update.py is adjacent to this file
update_script = os.path.join(os.path.dirname(__file__),
Expand Down
2 changes: 1 addition & 1 deletion src/workflow/workflow3.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import os
import sys

from workflow import Workflow
from .workflow import Workflow


class Variables(dict):
Expand Down

0 comments on commit a108cf8

Please sign in to comment.