doing 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c612dd40f383ef86320a0484b1ed9408fa761f13346f1ba64133ce94966fca
-  data.tar.gz: 5d5ef023946246e76a94bb726f3db8f623137a0930771d11c3dc180465c219a6
+  metadata.gz: 3a5b37a6be186a84231607095b3d365922e544bd0fe9b2fedb93427e6bbbd82f
+  data.tar.gz: 8d164c8a14642d66f46cd48e238ea43f1e765ed43c4a689c1600bfb42dd8a8cd
 SHA512:
-  metadata.gz: baae64a38314c2a406852a8479c3525fd287100aa738e538051e2f94848a1352d1f8ebbc8e3ed6b3136a9a3c5d49a6b28a6c1f53898a3bd0a26430505b907eda
-  data.tar.gz: 1b1c6af8c049e7c3f7e3eb9407e89af9f19e714b4ae3b740fe95b252515be5def9ed539e5df5a61d965440a2c4b7d2570bbf83ef126e7403e454714e97072dfc
+  metadata.gz: f03dd15248dce1ada9aa541b548768234fb10ae95cecf4424e29c001e9229e19238f121d83377fc81f9543ea88bcfc90c21e816663cad05955f8c4148da8d004
+  data.tar.gz: caf24a8c97de4c758043e0f6c0fb9fac3bd0f10df9381a124ba89015c541bdbc24a6691c3c5181a4ad49f554d38bdde4b156bd5b8deb36617f4ff6351e341288

data/README.md

@@ -418,12 +418,12 @@ You can also add notes at the time of entry by using the `-n` or `--note` flag w
 
 #### Displaying entries:
 
-    show      - List all entries
-    recent    - List recent entries
-    today     - List entries from today
-    yesterday - List entries from yesterday
-    last      - Show the last entry
-    grep      - Show entries matching text or pattern
+    show          - List all entries
+    recent        - List recent entries
+    today         - List entries from today
+    yesterday     - List entries from yesterday
+    last          - Show the last entry
+    grep, search  - Show entries matching text or pattern
 
 `doing show` on its own will list all entries in the "Currently" section. Add a section name as an argument to display that section instead. Use "all" to display all entries from all sections.
 
