friends 0.44 → 0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ee18ecc2add1c45714c81100ead732d85c7ff7
-  data.tar.gz: a6eb3b3a99415c702c946409af5d80767cc7c8aa
+  metadata.gz: eb0258b3dca86e0aba3b852b4d58462e2e3570f6
+  data.tar.gz: cbb2091ca9b77764999b5667b4a00c309ce1263d
 SHA512:
-  metadata.gz: 5e4643dc1724df57269c5172eb76316d52e821eed90367f88b18956dec2c28f293abc42e7e310145e7aa320cf5dc3aeb33668ff4078c7833f2fcb1fbee89e6f6
-  data.tar.gz: ea8d089451d5b2e29873aff17592613b9d99799a784f05ab43a9847441c7936de11e411cebdae3aae14d4bafc85e928d1418db12bbcfca0b74fb80803b642074
+  metadata.gz: '052706180f25b59c73618c545e659becf4a1b9295ba3bb4e8478b7279a0c7460c5e974eafc8627c3f5745c5236ba37ff31648b4129b9a70780bc4d55f83cac96'
+  data.tar.gz: 4e0819d8bcab2152a883853e5b2b6899660faa8eca350dfa73085658ad1e5b4a2fe95be97d4006f8fd5d23d11865a25a7cae66b8c8a78184ddc6b0c9406bef50

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -9,6 +9,7 @@ merge this change:
 - [ ] Code has tests as appropriate.
 - [ ] Code has been reviewed by @JacobEvelyn.
 - [ ] All tests pass on Travis CI.
+- [ ] Code coverage remains high.
 - [ ] Rubocop reports no issues on Travis CI.
 - [ ] The `README.md` file is updated as appropriate.
 

data/.travis.yml

@@ -5,9 +5,6 @@ rvm:
   - 2.3
   - 2.4
   - 2.5 # 2.6 is tested below
-branches:
-  only:
-    - master
 script:
   - bundle exec rake test
 matrix:
@@ -15,6 +12,11 @@ matrix:
     - rvm: 2.6
       script:
         - bundle exec rake test
-        - gem install rubocop && rubocop
+        - gem install --no-document rubocop && rubocop
+      env:
+        - CODE_COVERAGE=true
+branches:
+  only:
+    - master # Always run on the master branch
 notifications:
   email: false

data/CHANGELOG.md

@@ -14,6 +14,21 @@ making a small donation (🙏) to show you appreciate its continued development.
 
 👆 Donate with these buttons! 👆
 
