friends 0.48 → 0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0447c3979f63bd070ad83451203382518d615a4128f1180aa673cc2d5bdaa6b
-  data.tar.gz: aff492bcb17479c7ec16e5025bf2ad7f0b59355ef54363ff8c6714c84a87a644
+  metadata.gz: 1be607e71eb696b1ebf8c6e46b1b561f153288ecede0c429fc93facd82a4b392
+  data.tar.gz: 2ea6de005359014425d32386306c0654eaa8349be0ebf19c957da3582a8c33f2
 SHA512:
-  metadata.gz: 9121bba689b7b61af0ccc63f93e08e950885ac6d0d47eaf19a28bd826b65a8213e3dad5ee5546416540a03497b1bae0e21dfc8ee1f1243554b8b4700e39ecbba
-  data.tar.gz: ede549f847d3d962b69fd77c15a4c5a1c031cc3d6cc7c92aac29ea7da9fff928573681e3d0f1451611f00dd703ad338be4ee950e197c05ecbf11002a05ef7b34
+  metadata.gz: e946dd33cd26ee1fdbe288cc2a2be9f0eb3eaae6bede1e47096c8b42d2af5da753b7d151b29fd75aa3aac5958d717a7141cac7e108e949961cd000e6af5f3451
+  data.tar.gz: 3c8e1a84fec855f17d0177de3cadd52a31bdfe51255bf77dd70dd9188be59871eec15d734e6f0b269183e330e15734653679f821d322407c6a87ca8d3f1a3b8f

data/.github/CONTRIBUTING.md

@@ -55,7 +55,7 @@ promise I don't bite. 😊
 
 ## Code of Conduct
 
