friends 0.48 → 0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0447c3979f63bd070ad83451203382518d615a4128f1180aa673cc2d5bdaa6b
-  data.tar.gz: aff492bcb17479c7ec16e5025bf2ad7f0b59355ef54363ff8c6714c84a87a644
+  metadata.gz: 723092682f9f7d7c5cbd9079a5aaa4e2e413a4ea9ea4a60ef871abf9d8a8b391
+  data.tar.gz: e7f570b41f8c3e74dd19b4e540a804f4a585541a59efa29125e1f3c3000de213
 SHA512:
-  metadata.gz: 9121bba689b7b61af0ccc63f93e08e950885ac6d0d47eaf19a28bd826b65a8213e3dad5ee5546416540a03497b1bae0e21dfc8ee1f1243554b8b4700e39ecbba
-  data.tar.gz: ede549f847d3d962b69fd77c15a4c5a1c031cc3d6cc7c92aac29ea7da9fff928573681e3d0f1451611f00dd703ad338be4ee950e197c05ecbf11002a05ef7b34
+  metadata.gz: 60573538a3ac488669c1f2eddff260823aafdd488f2972cd29f9081c06e37aa98d3afbbdb45c650fdb369e392e9cfb98e7a3b29a4ed5dbc09eb2cfeed7aa37d4
+  data.tar.gz: 4f8e7159b3c99406d74c8cc4ba48cbfc9fd82114db29ab93c9bc855d9016bdd6c9bb570cf776083660b573660f110e6991600a17225f9c5f0fcd3af118f48d0a

data/CHANGELOG.md

@@ -4,6 +4,20 @@
 making a small donation (🙏) with the **Sponsor** button at the top of this page to
 show you appreciate its continued development.
 
+## [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)

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/friend.rb

@@ -16,9 +16,7 @@ module Friends
     # @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 Metrics/LineLength
     end
 
     # @return [Regexp] the string of what we expected during deserialization
@@ -134,12 +132,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/version.rb

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

data/test/add_event_helper.rb

@@ -117,6 +117,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 Metrics/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 Metrics/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 Metrics/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 Metrics/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/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/helper.rb

@@ -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.49'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic