friends 0.47 → 0.52

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 #'" }
 
@@ -78,7 +109,7 @@ Not cleaning file: "#{filename}" ("exit 1 #" did not exit successfully)
       <<-EXPECTED_CONTENT
 ### 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 _Marie's Diner_. George had to cancel at the last minute. @food
+- 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
 - 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying
 - 2014-12-16: Okay, yep, I definitely just saw **Bigfoot** in the _Mysterious Mountains_!
@@ -101,7 +132,7 @@ Not cleaning file: "#{filename}" ("exit 1 #" did not exit successfully)
 
 ### Locations:
 - Atlantis
-- Marie's Diner
+- Martha's Vineyard
 - Mysterious Mountains
 - Paris
       EXPECTED_CONTENT

data/test/commands/graph_spec.rb

@@ -27,7 +27,7 @@ clean_describe "graph" do
     let(:content) do
       <<-FILE
 ### Activities:
-- 2015-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute. @food
+- 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
 - 2015-01-14: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2015-01-06: Did some other things in _Paris_.
 - 2015-01-06: Did even more things in _Paris_.
@@ -42,7 +42,7 @@ clean_describe "graph" do
 
 ### Locations:
 - Atlantis
-- Marie's Diner
+- Martha's Vineyard
 - Paris
       FILE
     end
@@ -273,7 +273,7 @@ Nov 2014 |∙|
 
       it "matches tag case-insensitively and scales the graph" do
         stdout_only <<-OUTPUT
-Nov 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
@@ -294,7 +294,7 @@ Nov 2014 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 
         it "matches tag case-insensitively and does not scale graph" do
           stdout_only <<-OUTPUT
-Nov 2015 |█
+Nov 2015 |∙|
 Oct 2015 |
 Sep 2015 |
 Aug 2015 |

data/test/commands/list/activities_spec.rb

@@ -26,13 +26,13 @@ clean_describe "list activities" do
     # only reads from the (usually-sorted) file.
     let(:content) { SCRAMBLED_CONTENT }
 
-    it "lists activities in file order" do
+    it "lists activities in sorted order" do
       stdout_only <<-OUTPUT
-2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
-2015-11-01: Grace Hopper and I went to Marie's Diner. George had to cancel at the last minute. @food
 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.
-2014-11-15: Talked to George Washington Carver on the phone for an hour.
+2015-11-01: Grace Hopper and I went to Martha's Vineyard. George had to cancel at the last minute.
+2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
 2014-12-31: Celebrated the new year in Paris with Marie Curie. @partying
+2014-11-15: Talked to George Washington Carver on the phone for an hour.
       OUTPUT
     end
 
@@ -55,15 +55,16 @@ clean_describe "list activities" do
 
       describe "when implicit location is set" do
         let(:location_name) { "atlantis" }
-        let(:content) do
-          <<-FILE
+        describe "when activities are in order" do
+          let(:content) do
+            <<-FILE
 ### Activities:
-- 2015-01-30: Went to a museum with **George Washington Carver**.
-- 2015-01-29: moved to _Paris_.
-- 2015-01-01: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
-- 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying @food
-- 2014-12-30: Moved to _Atlantis_.
-- 2014-12-29: Talked to **George Washington Carver** on the phone for an hour.
+- 2000-01-06: Went to a museum with **George Washington Carver**.
+- 2000-01-05: Moved to _Paris_.
+- 2000-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
+- 2000-01-03: Celebrated my birthday in _Paris_ with **Marie Curie**. @partying @food
+- 2000-01-02: Went to _Atlantis_.
+- 2000-01-01: Talked to **George Washington Carver** on the phone for an hour.
 
 ### Friends:
 - George Washington Carver
@@ -73,14 +74,44 @@ clean_describe "list activities" do
 ### Locations:
 - Atlantis
 - Paris
-          FILE
+            FILE
+          end
+
+          it "matches location case-insensitively" do
+            stdout_only <<-OUTPUT
+2000-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+2000-01-02: Went to Atlantis.
+          OUTPUT
+          end
         end
