doing 0.2.5pre → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8806f026f8106baa4c033a2d30675e0f3c30afea
-  data.tar.gz: 77139cb8ae62cc18311d5fcd7c27a725806375c9
+  metadata.gz: a4645c47a272a4fdf45174b2adff019820ed1537
+  data.tar.gz: 444fa7c255629e9f9e5f1b357c28b0fd2ac3e8c3
 SHA512:
-  metadata.gz: 6fb8b55cc46ceefe4c139af635417b2c318e90705ef7da3fb3aa2e2050bd7e7de89d4d9633e538ec0ca26e6d3582a81e3fa394ac3bf032684d463a36573f5cca
-  data.tar.gz: 659c26db54235f3ca7d13cc34bdc2f4cdd3e028cc6514c2c5f01c0c9216c7c0fcc693de629f3b965dd5b533e91b8390e09fdd29aebd010d5109ba947394ef16a
+  metadata.gz: 4b8872bc854b897c25737f79f50ab86ec91f48b5b64118cc121c463c0782738070150b06ef8a9e076b5a9bdf5922f94a5d45db35166f80af8cf0fc63f9e51519
+  data.tar.gz: 4ed502a4de7165e67a5cc41d4737f069ececd82e64efa8af092d0c847b32ca1e99151ec7071945dace041277208411c0e0b36bdfc6a468330bb14a60b3660e87

data/README.md

@@ -261,6 +261,7 @@ Outputs:
     now      - Add an entry
     later    - Add an item to the Later section
     done     - Add a completed item with @done(date). No argument finishes last entry.
+    meanwhile - Finish any @meanwhile tasks and optionally create a new one
 
 The `doing now` command can accept `-s section_name` to send the new entry straight to a non-default section. 
 
@@ -270,6 +271,8 @@ You can also backdate entries using natural language with `--back 15m` or `--bac
 
 All of these commands accept a `-e` argument. This opens your command line editor as defined in the environment variable `$EDITOR`. Add your entry, save the temp file and close it, and the new entry will be added. Anything after the first line is included as a note on the entry.
 
+`doing meanwhile` is a special command for creating and finishing tasks that may have other entries come before they're complete. When you create an entry with `doing meanwhile [entry text]`, it will automatically complete the last @meanwhile item (dated @done tag) and add the @meanwhile tag to the new item. This allows time tracking on a more general basis, and still lets you keep track of the smaller things you do while working on an overarching project. The `meanwhile` command accepts `--back [time]` and will backdate the @done tag and start date of the new task at the same time. Running `meanwhile` with no arguments will simply complete the last @meanwhile task. See `doing help meanwhile` for more options.
+
 #### Modifying entries:
 
     finish      - Mark last X entries as @done
@@ -285,10 +288,11 @@ All of these commands accept a `-e` argument. This opens your command line edito
 
 #### Displaying entries:
 
-    show     - List all entries
-    recent   - List recent entries
-    today    - List entries from today
-    last     - Show the last entry
+    show      - List all entries
+    recent    - List recent entries
+    today     - List entries from today
+    yesterday - List entries from yesterday
+    last      - Show the last entry
 
 `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.
 
