diff --git a/Fakeum-2.2.1.alfredworkflow b/Fakeum-2.2.2.alfredworkflow similarity index 92% rename from Fakeum-2.2.1.alfredworkflow rename to Fakeum-2.2.2.alfredworkflow index 303d4a7..6a31d4b 100644 Binary files a/Fakeum-2.2.1.alfredworkflow and b/Fakeum-2.2.2.alfredworkflow differ diff --git a/requirements.txt b/requirements.txt index 4218357..d4eee42 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -Alfred-Workflow==1.37.1 +Alfred-Workflow==1.37.2 docopt==0.6.2 Faker==1.0.7 diff --git a/src/common.py b/src/common.py index e1b7046..1ad61a6 100644 --- a/src/common.py +++ b/src/common.py @@ -17,7 +17,6 @@ import os from workflow import Variables -from workflow.util import run_applescript log = logging.getLogger('workflow') @@ -147,14 +146,6 @@ def intvar(name, default=0): return default -def run_workflow(query=None): - """Run workflow with query.""" - query = KEYWORD + u' ' + (query or '') - script = SEARCH_AS.format(query=query) - log.debug(u'calling Alfred with query "%s" ...', query) - run_applescript(script) - - def notify(title, text=''): """Show a notification.""" if not boolvar('SHOW_NOTIFICATIONS'): diff --git a/src/fakeum.py b/src/fakeum.py index 5bbb07b..ae80f8e 100644 --- a/src/fakeum.py +++ b/src/fakeum.py @@ -8,7 +8,7 @@ # Created on 2014-12-29 # -"""Alfred 3 workflow to generate test data.""" +"""Alfred workflow to generate test data.""" from __future__ import print_function, absolute_import @@ -19,14 +19,13 @@ import sys from workflow import Workflow3, ICON_WARNING, MATCH_ALL, MATCH_ALLCHARS -from workflow.util import run_trigger, set_config +from workflow.util import run_trigger from common import ( DEFAULT_SETTINGS, ISSUE_URL, UPDATE_SETTINGS, intvar, - run_workflow, ) # Query delimiter that separates faker name from quantity @@ -200,7 +199,7 @@ def get_fake_data(names=None, count=1): for name in names: data = [] - for i in range(count): + for _ in range(count): data.append(get_fake_datum(name)) if name in ('Paragraph', 'Address'): @@ -233,8 +232,7 @@ def main(wf): if DELIMITER in query: if query.endswith(DELIMITER): # Back up to empty query - # run_trigger('fake') - run_workflow() + run_trigger('fake') return query, count = [s.strip() for s in query.split(DELIMITER)] diff --git a/src/info.plist b/src/info.plist index 0b71eb2..74d24ff 100644 --- a/src/info.plist +++ b/src/info.plist @@ -831,7 +831,7 @@ vars={allvars} readme - + Generate test data uidata 03F09777-FA2A-45F3-A8A8-49AA079FFC61 @@ -1091,7 +1091,7 @@ vars={allvars} SHOW_NOTIFICATIONS version - 2.2.1 + 2.2.2 webaddress diff --git a/src/workflow/update.py b/src/workflow/update.py index ffc6353..6affc94 100644 --- a/src/workflow/update.py +++ b/src/workflow/update.py @@ -222,7 +222,7 @@ class Version(object): """ #: Match version and pre-release/build information in version strings - match_version = re.compile(r'([0-9\.]+)(.+)?').match + match_version = re.compile(r'([0-9][0-9\.]*)(.+)?').match def __init__(self, vstr): """Create new `Version` object. @@ -247,7 +247,7 @@ def _parse(self, vstr): else: m = self.match_version(vstr) if not m: - raise ValueError('invalid version number: {!r}'.format(vstr)) + raise ValueError('invalid version number: ' + vstr) version, suffix = m.groups() parts = self._parse_dotted_string(version) @@ -257,7 +257,7 @@ def _parse(self, vstr): if len(parts): self.patch = parts.pop(0) if not len(parts) == 0: - raise ValueError('version number too long: {!r}'.format(vstr)) + raise ValueError('version number too long: ' + vstr) if suffix: # Build info @@ -268,11 +268,9 @@ def _parse(self, vstr): if suffix: if not suffix.startswith('-'): raise ValueError( - 'suffix must start with - : {0}'.format(suffix)) + 'suffix must start with - : ' + suffix) self.suffix = suffix[1:] - # wf().logger.debug('version str `{}` -> {}'.format(vstr, repr(self))) - def _parse_dotted_string(self, s): """Parse string ``s`` into list of ints and strings.""" parsed = [] diff --git a/src/workflow/version b/src/workflow/version index a537514..673b6a6 100644 --- a/src/workflow/version +++ b/src/workflow/version @@ -1 +1 @@ -1.37.1 \ No newline at end of file +1.37.2 \ No newline at end of file