+        describe "when activities are not in order" do
+          let(:content) do
+            <<-FILE
+### Activities:
+- 2000-01-06: Went to a museum with **George Washington Carver**.
+- 2000-01-02: Went to _Atlantis_.
+- 2000-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
+- 2000-01-03: Celebrated my birthday in _Paris_ with **Marie Curie**. @partying @food
+- 2000-01-05: Moved to _Paris_.
+- 2000-01-01: Talked to **George Washington Carver** on the phone for an hour.
 
-        it "matches location case-insensitively" do
-          stdout_only <<-OUTPUT
-2015-01-01: Got lunch with Grace Hopper and George Washington Carver. @food
-2014-12-30: Moved to Atlantis.
-        OUTPUT
+### Friends:
+- George Washington Carver
+- Marie Curie [Atlantis] @science
+- Grace Hopper (a.k.a. The Admiral a.k.a. Amazing Grace) [Paris] @navy @science
+
+### Locations:
+- Atlantis
+- Paris
+            FILE
+          end
+
+          it "matches location case-insensitively" do
+            stdout_only <<-OUTPUT
+2000-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+2000-01-02: Went to Atlantis.
+          OUTPUT
+          end
         end
       end
     end
@@ -127,7 +158,6 @@ clean_describe "list activities" do
       it "matches tag case-insensitively" do
         stdout_only <<-OUTPUT
 2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
-2015-11-01: Grace Hopper and I went to Marie's Diner. George had to cancel at the last minute. @food
         OUTPUT
       end
 
@@ -139,7 +169,7 @@ clean_describe "list activities" do
           <<-FILE
 ### Activities:
 - 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
-- 2015-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute. @food
+- 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
 - 2014-11-15: Talked to **George Washington Carver** on the phone for an hour.
 - 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying @food
 
@@ -161,11 +191,11 @@ FILE
     describe "--since" do
       subject { run_cmd("list activities --since 'January 4th 2015'") }
 
-      it "lists activities on and after the specified date" do
+      it "lists activities on and after the specified date in order" do
         stdout_only <<-OUTPUT
-2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
-2015-11-01: Grace Hopper and I went to Marie's Diner. George had to cancel at the last minute. @food
 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.
+2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
         OUTPUT
       end
     end
@@ -173,11 +203,11 @@ FILE
     describe "--until" do
       subject { run_cmd("list activities --until 'January 4th 2015'") }
 
-      it "lists activities before and on the specified date" do
+      it "lists activities before and on the specified date in order" do
         stdout_only <<-OUTPUT
 2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
-2014-11-15: Talked to George Washington Carver on the phone for an hour.
 2014-12-31: Celebrated the new year in Paris with Marie Curie. @partying
+2014-11-15: Talked to George Washington Carver on the phone for an hour.
         OUTPUT
       end
     end

data/test/commands/list/favorite/friends_spec.rb

@@ -26,7 +26,7 @@ clean_describe "list favorite friends" do
       <<-FILE
 ### Activities:
 - 2017-01-01: Did some math with **Grace Hopper**.
-- 2015-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute. @food
+- 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
 - 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying
 - 2014-11-15: Talked to **George Washington Carver** on the phone for an hour.

data/test/commands/list/favorite/locations_spec.rb

@@ -25,8 +25,8 @@ clean_describe "list favorite locations" do
     let(:content) do
       <<-FILE
 ### Activities:
-- 2017-01-01: **Grace Hopper** and I went to _Marie's Diner_ for breakfast.
-- 2015-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute. @food
+- 2017-01-01: **Grace Hopper** and I went to _Martha's Vineyard_ for breakfast.
+- 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
 - 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying
 - 2014-11-15: Talked to **George Washington Carver** on the phone for an hour.
@@ -38,7 +38,7 @@ clean_describe "list favorite locations" do
 
 ### Locations:
 - Atlantis
-- Marie's Diner
+- Martha's Vineyard
 - Paris
 FILE
     end
@@ -46,9 +46,9 @@ FILE
     it "lists locations in order of decreasing activity" do
       stdout_only <<-OUTPUT
 Your favorite locations:
