rbnotes 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de852db7e0679690dc371c256eb8f65a5f8022772b04ed6024c4f4b55c5cebae
-  data.tar.gz: 27764e6f940f29be341745d50db658ef419af0e576b674533398910694f294f7
+  metadata.gz: 4e4e20e7274cc9e4f9d013340447f7fb06a7dcf45d8536d71e6c6f456a29d310
+  data.tar.gz: e41d785998768d9b4655575ae5303240de437243b6349ecd4ce147a5a051359b
 SHA512:
-  metadata.gz: de49f9046ad826a346cabd37bab304e1d0ab08dfda4e6f5ca6ce7b216cc717ed39645baf092aa993e8287bd65761a605d1f2d1c158e465bc75efbac68ceeb785
-  data.tar.gz: 9c28c82c7b486695a5e5fe5875fda39e69bc1673e85434368fba4a2a1a71c0cff1918e60c88ecfd43bf22546bbb79d121319044b1fb068da5445dbc78b239639
+  metadata.gz: 5b2f313ceab8c9a18205189235d72f13c48b7724ba8b15e2651bfb79e1af62e55e1fc1d855eaa0b6eadb3b715e3fd85bd70fe692bbf18d706191a81532a27b0d
+  data.tar.gz: 430276b6461f3502e8f74463451c67a4ddfe40fe7abd5a676abbb6f0ac24980890de6f6ac22f5a7dd64827283c7b101323d4c21b6b210e8c99a577823244885f

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ## [Unreleased]
 Nothing to record here.
 
+## [0.4.9] - 2020-11-17
+### Added
+- Add a new option `--week` to the `list` command. (#67)
+
 ## [0.4.8] - 2020-11-16
 ### Fixed
 - Fix issue #65: messy output of the `search` command.

data/Gemfile.lock

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

data/lib/rbnotes/commands/list.rb

@@ -51,7 +51,34 @@ module Rbnotes::Commands
     #     execute(Array, Rbnotes::Conf or Hash) -> nil
 
     def execute(args, conf)
-      patterns = Rbnotes.utils.expand_keyword_in_args(args)
+      @opts = {}
+      while args.size > 0
+        arg = args.shift
+        case arg
+        when "-w", "--week"
+          @opts[:enum_week] = true
+        else
+          args.unshift(arg)
+          break
+        end
+      end
+
+      patterns = nil
+      if @opts[:enum_week]
+        arg = args.shift || Textrepo::Timestamp.now[0, 8]
+        case arg.size
+        when "yyyymodd".size, "yyyymoddhhmiss".size, "yyyymoddhhmiss_sfx".size
+          stamp_str = "#{arg}000000"[0, 14]
+          timestamp = Textrepo::Timestamp.parse_s(stamp_str)
+          patterns = Rbnotes.utils.timestamp_patterns_in_week(timestamp)
+        else
+          raise InvalidTimestampPatternError,
+                "cannot convert to a date [%s]" % args.unshift(arg)
+        end
+      else
+        patterns = Rbnotes.utils.expand_keyword_in_args(args)
+      end
+
       @repo = Textrepo.init(conf)
       # newer stamp shoud be above
       Rbnotes.utils.find_notes(patterns, @repo).each { |timestamp|
@@ -62,7 +89,7 @@ module Rbnotes::Commands
     def help                    # :nodoc:
       puts <<HELP
 usage:
-    #{Rbnotes::NAME} list [STAMP_PATTERN|KEYWORD]
+    #{Rbnotes::NAME} list [-w|--week][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
@@ -84,6 +111,16 @@ KEYWORD:
     - "this_week"  (or "tw")
     - "last_week"  (or "lw")
 
+An option "--week" is also acceptable.  It specifies to enumerate all
+days of a week.  Typically, the option is used with a STAMP_PATTERN
+which specifies a date, such "20201117", then it enumerates all days
+of the week which contains "17th November 2020".
+
+A STAMP_PATTERN other than (a) and (b) causes an error if it was used
+with "--week" option.
+
+When no STAMP_PATTERN was specified with "--week" option, the output
+would be as same as the KEYWORD, "this_week" was specified.
 HELP
     end
 

data/lib/rbnotes/error.rb

@@ -7,11 +7,12 @@ module Rbnotes
   # :stopdoc:
 
   module ErrMsg
-    MISSING_ARGUMENT  = "missing argument: %s"
-    MISSING_TIMESTAMP = "missing timestamp: %s"
+    MISSING_ARGUMENT  = "Missing argument: %s"
+    MISSING_TIMESTAMP = "Missing timestamp: %s"
     NO_EDITOR         = "No editor is available: %s"
     PROGRAM_ABORT     = "External program was aborted: %s"
     UNKNOWN_KEYWORD   = "Unknown keyword: %s"
+    INVALID_TIMESTAMP_PATTERN = "Invalid timestamp pattern: %s"
   end
 
   # :startdoc:
@@ -64,4 +65,14 @@ module Rbnotes
       super(ErrMsg::UNKNOWN_KEYWORD % keyword)
     end
   end
+
+  ##
+  # An error raised when an invalid timestamp pattern was specified.
+
+  class InvalidTimestampPatternError < Error
+    def initialize(pattern)
+      super(ErrMsg::INVALID_TIMESTAMP_PATTERN % pattern)
+    end
+  end
+
 end

data/lib/rbnotes/utils.rb

@@ -227,6 +227,17 @@ module Rbnotes
       }.flatten.sort{ |a, b| b <=> a }.uniq
     end
 
+    ##
+    # Enumerates all timestamp patterns in a week which contains a
+    # given timestamp as a day of the week.
+    #
+    # :call-seq:
+    #     timestamp_patterns_in_week(timestamp) -> [Array of Strings]
+
+    def timestamp_patterns_in_week(timestamp)
+      dates_in_week(start_date_in_the_week(timestamp.time)).map { |date| timestamp_pattern(date) }
+    end
+
     # :stopdoc:
 
     private
@@ -268,14 +279,18 @@ module Rbnotes
     end
 
     def start_date_in_this_week
-      today = Time.now
-      Date.new(today.year, today.mon, today.day).prev_day(wday(today))
+      start_date_in_the_week(Time.now)
     end
 
     def start_date_in_last_week
       start_date_in_this_week.prev_day(7)
     end
 
+    def start_date_in_the_week(time)
+      parts = [:year, :mon, :day].map { |sym| time.send(sym) }
+      Date.new(*parts).prev_day(wday(time))
+    end
+
     def wday(time)
       (time.wday - 1) % 7
     end

data/lib/rbnotes/version.rb

@@ -1,4 +1,4 @@
 module Rbnotes
-  VERSION = "0.4.8"
-  RELEASE = "2020-11-16"
+  VERSION = "0.4.9"
+  RELEASE = "2020-11-17"
 end

metadata

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