Skip to content

Commit aa2ee53

Browse files
committed
version bump
1 parent e8a28a1 commit aa2ee53

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

README.md

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -433,36 +433,22 @@ Example: Archive all Currently items for `@client` that are marked `@done`
433433

434434
## Extras
435435

436-
### Bash completion
436+
### Shell completion
437437

438-
See the file `doing.completion.bash` in the git repository for full bash completion. Thanks to [fcrespo82](https://github.com/fcrespo82) for getting it [started](https://gist.github.com/fcrespo82/9609318).
438+
__Bash:__ See the file [`doing.completion.bash`](https://github.com/ttscoff/doing/blob/master/doing.completion.bash) in the git repository for full bash completion. Thanks to [fcrespo82](https://github.com/fcrespo82) for getting it [started](https://gist.github.com/fcrespo82/9609318).
439439

440-
### Zsh completion
441440

442-
See the file `doing.completion.zsh` in the git repository for zsh completion.
441+
__Zsh:__ See the file [`doing.completion.zsh`](https://github.com/ttscoff/doing/blob/master/doing.completion.zsh) in the git repository for zsh completion. Courtesy of [Gabe Anzelini](https://github.com/gabeanzelini).
443442

444-
### Launchbar
443+
__Fish:__ See the file [`doing.fish`](https://github.com/ttscoff/doing/blob/master/doing.fish) in the git repository for Fish completion. This is the least complete of all of the completions, but it will autocomplete the first level of subcommands, and your custom sections and views for the `doing show` and `doing view` commands.
445444

446-
The previous incarnation of `doing` had a [LaunchBar](http://obdev.at/launchbar/) action that I used frequently. The Day One popup has mostly replaced that for me, but only because I have a system that connects it to my WWID file. However, I've still found a place for adding WWID entries without including them in my journal, and LaunchBar is the perfect way to do that for me.
445+
### Launchbar/Alfred
447446

448-
All you need is an AppleScript saved at `~/Library/Application Support/LaunchBar/Actions/Doing.scpt`. It should look like this:
447+
The LaunchBar action requires that `doing` be available in `/usr/local/bin/doing`. If it's not (because you're using RVM or similar), you'll need to symlink it there. Running the action with Return will show the latest 9 items from Currently, along with any time intervals recorded, and includes a submenu of Timers for each tag.
449448

449+
{% download 117 %}
450450

451-
on handle_string(message)
452-
-- get the input from LaunchBar
453-
if message is "?" then
454-
-- if the input is just "?" display the last three entries
455-
set _doing to do shell script "/usr/bin/doing recent 3"
456-
tell application "LaunchBar" to display in large type _doing
457-
else
458-
-- otherwise, create a new entry using the input
459-
do shell script "/usr/bin/doing now " & quoted form of message
460-
end if
461-
462-
end handle_string
463-
464-
465-
Evan Lovely has [converted this to an Alfred workflow as well](http://www.evanlovely.com/blog/technology/alfred-for-terpstras-doing/).
451+
Evan Lovely has [created an Alfred workflow as well](http://www.evanlovely.com/blog/technology/alfred-for-terpstras-doing/).
466452

467453
## Troubleshooting
468454

@@ -504,6 +490,14 @@ I'll try to document some of the code structure as I flesh it out. I'm currently
504490

505491
## Changelog
506492

493+
#### 1.0.17
494+
495+
- Add `--stdout` global option to send reporting to STDOUT instead of STDERR (for use with LaunchBar et al)
496+
497+
#### 1.0.16
498+
499+
- Fixes overzealous color resetting
500+
507501
#### 1.0.15
508502

509503
- CLI/text totals block was outputting when HTML output was selected

bin/doing

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ desc 'Output notes if included in the template'
3434
default_value true
3535
switch [:notes], :default_value => true, :negatable => true
3636

37+
desc 'Send results report to STDOUT instead of STDERR'
38+
default_value false
39+
switch [:stdout], :default_value => false, :negatable => false
40+
3741
# desc 'Wrap notes at X chars (0 for no wrap)'
3842
# flag [:w,:wrapwidth], :must_match => /^\d+$/, :type => Integer
3943

@@ -1076,7 +1080,11 @@ end
10761080
post do |global,command,options,args|
10771081
# Use skips_post before a command to skip this
10781082
# block on that command only
1079-
$stderr.puts wwid.results.join("\n")
1083+
if global[:stdout]
1084+
$stdout.print wwid.results.join("\n")
1085+
else
1086+
$stderr.puts wwid.results.join("\n")
1087+
end
10801088
end
10811089

10821090
on_error do |exception|

lib/doing/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Doing
2-
VERSION = '1.0.16'
2+
VERSION = '1.0.17'
33
end

0 commit comments

Comments
 (0)