never_do 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb4b077e59b83d0023a6b87f0480fcc61a11901e
-  data.tar.gz: 2d3f2a500e61bd13e095f27a8a6298e4a229cd41
+  metadata.gz: a1f81c7c0dbb139b1d6cb36b887b7581eb983e80
+  data.tar.gz: 4b68fc0243a160e85751e4812380a801651d5cd2
 SHA512:
-  metadata.gz: 3a74c138d16d9726cd582b84a22eec0e6b3e25d7343a2a3e184ba16c229ecf7cd9d330ff2cd628611eb0af414c0526ebeca9034e3a8cecc4baf1ed3ad3196126
-  data.tar.gz: 84ba33b67481cc33fec4dadfc910fb4b51b5f8e43b20ab4505e1692c47008ae398e7dbae16ca5f14e15603f3126f527a56ccf8d67864d4c8efeada3028e14cf3
+  metadata.gz: 20e87b98f70bc34ec953e1da32dad5c368c81583d5b39ff539df09bf4a7185c6b31a6ee02e7178799fcd5bdf8a063945aa80426383feaf048e098f7631cece2d
+  data.tar.gz: 4810248d69f3175af92f0eaf5c3cc5cad473ec535f419c91e88ddff6fb2f7af1a549709334486310f4f4ee3542341c66ecedb34472a0a7e37817e7c197fb0e61

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.swp
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/.rspec

@@ -1,2 +1,2 @@
---color
---require spec_helper
+--color
+--require spec_helper

data/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2016 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -47,6 +47,8 @@ Everything after `x` starting with `a` is considered as add a task, thus
 `x a ...` is the same as `x add ...`, the same for `l[ist]`, `f[inish]`,
 `e[dit]`, `g[enerate]`, `h[elp]`.
 
+![usage](./screenshots/usage.png)
+
 ## Contribute
 
 If you find any bug, or have any question, please file an issue or make a pr,

data/bin/x

@@ -4,7 +4,7 @@ require "date"
 require "fileutils"
 
 PATH   = "#{ENV["HOME"]}/.never_do"
-EDITOR = ENV["EDITOR"] || "gvim"
+EDITOR = ENV["EDITOR"] || "vi"
 
 class Task
     DELIM = "`"
@@ -15,6 +15,9 @@ class Task
         @desc   = desc
         @start  = start == -1 ? _now : start
         @finish = finish
+
+        @start = @start.to_i
+        @finish = @finish.to_i
     end
 
     def finish!
@@ -23,11 +26,15 @@ class Task
     end
 
     def finish?
-        @finish.to_i != -1
+        @finish != -1
     end
 
     def to_s
-        [@desc, @start, @finish].join(DELIM)
+        [@desc, @start.to_s, @finish.to_s].join(DELIM)
+    end
+
+    def pp
+        "#{@desc} [#{_time @start} -> #{_time(@finish)}]"
     end
 
     class << self
@@ -42,6 +49,10 @@ class Task
     def _now
         Time.now.to_i
     end
+
+    def _time(t)
+        t == -1 ? "infinity" : Time.at(t).localtime.strftime("%y/%m/%d %H:%M")
+    end
 end
 
 class X
@@ -57,8 +68,9 @@ class X
     end
 
     def list(done=false)
-        len = @ys.size.to_s.length
-        @ys.map.with_index { |t, i| "#{i.to_s.ljust(len)}  #{t.desc}" }
+        ls = done ? @zs : @ys
+        len = ls.size.to_s.length
+        ls.map.with_index { |t, i| "#{i.to_s.ljust(len)} -- #{t.pp}" }
     end
 
     # after finishing one task, the id is renumbered
@@ -95,7 +107,7 @@ class X
 
                     m_tasks.sort_by(&:start).each do |task|
                         mark = task.finish? ? "x" : " "
-                        done += 1 if task.finish?
+                        m_done += 1 if task.finish?
                         f.puts "- [#{mark}] #{task.desc}"
                     end
 
@@ -136,12 +148,12 @@ def help
     puts <<-EOH.gsub(/^\s*\|/, "")
         |Usage: x [OPTION] [ID|TASK|FILE]
         |
-        |  a TASK        add a task
-        |  l             list all tasks
-        |  f ID          finish task with ID
-        |  e [yz]        edit todo file y or done file z
-        |  g [OUTFILE]   generate task log to PATH
-        |  h             see me
+        |  add      TASK        add a task
+        |  list                 list all tasks
+        |  finish   ID          finish task with ID
+        |  edit     [yz]        edit todo file "y" or done file "z"
+        |  generate [OUTFILE]   generate task log to PATH
+        |  help                 see me
     EOH
 end
 
@@ -152,7 +164,7 @@ def never_do
     when /^a.*/
         x.add(ARGV.join(" "))
     when /^l.*/, nil
-        x.list.each { |t| puts t }
+        x.list(!ARGV.empty?).each { |t| puts t }
     when /^f.*/
         task = x.finish(ARGV.first.to_i).desc
         puts "finish task: #{task}"

data/lib/never_do/version.rb

@@ -1,3 +1,3 @@
 module NeverDo
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: never_do
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - delta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - lib/never_do.rb
 - lib/never_do/version.rb
 - never_do.gemspec
+- screenshots/usage.png
 homepage: https://github.com/delta4d/never_do
 licenses:
 - MIT
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: command line todo app