@@ -300,6 +304,8 @@ The `show` command can also show the time spent on a task if it has a `@done(dat
 
 If you have a use for it, you can use `--csv` on the show or view commands to output the results as a comma-separated CSV to STDOUT. Redirect to a file to save it: `doing show all done --csv > ~/Desktop/done.csv`.
 
+`doing yesterday` is great for stand-ups, thanks to [Sean Collins](https://github.com/sc68cal) for that. Note that you can show yesterday's activity from an alternate section by using the section name as an argument (e.g. `doing yesterday archive`).
+
 #### Views
 
     view     - Display a user-created view

data/bin/doing

@@ -25,6 +25,9 @@ switch [:notes], :default_value => true, :negatable => true
 # desc 'Wrap notes at X chars (0 for no wrap)'
 # flag [:w,:wrapwidth], :must_match => /^\d+$/, :type => Integer
 
+desc 'Specify a different doing_file'
+flag [:f, :doing_file]
+
 desc 'Add an entry'
 arg_name 'entry'
 command :now do |c|
@@ -83,6 +86,53 @@ command :now do |c|
   end
 end
 
+desc 'Finish any running @meanwhile tasks and optionally create a new one'
+arg_name 'entry'
+command :meanwhile do |c|
+  c.desc 'Section'
+  c.arg_name 'section_name'
+  c.default_value wwid.current_section
+  c.flag [:s,:section], :default_value => wwid.current_section
+
+  c.desc "Edit entry with #{ENV['EDITOR']}"
+  c.switch [:e,:editor]
+
+  c.desc "Archive previous @meanwhile entry"
+  c.switch [:a,:archive], :default_value => false
+
+  c.desc 'Backdate to "date_string" (natural language)'
+  c.flag [:back]
+
+  c.action do |global_options,options,args|
+    if options[:back]
+      date = wwid.chronify(options[:back])
+
+      raise "Unable to parse date string" if date.nil?
+    else
+      date = Time.now
+    end
+
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    input = ""
+
+    if options[:e]
+      raise "No EDITOR variable defined in environment" if ENV['EDITOR'].nil?
+      input += args.join(" ") if args.length > 0
+      input = wwid.fork_editor(input)
+    else
+      if args.length > 0
+        input = args.join(" ")
+      elsif STDIN.stat.size > 0
+        input = STDIN.read
+      end
+    end
+    input = false unless input && input.length > 0
+
+    wwid.stop_start("meanwhile",{:new_item => input, :back => date, :section => section, :archive => options[:a]})
+    wwid.write(wwid.doing_file)
+  end
+end
+
 desc 'Add an item to the Later section'
 arg_name 'entry'
 command :later do |c|
@@ -136,6 +186,10 @@ end
 desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'entry'
 command :done do |c|
+  c.desc 'Remove @done tag'
+  c.default_value false
+  c.switch [:r,:remove], :negatable => false, :default_value => false
+
   c.desc 'Include date'
   c.default_value true
   c.switch [:d,:date], :default_value => true
@@ -185,7 +239,11 @@ command :done do |c|
         raise "No content"
       end
     elsif args.length == 0 && STDIN.stat.size == 0
-      wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :archive => options[:a], :back => date, :date => options[:d]})
+      if options[:r]
+        wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :remove => true })
+      else
+        wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :archive => options[:a], :back => date, :date => options[:d]})
+      end
     else
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
@@ -430,6 +488,16 @@ command :today do |c|
   end
 end
 
+desc 'List entries from yesterday'
+default_value wwid.current_section
+arg_name 'section'
+command :yesterday do |c|
+  c.action do |global_options, options,args|
+    section = args.length > 0 ? args.join(" ") : wwid.current_section
+    puts wwid.yesterday(section).strip
+  end
+end
+
 desc 'Show the last entry'
 command :last do |c|
   c.action do |global_options,options,args|
@@ -616,11 +684,16 @@ command :config do |c|
   c.desc 'Application to use (OS X only)'
   c.flag [:a]
 
+  c.desc "Use the editor_app defined in ~/.doingrc (#{wwid.config['editor_app']})"
+  c.switch [:x]
+
   c.desc 'Application bundle id to use (OS X only)'
   c.flag [:b]
 
   c.action do |global_options,options,args|
-    if options[:a] || options[:b]
+    if options[:x]
+      %x{open -a "#{wwid.config['editor_app']}" "#{File.expand_path(DOING_CONFIG)}"}
+    elsif options[:a] || options[:b]
       if options[:a]
         %x{open -a "#{options[:a]}" "#{File.expand_path(DOING_CONFIG)}"}
       elsif options[:b]
@@ -635,6 +708,11 @@ command :config do |c|
 end
 
 pre do |global,command,options,args|
+  if global[:doing_file]
+    wwid.init_doing_file(input=global[:doing_file])
+  else
+    wwid.init_doing_file
+  end
   wwid.config[:include_notes] = false unless global[:notes]
   if global[:version]
     puts "doing v" + Doing::VERSION

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '0.2.5pre'
+  VERSION = '0.2.5'
 end

data/lib/doing/wwid.rb

@@ -12,7 +12,7 @@ class WWID
   attr_accessor :content, :sections, :current_section, :doing_file, :config
 
 
-  def initialize(input=nil)
+  def initialize
     @content = {}
     @timers = {}
     @config = read_config
@@ -64,7 +64,6 @@ class WWID
     @config['marker_tag'] ||= 'flagged'
     @config['marker_color'] ||= 'red'
 
-    @doing_file = File.expand_path(config['doing_file'])
     @current_section = config['current_section']
     @default_template = config['templates']['default']['template']
     @default_date_format = config['templates']['default']['date_format']
@@ -72,17 +71,24 @@ class WWID
     @config[:include_notes] ||= true
 
     File.open(File.expand_path(DOING_CONFIG), 'w') { |yf| YAML::dump(config, yf) }
+  end
+
+  def init_doing_file(input=nil)
+    @doing_file = File.expand_path(config['doing_file'])
 
     if input.nil?
       create(@doing_file) unless File.exists?(@doing_file)
       input = IO.read(@doing_file)
       input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
     elsif File.exists?(File.expand_path(input)) && File.file?(File.expand_path(input)) && File.stat(File.expand_path(input)).size > 0
+      @doing_file = File.expand_path(input)
       input = IO.read(File.expand_path(input))
       input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
-      @doing_file = File.expand_path(input)
     elsif input.length < 256
+      @doing_file = File.expand_path(input)
       create(input)
+      input = IO.read(File.expand_path(input))
+      input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
     end
 
     @other_content_top = []
@@ -125,7 +131,9 @@ class WWID
   end
 
   def create(filename=nil)
-    filename = @doing_file
+    if filename.nil?
+      filename = @doing_file
+    end
     unless File.exists?(filename) && File.stat(filename).size > 0
       File.open(filename,'w+') do |f|
         f.puts @current_section + ":"
@@ -302,7 +310,7 @@ class WWID
         title = item['title']
         opt[:tags].each {|tag|
           if opt[:remove]
-            title.gsub!(/(^| )@#{tag}/,'')
+            title.gsub!(/(^| )@#{tag.strip}(\([^\)]*\))?/,'')
           else
             unless title =~ /@#{tag}/
               if (tag == "done" && opt[:date]) || opt[:date]
@@ -328,6 +336,43 @@ class WWID
     end
   end
 
+  # accepts one tag and the raw text of a new item
+  # if the passed tag is on any item, it's replaced with @done
+  # if new_item is not nil, it's tagged with the passed tag and inserted
+  # This is for use where only one instance of a given tag should exist (@meanwhile)
+  def stop_start(tag,opt={})
+    opt[:section] ||= @current_section
+    opt[:archive] ||= false
+    opt[:back] ||= Time.now
+    opt[:new_item] ||= false
+
+    opt[:section] = guess_section(opt[:section])
+
+    tag.sub!(/^@/,'')
+
+    @content[opt[:section]]['items'].each_with_index {|item, i|
+      if item['title'] =~ /@#{tag}/
+        title = item['title'].gsub(/(^| )@(#{tag}|done)(\([^\)]*\))?/,'')
+        title += " @done(#{opt[:back].strftime('%F %R')})"
+
+        @content[opt[:section]]['items'][i]['title'] = title
+
+        if opt[:archive] && opt[:section] != "Archive"
+          @content['Archive']['items'].push(@content[opt[:section]]['items'][i])
+          @content[opt[:section]]['items'].delete_at(i)
+        end
+      end
+    }
+
+    if opt[:new_item]
+      title, note = format_input(opt[:new_item])
+      title += " @#{tag}"
+      add_item(title.cap_first, opt[:section], {:note => note, :back => opt[:back]})
+    end
+
+    write(@doing_file)
+  end
+
   def write(file=nil)
     if @other_content_top.empty?
       output = ""
@@ -448,6 +493,10 @@ class WWID
         item['date'] < Date.today.to_time
       }.reverse!
       section = Time.now.strftime('%A, %B %d')
+    elsif opt[:yesterday]
+      items.delete_if {|item| item['date'] <= Date.today.prev_day.to_time or
+                       item['date'] >= Date.today.to_time
+                      }.reverse!
     else
       if opt[:age] =~ /oldest/i
         items = items[0..count]
@@ -486,13 +535,20 @@ class WWID
         # else
         #   note = ''
         # end
+        if RUBY_VERSION.to_f > 1.8
+          title = i['title'].force_encoding('utf-8')
+          note = i['note'].map {|line| line.force_encoding('utf-8').strip } if i['note']
+        else
+          title = i['title']
+          note = i['note'].map { |line| line.strip }
+        end
         items_out << {
           :date => i['date'].strftime('%a %-I:%M%p'),
-          :title => i['title'].gsub(/(@[^ \(]+(\(.*?\))?)/is,'<span class="tag">\1</span>').strip, #+ " #{note}"
-          :note => i['note']
+          :title => title.gsub(/(@[^ \(]+(\(.*?\))?)/im,'<span class="tag">\1</span>').strip, #+ " #{note}"
+          :note => note
         }
       }
-      style = "body{background:#faf9f5;color:#333;font-family:Palatino,Georgia,serif;font-size:16px;line-height:120%;text-align:justify;padding:20px}h1{text-align:left;position:relative;left:220px;margin-bottom:1em}ul{list-style-position:outside;position:relative;left:170px;margin-right:170px;text-align:left}ul li{list-style-type:none;border-left:solid 1px #ccc;padding-left:10px;line-height:1.75}ul li .date{font-size:14px;position:absolute;left:-82px;color:#7d9ca2;text-align:right;width:110px;line-height:2}ul li .tag{color:#999}ul li .note{display:block;color:#666;padding:0 0 0 22px;line-height:1.4;font-size:15px}ul li .note:before{content:'\\25BA';font-weight:300;position:absolute;left:40px;font-size:8px;color:#aaa;line-height:3}ul li:hover .note{display:block}"
+      style = "body{background:#fff;color:#333;font-family:Helvetica,arial,freesans,clean,sans-serif;font-size:16px;line-height:120%;text-align:justify;padding:20px}h1{text-align:left;position:relative;left:220px;margin-bottom:1em}ul{list-style-position:outside;position:relative;left:170px;margin-right:170px;text-align:left}ul li{list-style-type:none;border-left:solid 1px #ccc;padding-left:10px;line-height:2}ul li .date{font-size:14px;position:absolute;left:-82px;color:#7d9ca2;text-align:right;width:110px;line-height:2}ul li .tag{color:#999}ul li .note{display:block;color:#666;padding:0 0 0 22px;line-height:1.4;font-size:15px}ul li .note:before{content:'\\25BA';font-weight:300;position:absolute;left:40px;font-size:8px;color:#aaa;line-height:3}ul li:hover .note{display:block}"
       template =<<EOT
 !!!
 %html
@@ -580,7 +636,7 @@ EOT
           output.gsub!(/\s(@\S+(?:\(.*?\))?)/," #{colors[opt[:tags_color]]}\\1")
         end
         output.sub!(/%note/,note)
-        output.sub!(/%odnote/,note.gsub(/\t\t/,"\t"))
+        output.sub!(/%odnote/,note.gsub(/^\t*/,""))
         output.gsub!(/%hr(_under)?/) do |m|
           o = ""
           `tput cols`.to_i.times do
@@ -736,6 +792,11 @@ EOT
     list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :today => true, :times => times, :output => output})
   end
 
+  def yesterday(section)
+    section = guess_section(section)
+    list_section({:section => section, :count => 0, :order => "asc", :yesterday => true})
+  end
+
   def recent(count=10,section=nil,opt={})
     times = opt[:t] || true
     cfg = @config['templates']['recent']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 0.2.5pre
+  version: 0.2.5
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,9 +144,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2