friends 0.51 → 0.55

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

@@ -42,7 +42,7 @@ Total time elapsed: 0 days
       stdout_only <<-OUTPUT
 Total activities: 5
 Total friends: 5
-Total locations: 3
+Total locations: 4
 Total notes: 4
 Total tags: 10
 Total time elapsed: 1179 days

data/test/default_file_spec.rb

@@ -4,7 +4,7 @@ require "./test/helper"
 
 # Since this touches the ~/friends.md file instead of a temp
 # one, we only want to run it on our CI servers.
-if ENV["TRAVIS"] == "true"
+if ENV["CI"] == "true"
   describe "default filename behavior" do
     let(:filename) { File.expand_path("~/friends.md") }
 

data/test/helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if ENV["TRAVIS"] == "true" && ENV["CODE_COVERAGE"] == "true"
+if ENV["CI"] == "true" && ENV["CODE_COVERAGE"] == "true"
   require "simplecov"
   require "codecov"
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
@@ -48,6 +48,7 @@ CONTENT = <<-FILE
 ### Locations:
 - Atlantis
 - Martha's Vineyard
+- New York City (a.k.a. NYC a.k.a. NY)
 - Paris
 FILE
 
@@ -77,6 +78,7 @@ SCRAMBLED_CONTENT = <<-FILE
 - Paris
 - Atlantis
 - Martha's Vineyard
+- New York City (a.k.a. NYC a.k.a. NY)
 FILE
 
 # Define these methods so they can be referenced in the methods below. They'll be overridden in
@@ -119,6 +121,17 @@ def stderr_only(expected)
   value(subject[:status]).must_be :>, 0
 end
 
+def stdout_only_regexes(regexes)
+  puts subject[:stderr] unless subject[:stderr] == ""
+  lines = subject[:stdout].split("\n")
+  regexes.each_with_index do |regex, index|
+    value(lines[index]).must_match regex
+  end
+  assert_nil(lines[regexes.size])
+  value(subject[:stderr]).must_equal ""
+  value(subject[:status]).must_equal 0
+end
+
 def file_equals(expected)
   subject
   value(File.read(filename)).must_equal expected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.51'
+  version: '0.55'
 platform: ruby
 authors:
 - Jacob Evelyn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -120,10 +120,10 @@ files:
 - ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -163,6 +163,7 @@ files:
 - lib/friends/version.rb
 - test/add_event_helper.rb
 - test/commands/add/activity_spec.rb
+- test/commands/add/alias_spec.rb
 - test/commands/add/friend_spec.rb
 - test/commands/add/location_spec.rb
 - test/commands/add/nickname_spec.rb
@@ -173,12 +174,11 @@ files:
 - test/commands/graph_spec.rb
 - test/commands/help_spec.rb
 - test/commands/list/activities_spec.rb
-- test/commands/list/favorite/friends_spec.rb
-- test/commands/list/favorite/locations_spec.rb
 - test/commands/list/friends_spec.rb
 - test/commands/list/locations_spec.rb
 - test/commands/list/notes_spec.rb
 - test/commands/list/tags_spec.rb
+- test/commands/remove/alias_spec.rb
 - test/commands/remove/nickname_spec.rb
 - test/commands/remove/tag_spec.rb
 - test/commands/rename/friend_spec.rb
@@ -212,13 +212,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Spend time with the people you care about.
 test_files:
 - test/add_event_helper.rb
 - test/commands/add/activity_spec.rb
+- test/commands/add/alias_spec.rb
 - test/commands/add/friend_spec.rb
 - test/commands/add/location_spec.rb
 - test/commands/add/nickname_spec.rb
@@ -229,12 +230,11 @@ test_files:
 - test/commands/graph_spec.rb
 - test/commands/help_spec.rb
 - test/commands/list/activities_spec.rb