-Note that this project follows a [Code of Conduct](https://github.com/JacobEvelyn/friends/blob/master/CODE_OF_CONDUCT.md).
+Note that this project follows a [Code of Conduct](https://github.com/JacobEvelyn/friends/blob/main/CODE_OF_CONDUCT.md).
 If you're a polite, reasonable person you won't have any issues!
 
 ## Financial contributions

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
@@ -10,9 +10,18 @@ Layout/ClosingHeredocIndentation:
 Layout/DotPosition:
   EnforcedStyle: trailing
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
+Layout/LineLength:
+  Max: 100
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -28,9 +37,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 100
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -46,6 +52,15 @@ Naming/AccessorMethodName:
 Style/Documentation:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/MultilineBlockChain:
   Enabled: false
 

data/.travis.yml

@@ -1,24 +1,24 @@
 language: ruby
+cache: bundler
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
-  - 2.5 # 2.6 is tested below
+  - 2.5
+  - 2.6 # 2.7 is tested below
 gemfile: Gemfile.old # The latest Ruby version uses Gemfile below
 script:
   - bundle exec rake test
 matrix:
   include:
-    - rvm: 2.6
+    - rvm: 2.7
       gemfile: Gemfile
       script:
         - bundle exec rake test
-        - gem install --no-document rubocop -v 0.67 && rubocop
+        - bundle exec rubocop
       env:
         - CODE_COVERAGE=true
 branches:
   only:
-    - master # Always run on the master branch
+    - main # Always run on the main branch
 notifications:
   email: false

data/CHANGELOG.md

@@ -4,6 +4,79 @@
 making a small donation (🙏) with the **Sponsor** button at the top of this page to
 show you appreciate its continued development.
 
+## [v0.53](https://github.com/JacobEvelyn/friends/tree/v0.53) (2020-07-06)
+
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.52...v0.53)
+
+**Fixed bugs:**
+
+- undefined method error occurred when “add tag" or “add nickname” executed with no arguments [\#265](https://github.com/JacobEvelyn/friends/issues/265)
+
+**Merged pull requests:**
+
+- Fix for the case of add tag or add nickname args are nill [\#266](https://github.com/JacobEvelyn/friends/pull/266) ([m-t-a-n-a-k-a](https://github.com/m-t-a-n-a-k-a))
+
+## [v0.52](https://github.com/JacobEvelyn/friends/tree/v0.52) (2020-06-03)
+
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.51...v0.52)
+
+**Fixed bugs:**
+
+- undefined method error occurred when "remove tag" is executed with no arguments [\#262](https://github.com/JacobEvelyn/friends/issues/262)
+
+**Closed issues:**
+
+- Try using bundler caching in Travis [\#260](https://github.com/JacobEvelyn/friends/issues/260)
+
+**Merged pull requests:**
+
+- Use correct RuboCop version in Travis [\#264](https://github.com/JacobEvelyn/friends/pull/264) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Fix convert\_to\_tag for the case of str is nil [\#263](https://github.com/JacobEvelyn/friends/pull/263) ([m-t-a-n-a-k-a](https://github.com/m-t-a-n-a-k-a))
+- Cache bundler directory in Travis [\#261](https://github.com/JacobEvelyn/friends/pull/261) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Update rubocop requirement from 0.67 to 0.81.0 [\#259](https://github.com/JacobEvelyn/friends/pull/259) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+
+## [v0.51](https://github.com/JacobEvelyn/friends/tree/v0.51) (2020-04-05)
+
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.50...v0.51)
+
+**Implemented enhancements:**
+
+- Drop Semverse dependency [\#256](https://github.com/JacobEvelyn/friends/issues/256)
+
+**Closed issues:**
+
+- Drop support for Ruby \<2.3 [\#257](https://github.com/JacobEvelyn/friends/issues/257)
+
+**Merged pull requests:**
+
+- Remove Semverse dependency, and require Ruby 2.3+ [\#258](https://github.com/JacobEvelyn/friends/pull/258) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
+## [v0.50](https://github.com/JacobEvelyn/friends/tree/v0.50) (2020-04-03)
+
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.49...v0.50)
+
+**Implemented enhancements:**
+
+- Add support for Ruby 2.7 [\#254](https://github.com/JacobEvelyn/friends/issues/254)
+
+**Merged pull requests:**
+
+- Add Travis tests for Ruby 2.7 [\#255](https://github.com/JacobEvelyn/friends/pull/255) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
+## [v0.49](https://github.com/JacobEvelyn/friends/tree/v0.49) (2020-04-02)
+
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.48...v0.49)
+
+**Fixed bugs:**
+
+- Multi-word editors no longer work with `friends edit` [\#251](https://github.com/JacobEvelyn/friends/issues/251)
+- Punctuation swallowed after friend name with last initial [\#235](https://github.com/JacobEvelyn/friends/issues/235)
+
+**Merged pull requests:**
+
+- Improve name matching to not swallow punctuation [\#253](https://github.com/JacobEvelyn/friends/pull/253) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Fix `friends edit` for multi-word EDITORs [\#252](https://github.com/JacobEvelyn/friends/pull/252) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [v0.48](https://github.com/JacobEvelyn/friends/tree/v0.48) (2020-03-27)
 
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.47...v0.48)
@@ -31,7 +104,7 @@ show you appreciate its continued development.
 
 **Fixed bugs:**
 
-- Tests are failing in `master` [\#238](https://github.com/JacobEvelyn/friends/issues/238)
+- Tests are failing in `main` [\#238](https://github.com/JacobEvelyn/friends/issues/238)
 
 **Merged pull requests:**
 
@@ -584,7 +657,7 @@ show you appreciate its continued development.
 **Merged pull requests:**
 
 - Highlight multiple occurrences [\#70](https://github.com/JacobEvelyn/friends/pull/70) ([GuruKhalsa](https://github.com/GuruKhalsa))
-- Fix Travis badge \(master only\) [\#67](https://github.com/JacobEvelyn/friends/pull/67) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Fix Travis badge \(main only\) [\#67](https://github.com/JacobEvelyn/friends/pull/67) ([JacobEvelyn](https://github.com/JacobEvelyn))
 - Move activity prompt to bin/friends [\#64](https://github.com/JacobEvelyn/friends/pull/64) ([JacobEvelyn](https://github.com/JacobEvelyn))
 - Adds the --debug flag for printing backtraces on error [\#63](https://github.com/JacobEvelyn/friends/pull/63) ([JacobEvelyn](https://github.com/JacobEvelyn))
 - Move file writes to end of command actions [\#61](https://github.com/JacobEvelyn/friends/pull/61) ([JacobEvelyn](https://github.com/JacobEvelyn))

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem "rubocop", "0.67"
+  gem "rubocop", "0.81.0"
 end
 
 group :test do

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/friends.svg)](https://badge.fury.io/rb/friends)
-[![Code Coverage](https://codecov.io/gh/JacobEvelyn/friends/branch/master/graph/badge.svg)](https://codecov.io/gh/JacobEvelyn/friends)
-[![Build Status](https://travis-ci.com/JacobEvelyn/friends.svg?branch=master)](https://travis-ci.com/JacobEvelyn/friends)
+[![Code Coverage](https://codecov.io/gh/JacobEvelyn/friends/branch/main/graph/badge.svg)](https://codecov.io/gh/JacobEvelyn/friends)
+[![Build Status](https://travis-ci.com/JacobEvelyn/friends.svg?branch=main)](https://travis-ci.com/JacobEvelyn/friends)
 [![Readme Score](http://readme-score-api.herokuapp.com/score.svg?url=JacobEvelyn/friends&bust=1)](http://clayallsopp.github.io/readme-score?url=JacobEvelyn/friends)
 [![Inline docs](http://inch-ci.org/github/JacobEvelyn/friends.png)](http://inch-ci.org/github/JacobEvelyn/friends)
 [![Gem](https://img.shields.io/gem/dt/friends.svg)](https://rubygems.org/gems/friends)
@@ -181,7 +181,7 @@ The `friends.md` Markdown file that stores all of your data contains:
 ```
 
 See the example
-[`friends.md`](https://github.com/JacobEvelyn/friends/blob/master/friends.md)
+[`friends.md`](https://github.com/JacobEvelyn/friends/blob/main/friends.md)
 file for more information.
 
 ### Global flags
@@ -956,7 +956,7 @@ If you have an idea,
 [make a GitHub issue](https://github.com/JacobEvelyn/friends/issues/new)!
 Suggestions are very very welcome, and usually are implemented very
 quickly. And if you'd like to do the implementing yourself, see the
-[contributing guide](https://github.com/JacobEvelyn/friends/blob/master/.github/CONTRIBUTING.md).
+[contributing guide](https://github.com/JacobEvelyn/friends/blob/main/.github/CONTRIBUTING.md).
 
 A big big thanks to all of this project's lovely
 [contributors](https://github.com/JacobEvelyn/friends/graphs/contributors):
@@ -988,10 +988,10 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 ## Code of Conduct
 
-Note that this project follows a [Code of Conduct](https://github.com/JacobEvelyn/friends/blob/master/CODE_OF_CONDUCT.md).
+Note that this project follows a [Code of Conduct](https://github.com/JacobEvelyn/friends/blob/main/CODE_OF_CONDUCT.md).
 If you're a polite, reasonable person you won't have any issues!
 
 ## License
 
 Friends is released under the
-[MIT License](https://github.com/JacobEvelyn/friends/blob/master/LICENSE.txt).
+[MIT License](https://github.com/JacobEvelyn/friends/blob/main/LICENSE.txt).

data/RELEASING.md

@@ -2,7 +2,7 @@
 
 These are steps for the maintainer to take to release a new version of this gem.
 
-1.  On the `master` branch, update the `VERSION` constant in
+1.  On the `main` branch, update the `VERSION` constant in
     `lib/friends/version.rb`.
 2.  Commit the change (`git add -A && git commit -m 'Bump to vX.X'`).
 3.  Add a tag (`git tag -am "vX.X" vX.X`).

data/bin/friends

@@ -12,7 +12,6 @@ end
 require "gli"
 require "paint"
 require "readline"
-require "semverse"
 
 require "friends/introvert"
 require "friends/version"
@@ -35,7 +34,7 @@ class Tag
   # conversions for arguments.
   # See: https://github.com/davetron5000/gli/issues/241
   def self.convert_to_tag(str)
-    str = str.strip
+    str = str.to_s.strip
     !str.empty? && str[0] == "@" ? str : "@#{str}"
   end
 end
@@ -48,10 +47,7 @@ class Stripped; end
 accept(Stripped, &:strip)
 
 class InputDate; end
-accept(InputDate) do |value|
-  time = Chronic.parse(value)
-  time && time.to_date
-end
+accept(InputDate) { |value| Chronic.parse(value)&.to_date }
 
 switch [:quiet],
        negatable: false,
@@ -102,7 +98,7 @@ post do
     rescue Errno::ENOENT
       # If the pager is not installed, just print the output.
       puts @introvert.output
-    rescue Errno::EPIPE # rubocop:disable Lint/HandleExceptions
+    rescue Errno::EPIPE
       # Occurs when quitting the pager.
     end
   end

data/friends.gemspec

@@ -23,17 +23,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  # We need Ruby 2.1's default-less keyword arguments and default UTF-8
-  # encoding.
-  spec.required_ruby_version = ">= 2.1"
+  # We need Ruby 2.3's safe navigation operator.
+  spec.required_ruby_version = ">= 2.3"
 
   spec.add_dependency "chronic", "~> 0.10"
   spec.add_dependency "gli", "~> 2.14"
   spec.add_dependency "paint", "~> 2.0"
-  spec.add_dependency "semverse", ">= 2", "< 4"
   spec.add_dependency "tty-pager", "~> 0.11"
 
   spec.add_development_dependency "minitest", "~> 5.5"
   spec.add_development_dependency "minitest-proveit", "~> 1.0"
-  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rake", "~> 13.0"
 end

data/lib/friends/commands/add.rb

@@ -35,7 +35,7 @@ command :add do |add|
   add.arg_name "NAME NICKNAME"
   add.command :nickname do |add_nickname|
     add_nickname.action do |_, _, args|
-      @introvert.add_nickname(name: args.first.strip, nickname: args[1].strip)
+      @introvert.add_nickname(name: args.first.to_s.strip, nickname: args[1].to_s.strip)
       @dirty = true # Mark the file for cleaning.
     end
   end
@@ -46,7 +46,7 @@ command :add do |add|
     add_tag.action do |_, _, args|
       @introvert.add_tag(
         name: args[0..-2].join(" "),
-        tag: Tag.convert_to_tag(args.last.strip)
+        tag: Tag.convert_to_tag(args.last.to_s.strip)
       )
       @dirty = true # Mark the file for cleaning.
     end

data/lib/friends/commands/edit.rb

@@ -9,7 +9,7 @@ command :edit do |edit|
     puts "Opening \"#{filename}\" with \"#{editor}\"" unless global_options[:quiet]
 
     # Mark the file for cleaning once the editor was closed correctly.
-    if Kernel.system(editor, filename)
+    if Kernel.system("#{editor} #{filename}")
       @introvert = Friends::Introvert.new(filename: filename)
       @clean_command = true
       @dirty = true

data/lib/friends/commands/update.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "friends/post_install_message"
+require "friends/sem_ver_comparator"
 
 desc "Updates the `friends` program"
 command :update do |update|
@@ -9,8 +10,7 @@ command :update do |update|
     if match = `gem search friends`.match(/^friends\s\(([^\)]+)\)$/)
       # rubocop:enable Lint/AssignmentInCondition
       remote_version = match[1]
-      if Semverse::Version.coerce(remote_version) >
-         Semverse::Version.coerce(Friends::VERSION)
+      if Friends::SemVerComparator.greater?(remote_version, Friends::VERSION)
         `gem update friends && gem cleanup friends`
 
         unless global_options[:quiet]

data/lib/friends/event.rb

@@ -14,8 +14,8 @@ module Friends
   class Event
     extend Serializable
 
-    SERIALIZATION_PREFIX = "- ".freeze
-    DATE_PARTITION = ": ".freeze
+    SERIALIZATION_PREFIX = "- "
+    DATE_PARTITION = ": "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex

data/lib/friends/friend.rb

@@ -10,15 +10,13 @@ module Friends
   class Friend
     extend Serializable
 
-    SERIALIZATION_PREFIX = "- ".freeze
-    NICKNAME_PREFIX = "a.k.a. ".freeze
+    SERIALIZATION_PREFIX = "- "
+    NICKNAME_PREFIX = "a.k.a. "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex
       # Note: this regex must be on one line because whitespace is important
-      # rubocop:disable Metrics/LineLength
-      /(#{SERIALIZATION_PREFIX})?(?<name>[^\(\[@]*[^\(\[@\s])(\s+\(#{NICKNAME_PREFIX}(?<nickname_str>.+)\))?(\s+\[(?<location_name>[^\]]+)\])?(\s+(?<tags_str>(#{TAG_REGEX}\s*)+))?/
-      # rubocop:enable Metrics/LineLength
+      /(#{SERIALIZATION_PREFIX})?(?<name>[^\(\[@]*[^\(\[@\s])(\s+\(#{NICKNAME_PREFIX}(?<nickname_str>.+)\))?(\s+\[(?<location_name>[^\]]+)\])?(\s+(?<tags_str>(#{TAG_REGEX}\s*)+))?/ # rubocop:disable Layout/LineLength
     end
 
     # @return [Regexp] the string of what we expected during deserialization
@@ -34,11 +32,9 @@ module Friends
       tags_str: nil
     )
       @name = name
-      @nicknames = nickname_str &&
-                   nickname_str.split(" #{NICKNAME_PREFIX}") ||
-                   []
+      @nicknames = nickname_str&.split(" #{NICKNAME_PREFIX}") || []
       @location_name = location_name
-      @tags = tags_str && tags_str.split(/\s+/) || []
+      @tags = tags_str&.split(/\s+/) || []
     end
 
     attr_accessor :name
@@ -134,12 +130,23 @@ module Friends
         chunks, # Match a full name with the highest priority.
         *@nicknames.map { |n| [n] },
 
-        # Match a first name followed by a last name initial, period, and then
-        # (via lookahead) spacing followed by a lowercase letter. This matches
-        # the "Jake E." part of something like "Jake E. and I went skiing." This
+        # Match a first name followed by a last name initial, period (that via
+        # lookahead is *NOT* a part of an ellipsis), and then (via lookahead)
+        # either:
+        # - other punctuation that would indicate we want to swallow the period
+        #   (note that we do not include closing parentheses in this list because
+        #   they could be part of an offset sentence), OR
+        # - anything, so long as the first alphabetical character afterwards is
+        #   lowercase.
+        # This matches the "Jake E." part of something like "Jake E. and I went
+        # skiing." or "Jake E., Marie Curie, and I studied science." This
         # allows us to correctly count the period as part of the name when it's
         # in the middle of a sentence.
-        ([chunks.first, "#{chunks.last[0]}\.(?=#{splitter}(?-i)[a-z])"] if chunks.size > 1),
+        (
+          if chunks.size > 1
+            [chunks.first, "#{chunks.last[0]}\\.(?!\\.\\.)(?=([,!?;:—]+|(?-i)[^A-Z]+[a-z]))"]
+          end
+        ),
 
         # If the above doesn't match, we check for just the first name and then
         # a last name initial. This matches the "Jake E" part of something like

data/lib/friends/graph.rb

@@ -4,7 +4,7 @@
 
 module Friends
   class Graph
-    DATE_FORMAT = "%b %Y".freeze
+    DATE_FORMAT = "%b %Y"
     SCALED_SIZE = 20
 
     # @param filtered_activities [Array<Friends::Activity>] a list of activities to highlight in

data/lib/friends/introvert.rb

@@ -16,10 +16,10 @@ require "friends/friends_error"
 
 module Friends
   class Introvert
-    ACTIVITIES_HEADER = "### Activities:".freeze
-    NOTES_HEADER = "### Notes:".freeze
-    FRIENDS_HEADER = "### Friends:".freeze
-    LOCATIONS_HEADER = "### Locations:".freeze
+    ACTIVITIES_HEADER = "### Activities:"
+    NOTES_HEADER = "### Notes:"
+    FRIENDS_HEADER = "### Friends:"
+    LOCATIONS_HEADER = "### Locations:"
 
     # @param filename [String] the name of the friends Markdown file
     def initialize(filename:)
@@ -203,6 +203,7 @@ module Friends
     # @param nickname [String] the nickname to add to the friend
     # @raise [FriendsError] if 0 or 2+ friends match the given name
     def add_nickname(name:, nickname:)
+      raise FriendsError, "Expected \"[Friend Name]\" \"[Nickname]\"" if name.empty?
       raise FriendsError, "Nickname cannot be blank" if nickname.empty?
 
       friend = thing_with_name_in(:friend, name)
@@ -216,6 +217,7 @@ module Friends
     # @param tag [String] the tag to add to the friend, of the form: "@tag"
     # @raise [FriendsError] if 0 or 2+ friends match the given name
     def add_tag(name:, tag:)
+      raise FriendsError, "Expected \"[Friend Name]\" \"[Tag]\"" if name.empty?
       raise FriendsError, "Tag cannot be blank" if tag == "@"
 
       friend = thing_with_name_in(:friend, name)
@@ -725,8 +727,8 @@ module Friends
 
       begin
         instance_variable_get("@#{stage.id}") << stage.klass.deserialize(line)
-      rescue StandardError => ex
-        bad_line(ex, line_num)
+      rescue StandardError => e
+        bad_line(e, line_num)
       end
 
       state
@@ -808,7 +810,7 @@ module Friends
           a.default_location && a.default_location != activity.default_location
         end
 
-        str += " to #{Paint[(later_activity.date if later_activity) || 'present', :bold]}"
+        str += " to #{Paint[later_activity&.date || 'present', :bold]}"
       end
 
       str += " already" if earlier_activity_with_default_location != activity

data/lib/friends/location.rb

@@ -9,7 +9,7 @@ module Friends
   class Location
     extend Serializable
 
-    SERIALIZATION_PREFIX = "- ".freeze
+    SERIALIZATION_PREFIX = "- "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex

data/lib/friends/post_install_message.rb

@@ -3,6 +3,5 @@
 module Friends
   POST_INSTALL_MESSAGE = "\nfriends is a volunteer project. If you find it useful, please "\
                          "consider making a small donation:\n\n\t"\
-                         "https://github.com/JacobEvelyn/friends#contributing-its-encouraged\n\n".
-                         freeze
+                         "https://github.com/JacobEvelyn/friends#contributing-its-encouraged\n\n"
 end

data/lib/friends/regex_builder.rb

@@ -6,26 +6,26 @@ module Friends
   class RegexBuilder
     # We don't want to match strings that are "escaped" with a leading
     # backslash.
-    NO_LEADING_BACKSLASH = "(?<!\\\\)".freeze
+    NO_LEADING_BACKSLASH = "(?<!\\\\)"
 
     # We don't want to match strings that are directly touching double asterisks
     # as these are treated as sacred by our program.
-    NO_LEADING_ASTERISKS = "(?<!\\*\\*)".freeze
-    NO_TRAILING_ASTERISKS = "(?!\\*\\*)".freeze
+    NO_LEADING_ASTERISKS = "(?<!\\*\\*)"
+    NO_TRAILING_ASTERISKS = "(?!\\*\\*)"
 
     # We don't want to match strings that are directly touching underscores
     # as these are treated as sacred by our program.
-    NO_LEADING_UNDERSCORES = "(?<!_)".freeze
-    NO_TRAILING_UNDERSCORES = "(?!_)".freeze
+    NO_LEADING_UNDERSCORES = "(?<!_)"
+    NO_TRAILING_UNDERSCORES = "(?!_)"
 
     # We don't want to match strings that are part of other words.
-    NO_LEADING_ALPHABETICALS = "(?<![A-z])".freeze
-    NO_TRAILING_ALPHABETICALS = "(?![A-z])".freeze
+    NO_LEADING_ALPHABETICALS = "(?<![A-z])"
+    NO_TRAILING_ALPHABETICALS = "(?![A-z])"
 
     # We ignore case within the regex as opposed to globally to allow consumers
     # of this API the ability to pass in strings that turn off this modifier
     # with the "(?-i)" string.
-    IGNORE_CASE = "(?i)".freeze
+    IGNORE_CASE = "(?i)"
 
     def self.regex(str)
       Regexp.new(

data/lib/friends/sem_ver_comparator.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Friends
+  module SemVerComparator
+    SEPARATOR = "."
+    NUMBER_REGEX = /\d+/.freeze
+
+    def self.greater?(version_a, version_b)
+      version_a.split(SEPARATOR).zip(version_b.split(SEPARATOR)) do |a, b|
+        a_num = a&.[](NUMBER_REGEX)&.to_i
+        b_num = b&.[](NUMBER_REGEX)&.to_i
+        return false if a_num.nil?
+        return true if b_num.nil? || a_num > b_num
+        return false if a_num < b_num
+      end
+
+      false
+    end
+  end
+end

data/lib/friends/serializable.rb

@@ -26,7 +26,7 @@ module Serializable
            reduce(:merge).
            reject { |_, v| v.nil? }
 
-    new(args)
+    new(**args)
   end
 
   class SerializationError < StandardError

data/lib/friends/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Friends
-  VERSION = "0.48".freeze
+  VERSION = "0.53"
 end

data/test/add_event_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def date_parsing_specs(test_stdout: true)
   describe "date parsing" do
     let(:description) { "Test." }
@@ -117,6 +119,60 @@ def description_parsing_specs(test_stdout: true)
           it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper at 12.\"" }
         end
       end
+
+      describe "when followed by a period and a comma" do
+        let(:description) { "Met grace h., and others, at 12." }
+
+        it { line_added "- #{date}: Met **Grace Hopper**, and others, at 12." }
+        if test_stdout
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper, and others, at 12.\"" } # rubocop:disable Layout/LineLength
+        end
+      end
+
+      describe "when followed by a period, a comma, and a proper noun" do
+        let(:description) { "Met grace h., King James, and others at 12." }
+
+        it { line_added "- #{date}: Met **Grace Hopper**, King James, and others at 12." }
+        if test_stdout
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper, King James, and others at 12.\"" } # rubocop:disable Layout/LineLength
+        end
+      end
+
+      describe "when followed by a period and a complex series of sentence-ending punctuation" do
+        let(:description) { "Met someone—grace h.?! At 12." }
+
+        it { line_added "- #{date}: Met someone—**Grace Hopper**?! At 12." }
+        if test_stdout
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met someone—Grace Hopper?! At 12.\"" } # rubocop:disable Layout/LineLength
+        end
+      end
+
+      describe "when followed by a period and a complex series of mid-sentence punctuation" do
+        let(:description) { "Met someone {grace h.}—at 12." }
+
+        it { line_added "- #{date}: Met someone {**Grace Hopper**}—at 12." }
+        if test_stdout
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met someone {Grace Hopper}—at 12.\"" } # rubocop:disable Layout/LineLength
+        end
+      end
+
+      describe "when followed by a period as part of a sentence-ending ellipsis" do
+        let(:description) { "Met grace h... Great!" }
+
+        it { line_added "- #{date}: Met **Grace Hopper**... Great!" }
+        if test_stdout
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper... Great!\"" }
+        end
+      end
+
+      describe "when followed by a period as part of a mid-sentence ellipsis" do
+        let(:description) { "Met grace h... at 12." }
+
+        it { line_added "- #{date}: Met **Grace Hopper**... at 12." }
+        if test_stdout
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper... at 12.\"" }
+        end
+      end
     end
 
     describe "when description includes a friend's nickname (case insensitive)" do

data/test/commands/add/nickname_spec.rb

@@ -7,6 +7,15 @@ clean_describe "add nickname" do
 
   let(:content) { CONTENT }
 
+  describe "when friend name and nickname are blank" do
+    let(:friend_name) { nil }
+    let(:nickname) { nil }
+
+    it "prints an error message" do
+      stderr_only 'Error: Expected "[Friend Name]" "[Nickname]"'
+    end
+  end
+
   describe "when friend name has no matches" do
     let(:friend_name) { "Garbage" }
     let(:nickname) { "Georgie" }

data/test/commands/add/tag_spec.rb

@@ -7,6 +7,15 @@ clean_describe "add tag" do
 
   let(:content) { CONTENT }
 
+  describe "when friend name and tag are blank" do
+    let(:friend_name) { nil }
+    let(:tag) { nil }
+
+    it "prints an error message" do
+      stderr_only 'Error: Expected "[Friend Name]" "[Tag]"'
+    end
+  end
+
   describe "when friend name has no matches" do
     let(:friend_name) { "Garbage" }
     let(:tag) { "school" }

data/test/commands/edit_spec.rb

@@ -36,6 +36,37 @@ clean_describe "edit" do
     end
   end
 
+  describe "when editor is multiple words" do
+    let(:editor) { "'cat -u'" }
+
+    describe "when output is quieted" do
+      let(:quiet) { "--quiet" }
+
+      it 'opens the file in the "editor"' do
+        stdout_only content
+      end
+
+      it "cleans the file" do
+        file_equals CONTENT # File is cleaned (no longer scrambled).
+      end
+    end
+
+    describe "when output is not quieted" do
+      let(:quiet) { nil }
+
+      # Since our "editor" is just `cat -u`, our STDOUT output will include both the opening
+      # message and the contents of the file.
+      it 'prints a message and opens the file in the "editor"' do
+        stdout_only "Opening \"#{filename}\" with \"#{editor.tr("'", '')}\""\
+                    "\n#{content}File cleaned: \"#{filename}\""
+      end
+
+      it "cleans the file" do
+        file_equals CONTENT # File is cleaned (no longer scrambled).
+      end
+    end
+  end
+
   describe "when editor does not exit successfully" do
     let(:editor) { "'exit 1 #'" }
 

data/test/commands/remove/tag_spec.rb

@@ -7,6 +7,15 @@ clean_describe "remove tag" do
 
   let(:content) { CONTENT }
 
+  describe "when friend name and tag are blank" do
+    let(:friend_name) { nil }
+    let(:tag) { nil }
+
+    it "prints an error message" do
+      stderr_only 'Error: No friend found for ""'
+    end
+  end
+
   describe "when friend name has no matches" do
     let(:friend_name) { "Garbage" }
     let(:tag) { "science" }

data/test/editor

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 # This is an example "editor" used to test the `friends edit` command.
 # It inserts a new activity into the second line of the file, allowing
 # us to test that friends and locations added in an `edit` command are

data/test/helper.rb

@@ -24,7 +24,7 @@ require "securerandom"
 
 require "friends"
 
-CONTENT = <<-FILE.freeze
+CONTENT = <<-FILE
 ### Activities:
 - 2018-02-06: @science:indoors:agronomy-with-hydroponics: **Norman Borlaug** and **George Washington Carver** scored a tour of _Atlantis_' hydroponics gardens through wetplants@example.org and they took me along.
 - 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
@@ -52,7 +52,7 @@ CONTENT = <<-FILE.freeze
 FILE
 
 # This is CONTENT but with activities, friends, and locations unsorted.
-SCRAMBLED_CONTENT = <<-FILE.freeze
+SCRAMBLED_CONTENT = <<-FILE
 ### Activities:
 - 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
@@ -135,7 +135,7 @@ def line_added(expected)
   n_initial_lines = File.read(filename).split("\n").size
   subject
   lines = File.read(filename).split("\n")
-  value(lines.index(expected)).must_be_kind_of Numeric # Not nil, so we know `expected` was found.
+  value(lines).must_include expected # Output includes our line
   value(lines.size).must_equal(n_initial_lines + 1) # Line was added, not changed.
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.48'
+  version: '0.53'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -52,26 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: semverse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: tty-pager
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 description: Spend time with the people you care about. Introvert-tested. Extrovert-approved.
 email:
 - jacobevelyn@gmail.com
@@ -177,6 +157,7 @@ files:
 - lib/friends/note.rb
 - lib/friends/post_install_message.rb
 - lib/friends/regex_builder.rb
+- lib/friends/sem_ver_comparator.rb
 - lib/friends/serializable.rb
 - lib/friends/tag_regex.rb
 - lib/friends/version.rb
@@ -224,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="