@@ -439,6 +439,8 @@ If you have a use for it, you can use `-o csv` on the show or view commands to o
 
 `doing on` allows for full date ranges and filtering. `doing on saturday`, or `doing on one month to today` will give you ranges. You can use the same terms with the `show` command by adding the `-f` or `--from` flag. `doing show @done --from "monday to friday"` will give you all of your completed items for the last week (assuming it's the weekend).
 
+You can also show entries matching a search string with `doing grep` (synonym `doing search`). If you want to search with regular expressions or for an exact match, surround your search query with forward slashes, e.g. `doing search /project name/`. If you pass a search string without slashes, it's treated as a fuzzy search string, meaning matches can be found as long as the characters in the search string are in order and with no more than three other characters between each. By default searches are across all sections, but you can limit it to one with the `-s SECTION_NAME` flag. Searches can be displayed with the default template, or output as HTML, CSV, or JSON.
+
 #### Views
 
     view     - Display a user-created view
@@ -548,6 +550,12 @@ Feel free to [poke around](http://github.com/ttscoff/doing/), I'll try to add mo
 
 ## Changelog
 
+#### 1.0.21
+
+- Add legitimate regex search capabilities
+- Synonyms for grep (search) and now (next)
+- CSS fix
+
 #### 1.0.20
 
 - Rewrite HTML export templates with responsive layout and typography

data/bin/doing

@@ -46,7 +46,7 @@ flag [:f, :doing_file]
 
 desc 'Add an entry'
 arg_name 'entry'
-command :now do |c|
+command [:now,:next] do |c|
   c.desc 'Section'
   c.arg_name 'section_name'
   c.default_value wwid.current_section
@@ -114,6 +114,11 @@ command :now do |c|
 end
 
 desc 'Add a note to the last entry'
+long_desc %{
+  If -r is provided with no other arguments, the last note is removed. If new content is specified through arguments or STDIN, any previous note will be replaced with the new one.
+
+  Use -e to load the last entry in a text editor where you can append a note.
+}
 arg_name 'note_text'
 command :note do |c|
   c.desc 'Section'
@@ -125,7 +130,6 @@ command :note do |c|
   c.switch [:e,:editor], :negatable => false, :default_value => false
 
   c.desc "Replace/Remove last entry's note"
-  c.long_desc "If -r is provided with no other arguments, the last note is removed. If new content is specified through arguments or STDIN, any previous note will be replaced with the new one."
   c.switch [:r,:remove], :negatable => false, :default_value => false
 
   c.action do |global_options,options,args|
@@ -226,7 +230,10 @@ command :meanwhile do |c|
   end
 end
 
-desc 'Output HTML templates for customization. Save them to files and use them in the configuration file under html_template'
+desc 'Output HTML templates for customization'
+long_desc %{
+  Templates are printed to STDOUT for piping to a file. Save them and use them in the configuration file under html_template. Example `doing templates --type=HAML > ~/styles/my_doing.haml`
+}
 command :templates do |c|
   c.desc "Type of template to output (HAML|CSS)"
   c.arg_name 'template_type'
@@ -327,8 +334,7 @@ command :done do |c|
   c.desc 'Backdate start date by interval [4pm|20m|2h|yesterday noon]'
   c.flag [:b,:back]
 
-  c.desc 'Set completion date to start date plus interval (XX[mhd] or HH:MM)'
-  c.long_desc 'If used without the --back option, the start date will be moved back to allow the completion date to be the current time.'
+  c.desc 'Set completion date to start date plus interval (XX[mhd] or HH:MM). If used without the --back option, the start date will be moved back to allow the completion date to be the current time.'
   c.flag [:t,:took]
 
   c.desc 'Section'
@@ -424,8 +430,7 @@ command :finish do |c|
   c.desc 'Set the completed date to the start date plus XX[hmd]'
   c.flag [:t,:took]
 
-  c.desc 'Auto-generate finish dates from next entry\'s start time'
-  c.long_desc 'Automatically generate completion dates 1 minute before next start date. --auto overrides the --date and --back parameters.'
+  c.desc 'Auto-generate finish dates from next entry\'s start time. Automatically generate completion dates 1 minute before next start date. --auto overrides the --date and --back parameters.'
   c.default_value false
   c.switch [:auto], :negatable => false, :default_value => false
 
@@ -549,7 +554,7 @@ command :mark do |c|
 end
 
 desc 'List all entries'
-long_desc 'The argument can be a section name, tag(s) or both. "pick" or "choose" as an argument will offer a section menu.'
+long_desc 'The argument can be a section name, @tag(s) or both. "pick" or "choose" as an argument will offer a section menu.'
 arg_name 'section [tags]'
 command :show do |c|
   c.desc 'Tag boolean (AND,OR,NONE)'
@@ -568,8 +573,9 @@ command :show do |c|
   c.default_value 'asc'
   c.flag [:s,:sort], :default_value => 'asc'
 
-  c.desc 'Date range to show, or a single day to filter date on.'
-  c.long_desc 'Date range argument should be quoted. Date specifications can be natural language. To specify a range, use "to," or "through,".\n\ndoing show --from "monday to friday"'
+  c.desc %{
+    Date range to show, or a single day to filter date on. Date range argument should be quoted. Date specifications can be natural language. To specify a range, use "to," or "through,". Example `doing show --from "monday to friday"`
+  }
   c.flag [:f,:from]
 
   c.desc 'Show time intervals on @done tasks'
@@ -648,9 +654,9 @@ command :show do |c|
 end
 
 desc 'Search for entries'
-long_desc 'Search all sections (or limit to a single section) for entries matching text or regular expression.'
+long_desc 'Search all sections (or limit to a single section) for entries matching text or regular expression. Normal strings are fuzzy matched, delineate regex with /expression/'
 arg_name 'search_pattern'
-command :grep do |c|
+command [:grep,:search] do |c|
   c.desc 'Section'
   c.default_value "all"
   c.flag [:s,:section], :default_value => "All"
@@ -807,8 +813,12 @@ end
 
 desc 'Show the last entry'
 command :last do |c|
+  c.desc 'Specify a section'
+  c.default_value wwid.current_section
+  c.flag [:s,:section]
+
   c.action do |global_options,options,args|
-    puts wwid.last.strip
+    puts wwid.last(true,options[:s]).strip
   end
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.20'
+  VERSION = '1.0.21'
 end

data/lib/doing/wwid.rb

@@ -792,7 +792,11 @@ class WWID
     if opt[:search]
       items.keep_if {|item|
         text = item['note'] ? item['title'] + item['note'].join(" ") : item['title']
-        pattern = opt[:search].split('').join('.{0,3}')
+        if opt[:search].strip =~ /^\/.*?\/$/
+          pattern = opt[:search].sub(/\/(.*?)\//,'\1')
+        else
+          pattern = opt[:search].split('').join('.{0,3}')
+        end
         text =~ /#{pattern}/i
       }
     end
@@ -1255,9 +1259,11 @@ EOTEMPLATE
     list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => count, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :times => times, :totals => opt[:totals] })
   end
 
-  def last(times=true)
+  def last(times=true,section=nil)
+    section ||= @current_section
+    section = guess_section(section)
     cfg = @config['templates']['last']
-    list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 1, :format => cfg['date_format'], :template => cfg['template'], :times => times})
+    list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => 1, :format => cfg['date_format'], :template => cfg['template'], :times => times})
   end
 
   def tag_times(format="text")

data/lib/templates/doing.css

@@ -49,7 +49,7 @@ article > ul > li:hover {
 
 .date {
   color: #7d9ca2;
-  font-size: 14px;
+  font-size: 17px;
   padding: 15px 1ch 0 0;
   text-align: right;
   white-space: nowrap;
@@ -71,7 +71,7 @@ article > ul > li:hover {
 .note {
   color: #aaa;
   display: block;
-  font-size: 16px;
+  font-size: 17px;
   line-height: 1.1;
   padding: 1em 0 0 2ch;
   position: relative;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - Brett Terpstra