rbnotes 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f48ac5666d917964e9c103c11be86b12736b81ced6e072be4707e1e943b6ff76
-  data.tar.gz: d29b9b68d6ebfcfdc7289962405a0390daed2705cd80b3beb50e036d2f8d9e85
+  metadata.gz: a04bd4d45d7c2f4227f355672baa860602ae3b9e481e7a384daf4283f4ad6754
+  data.tar.gz: bc707b20ea91ab655f6e355026164c01844c82ea3869c18fd5ca1040c968934d
 SHA512:
-  metadata.gz: f5be0687fc189a5dad6178104a05af0f64e35fc44dd1a73bf677a232038b81b4f88e5562ca9f9e8f098152136c005ebdc334158d34652c0fe7a2bea8e13c4056
-  data.tar.gz: a1e5d671d93ff9efdbe33e7c6751984f851c39756304df7c874fe82df558b18b7f4f716d82253e99b2d8e21cc1d795d6b81c0f1ba665f8f3e99e38c30e4d19d8
+  metadata.gz: d93df0df9e002a8bae26b7d9e1e89acf19d84551635d58f3ec747c78f3764ac004a784977a3d9940783a8b4661b2caafd2b55502644bca4bb69947d91593bd79
+  data.tar.gz: 913c240b04215cb5502146f4d1edcd5c1ddc273de31baace3f0d8dff600dcf759e5983aee5cce72fb5079dc26e1a22b43c0aad46e1cc766c4127697090fb0037

data/CHANGELOG.md

@@ -7,9 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ## [Unreleased]
 Nothing to record here.
 
+## [0.4.4] - 2020-11-09
+###
+- Add a feature to use a keyword as an argument for `list`. (#47)
+
 ## [0.4.3] - 2020-11-08
 ### Added
-- Add a new command `export` to write out a note into a file (#51)
+- Add a new command `export` to write out a note into a file. (#51)
 - Add individual help for each command. (#42)
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbnotes (0.4.3)
+    rbnotes (0.4.4)
       textrepo (~> 0.5.4)
       unicode-display_width (~> 1.7)
 

data/lib/rbnotes/commands.rb

@@ -61,7 +61,7 @@ Example usage:
   #{Rbnotes::NAME} delete [TIMESTAMP]
   #{Rbnotes::NAME} export [TIMESTAMP [FILENAME]]
   #{Rbnotes::NAME} import FILE
-  #{Rbnotes::NAME} list [STAMP_PATTERN]
+  #{Rbnotes::NAME} list [STAMP_PATTERN|KEYWORD]
   #{Rbnotes::NAME} search PATTERN [STAMP_PATTERN]
   #{Rbnotes::NAME} show [TIMESTAMP]
   #{Rbnotes::NAME} update [TIMESTAMP]

data/lib/rbnotes/commands/list.rb

@@ -1,3 +1,4 @@
+require "date"
 require "unicode/display_width"
 require "io/console/size"
 
@@ -20,8 +21,7 @@ module Rbnotes::Commands
     # timestamp pattern is a string which would match several
     # Timestamp objects.
     #
-    # Here is
-    # several examples of timestamp patterns.
+    # Here is several examples of timestamp patterns.
     #
     #   "20201027093600_012": a complete string to represent a timestamp
     #   - this pattern would match exactly one Timestamp object
@@ -43,11 +43,28 @@ module Rbnotes::Commands
     #     execute(Array, Rbnotes::Conf or Hash) -> nil
 
     def execute(args, conf)
-      pattern = args.shift      # `nil` is acceptable
+      arg = args.shift
+      patterns = []
+
+      case arg.to_s
+      when "today", "to"
+        patterns << Textrepo::Timestamp.new(Time.now).to_s[0..7]
+      when "yesterday", "ye"
+        t = Time.now
+        patterns << Date.new(t.year, t.mon, t.day).prev_day.strftime("%Y%m%d")
+      when "this_week", "tw"
+        patterns.concat(dates_in_this_week)
+      when "last_week", "lw"
+        patterns.concat(dates_in_last_week)
+      else
+        patterns << arg
+      end
 
       @repo = Textrepo.init(conf)
+      stamps = patterns.map { |pat|
+        @repo.entries(pat).sort{|a, b| b <=> a}
+      }.flatten
       # newer stamp shoud be above
-      stamps = @repo.entries(pattern).sort{|a, b| b <=> a}
       stamps.each { |timestamp|
         puts make_headline(timestamp)
       }
@@ -56,11 +73,12 @@ module Rbnotes::Commands
     def help                    # :nodoc:
       puts <<HELP
 usage:
-    #{Rbnotes::NAME} list [STAMP_PATTERN]
+    #{Rbnotes::NAME} list [STAMP_PATTERN|KEYWORD]
 
 Show a list of notes.  When no arguments, make a list with all notes
 in the repository.  When specified STAMP_PATTERN, only those match the
-pattern are listed.
+pattern are listed.  Instead of STAMP_PATTERN, some KEYWORDs could be
+used.
 
 STAMP_PATTERN must be:
 
@@ -69,6 +87,14 @@ STAMP_PATTERN must be:
     (c) year and month part: "202010"
     (d) year part only: "2020"
     (e) date part only: "1030"
+
+KEYWORD:
+
+    - "today"      (or "to")
+    - "yeasterday" (or "ye")
+    - "this_week"  (or "tw")
+    - "last_week"  (or "lw")
+
 HELP
     end
 
@@ -119,6 +145,29 @@ HELP
       str.sub(/^#+ +/, '')
     end
 
+    # week day for Monday start calendar
+    def wday(time)
+      (time.wday - 1) % 7
+    end
+
+    def dates_in_this_week
+      to = Time.now
+      start = Date.new(to.year, to.mon, to.day).prev_day(wday(to))
+      dates_in_week(start)
+    end
+
+    def dates_in_last_week
+      to = Time.now
+      start_of_this_week = Date.new(to.year, to.mon, to.day).prev_day(wday(to))
+      dates_in_week(start_of_this_week.prev_day(7))
+    end
+
+    def dates_in_week(start_date)
+      dates = [start_date]
+      1.upto(6) { |i| dates << start_date.next_day(i) }
+      dates.map { |d| d.strftime("%Y%m%d") }
+    end
+
     # :startdoc:
   end
 end

data/lib/rbnotes/version.rb

@@ -1,4 +1,4 @@
 module Rbnotes
-  VERSION = "0.4.3"
-  RELEASE = "2020-11-08"
+  VERSION = "0.4.4"
+  RELEASE = "2020-11-09"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbnotes
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - mnbi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textrepo