-- test/commands/list/favorite/friends_spec.rb
-- test/commands/list/favorite/locations_spec.rb
 - test/commands/list/friends_spec.rb
 - test/commands/list/locations_spec.rb
 - test/commands/list/notes_spec.rb
 - test/commands/list/tags_spec.rb
+- test/commands/remove/alias_spec.rb
 - test/commands/remove/nickname_spec.rb
 - test/commands/remove/tag_spec.rb
 - test/commands/rename/friend_spec.rb

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 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.7
-      gemfile: Gemfile
-      script:
-        - bundle exec rake test
-        - gem install --no-document rubocop && rubocop
-      env:
-        - CODE_COVERAGE=true
-branches:
-  only:
-    - master # Always run on the master branch
-notifications:
-  email: false

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

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-require "./test/helper"
-
-clean_describe "list favorite friends" do
-  subject { run_cmd("list favorite friends") }
-
-  describe "when file does not exist" do
-    let(:content) { nil }
-
-    it "prints a no-data message" do
-      stdout_only "Your favorite friends:"
-    end
-  end
-
-  describe "when file is empty" do
-    let(:content) { "" }
-
-    it "prints a no-data message" do
-      stdout_only "Your favorite friends:"
-    end
-  end
-
-  describe "when file has content" do
-    let(:content) do
-      <<-FILE
-### Activities:
-- 2017-01-01: Did some math with **Grace Hopper**.
-- 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.
-
-### Friends:
-- George Washington Carver
-- Grace Hopper (a.k.a. The Admiral a.k.a. Amazing Grace) [Paris] @navy @science
-- Marie Curie [Atlantis] @science
-FILE
-    end
-
-    it "lists friends in order of decreasing activity" do
-      stdout_only <<-OUTPUT
-Your favorite friends:
-1. Grace Hopper             (3 activities)
-2. George Washington Carver (2)
-3. Marie Curie              (1)
-      OUTPUT
-    end
-
-    describe "when friends are tied for the same number of activities" do
-      let(:content) do
-        <<-FILE
-### Activities:
-- 2017-01-01: Did something with **Friend A**.
-- 2017-01-01: Did something with **Friend A**.
-- 2017-01-01: Did something with **Friend B**.
-- 2017-01-01: Did something with **Friend B**.
-- 2017-01-01: Did something with **Friend C**.
-- 2017-01-01: Did something with **Friend D**.
-- 2017-01-01: Did something with **Friend E**.
-- 2017-01-01: Did something with **Friend F**.
-- 2017-01-01: Did something with **Friend G**.
-- 2017-01-01: Did something with **Friend H**.
-- 2017-01-01: Did something with **Friend I**.
-- 2017-01-01: Did something with **Friend J**.
-
-### Friends:
-- Friend A
-- Friend B
-- Friend C
-- Friend D
-- Friend E
-- Friend F
-- Friend G
-- Friend H
-- Friend I
-- Friend J
-FILE
-      end
-
-      it "uses tied ranks" do
-        value(subject[:stderr]).must_equal ""
-        value(subject[:status]).must_equal 0
-
-        lines = subject[:stdout].split("\n")
-        value(lines[1]).must_match(/1\. Friend (A|B)/)
-        value(lines[2]).must_match(/1\. Friend (A|B)/)
-        value(lines[3]).must_include "3. Friend"
-      end
-
-      it "only uses the word 'activities' for the first item, even when a tie" do
-        value(subject[:stderr]).must_equal ""
-        value(subject[:status]).must_equal 0
-
-        lines = subject[:stdout].split("\n")
-        value(lines[1]).must_include "activities"
-        value(lines[2]).wont_include "activities"
-      end
-
-      it "indents based on the highest rank number, not the number of friends" do
-        value(subject[:stderr]).must_equal ""
-        value(subject[:status]).must_equal 0
-
-        # Since there are 10 friends, a naive implementation would pad our output
-        # assuming the (numerically) highest rank is "10." but since the highest
-        # rank is a tie, we never display a double-digit rank, so we don't need to
-        # pad our output for double digits.
-        lines = subject[:stdout].split("\n")
-        value(lines.last).must_include "3. Friend"
-      end
-    end
-  end
-end

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