+## [v0.45](https://github.com/JacobEvelyn/friends/tree/v0.45) (2019-01-15)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.44...v0.45)
+
+**Implemented enhancements:**
+
+- Match tags case-insensitively [\#226](https://github.com/JacobEvelyn/friends/issues/226)
+- Add `friends graph --unscaled` [\#201](https://github.com/JacobEvelyn/friends/issues/201)
+
+**Merged pull requests:**
+
+- Switch from Coveralls to Codecov [\#230](https://github.com/JacobEvelyn/friends/pull/230) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Match tags case-insensitively [\#229](https://github.com/JacobEvelyn/friends/pull/229) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Only compute code coverage once per Travis run [\#228](https://github.com/JacobEvelyn/friends/pull/228) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Scale graphs by default [\#227](https://github.com/JacobEvelyn/friends/pull/227) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [v0.44](https://github.com/JacobEvelyn/friends/tree/v0.44) (2019-01-12)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.43...v0.44)
 
@@ -649,4 +664,4 @@ making a small donation (🙏) to show you appreciate its continued development.
 ## [v0.0.1](https://github.com/JacobEvelyn/friends/tree/v0.0.1) (2014-12-11)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/friends.svg)](https://badge.fury.io/rb/friends)
-[![Coverage Status](https://coveralls.io/repos/github/JacobEvelyn/friends/badge.svg)](https://coveralls.io/github/JacobEvelyn/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.org/JacobEvelyn/friends.svg?branch=master)](https://travis-ci.org/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)
@@ -483,86 +483,97 @@ Graphs (in color!) your activities over time:
 
 ```bash
 $ friends graph
-Nov 2017 |███
-Dec 2017 |██
+Feb 2018 |██████∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2018 |████████████████████
+Dec 2017 |███∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2017 |█████████∙∙∙∙∙∙∙∙∙∙∙|
+```
+
+By default, graphs are scaled relative to the month with the most activities.
+You can also show the unscaled graph:
+
+```bash
+$ friends graph --unscaled
+Feb 2018 |██
 Jan 2018 |███████
-Feb 2018 |█████
+Dec 2017 |█
+Nov 2017 |███
 ```
 
-Or graph only activities with a certain friend:
+You can graph only activities with a certain friend:
 
 ```bash
 $ friends graph --with George
-Nov 2017 |█∙∙|
-Dec 2017 |∙∙|
-Jan 2018 |█████∙∙|
-Feb 2018 |███∙∙|
+Feb 2018 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2018 |█████████████████∙∙∙|
+Dec 2017 |███∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2017 |██████∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 ```
 
-The dots represent the total activities that month, so you can get a feel for the
+The dots represent the total activities of each month, so you can get a feel for the
 proportion of activities with that friend vs. the total you've logged.
 
 You can also graph a certain group of friends:
 
 ```bash
 $ friends graph --with George --with Grace
-Nov 2017 |∙∙∙|
-Dec 2017 |∙∙|
-Jan 2018 |█∙∙∙∙∙∙|
-Feb 2018 |∙∙∙∙∙|
+Feb 2018 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2018 |███████████∙∙∙∙∙∙∙∙∙|
+Dec 2017 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2017 |███∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 ```
 
 Or graph only activities with a certain tag:
 
 ```bash
 $ friends graph --tagged food
-Nov 2017 |█∙∙|
-Dec 2017 |∙∙|
-Jan 2018 |∙∙∙∙∙∙∙|
-Feb 2018 |███∙∙|
+Feb 2018 |██████∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2018 |█████████∙∙∙∙∙∙∙∙∙∙∙|
+Dec 2017 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2017 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 ```
 
 Or with multiple tags:
 
 ```bash
-$ friends graph --tagged @fun --tagged @work
-Nov 2017 |∙∙∙|
-Dec 2017 |█∙|
-Jan 2018 |∙∙∙∙∙∙∙|
-Feb 2018 |█∙∙∙∙|
+$ friends graph --tagged fun --tagged work
+Feb 2018 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2018 |█∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Dec 2017 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2017 |█∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 ```
 
 Or graph only activities in a certain location:
 
 ```bash
 $ friends graph --in Paris
-Nov 2017 |█∙∙|
-Dec 2017 |∙∙|
-Jan 2018 |∙∙∙∙∙∙∙|
-Feb 2018 |█∙∙∙∙|
+Feb 2018 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2018 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Dec 2017 |███∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2017 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 ```
 
 Or graph only activities on or after a certain date:
 
 ```bash
-$ friends graph --since 'January 1st 2018'
-Jan 2018 |███████
-Feb 2018 |█████
+$ friends graph --since 'January 21st 2018'
+Feb 2018 |███████∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2018 |█∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
 ```
 
 Or graph only activities before or on a certain date:
 
 ```bash
 $ friends graph --until 'January 1st 2018'
-Nov 2017 |███
-Dec 2017 |██
-Jan 2018 |███████
+Jan 2018 |█████████████∙∙∙∙∙∙∙|
+Dec 2017 |███∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2017 |█████████∙∙∙∙∙∙∙∙∙∙∙|
 ```
 
 And you can use multiple of these flags together:
 
 ```bash
-$ friends graph --in Paris --tagged food --with George --since 'Jan 2018'
+$ friends graph --unscaled --in Paris --tagged food --with George --since 'Jan 2018'
 Jan 2018 |∙∙∙∙∙∙∙|
 Fen 2017 |█∙∙∙∙|
 ```
@@ -639,7 +650,7 @@ $ friends list activities --tagged food
 Or use more than one tag:
 
 ```bash
-$ friends list activities --tagged @fun --tagged @work
+$ friends list activities --tagged fun --tagged work
 2018-07-04: Summer picnic with @work colleagues. @fun
 ```
 

data/bin/friends

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-if ENV["TRAVIS"] == "true"
+if ENV["TRAVIS"] == "true" && ENV["CODE_COVERAGE"] == "true"
   require "simplecov"
   SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter
   SimpleCov.command_name Process.pid.to_s

data/friends.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "tty-pager", "~> 0.11"
 
   spec.add_development_dependency "bundler", ">= 1.6"
-  spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "codecov", "~> 0.1.14"
   spec.add_development_dependency "minitest", "~> 5.5"
   spec.add_development_dependency "minitest-proveit", "~> 1.0"
   spec.add_development_dependency "rake", "~> 12.3"

data/lib/friends/commands/graph.rb

@@ -29,13 +29,18 @@ command :graph do |graph|
              desc: "Graph activities before or on the given date",
              type: InputDate
 
+  graph.switch [:unscaled],
+               negatable: false,
+               desc: "Do not scale the bars in the graph"
+
   graph.action do |_, options|
     @introvert.graph(
       with: options[:with],
       location_name: options[:in],
       tagged: options[:tagged],
       since_date: options[:since],
-      until_date: options[:until]
+      until_date: options[:until],
+      unscaled: options[:unscaled]
     )
   end
 end

data/lib/friends/event.rb

@@ -146,12 +146,12 @@ module Friends
     # @param tag [String] the tag to test, of the form "@tag"
     # @return [Boolean] true iff this activity includes the given tag
     def includes_tag?(tag)
-      tags.include? tag
+      tags.include? tag.downcase
     end
 
     # @return [Set] all tags in this activity (including the "@")
     def tags
-      Set.new(@description.scan(TAG_REGEX))
+      Set.new(@description.scan(TAG_REGEX).map(&:downcase))
     end
 
     # Find the names of all friends in this description.

data/lib/friends/graph.rb

@@ -5,11 +5,17 @@
 module Friends
   class Graph
     DATE_FORMAT = "%b %Y".freeze
+    SCALED_SIZE = 20
 
-    # @param activities [Array<Friends::Activity>] a list of activities to graph
-    def initialize(filtered_activities:, all_activities:)
+    # @param filtered_activities [Array<Friends::Activity>] a list of activities to highlight in
+    #   the graph (may be the same as `all_activities`)
+    # @param all_activities [Array<Friends::Activity>] a list of activities to graph
+    # @param unscaled [Boolean] true iff we should show the absolute size of bars in the graph
+    #   rather than a scaled version
+    def initialize(filtered_activities:, all_activities:, unscaled:)
       @filtered_activities = filtered_activities
       @all_activities = all_activities
+      @unscaled = unscaled
 
       return if @all_activities.empty?
 
@@ -19,7 +25,18 @@ module Friends
 
     # @return [Array<String>] the output to print, with colors
     def output
-      to_h.map do |month, (filtered_count, total_count)|
+      hash = to_h
+      global_total = hash.max_by { |_, (_, val)| val }.last.last unless @unscaled || hash.empty?
+
+      hash.map do |month, (filtered_count, total_count)|
+        unless @unscaled
+          # We want to use rationals for math so we can round up as well
+          # as down (instead of int division), for more accurate graphing.
+          # Floats are less trustworthy and could give results < 0 or > total_count
+          filtered_count = Rational(filtered_count * SCALED_SIZE, global_total).round
+          total_count = SCALED_SIZE
+        end
+
         str = "#{month} |"
         str += Array.new(filtered_count) do |count|
           Paint["█", color(count)]

data/lib/friends/introvert.rb

@@ -264,7 +264,7 @@ module Friends
       # Filter by tag if param is passed.
       unless tagged.empty?
         fs = fs.select do |friend|
-          tagged.all? { |tag| friend.tags.include? tag }
+          tagged.all? { |tag| friend.tags.map(&:downcase).include? tag.downcase }
         end
       end
 
@@ -317,9 +317,11 @@ module Friends
     #   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
+    # @param unscaled [Boolean] true iff we should show the absolute size of bars in the graph
+    #   rather than a scaled version
     # @raise [FriendsError] if friend, location or tag cannot be found or
     #   is ambiguous
-    def graph(with:, location_name:, tagged:, since_date:, until_date:)
+    def graph(with:, location_name:, tagged:, since_date:, until_date:, unscaled:)
       filtered_activities_to_graph = filtered_events(
         events: @activities,
         with: with,
@@ -340,13 +342,18 @@ module Friends
         with: [],
         location_name: nil,
         tagged: [],
-        since_date: since_date,
-        until_date: until_date
+
+        # By including all activities for the "fencepost" months in our totals,
+        # we prevent those months from being always "full" in the graph
+        # because all filtered events will match the criteria.
+        since_date: (since_date.prev_day(since_date.day - 1) if since_date),
+        until_date: (until_date.prev_day(until_date.day - 1).next_month.prev_day if until_date)
       )
 
       Graph.new(
         filtered_activities: filtered_activities_to_graph,
-        all_activities: all_activities_to_graph
+        all_activities: all_activities_to_graph,
+        unscaled: unscaled
       ).output.each { |line| @output << line }
     end
 

data/lib/friends/version.rb

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

data/test/commands/graph_spec.rb

@@ -3,7 +3,8 @@
 require "./test/helper"
 
 clean_describe "graph" do
-  subject { run_cmd("graph") }
+  subject { run_cmd("graph#{' --unscaled' if unscaled}") }
+  let(:unscaled) { false }
 
   describe "when file does not exist" do
     let(:content) { nil }
@@ -46,8 +47,29 @@ clean_describe "graph" do
       FILE
     end
 
-    it "graphs all activities" do
+    it "graphs all activities, scaled" do
       stdout_only <<-OUTPUT
+Nov 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jul 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jun 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+May 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Apr 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Mar 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Feb 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2015 |████████████████████
+Dec 2014 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2014 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+      OUTPUT
+    end
+
+    describe "--unscaled" do
+      let(:unscaled) { true }
+
+      it "graphs all activities, unscaled" do
+        stdout_only <<-OUTPUT
 Nov 2015 |█
 Oct 2015 |
 Sep 2015 |
@@ -61,13 +83,15 @@ Feb 2015 |
 Jan 2015 |████
 Dec 2014 |█
 Nov 2014 |█
-      OUTPUT
+        OUTPUT
+      end
     end
 
     describe "when there are more activities than colors" do
       let(:content) do
         (["### Activities:"] + (["- 2017-06-01: Did something."] * 100)).join("\n")
       end
+      let(:unscaled) { true }
 
       it "displays the correct number of activities" do
         stdout_only("Jun 2017 |" + ("█" * 100))
@@ -75,7 +99,7 @@ Nov 2014 |█
     end
 
     describe "--in" do
-      subject { run_cmd("graph --in #{location_name}") }
+      subject { run_cmd("graph#{' --unscaled' if unscaled} --in #{location_name}") }
 
       describe "when location does not exist" do
         let(:location_name) { "Garbage" }
@@ -86,8 +110,30 @@ Nov 2014 |█
 
       describe "when location exists" do
         let(:location_name) { "paris" }
-        it "matches location case-insensitively" do
+
+        it "matches location case-insensitively and scales the graph" do
           stdout_only <<-OUTPUT
+Nov 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jul 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jun 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+May 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Apr 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Mar 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Feb 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2015 |███████████████∙∙∙∙∙|
+Dec 2014 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2014 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+          OUTPUT
+        end
+
+        describe "--unscaled" do
+          let(:unscaled) { true }
+
+          it "matches location case-insensitively and does not scale graph" do
+            stdout_only <<-OUTPUT
 Nov 2015 |∙|
 Oct 2015 |
 Sep 2015 |
@@ -101,13 +147,14 @@ Feb 2015 |
 Jan 2015 |███∙|
 Dec 2014 |█
 Nov 2014 |∙|
-          OUTPUT
+            OUTPUT
+          end
         end
       end
     end
 
     describe "--with" do
-      subject { run_cmd("graph --with #{friend_name}") }
+      subject { run_cmd("graph#{' --unscaled' if unscaled} --with #{friend_name}") }
 
       describe "when friend does not exist" do
         let(:friend_name) { "Garbage" }
@@ -128,8 +175,29 @@ Nov 2014 |∙|
       describe "when friend name matches one friend" do
         let(:friend_name) { "george" }
 
-        it "matches friend case-insensitively" do
+        it "matches friend case-insensitively and scales the graph" do
           stdout_only <<-OUTPUT
+Nov 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jul 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jun 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+May 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Apr 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Mar 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Feb 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Dec 2014 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2014 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+          OUTPUT
+        end
+
+        describe "--unscaled" do
+          let(:unscaled) { true }
+
+          it "matches friend case-insensitively and does not scale graph" do
+            stdout_only <<-OUTPUT
 Nov 2015 |∙|
 Oct 2015 |
 Sep 2015 |
@@ -143,17 +211,44 @@ Feb 2015 |
 Jan 2015 |█∙∙∙|
 Dec 2014 |∙|
 Nov 2014 |█
-          OUTPUT
+            OUTPUT
+          end
         end
       end
 
       describe "when more than one friend name is passed" do
-        subject { run_cmd("graph --with #{friend_name1} --with #{friend_name2}") }
+        subject do
+          run_cmd(
+            "graph#{' --unscaled' if unscaled} --with #{friend_name1} --with #{friend_name2}"
+          )
+        end
+
         let(:friend_name1) { "george" }
         let(:friend_name2) { "grace" }
 
-        it "matches all friends case-insensitively" do
+        it "matches all friends case-insensitively and scales the graph" do
           stdout_only <<-OUTPUT
+Nov 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jul 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jun 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+May 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Apr 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Mar 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Feb 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Dec 2014 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2014 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+          OUTPUT
+        end
+
+        describe "--unscaled" do
+          let(:unscaled) { true }
+
+          it "matches all friends case-insensitively and does not scale graph" do
+            stdout_only <<-OUTPUT
 Nov 2015 |∙|
 Oct 2015 |
 Sep 2015 |
@@ -167,16 +262,38 @@ Feb 2015 |
 Jan 2015 |█∙∙∙|
 Dec 2014 |∙|
 Nov 2014 |∙|
-          OUTPUT
+            OUTPUT
+          end
         end
       end
     end
 
     describe "--tagged" do
-      subject { run_cmd("graph --tagged food") }
+      subject { run_cmd("graph#{' --unscaled' if unscaled} --tagged Food") }
 
-      it "matches tag case-sensitively" do
+      it "matches tag case-insensitively and scales the graph" do
         stdout_only <<-OUTPUT
+Nov 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jul 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jun 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+May 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Apr 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Mar 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Feb 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Dec 2014 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2014 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+        OUTPUT
+      end
+
+      describe "--unscaled" do
+        let(:unscaled) { true }
+
+        it "matches tag case-insensitively and does not scale graph" do
+          stdout_only <<-OUTPUT
 Nov 2015 |█
 Oct 2015 |
 Sep 2015 |
@@ -191,15 +308,37 @@ Jan 2015 |█∙∙∙|
 Dec 2014 |█
 Nov 2014 |∙|
         OUTPUT
+        end
       end
 
       describe "when more than one tag is passed" do
-        subject { run_cmd("graph --tagged #{tag1} --tagged #{tag2}") }
-        let(:tag1) { "food" }
-        let(:tag2) { "partying" }
+        subject { run_cmd("graph#{' --unscaled' if unscaled} --tagged #{tag1} --tagged #{tag2}") }
+        let(:tag1) { "Food" }
+        let(:tag2) { "PARTYING" }
 
-        it "matches all tags case-sensitively" do
+        it "matches all tags case-insensitively and scales the graph" do
           stdout_only <<-OUTPUT
+Nov 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jul 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jun 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+May 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Apr 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Mar 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Feb 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Dec 2014 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2014 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+          OUTPUT
+        end
+
+        describe "--unscaled" do
+          let(:unscaled) { true }
+
+          it "matches all tags case-insensitively and does not scale graph" do
+            stdout_only <<-OUTPUT
 Nov 2015 |∙|
 Oct 2015 |
 Sep 2015 |
@@ -213,16 +352,36 @@ Feb 2015 |
 Jan 2015 |∙∙∙∙|
 Dec 2014 |█
 Nov 2014 |∙|
-          OUTPUT
+            OUTPUT
+          end
         end
       end
     end
 
     describe "--since" do
-      subject { run_cmd("graph --since 'January 6th 2015'") }
+      subject { run_cmd("graph#{' --unscaled' if unscaled} --since 'January 6th 2015'") }
 
-      it "graphs activities on and after the specified date" do
+      it "graphs activities on and after the specified date and scales the graph" do
         stdout_only <<-OUTPUT
+Nov 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jul 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jun 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+May 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Apr 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Mar 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Feb 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2015 |███████████████∙∙∙∙∙|
+        OUTPUT
+      end
+
+      describe "--unscaled" do
+        let(:unscaled) { true }
+
+        it "graphs activities on and after the specified date and does not scale graph" do
+          stdout_only <<-OUTPUT
 Nov 2015 |█
 Oct 2015 |
 Sep 2015 |
@@ -233,30 +392,68 @@ May 2015 |
 Apr 2015 |
 Mar 2015 |
 Feb 2015 |
-Jan 2015 |███
-        OUTPUT
+Jan 2015 |███∙|
+          OUTPUT
+        end
       end
     end
 
     describe "--until" do
-      subject { run_cmd("graph --until 'January 6th 2015'") }
+      subject { run_cmd("graph#{' --unscaled' if unscaled} --until 'January 6th 2015'") }
 
-      it "graphs activities before and on the specified date" do
+      it "graphs activities before and on the specified date and scales the graph" do
         stdout_only <<-OUTPUT
-Jan 2015 |███
+Jan 2015 |███████████████∙∙∙∙∙|
+Dec 2014 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Nov 2014 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+        OUTPUT
+      end
+
+      describe "--unscaled" do
+        let(:unscaled) { true }
+
+        it "graphs activities before and on the specified date and does not scale graph" do
+          stdout_only <<-OUTPUT
+Jan 2015 |███∙|
 Dec 2014 |█
 Nov 2014 |█
-        OUTPUT
+          OUTPUT
+        end
       end
     end
 
     describe "combining filters" do
-      subject { run_cmd("graph --since 'January 6th 2015' --with Grace") }
+      subject do
+        run_cmd("graph#{' --unscaled' if unscaled} --since 'January 6th 2015' --with Grace")
+      end
 
-      it "only shows other activities within the same period as the filtered ones" do
+      it "only shows other activities within the same period as the filtered ones and scales the "\
+         "graph" do
         # If we just rounded to the month, there would be three unfiltered activities in
         # January displayed (due to the one on 1/5/2015). Instead, we correctly display two.
         stdout_only <<-OUTPUT
+Nov 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Oct 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Sep 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Aug 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jul 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jun 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+May 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Apr 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Mar 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Feb 2015 |∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+Jan 2015 |█████∙∙∙∙∙∙∙∙∙∙∙∙∙∙∙|
+        OUTPUT
+      end
+
+      describe "--unscaled" do
+        let(:unscaled) { true }
+
+        it "only shows other activities within the same period as the filtered ones and does not "\
+           "scale graph" do
+          # If we just rounded to the month, there would be three unfiltered activities in
+          # January displayed (due to the one on 1/5/2015). Instead, we correctly display two.
+          stdout_only <<-OUTPUT
 Nov 2015 |█
 Oct 2015 |
 Sep 2015 |
@@ -267,8 +464,9 @@ May 2015 |
 Apr 2015 |
 Mar 2015 |
 Feb 2015 |
-Jan 2015 |█∙∙|
-        OUTPUT
+Jan 2015 |█∙∙∙|
+          OUTPUT
+        end
       end
     end
   end

data/test/commands/list/activities_spec.rb

@@ -92,9 +92,9 @@ clean_describe "list activities" do
     end
 
     describe "--tagged" do
-      subject { run_cmd("list activities --tagged food") }
+      subject { run_cmd("list activities --tagged FOOD") }
 
-      it "matches tag case-sensitively" 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
@@ -103,8 +103,8 @@ clean_describe "list activities" do
 
       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(:tag1) { "Food" }
+        let(:tag2) { "PARTYING" }
         let(:content) do
           <<-FILE
 ### Activities:
@@ -120,7 +120,7 @@ clean_describe "list activities" do
 FILE
         end
 
-        it "matches all tags case-sensitively" do
+        it "matches all tags case-insensitively" do
           stdout_only(
             "2014-12-31: Celebrated the new year in Paris with Marie Curie. @partying @food"
           )

data/test/commands/list/friends_spec.rb

@@ -69,9 +69,9 @@ Norman Borlaug (a.k.a. Norm) @science @science:outdoors @science:outdoors:agrono
     end
 
     describe "--tagged" do
-      subject { run_cmd("list friends --tagged science") }
+      subject { run_cmd("list friends --tagged scIence") }
 
-      it "matches tag case-sensitively" do
+      it "matches tag case-insensitively" do
         stdout_only <<-OUTPUT
 Marie Curie
 Grace Hopper
@@ -81,8 +81,8 @@ Norman Borlaug
 
       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(:tag1) { "Science" }
+        let(:tag2) { "NAVY" }
         let(:content) do
           <<-FILE
 ### Activities:
@@ -96,7 +96,7 @@ Norman Borlaug
 FILE
         end
 
-        it "matches all tags case-sensitively" do
+        it "matches all tags case-insensitively" do
           stdout_only <<-OUTPUT
 Grace Hopper
 Neil Armstrong

data/test/commands/list/notes_spec.rb

@@ -95,9 +95,9 @@ clean_describe "list notes" do
     end
 
     describe "--tagged" do
-      subject { run_cmd("list notes --tagged school") }
+      subject { run_cmd("list notes --tagged School") }
 
-      it "matches tag case-sensitively" do
+      it "matches tag case-insensitively" do
         stdout_only <<-OUTPUT
 2015-06-06: Marie Curie just got accepted into a PhD program in Paris. @school
 2017-03-12: Marie Curie completed her PhD in record time. @school
@@ -106,8 +106,8 @@ clean_describe "list notes" do
 
       describe "when more than one tag is passed" do
         subject { run_cmd("list notes --tagged #{tag1} --tagged #{tag2}") }
-        let(:tag1) { "science" }
-        let(:tag2) { "school" }
+        let(:tag1) { "Science" }
+        let(:tag2) { "SCHOOL" }
         let(:content) do
           <<-FILE
 ### Notes:
@@ -123,7 +123,7 @@ clean_describe "list notes" do
 FILE
         end
 
-        it "matches all tags case-sensitively" do
+        it "matches all tags case-insensitively" do
           stdout_only <<-OUTPUT
 2015-11-01: Grace Hopper just started a PhD program. @school @science
 2014-12-31: Marie Curie completed her PhD today! @science @school

data/test/helper.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-if ENV["TRAVIS"] == "true"
+if ENV["TRAVIS"] == "true" && ENV["CODE_COVERAGE"] == "true"
   require "simplecov"
-  require "coveralls"
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  require "codecov"
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
   SimpleCov.start do
     add_filter "/test/"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.44'
+  version: '0.45'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -101,19 +101,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.1.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.1.14
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement