rbnotes 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c8badba84cecd738d81b16ec9539c6b8f51199433da1808bcf07fffd45635c
-  data.tar.gz: ab85b5e5d963b88014ffeb780c8da1beb2116e55789e13dfcd2fdea3183651e1
+  metadata.gz: a6625e8e9365a5c69cb9fd1f9d227e04247edda6ddbb9f5d3d442e0e7f87ac96
+  data.tar.gz: 5b00c1ecef74b47957112de785c57e249aa35b07c8809401872f75dec392f4c1
 SHA512:
-  metadata.gz: 6bcbd5ce75daf93183480fe1f00ab72d801b70c894bb9ba70ecc8f03cc7cdc3f2173c71dc0a7c6d119cfcbb9a0c63dff5b8c05a527c1df8dfbbe186509a4e41c
-  data.tar.gz: 72a593af5a18ce7482952df1ceb9d2eb6132d2072bb3adc70075b08118e0594d0f294738e74ddf0087adb2a06946f145cef4ff71b4425aeb855aeaf68e211ac9
+  metadata.gz: 3d6e047ed738940dcbadd14bc8c176c486404951e4349eebe82c8bfbd92c1ad09fe996adb7c5db8bfdbf20ca364b6cebabd5dad3a2edbd9a597a2ad373a658ec
+  data.tar.gz: 504add631c2960e0b12eabce1075ba6d90745db531ebb95b1721a46bee236d7906d489169e0161d9e6213627cd28ceea59a8db1bb0e9c3f5ab0ba8878befb3c7

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ## [Unreleased]
 Nothing to record here.
 
+## [0.4.7] - 2020-11-15
+### Changed
+- Beautify output of the `search` command. (#63)
+
+### Fixed
+- Fix issue #61: `list` command fails in pipeline.
+
 ## [0.4.6] - 2020-11-13
 ### Added
 - Add a new command `pick` to select a note with picker program. (#59)

data/Gemfile.lock

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

data/exe/rbnotes

@@ -48,6 +48,11 @@ app = App.new
 begin
   app.parse_global_options(ARGV)
   app.run(ARGV)
+rescue Errno::EPIPE => e
+  # Fix issue #61: When the pipeline which rbnotes connects is
+  # discarded by the other program, the execption was raised.  It does
+  # not end abnormally for rbnotes.  So, just ignores the exception.
+  exit 0
 rescue MissingArgumentError, MissingTimestampError,
        NoEditorError, ProgramAbortError,
        Textrepo::InvalidTimestampStringError,

data/lib/rbnotes/commands/search.rb

@@ -39,11 +39,8 @@ module Rbnotes::Commands
         result = repo.search(pattern, timestamp_pattern)
       rescue Textrepo::InvalidSearchResultError => e
         puts e.message
-      else
-        result.each { |stamp, num, match|
-          puts "#{stamp}:#{num}:#{match}"
-        }
       end
+      print_search_result(result.map{ |e| SearchEntry.new(*e) })
     end
 
     def help                    # :nodoc:
@@ -63,5 +60,47 @@ STAMP_PATTERN must be:
     (e) date part only: "1030"
 HELP
     end
+
+    private
+
+    # Each entry of search result is:
+    #
+    #   [<timestamp>, <line_number>, <matched_text>]
+    #
+    # The sort must be done in;
+    #
+    #   - descending order for <timestamp>,
+    #   - ascending ordier for <line_number>.
+    #
+
+    SearchEntry = Struct.new(:timestamp, :line_number, :matched_text) {
+      def timestamp_size
+        timestamp.to_s.size
+      end
+    }
+
+    def print_search_result(entries)
+      maxcol_stamp = entries.map(&:timestamp_size).max
+      maxcol_num = entries.map(&:line_number).max
+
+      sort(entries).each { |e|
+        stamp_display = "%- *s" % [maxcol_stamp, e.timestamp]
+        num_display = "%*d" % [maxcol_num, e.line_number]
+
+        puts "#{stamp_display}: #{num_display}: #{e.matched_text}"
+      }
+    end
+
+    def sort(search_result)
+      search_result.sort { |a, b|
+        stamp_comparison = (b.timestamp <=> a.timestamp)
+        if stamp_comparison == 0
+          a.line_number <=> b.line_number
+        else
+          stamp_comparison
+        end
+      }
+    end
+
   end
 end

data/lib/rbnotes/utils.rb

@@ -203,11 +203,12 @@ module Rbnotes
     def make_headline(timestamp, text)
       _, column = IO.console_size
       delimiter = ": "
-      subject_width = column - TIMESTAMP_STR_MAX_WIDTH - delimiter.size - 1
+      timestamp_width = timestamp.to_s.size
+      subject_width = column - timestamp_width - delimiter.size - 1
 
       subject = remove_heading_markup(text[0])
 
-      ts_part = "#{timestamp.to_s}    "[0..(TIMESTAMP_STR_MAX_WIDTH - 1)] 
+      ts_part = "#{timestamp.to_s}    "[0..(timestamp_width - 1)]
       sj_part = truncate_str(subject, subject_width)
 
       ts_part + delimiter + sj_part
@@ -285,8 +286,6 @@ module Rbnotes
       dates
     end
 
-    TIMESTAMP_STR_MAX_WIDTH = "yyyymoddhhmiss_sfx".size
-
     def truncate_str(str, size)
       count = 0
       result = ""

data/lib/rbnotes/version.rb

@@ -1,4 +1,4 @@
 module Rbnotes
-  VERSION = "0.4.6"
-  RELEASE = "2020-11-13"
+  VERSION = "0.4.7"
+  RELEASE = "2020-11-15"
 end

metadata

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