@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-
-require "./test/helper"
-
-clean_describe "list favorite locations" do
-  subject { run_cmd("list favorite locations") }
-
-  describe "when file does not exist" do
-    let(:content) { nil }
-
-    it "prints a no-data message" do
-      stdout_only "Your favorite locations:"
-    end
-  end
-
-  describe "when file is empty" do
-    let(:content) { "" }
-
-    it "prints a no-data message" do
-      stdout_only "Your favorite locations:"
-    end
-  end
-
-  describe "when file has content" do
-    let(:content) do
-      <<-FILE
-### Activities:
-- 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.
-
-### Friends:
-- George Washington Carver
-- Grace Hopper (a.k.a. The Admiral a.k.a. Amazing Grace) [Paris] @navy @science
-- Marie Curie [Atlantis] @science
-
-### Locations:
-- Atlantis
-- Martha's Vineyard
-- Paris
-FILE
-    end
-
-    it "lists locations in order of decreasing activity" do
-      stdout_only <<-OUTPUT
-Your favorite locations:
-1. Martha's Vineyard (2 activities)
-2. Paris             (1)
-3. Atlantis          (0)
-      OUTPUT
-    end
-
-    describe "when locations are tied for the same number of activities" do
-      let(:content) do
-        <<-FILE
-### Activities:
-- 2017-01-01: Did something in _Location A_.
-- 2017-01-01: Did something in _Location A_.
-- 2017-01-01: Did something in _Location B_.
-- 2017-01-01: Did something in _Location B_.
-- 2017-01-01: Did something in _Location C_.
-- 2017-01-01: Did something in _Location D_.
-- 2017-01-01: Did something in _Location E_.
-- 2017-01-01: Did something in _Location F_.
-- 2017-01-01: Did something in _Location G_.
-- 2017-01-01: Did something in _Location H_.
-- 2017-01-01: Did something in _Location I_.
-- 2017-01-01: Did something in _Location J_.
-
-### Locations:
-- Location A
-- Location B
-- Location C
-- Location D
-- Location E
-- Location F
-- Location G
-- Location H
-- Location I
-- Location J
-FILE
-      end
-
-      it "uses tied ranks" do
-        value(subject[:stderr]).must_equal ""
-        value(subject[:status]).must_equal 0
-
-        lines = subject[:stdout].split("\n")
-        value(lines[1]).must_match(/1\. Location (A|B)/)
-        value(lines[2]).must_match(/1\. Location (A|B)/)
-        value(lines[3]).must_include "3. Location"
-      end
-
-      it "only uses the word 'activities' for the first item, even when a tie" do
-        value(subject[:stderr]).must_equal ""
-        value(subject[:status]).must_equal 0
-
-        lines = subject[:stdout].split("\n")
-        value(lines[1]).must_include "activities"
-        value(lines[2]).wont_include "activities"
-      end
-
-      it "indents based on the highest rank number, not the number of locations" do
-        value(subject[:stderr]).must_equal ""
-        value(subject[:status]).must_equal 0
-
-        # Since there are 10 friends, a naive implementation would pad our output
-        # assuming the (numerically) highest rank is "10." but since the highest
-        # rank is a tie, we never display a double-digit rank, so we don't need to
-        # pad our output for double digits.
-        lines = subject[:stdout].split("\n")
-        value(lines.last).must_include "3. Location"
-      end
-    end
-
-    describe "when implied locations are set" 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: Went to _Atlantis_.
-- 2014-12-29: Talked to **George Washington Carver** on the phone for an hour.
-
-### 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 "lists locations in order of decreasing activity" do
-        stdout_only <<-OUTPUT
-Your favorite locations:
-1. Paris    (3 activities)
-2. Atlantis (2)
-        OUTPUT
-      end
-    end
-  end
-end