doing 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 099152d20912d3303aaa11fe984099c26dd658c0
-  data.tar.gz: e8a2977882d97fe1b93a913fbd2a2059f2d2bd43
+  metadata.gz: 63ac7ddde25074344e59d1b2205b47c0721511f7
+  data.tar.gz: 51097a7e2ad2bee2a3d45cca702b3846be7cdf91
 SHA512:
-  metadata.gz: 0e33df82c4ada897a07b08e129024b34c357c10438df188cc50a18cd00a9bd9e1ccf029e78448e6ed7993077352c17040533f4cfd39bfc72fb7f6794f58561a0
-  data.tar.gz: 07a8ff1889b6f7f8a7864cdc6561f3ae33cf01f0f1fd884ac135a279342699ab84fd1816485ef79045adf76b0a8dbd1cdeeb6e491098034a8c55b52750890aa3
+  metadata.gz: 6ede9fd7ced675665f25f9858abf86e981f30688e202bac3040f5101c27dec85578bebcc18fe59c252f7d99f686947cc63b3867b5d3334399368681d685501fb
+  data.tar.gz: 0fb124bcb05e1328f58033038ea08365505f12d829cfae7e3bd7e4636bda78ae4e8d1ac1402b1a6547fd719111481484e2f8e4eda77919f26cc87afb0cf4173b

data/README.rdoc

@@ -33,6 +33,7 @@ Commands:
     archive  - Archive all but the most recent 5 entries
     choose   - Select a section to display
     config   - Edit the default configuration
+    done     - Add an entry tagged with @done(YYYY-mm-dd hh:mm)
     help     - Shows a list of commands or help for one command
     last     - Show the last entry
     later    - Add an item to the Later section

data/bin/doing

@@ -50,6 +50,29 @@ command :later do |c|
   end
 end
 
+desc 'Add a completed item with @done(date)'
+arg_name 'entry'
+command :done do |c|
+  c.desc 'Immediately archive the entry'
+  c.switch [:a,:archive], :negatable => true
+
+  c.desc 'Section'
+  c.default_value wwid.current_section
+  c.flag [:s,:section], :default_value => wwid.current_section
+
+  c.action do |global_options,options,args|
+    if args.length > 0
+      task = args.join(" ").cap_first
+      task += " @done(#{Time.now.strftime('%F %R')})"
+      section = options[:a] ? "Archive" : options[:s]
+      wwid.add_item(task, section)
+      wwid.write(wwid.doing_file)
+    else
+      raise "You must provide content when creating a new entry"
+    end
+  end
+end
+
 desc 'List all entries'
 arg_name 'section'
 command :show do |c|
@@ -113,24 +136,68 @@ command :choose do |c|
   end
 end
 
-desc 'Move all but the most recent 5 entries to the Archive section'
-default_value wwid.current_section
+desc 'Add a new section to the "doing" file'
+arg_name 'section_name'
+command :add_section do |c|
+  c.action do |global_options,options,args|
+    unless wwid.sections.include?(args[0])
+      wwid.add_section(args[0].cap_first)
+      wwid.write(wwid.doing_file)
+    else
+      raise "Section #{args[0]} already exists"
+    end
+  end
+end
+
+desc 'Display a user-created view'
+arg_name 'view_name'
+command :view do |c|
+  c.desc 'Section'
+  c.flag [:s,:section]
+
+  c.desc 'Count to display'
+  c.flag [:c,:count], :must_match => /^\d+$/, :type => Integer
+
+  c.action do |global_options,options,args|
+    view = wwid.get_view(args[0])
+    if view
+      template = view.has_key?('template') ? view['template'] : nil
+      format = view.has_key?('date_format') ? view['date_format'] : nil
+      count = options[:c] ? options[:c] : view.has_key?('count') ? view['count'] : 10
+      section = options[:s] ? options[:s] : view.has_key?('section') ? view['section'] : wwid.current_section
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format})
+    else
+      raise "View #{args[0]} not found in config"
+    end
+  end
+end
+
+desc 'Move all but the most recent 5 entries in a section to Archive'
 arg_name 'section'
+default_value wwid.current_section
 command :archive do |c|
+  c.desc 'Count to keep'
+  c.default_value 5
+  c.flag [:k,:keep], :default_value => 5, :must_match => /^\d+$/, :type => Integer
+
   c.action do |global_options,options,args|
     if args.length > 0
       section = args.join(" ").capitalize
     else
       section = wwid.current_section
     end
-    wwid.archive(section)
+    wwid.archive(section,options[:k])
   end
 end
 
-desc 'Edit the default configuration'
+desc 'Edit the configuration file'
 command :config do |c|
+  c.desc 'Editor to use'
+  c.default_value ENV['EDITOR']
+  c.flag [:e,:editor]
+
   c.action do |global_options,options,args|
-    system %Q{"#{ENV['EDITOR']}" "#{DOING_CONFIG}"}
+    system %Q{"#{options[:e]}" "#{File.expand_path(DOING_CONFIG)}"}
   end
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/doing/wwid.rb

@@ -36,14 +36,23 @@ class WWID
       'wrap_width' => 0
     }
     @config['templates']['last'] ||= {
-      'date_format' => '%_I:%M%P',
-      'template' => '%date: %title%note',
-      'wrap_width' => 60
+      'date_format' => '%-I:%M%P on %a',
+      'template' => '%title (at %date)%odnote',
+      'wrap_width' => 88
     }
     @config['templates']['recent'] ||= {
       'date_format' => '%_I:%M%P',
       'template' => '%shortdate: %title',
-      'wrap_width' => 60
+      'wrap_width' => 88
+    }
+    @config['views'] ||= {
+      'sample' => {
+        'date_format' => '%_I:%M%P',
+        'template' => '%date | %title%note',
+        'wrap_width' => 0,
+        'section' => 'section_name',
+        'count' => 5
+      }
     }
 
     @doing_file = File.expand_path(config['doing_file'])
@@ -132,7 +141,7 @@ class WWID
   end
 
   def add_item(title,section=nil,opt={})
-    section = @current_section if section.nil?
+    section ||= @current_section
     add_section(section) unless @content.has_key?(section)
     opt[:date] ||= Time.now
     opt[:note] ||= ""
@@ -176,6 +185,13 @@ class WWID
     return sections[num.to_i - 1]
   end
 
+  def get_view(title)
+    if @config['views'].has_key?(title)
+      return @config['views'][title]
+    end
+    false
+  end
+
   def list_section(opt={})
     opt[:count] ||= 0
     count = opt[:count] - 1
@@ -263,14 +279,14 @@ class WWID
     return out
   end
 
-  def archive(section=nil)
+  def archive(section=nil,count=10)
     section = choose_section if section.nil? || section =~ /choose/i
     if sections.include?(section)
       items = @content[section]['items']
       return if items.length < 10
       @content[section]['items'] = items[0..5]
       add_section('Archive') unless sections.include?('Archive')
-      @content['Archive']['items'] += items[6..-1]
+      @content['Archive']['items'] += items[count..-1]
       write(@doing_file)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake