friends 0.29 → 0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 266cfedd5b0654ca5ebd434c11ead3d8c21d4e9e
-  data.tar.gz: 76d290e42cc9babe0dcfe3dd9419dded6ca4825d
+  metadata.gz: 81e378aa8d3e1a7285adcb3f92cc91977c22eca2
+  data.tar.gz: f48b3ccd7d4006679c7b072b06a980432c759a6c
 SHA512:
-  metadata.gz: 41e311c6cd3f8dc4a0c9e86d5268badad683731307626f6f50ef33eaf15edfc930754adce617f2934262b6915caa87b3167b138741b3e6b99025d0c4cc542a06
-  data.tar.gz: e838474558ec1a065cd7d72a828fb6073adafac32a6aec23b4bc6e930063f5838e55129d9a6d82d01bf0236a79777db936a31a32b15104fce83cdd3c146e1c5c
+  metadata.gz: ee11daf225f5c245b68a732267b0fafd7041d478d8cff7d68860f9b50a71f9a3db51de2edd4a7dac723a6db5c5c26045a697a21bc7215acc770bed3a2390ee10
+  data.tar.gz: e47d850e7cc62ea74a0c212f0315de2cc5bd1eb72f331526ccee67dd39d7599b091a546770d14ba2af7132f929ab8d9076f61b28cb8a68a36432ccda3d481f56

data/.gitignore

@@ -17,3 +17,4 @@ ideas.txt
 TODO.txt
 .DS_Store
 .byebug_history
+.ruby-version

data/.rubocop.yml

@@ -125,6 +125,9 @@ Lambda:
 LambdaCall:
   Enabled: false
 
+Layout/IndentHeredoc:
+  Enabled: false
+
 LineEndConcatenation:
   Enabled: false
 
@@ -235,6 +238,9 @@ StringLiterals:
 Style/MultilineBlockChain:
   Enabled: false
 
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
 VariableInterpolation:
   Enabled: false
 

data/.travis.yml

@@ -5,10 +5,7 @@ rvm:
 - 2.3.0
 - 2.4.0
 script:
-  - bundle exec rake test
-  - bundle exec rubocop
-addons:
-  code_climate:
-    repo_token: d744a74c96e3e5c763ed776709aff0662ac2f3e8274c01e439e09b38c8be4225
+- bundle exec rake test
+- bundle exec rubocop
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [v0.30](https://github.com/JacobEvelyn/friends/tree/v0.30) (2017-05-30)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.29...v0.30)
+
+**Implemented enhancements:**
+
+- Code coverage in README is too low [\#163](https://github.com/JacobEvelyn/friends/issues/163)
+- Improve display of favorites for ties [\#158](https://github.com/JacobEvelyn/friends/issues/158)
+- Filter activities based on more than one friend/tag/etc. [\#88](https://github.com/JacobEvelyn/friends/issues/88)
+
+**Merged pull requests:**
+
+- Be able to filter output by more than one friend or tag [\#168](https://github.com/JacobEvelyn/friends/pull/168) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Improve display of favorites for ties [\#165](https://github.com/JacobEvelyn/friends/pull/165) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Correct code coverage calculations [\#164](https://github.com/JacobEvelyn/friends/pull/164) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [v0.29](https://github.com/JacobEvelyn/friends/tree/v0.29) (2017-03-18)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.28...v0.29)
 

data/PULL_REQUEST_TEMPLATE.md

@@ -6,8 +6,8 @@ merge this change:
 - [ ] The code in these changes works correctly.
 - [ ] Code has tests as appropriate.
 - [ ] Code has been reviewed by @JacobEvelyn.
-- [ ] All tests pass on TravisCI.
-- [ ] Rubocop reports no issues on TravisCI.
+- [ ] All tests pass on Travis CI.
+- [ ] Rubocop reports no issues on Travis CI.
 - [ ] The `README.md` file is updated as appropriate.
 
 Don't worry—this list will get checked off in no time!

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/friends.svg)](https://badge.fury.io/rb/friends) [![Dependency Status](https://gemnasium.com/badges/github.com/JacobEvelyn/friends.svg)](https://gemnasium.com/github.com/JacobEvelyn/friends)
- [![Code Climate](https://codeclimate.com/github/JacobEvelyn/friends/badges/gpa.svg)](https://codeclimate.com/github/JacobEvelyn/friends) [![Test Coverage](https://codeclimate.com/github/JacobEvelyn/friends/badges/coverage.svg)](https://codeclimate.com/github/JacobEvelyn/friends) [![Build Status](https://travis-ci.org/JacobEvelyn/friends.svg?branch=master)](https://travis-ci.org/JacobEvelyn/friends) [![Inline docs](http://inch-ci.org/github/JacobEvelyn/friends.png)](http://inch-ci.org/github/JacobEvelyn/friends) [![ghit.me](https://ghit.me/badge.svg?repo=JacobEvelyn/friends)](https://ghit.me/repo/JacobEvelyn/friends)
+ [![Coverage Status](https://coveralls.io/repos/github/JacobEvelyn/friends/badge.svg)](https://coveralls.io/github/JacobEvelyn/friends) [![Build Status](https://travis-ci.org/JacobEvelyn/friends.svg?branch=master)](https://travis-ci.org/JacobEvelyn/friends) [![Inline docs](http://inch-ci.org/github/JacobEvelyn/friends.png)](http://inch-ci.org/github/JacobEvelyn/friends) [![ghit.me](https://ghit.me/badge.svg?repo=JacobEvelyn/friends)](https://ghit.me/repo/JacobEvelyn/friends)
 
 # `friends`
 
@@ -343,6 +343,13 @@ Jan 2015 |█████
 Feb 2015 |███
 ```
 
+Or a certain group of friends:
+
+```bash
+$ friends graph --with George --with Grace
+Jan 2015 |█
+```
+
 Or graph only activities with a certain tag:
 
 ```bash
@@ -353,6 +360,13 @@ Jan 2015 |
 Feb 2015 |███
 ```
 
+Or with multiple tags:
+
+```bash
+$ friends graph --tagged @fun --tagged @work
+Jul 2017 |█
+```
+
 Or graph only activities in a certain location:
 
 ```bash
@@ -443,6 +457,13 @@ $ friends list activities --with George
 2014-11-15: Talked to George Washington Carver on the phone for an hour.
 ```
 
+Or only filter activities done with a group of friends:
+
+```bash
+$ friends list activities --with George --with Grace
+2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+```
+
 Or filter your activities by location:
 
 ```bash
@@ -457,16 +478,23 @@ $ friends list activities --tagged food
 2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
 ```
 
+Or use more than one tag:
+
+```bash
+$ friends list activities --tagged @fun --tagged @work
+2017-07-04: Summer picnic with @work colleagues. @fun
+```
+
 Or by date:
 
 ```bash
-$ friends graph --since 'December 31st 2014'
+$ friends list activities --since 'December 31st 2014'
 2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
 2014-12-31: Celebrated the new year with Marie Curie in New York City. @partying
 ```
 
 ```bash
-$ friends graph --until 'December 31st 2014'
+$ friends list activities --until 'December 31st 2014'
 2014-12-31: Celebrated the new year with Marie Curie in New York City. @partying
 2014-11-15: Talked to George Washington Carver on the phone for an hour.
 ```
@@ -474,7 +502,7 @@ $ friends graph --until 'December 31st 2014'
 And you can mix and match these options to your heart's content:
 
 ```bash
-$ friends list activities --tagged food --with Grace
+$ friends list activities --tagged food --with Grace --with George
 2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
 ```
 
@@ -487,7 +515,7 @@ $ friends list favorite friends
 Your favorite friends:
 1. George Washington Carver (2 activities)
 2. Grace Hopper             (1)
-3. Marie Curie              (1)
+3. Marie Curie              (0)
 ```
 
 You can specify a number of favorites to show:
@@ -508,7 +536,7 @@ $ friends list favorite locations
 Your favorite locations:
 1. Atlantis (2 activities)
 2. Paris    (1)
-3. London   (1)
+3. London   (0)
 ```
 
 You can specify a number of favorites to show:
@@ -555,6 +583,13 @@ Grace Hopper
 Marie Curie
 ```
 
+You can even use more than one tag to further narrow down the list:
+
+```bash
+$ friends list friends --tagged science --tagged navy
+Grace Hopper
+```
+
 #### `list tags`
 
 Lists all tags you've used, in alphabetical order:

data/bin/friends

@@ -1,6 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+if ENV["TRAVIS"] == "true"
+  require "simplecov"
+  SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter
+  SimpleCov.command_name Process.pid
+  SimpleCov.start
+end
+
 require "gli"
 require "paint"
 require "readline"

data/friends.gemspec

@@ -30,11 +30,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "semverse", "~> 1.2"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.5"
+  spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "minitest", "~> 5.5"
-  spec.add_development_dependency "minitest-parallel_fork", "~> 1.0"
   spec.add_development_dependency "minitest-proveit", "~> 1.0"
-  spec.add_development_dependency "overcommit", "~> 0.34"
   spec.add_development_dependency "rake", "~> 11.2"
-  spec.add_development_dependency "rubocop", "~> 0.40"
+  spec.add_development_dependency "rubocop", "~> 0.49"
+  spec.add_development_dependency "simplecov", "~> 0.14"
 end

data/lib/friends/commands/graph.rb

@@ -5,7 +5,8 @@ command :graph do |graph|
   graph.flag [:with],
              arg_name: "NAME",
              desc: "Graph activities with the given friend",
-             type: Stripped
+             type: Stripped,
+             multiple: true
 
   graph.flag [:in],
              arg_name: "LOCATION",
@@ -15,7 +16,8 @@ command :graph do |graph|
   graph.flag [:tagged],
              arg_name: "@TAG",
              desc: "Graph activities with the given tag",
-             type: Tag
+             type: Tag,
+             multiple: true
 
   graph.flag [:since],
              arg_name: "DATE",

data/lib/friends/commands/list.rb

@@ -12,7 +12,8 @@ command :list do |list|
     list_friends.flag [:tagged],
                       arg_name: "@TAG",
                       desc: "List only friends with the given tag",
-                      type: Tag
+                      type: Tag,
+                      multiple: true
 
     list_friends.switch [:verbose],
                         negatable: false,
@@ -38,7 +39,8 @@ command :list do |list|
     list_activities.flag [:with],
                          arg_name: "NAME",
                          desc: "List only activities with the given friend",
-                         type: Stripped
+                         type: Stripped,
+                         multiple: true
 
     list_activities.flag [:in],
                          arg_name: "LOCATION",
@@ -48,7 +50,8 @@ command :list do |list|
     list_activities.flag [:tagged],
                          arg_name: "@TAG",
                          desc: "List only activities with the given tag",
-                         type: Tag
+                         type: Tag,
+                         multiple: true
 
     list_activities.flag [:since],
                          arg_name: "DATE",
@@ -101,18 +104,7 @@ command :list do |list|
                                  type: Integer
 
       list_favorite_friends.action do |_, options|
-        favorites = @introvert.list_favorite_friends(limit: options[:limit])
-
-        if options[:limit] == 1
-          puts "Your best friend is #{favorites.first}"
-        else
-          puts "Your favorite friends:"
-
-          num_str_size = favorites.size.to_s.size + 1
-          favorites.each.with_index(1) do |name, rank|
-            puts "#{"#{rank}.".ljust(num_str_size)} #{name}"
-          end
-        end
+        @introvert.list_favorite_friends(limit: options[:limit])
       end
     end
 
@@ -125,18 +117,7 @@ command :list do |list|
                                    type: Integer
 
       list_favorite_locations.action do |_, options|
-        favorites = @introvert.list_favorite_locations(limit: options[:limit])
-
-        if options[:limit] == 1
-          puts "Your favorite location is #{favorites.first}"
-        else
-          puts "Your favorite locations:"
-
-          num_str_size = favorites.size.to_s.size + 1
-          favorites.each.with_index(1) do |name, rank|
-            puts "#{"#{rank}.".ljust(num_str_size)} #{name}"
-          end
-        end
+        @introvert.list_favorite_locations(limit: options[:limit])
       end
     end
   end

data/lib/friends/graph.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Graphs activities by month
 
 module Friends

data/lib/friends/introvert.rb

@@ -186,8 +186,8 @@ module Friends
     # List all friend names in the friends file.
     # @param location_name [String] the name of a location to filter by, or nil
     #   for unfiltered
-    # @param tagged [String] the name of a tag to filter by (of the form:
-    #   "@tag"), or nil for unfiltered
+    # @param tagged [Array<String>] the names of tags to filter by, or empty for
+    #   unfiltered
     # @param verbose [Boolean] true iff we should output friend names with
     #   nicknames, locations, and tags; false for names only
     # @return [Array] a list of all friend names
@@ -200,8 +200,12 @@ module Friends
         fs = fs.select { |friend| friend.location_name == location.name }
       end
 
-      # Filter by tag if one is passed.
-      fs = fs.select { |friend| friend.tags.include? tagged } if tagged
+      # Filter by tag if param is passed.
+      unless tagged.empty?
+        fs = fs.select do |friend|
+          tagged.all? { |tag| friend.tags.include? tag }
+        end
+      end
 
       verbose ? fs.map(&:to_s) : fs.map(&:name)
     end
@@ -225,12 +229,12 @@ module Friends
     # List all activity details.
     # @param limit [Integer] the number of activities to return, or nil for no
     #   limit
-    # @param with [String] the name of a friend to filter by, or nil for
+    # @param with [Array<String>] the names of friends to filter by, or empty for
+    #   unfiltered
+    # @param location_name [String] the name of a location to filter by, or
+    #   nil for unfiltered
+    # @param tagged [Array<String>] the names of tags to filter by, or empty for
     #   unfiltered
-    # @param location_name [String] the name of a location to filter by, or nil
-    #   for unfiltered
-    # @param tagged [String] the name of a tag to filter by (of the form:
-    #   "@tag"), or nil for unfiltered
     # @param since_date [Date] a date on or after which to find activities, or nil for unfiltered
     # @param until_date [Date] a date before or on which to find activities, or nil for unfiltered
     # @return [Array] a list of all activity text values
@@ -294,12 +298,12 @@ module Friends
     # The keys of the hash are all of the months (inclusive) between the first
     # and last month in which activities have been recorded.
     #
-    # @param with [String] the name of a friend to filter by, or nil for
+    # @param with [Array<String>] the names of friends to filter by, or empty for
+    #   unfiltered
+    # @param location_name [String] the name of a location to filter by, or
+    #   nil for unfiltered
+    # @param tagged [Array<String>] the names of tags to filter by, or empty for
     #   unfiltered
-    # @param location_name [String] the name of a location to filter by, or nil
-    #   for unfiltered
-    # @param tagged [String] the name of a tag to filter by (of the form:
-    #   "@tag"), or nil for unfiltered
     # @param since_date [Date] a date on or after which to find activities, or nil for unfiltered
     # @param until_date [Date] a date before or on which to find activities, or nil for unfiltered
     # @return [Hash{String => Integer}]
@@ -451,11 +455,11 @@ module Friends
     private
 
     # Filter activities by friend, location and tag
-    # @param with [String] the name of a friend to filter by, or nil for
+    # @param with [Array<String>] the names of friends to filter by, or empty for
     #   unfiltered
-    # @param location_name [String] the name of a location to filter by, or nil
-    #   for unfiltered
-    # @param tagged [String] the name of a tag to filter by, or nil for
+    # @param location_name [String] the name of a location to filter by, or
+    #   nil for unfiltered
+    # @param tagged [Array<String>] the names of tags to filter by, or empty for
     #   unfiltered
     # @param since_date [Date] a date on or after which to find activities, or nil for unfiltered
     # @param until_date [Date] a date before or on which to find activities, or nil for unfiltered
@@ -466,9 +470,11 @@ module Friends
       acts = @activities
 
       # Filter by friend name if argument is passed.
-      unless with.nil?
-        friend = thing_with_name_in(:friend, with)
-        acts = acts.select { |act| act.includes_friend?(friend) }
+      unless with.empty?
+        friends = with.map { |name| thing_with_name_in(:friend, name) }
+        acts = acts.select do |act|
+          friends.all? { |friend| act.includes_friend?(friend) }
+        end
       end
 
       # Filter by location name if argument is passed.
@@ -478,7 +484,11 @@ module Friends
       end
 
       # Filter by tag if argument is passed.
-      acts = acts.select { |act| act.includes_tag?(tagged) } unless tagged.nil?
+      unless tagged.empty?
+        acts = acts.select do |act|
+          tagged.all? { |tag| act.includes_tag?(tag) }
+        end
+      end
 
       # Filter by date if arguments are passed.
       acts = acts.select { |act| act.date >= since_date } unless since_date.nil?
@@ -504,15 +514,42 @@ module Friends
         -thing.n_activities
       end.take(limit) # Trim the list.
 
-      max_str_size = results.map(&:name).map(&:size).max
-      results.map.with_index(0) do |thing, index|
-        name = thing.name.ljust(max_str_size)
-        n = thing.n_activities
-        if index.zero?
-          label = n == 1 ? " activity" : " activities"
+      if results.size == 1
+        favorite = results.first
+        puts "Your favorite #{type} is "\
+             "#{favorite.name} "\
+             "(#{favorite.n_activities} "\
+             "#{favorite.n_activities == 1 ? 'activity' : 'activities'})"
+      else
+        puts "Your favorite #{type}s:"
+
+        max_str_size = results.map(&:name).map(&:size).max
+
+        grouped_results = results.group_by(&:n_activities)
+
+        rank = 1
+        first = true
+        data = grouped_results.each.with_object([]) do |(n_activities, things), arr|
+          things.each do |thing|
+            name = thing.name.ljust(max_str_size)
+            if first
+              label = n_activities == 1 ? " activity" : " activities"
+              first = false
+            end
+            str = "#{name} (#{n_activities}#{label})"
+
+            arr << [rank, str]
+          end
+          rank += things.size
+        end
+
+        # We need to use `data.last.first` instead of `rank` to determine the size
+        # of the numbering prefix because `rank` will simply be the size of all
+        # elements, which may be too large if the last element in the list is a tie.
+        num_str_size = data.last.first.to_s.size + 1 unless data.empty?
+        data.each do |ranking, str|
+          puts "#{"#{ranking}.".ljust(num_str_size)} #{str}"
         end
-        parenthetical = "(#{n}#{label})"
-        "#{name} #{parenthetical}"
       end
     end
 

data/lib/friends/serializable.rb

@@ -24,7 +24,7 @@ module Serializable
     args = match.names.
            map { |name| { name.to_sym => match[name.to_sym] } }.
            reduce(:merge).
-           select { |_, v| !v.nil? }
+           reject { |_, v| v.nil? }
 
     new(args)
   end

data/lib/friends/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Friends
-  VERSION = "0.29"
+  VERSION = "0.30"
 end

data/test/commands/graph_spec.rb

@@ -90,6 +90,16 @@ Jan 2015 |█
           OUTPUT
         end
       end
+
+      describe "when more than one friend name is passed" do
+        subject { run_cmd("graph --with #{friend_name1} --with #{friend_name2}") }
+        let(:friend_name1) { "george" }
+        let(:friend_name2) { "grace" }
+
+        it "matches all friends case-insensitively" do
+          stdout_only "Jan 2015 |█"
+        end
+      end
     end
 
     describe "--tagged" do
@@ -110,6 +120,30 @@ Oct 2015 |
 Nov 2015 |█
         OUTPUT
       end
+
+      describe "when more than one tag is passed" do
+        subject { run_cmd("graph --tagged #{tag1} --tagged #{tag2}") }
+        let(:tag1) { "food" }
+        let(:tag2) { "partying" }
+        let(:content) 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
+- 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
+
+### Friends:
+- George Washington Carver
+- Marie Curie [Atlantis] @science
+- Grace Hopper (a.k.a. The Admiral a.k.a. Amazing Grace) [Paris] @navy @science
+FILE
+        end
+
+        it "matches all tags case-sensitively" do
+          stdout_only "Dec 2014 |█"
+        end
+      end
     end
 
     describe "--since" do

data/test/commands/list/activities_spec.rb

@@ -97,6 +97,16 @@ clean_describe "list activities" do
           stdout_only "2014-12-31: Celebrated the new year in Paris with Marie Curie. @partying"
         end
       end
+
+      describe "when more than one friend name is passed" do
+        subject { run_cmd("list activities --with #{friend_name1} --with #{friend_name2}") }
+        let(:friend_name1) { "george" }
+        let(:friend_name2) { "grace" }
+
+        it "matches all friends case-insensitively" do
+          stdout_only "2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food"
+        end
+      end
     end
 
     describe "--tagged" do
@@ -108,6 +118,32 @@ clean_describe "list activities" do
 2015-11-01: Grace Hopper and I went to Marie's Diner. George had to cancel at the last minute. @food
         OUTPUT
       end
+
+      describe "when more than one tag is passed" do
+        subject { run_cmd("list activities --tagged #{tag1} --tagged #{tag2}") }
+        let(:tag1) { "food" }
+        let(:tag2) { "partying" }
+        let(:content) 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
+- 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
+
+### Friends:
+- George Washington Carver
+- Marie Curie [Atlantis] @science
+- Grace Hopper (a.k.a. The Admiral a.k.a. Amazing Grace) [Paris] @navy @science
+FILE
+        end
+
+        it "matches all tags case-sensitively" do
+          stdout_only(
+            "2014-12-31: Celebrated the new year in Paris with Marie Curie. @partying @food"
+          )
+        end
+      end
     end
 
     describe "--since" do

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

@@ -45,6 +45,69 @@ Your favorite friends:
       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
+        subject[:stderr].must_equal ""
+        subject[:status].must_equal 0
+
+        lines = subject[:stdout].split("\n")
+        lines[1].must_match(/1\. Friend (A|B)/)
+        lines[2].must_match(/1\. Friend (A|B)/)
+        lines[3].must_include "3. Friend"
+      end
+
+      it "only uses the word 'activities' for the first item, even when a tie" do
+        subject[:stderr].must_equal ""
+        subject[:status].must_equal 0
+
+        lines = subject[:stdout].split("\n")
+        lines[1].must_include "activities"
+        lines[2].wont_include "activities"
+      end
+
+      it "indents based on the highest rank number, not the number of friends" do
+        subject[:stderr].must_equal ""
+        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")
+        lines.last.must_include "3. Friend"
+      end
+    end
+
     describe "--limit" do
       subject { run_cmd("list favorite friends --limit #{limit}") }
 
@@ -57,8 +120,27 @@ Your favorite friends:
 
       describe "when limit is 1" do
         let(:limit) { 1 }
-        it "outputs as a best friend" do
-          stdout_only "Your best friend is Grace Hopper (3 activities)"
+
+        it "uses correct friend pluralization" do
+          stdout_only "Your favorite friend is Grace Hopper (3 activities)"
+        end
+
+        describe "when favorite friend only has one activity" do
+          let(:content) do
+            <<-FILE
+### Activities:
+- 2017-01-01: Did some math with **Grace Hopper**.
+
+### 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 "uses correct activity pluralization" do
+            stdout_only "Your favorite friend is Grace Hopper (1 activity)"
+          end
         end
       end
 

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

@@ -50,6 +50,69 @@ Your favorite locations:
       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
+        subject[:stderr].must_equal ""
+        subject[:status].must_equal 0
+
+        lines = subject[:stdout].split("\n")
+        lines[1].must_match(/1\. Location (A|B)/)
+        lines[2].must_match(/1\. Location (A|B)/)
+        lines[3].must_include "3. Location"
+      end
+
+      it "only uses the word 'activities' for the first item, even when a tie" do
+        subject[:stderr].must_equal ""
+        subject[:status].must_equal 0
+
+        lines = subject[:stdout].split("\n")
+        lines[1].must_include "activities"
+        lines[2].wont_include "activities"
+      end
+
+      it "indents based on the highest rank number, not the number of locations" do
+        subject[:stderr].must_equal ""
+        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")
+        lines.last.must_include "3. Location"
+      end
+    end
+
     describe "--limit" do
       subject { run_cmd("list favorite locations --limit #{limit}") }
 
@@ -62,9 +125,33 @@ Your favorite locations:
 
       describe "when limit is 1" do
         let(:limit) { 1 }
-        it "outputs as a favorite location" do
+
+        it "uses correct location pluralization" do
           stdout_only "Your favorite location is Marie's Diner (2 activities)"
         end
+
+        describe "when favorite location only has one activity" do
+          let(:content) do
+            <<-FILE
+### Activities:
+- 2017-01-01: Did some math with **Grace Hopper** at _Marie's Diner_.
+
+### 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
+- Marie's Diner
+- Paris
+FILE
+          end
+
+          it "uses correct activity pluralization" do
+            stdout_only "Your favorite location is Marie's Diner (1 activity)"
+          end
+        end
       end
 
       describe "when limit is greater than 1" do

data/test/commands/list/friends_spec.rb

@@ -71,6 +71,31 @@ Marie Curie
 Grace Hopper
         OUTPUT
       end
+
+      describe "when more than one tag is passed" do
+        subject { run_cmd("list friends --tagged #{tag1} --tagged #{tag2}") }
+        let(:tag1) { "science" }
+        let(:tag2) { "navy" }
+        let(:content) do
+          <<-FILE
+### Activities:
+
+### Friends:
+- George Washington Carver
+- Grace Hopper (a.k.a. The Admiral a.k.a. Amazing Grace) [Paris] @navy @science
+- Marie Curie [Atlantis] @science
+- Neil Armstrong @navy @science
+- John F. Kennedy @navy
+FILE
+        end
+
+        it "matches all tags case-sensitively" do
+          stdout_only <<-OUTPUT
+Grace Hopper
+Neil Armstrong
+        OUTPUT
+        end
+      end
     end
   end
 end

data/test/helper.rb

@@ -1,14 +1,24 @@
 # frozen_string_literal: true
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+if ENV["TRAVIS"] == "true"
+  require "simplecov"
+  require "coveralls"
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter "/test/"
+  end
+end
 
 ENV["MT_HELL"] = "1" # Forces tests to have at least one assertion to pass.
 
 require "minitest/autorun"
-require "minitest/parallel_fork"
-require "minitest/pride"
+
+# Runs tests in parallel. Also, in combination with the MT_HELL environment var
+# set above and the loading of the `minitest-proveit` gem, requires that tests
+# have at least one assertion to pass.
 require "minitest/hell"
+
+require "minitest/pride"
 require "open3"
 require "securerandom"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.29'
+  version: '0.30'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
-- !ruby/object:Gem::Dependency
-  name: minitest-parallel_fork
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest-proveit
   requirement: !ruby/object:Gem::Requirement
@@ -151,47 +137,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: overcommit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.14'
 description: Spend time with the people you care about. Introvert-tested. Extrovert-approved.
 email:
 - jacobevelyn@gmail.com
@@ -203,7 +189,6 @@ files:
 - ".gitignore"
 - ".overcommit.yml"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md

data/.ruby-version

@@ -1 +0,0 @@
-2.4.0