rbnotes 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04bd4d45d7c2f4227f355672baa860602ae3b9e481e7a384daf4283f4ad6754
-  data.tar.gz: bc707b20ea91ab655f6e355026164c01844c82ea3869c18fd5ca1040c968934d
+  metadata.gz: 840d2acc4c93d5b03d833b6a518c9740518e025aeb3bb2b6751864d5cf9e9d1c
+  data.tar.gz: 759f8bdc29d64e32c73d7e02540603c3bdf84b6bdf3ac91b7a76bf8e3cf2005d
 SHA512:
-  metadata.gz: d93df0df9e002a8bae26b7d9e1e89acf19d84551635d58f3ec747c78f3764ac004a784977a3d9940783a8b4661b2caafd2b55502644bca4bb69947d91593bd79
-  data.tar.gz: 913c240b04215cb5502146f4d1edcd5c1ddc273de31baace3f0d8dff600dcf759e5983aee5cce72fb5079dc26e1a22b43c0aad46e1cc766c4127697090fb0037
+  metadata.gz: b47f361e68f7e5275b981848035621fd31342a994d6bd5d90002f91417f4806ba364714b4ea86728f993e43e74868bf08508701531361c4e785830cc772a5b2e
+  data.tar.gz: '09cea0ff486e4e2a8521d732296e64a520c7d076088dd63c05cc4a9c219a2be28e65e50234859bab0d2772a92fb466b1ffc580525fb3565e8d68f7f7f81f8eec'

data/CHANGELOG.md

@@ -7,8 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ## [Unreleased]
 Nothing to record here.
 
+## [0.4.5] - 2020-11-12
+### Changed
+- Add a feature to accept multiple args for `list`. (#57)
+
+### Fixed
+- Fix issue #54: Notes list does not sort correctly.
+
 ## [0.4.4] - 2020-11-09
-###
+### Changed
 - Add a feature to use a keyword as an argument for `list`. (#47)
 
 ## [0.4.3] - 2020-11-08
@@ -20,14 +27,14 @@ Nothing to record here.
 - Fix `add` fails without modification (#48)
 
 ## [0.4.2] - 2020-11-05
-### Added
+### Changed
 - Add a feature to keep the timestamp in `update` command. (#44)
 
 ### Fixed
 - Fix issue #45: hanging up of `add` command.
 
 ## [0.4.1] - 2020-11-04
-### Added
+### Changed
 - Add a feature to accept a timestamp in `add` command. (#34)
 
 ## [0.4.0] - 2020-11-03
@@ -36,20 +43,21 @@ Nothing to record here.
 
 ## [0.3.1] - 2020-10-30
 ### Added
-- Add feature to specify configuration file in the command line. (#21)
+- Add a feature to specify configuration file in the command
+  line. (#21)
 
 ## [0.3.0] - 2020-10-29
-### Added
+### Changed
 - Add feature to read argument from the standard input. (#27)
 
 ## [0.2.2] - 2020-10-27
-### Added
-- Add feature to accept a timestamp pattern in `list` command. (#22)
+### Changed
+- Add a feature to accept a timestamp pattern in `list` command. (#22)
 
 ## [0.2.1] - 2020-10-25
 ### Added
-- Add feature to load the configuration from an external file.
-- Add description about the configuration file in README.md
+- Add a feature to load the configuration from an external file.
+  - Add a description about the configuration file in README.md.
 
 ## [0.2.0] - 2020-10-23
 ### Added
@@ -59,15 +67,15 @@ Nothing to record here.
 - Add a new task into `Rakefile` to generate RI docs.
   - The intention of the task is to verify RI docs.
 
-### Fixed
+### Changed
 - Refactor some tests.
 
 ## [0.1.3] - 2020-10-15
-### Fixed
+### Changed
 - Add help text for the `conf` command.
 
 ## [0.1.2] - 2020-10-15
-### Fixed
+### Changed
 - Adapt the API change in `textrepo` (0.4.0).
 
 ## [0.1.0] - 2020-10-12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbnotes (0.4.4)
+    rbnotes (0.4.5)
       textrepo (~> 0.5.4)
       unicode-display_width (~> 1.7)
 
@@ -10,7 +10,7 @@ GEM
   specs:
     minitest (5.14.2)
     rake (13.0.1)
-    textrepo (0.5.4)
+    textrepo (0.5.6)
     unicode-display_width (1.7.0)
 
 PLATFORMS

data/README.md

@@ -164,10 +164,10 @@ don't have to set `:searcher_options` for them.
 
 | searcher | default options in `textrepo`                      |
 |:---------|:---------------------------------------------------|
-| `grep`   | `["-i", "-n", "-R", "-E"]`                         |
-| `egrep`  | `["-i", "-n", "-R"]`                               |
-| `ggrep`  | `["-i", "-n", "-R", "-E"]`                         |
-| `gegrep` | `["-i", "-n", "-R"]`                               |
+| `grep`   | `["-i", "-n", "-H", "-R", "-E"]`                   |
+| `egrep`  | `["-i", "-n", "-H", "-R"]`                         |
+| `ggrep`  | `["-i", "-n", "-H", "-R", "-E"]`                   |
+| `gegrep` | `["-i", "-n", "-H", "-R"]`                         |
 | `rg`     | `["-S", "-n", "--no-heading", "--color", "never"]` |
 
 Those searcher names are used in macOS (with Homebrew).  Any other OS

data/lib/rbnotes/commands/list.rb

@@ -15,11 +15,23 @@ module Rbnotes::Commands
     end
 
     ##
-    # Shows a list of notes in the repository.  The only argument is
-    # optional.  If it passed, it must be an timestamp pattern.  A
-    # timestamp is an instance of Textrepo::Timestamp class.  A
-    # timestamp pattern is a string which would match several
-    # Timestamp objects.
+    # Shows a list of notes in the repository.  Arguments are
+    # optional.  If several args are passed, each of them must be a
+    # timestamp pattern or a keyword.
+    #
+    # Any order of timestamp patterns and keywords mixture is
+    # acceptable.  The redundant patterns are just ignored.
+    #
+    # A timestamp pattern is a string which would match several
+    # Timestamp objects.  A timestamp is an instance of
+    # Textrepo::Timestamp class.
+    #
+    # A keyword must be one of them:
+    #
+    # - "today"      (or "to")
+    # - "yeasterday" (or "ye")
+    # - "this_week"  (or "tw")
+    # - "last_week"  (or "lw")
     #
     # Here is several examples of timestamp patterns.
     #
@@ -43,28 +55,13 @@ module Rbnotes::Commands
     #     execute(Array, Rbnotes::Conf or Hash) -> nil
 
     def execute(args, conf)
-      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
+      patterns = args.size > 0 ? convert_keyword(args) : [nil]
 
       @repo = Textrepo.init(conf)
-      stamps = patterns.map { |pat|
-        @repo.entries(pat).sort{|a, b| b <=> a}
-      }.flatten
       # newer stamp shoud be above
+      stamps = patterns.map { |pat|
+        @repo.entries(pat)
+      }.flatten.sort{|a, b| b <=> a}.uniq
       stamps.each { |timestamp|
         puts make_headline(timestamp)
       }
@@ -145,6 +142,27 @@ HELP
       str.sub(/^#+ +/, '')
     end
 
+    def convert_keyword(args)
+      patterns = []
+      while args.size > 0
+        arg = args.shift
+        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
+      end
+      patterns.sort!.uniq
+    end
+
     # week day for Monday start calendar
     def wday(time)
       (time.wday - 1) % 7

data/lib/rbnotes/version.rb

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

metadata

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