-1. Marie's Diner (2 activities)
-2. Paris         (1)
-3. Atlantis      (0)
+1. Martha's Vineyard (2 activities)
+2. Paris             (1)
+3. Atlantis          (0)
       OUTPUT
     end
 
@@ -120,10 +120,10 @@ FILE
         <<-FILE
 ### Activities:
 - 2015-01-30: Went to a museum with **George Washington Carver**.
-- 2015-01-29: moved to _Paris_.
+- 2015-01-29: Moved to _Paris_.
 - 2015-01-01: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying @food
-- 2014-12-30: Moved to _Atlantis_.
+- 2014-12-30: Went to _Atlantis_.
 - 2014-12-29: Talked to **George Washington Carver** on the phone for an hour.
 
 ### Friends:

data/test/commands/list/locations_spec.rb

@@ -30,7 +30,7 @@ clean_describe "list locations" do
       stdout_only <<-OUTPUT
 Paris
 Atlantis
-Marie's Diner
+Martha's Vineyard
       OUTPUT
     end
   end

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/commands/rename/friend_spec.rb

@@ -35,7 +35,7 @@ clean_describe "rename friend" do
     it "updates friend name in activities" do
       value(run_cmd("list activities")[:stdout]).must_equal <<-FILE
 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 Marie's Diner. George had to cancel at the last minute. @food
+2015-11-01: Grace Hopper and I went to Martha's Vineyard. George had to cancel at the last minute.
 2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
 2014-12-31: Celebrated the new year in Paris with Marie Curie. @partying
 2014-11-15: Talked to George Washington Carver on the phone for an hour.
@@ -43,7 +43,7 @@ clean_describe "rename friend" do
       subject
       value(run_cmd("list activities")[:stdout]).must_equal <<-FILE
 2018-02-06: @science:indoors:agronomy-with-hydroponics: Norman Borlaug and George Washington 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 Marie's Diner. George had to cancel at the last minute. @food
+2015-11-01: Grace Hopper and I went to Martha's Vineyard. George had to cancel at the last minute.
 2015-01-04: Got lunch with Grace Hopper and George Washington. @food
 2014-12-31: Celebrated the new year in Paris with Marie Curie. @partying
 2014-11-15: Talked to George Washington on the phone for an hour.

data/test/commands/suggest_spec.rb

@@ -48,7 +48,7 @@ Close friend: None found
 - 2016-03-01: Met up with **Grace Hopper**.
 - 2016-02-01: Met up with **Grace Hopper**.
 - 2016-01-01: Met up with **Grace Hopper**.
-- 2015-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute. @food
+- 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
 - 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying
 - 2014-11-15: Talked to **George Washington Carver** on the phone for an hour.
@@ -60,7 +60,7 @@ Close friend: None found
 
 ### Locations:
 - Atlantis
-- Marie's Diner
+- Martha's Vineyard
 - Paris
 FILE
     end

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,10 +24,10 @@ 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 _Marie's Diner_. George had to cancel at the last minute. @food
+- 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
 - 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying
 - 2014-11-15: Talked to **George Washington Carver** on the phone for an hour.
@@ -47,15 +47,15 @@ CONTENT = <<-FILE.freeze
 
 ### Locations:
 - Atlantis
-- Marie's Diner
+- Martha's Vineyard
 - Paris
 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 _Marie's Diner_. George had to cancel at the last minute. @food
+- 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
 - 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.
 - 2014-11-15: Talked to **George Washington Carver** on the phone for an hour.
 - 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying
@@ -76,7 +76,7 @@ SCRAMBLED_CONTENT = <<-FILE.freeze
 ### Locations:
 - Paris
 - Atlantis
-- Marie's Diner
+- Martha's Vineyard
 FILE
 
 # Define these methods so they can be referenced in the methods below. They'll be overridden in
@@ -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.47'
+  version: '0.52'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-06-03 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
@@ -137,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CONTRIBUTING.md"
+- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
@@ -176,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
@@ -223,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:
   - - ">="