friends 0.30 → 0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81e378aa8d3e1a7285adcb3f92cc91977c22eca2
-  data.tar.gz: f48b3ccd7d4006679c7b072b06a980432c759a6c
+  metadata.gz: d644149046a9df58031ed1aefcd34ca28d45fb91
+  data.tar.gz: f4964423489ad13fcdfc789c3e9ccc025c65a0e9
 SHA512:
-  metadata.gz: ee11daf225f5c245b68a732267b0fafd7041d478d8cff7d68860f9b50a71f9a3db51de2edd4a7dac723a6db5c5c26045a697a21bc7215acc770bed3a2390ee10
-  data.tar.gz: e47d850e7cc62ea74a0c212f0315de2cc5bd1eb72f331526ccee67dd39d7599b091a546770d14ba2af7132f929ab8d9076f61b28cb8a68a36432ccda3d481f56
+  metadata.gz: 2c5189966fe28ac95307bab8375cd31075deb6e928847950dd7e7af1e5f9c4b4b186d2da8ca91da9021324dbf8f720a9799c0a4ef6327afe2a7bac67b2573c4c
+  data.tar.gz: dd219dc75e1f7a01e7f8f0131f5980490b122641fbafbdf87d09221aa18a672cce34707a7c9cb4d9c91282e84710ff874783e570c49d8988f73180c5e593c152

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## [v0.31](https://github.com/JacobEvelyn/friends/tree/v0.31) (2017-06-02)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.30...v0.31)
+
+**Implemented enhancements:**
+
+- Change graph commands to display filtered graphs within total [\#171](https://github.com/JacobEvelyn/friends/issues/171)
+
+**Fixed bugs:**
+
+- Graph does not display more than 42 activities per month [\#172](https://github.com/JacobEvelyn/friends/issues/172)
+
+**Closed issues:**
+
+- Reduce dependencies [\#167](https://github.com/JacobEvelyn/friends/issues/167)
+- Add standalone distribution [\#160](https://github.com/JacobEvelyn/friends/issues/160)
+- Integrate with cron for regular reminders [\#56](https://github.com/JacobEvelyn/friends/issues/56)
+
+**Merged pull requests:**
+
+- Improve graph command [\#174](https://github.com/JacobEvelyn/friends/pull/174) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Remove Memoist dependency and bump gem dependencies [\#170](https://github.com/JacobEvelyn/friends/pull/170) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Remove warnings when running tests [\#169](https://github.com/JacobEvelyn/friends/pull/169) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [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)
 
@@ -9,6 +32,10 @@
 - 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)
 
+**Closed issues:**
+
+- Reduce warnings [\#166](https://github.com/JacobEvelyn/friends/issues/166)
+
 **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))

data/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,5 @@
+---
+
 Hi there! Thanks so much for submitting a pull request!
 
 Let's just make sure together that all of these boxes are checked before we

data/README.md

@@ -18,6 +18,7 @@ lots of help), and give feedback!**
   - [Core concepts](#core-concepts)
   - [Global flags](#global-flags)
   - [Syncing across multiple machines](#syncing-across-multiple-machines)
+  - [Setting reminders](#setting-reminders)
   - [Command reference](#command-reference)
     - `add`
       - [`add activity`](#add-activity)
@@ -124,10 +125,10 @@ The `friends.md` Markdown file that stores all of your data contains:
 
 ```markdown
 ### Activities:
-- 2015-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute.
-- 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**.
-- 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**.
-- 2014-11-15: Talked to **George Washington Carver** on the phone for an hour.
+- 2018-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute.
+- 2018-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**.
+- 2017-12-31: Celebrated the new year in _Paris_ with **Marie Curie**.
+- 2017-11-15: Talked to **George Washington Carver** on the phone for an hour.
 ```
 
 See the example
@@ -188,6 +189,29 @@ do this for you, like so:
 alias friends="friends --filename '~/Dropbox/friends.md'"
 ```
 
+### Setting reminders
+
+Though `friends` has no built-in reminder functionality, it's easy to use a
+system like `cron` (Mac or Linux) or `Task Scheduler` (Windows) to set various
+reminders.
+
+For example, on a Mac, the following `crontab` configuration results in every day
+at 9:00 p.m. a Terminal tab opening, printing "Time to journal!" and then launching
+an `add activity` prompt through `friends`:
+
+```
+0 21 * * * osascript -e 'activate application "Terminal"' &> /dev/null && osascript -e 'tell application "Terminal" to do script "clear && echo Time to journal! && friends add activity"' &> /dev/null
+```
+
+Here's another example (also for Mac) of using `friends` to suggest some people to
+hang out with every Saturday morning:
+
+```
+0 10 * * 6 osascript -e 'activate application "Terminal"' &> /dev/null && osascript -e 'tell application "Terminal" to do script "clear && echo Consider hanging out with one of these friends today: && friends suggest"' &> /dev/null
+```
+
+(If you use other tools, please share and we'll add to these examples!)
+
 ### Command reference*
 
 *Note that the command-line output is colored, which this README cannot show.
@@ -196,7 +220,7 @@ alias friends="friends --filename '~/Dropbox/friends.md'"
 
 ```bash
 $ friends add activity Got lunch with Grace and George.
-Activity added: "2015-01-04: Got lunch with Grace Hopper and George Washington Carver."
+Activity added: "2018-01-04: Got lunch with Grace Hopper and George Washington Carver."
 ```
 
 `friends` will **automatically** figure out which "Grace" and "George" you're referring to, *even if you're friends with lots of different Graces and Georges*.
@@ -206,7 +230,7 @@ just like formal names:
 
 ```bash
 $ friends add activity Invented debugging with The Admiral.
-Activity added: "2016-01-06: Invented debugging with Grace Hopper."
+Activity added: "2017-01-06: Invented debugging with Grace Hopper."
 ```
 
 You can also use the first initial of a last name instead of the whole thing.
@@ -215,14 +239,14 @@ them) based on whether you're in the middle of a sentence or not:
 
 ```bash
 $ friends add activity Got lunch with Earnest H and Earnest S. in the park. Man, I like Earnest H. but really love Earnest S.
-Activity added: "2016-05-01: Got lunch with Earnest Hemingway and Earnest Shackleton in the park. Man, I like Earnest Hemingway but really love Earnest Shackleton."
+Activity added: "2017-05-01: Got lunch with Earnest Hemingway and Earnest Shackleton in the park. Man, I like Earnest Hemingway but really love Earnest Shackleton."
 ```
 
 And locations will be matched as well:
 
 ```bash
 $ friends add activity Went swimming near atlantis with George.
-Activity added: "2016-01-06: Went swimming near Atlantis with George Washington Carver."
+Activity added: "2017-01-06: Went swimming near Atlantis with George Washington Carver."
 ```
 
 Tags will be colored if they're provided (though this README can't display
@@ -230,35 +254,35 @@ color so you'll just have to have faith here):
 
 ```bash
 $ friends add activity The office softball team wins a game! @work @exercise
-Activity added: "2016-05-05: The office softball team wins a game! @work @exercise"
+Activity added: "2017-05-05: The office softball team wins a game! @work @exercise"
 ```
 
 You can of course specify a date for the activity:
 
 ```bash
 $ friends add activity Yesterday: Celebrated the new year with Marie.
-Activity added: "2014-12-31: Celebrated the new year with Marie Curie."
+Activity added: "2017-12-31: Celebrated the new year with Marie Curie."
 ```
 
 Or get an **interactive prompt** by just typing `friends add activity`, with or without a date specified:
 
 ```bash
-$ friends add activity 2015-11-01
-2015-11-01: <type description here>
+$ friends add activity 2018-11-01
+2018-11-01: <type description here>
 ```
 
 **Natural-language dates** work just fine:
 
 ```bash
 $ friends add activity last Monday
-2016-03-07: <type description here>
+2017-03-07: <type description here>
 ```
 
 You can escape the names of friends you don't want `friends` to match with a backslash:
 
 ```bash
-$ friends add activity "2015-11-01: Grace and I went to \Marie's Diner. \George had to cancel at the last minute."
-Activity added: "2015-11-01: Grace Hopper and I went to Marie's Diner. George had to cancel at the last minute."
+$ friends add activity "2018-11-01: Grace and I went to \Marie's Diner. \George had to cancel at the last minute."
+Activity added: "2018-11-01: Grace Hopper and I went to Marie's Diner. George had to cancel at the last minute."
 ```
 
 #### `add friend`
@@ -327,78 +351,88 @@ Graphs (in color!) your activities over time:
 
 ```bash
 $ friends graph
-Nov 2014 |███
-Dec 2014 |██
-Jan 2015 |███████
-Feb 2015 |█████
+Nov 2017 |███
+Dec 2017 |██
+Jan 2018 |███████
+Feb 2018 |█████
 ```
 
 Or graph only activities with a certain friend:
 
 ```bash
 $ friends graph --with George
-Nov 2014 |█
-Dec 2014 |
-Jan 2015 |█████
-Feb 2015 |███
+Nov 2017 |█∙∙|
+Dec 2017 |∙∙|
+Jan 2018 |█████∙∙|
+Feb 2018 |███∙∙|
 ```
 
-Or a certain group of friends:
+The dots represent the total activities that 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
-Jan 2015 |█
+Nov 2017 |∙∙∙|
+Dec 2017 |∙∙|
+Jan 2018 |█∙∙∙∙∙∙|
+Feb 2018 |∙∙∙∙∙|
 ```
 
 Or graph only activities with a certain tag:
 
 ```bash
 $ friends graph --tagged food
-Nov 2014 |█
-Dec 2014 |
-Jan 2015 |
-Feb 2015 |███
+Nov 2017 |█∙∙|
+Dec 2017 |∙∙|
+Jan 2018 |∙∙∙∙∙∙∙|
+Feb 2018 |███∙∙|
 ```
 
 Or with multiple tags:
 
 ```bash
 $ friends graph --tagged @fun --tagged @work
-Jul 2017 |█
+Nov 2017 |∙∙∙|
+Dec 2017 |█∙|
+Jan 2018 |∙∙∙∙∙∙∙|
+Feb 2018 |█∙∙∙∙|
 ```
 
 Or graph only activities in a certain location:
 
 ```bash
 $ friends graph --in Paris
-Nov 2014 |█
-Dec 2014 |
-Jan 2015 |
-Feb 2015 |█
+Nov 2017 |█∙∙|
+Dec 2017 |∙∙|
+Jan 2018 |∙∙∙∙∙∙∙|
+Feb 2018 |█∙∙∙∙|
 ```
 
 Or graph only activities on or after a certain date:
 
 ```bash
-$ friends graph --since 'January 1st 2015'
-Jan 2015 |███████
-Feb 2015 |█████
+$ friends graph --since 'January 1st 2018'
+Jan 2018 |███████
+Feb 2018 |█████
 ```
 
 Or graph only activities before or on a certain date:
 
 ```bash
-$ friends graph --until 'January 1st 2015'
-Nov 2014 |███
-Dec 2014 |██
-Jan 2015 |███████
+$ friends graph --until 'January 1st 2018'
+Nov 2017 |███
+Dec 2017 |██
+Jan 2018 |███████
 ```
 
 And you can use multiple of these flags together:
 
 ```bash
-$ friends graph --in Paris --tagged food --with George --after 'September 2014'
-Nov 2014 |█
+$ friends graph --in Paris --tagged food --with George --since 'Jan 2018'
+Jan 2018 |∙∙∙∙∙∙∙|
+Fen 2017 |█∙∙∙∙|
 ```
 
 #### `help`
@@ -436,74 +470,74 @@ Lists recent activities:
 
 ```bash
 $ friends list activities
-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
-2014-11-15: Talked to George Washington Carver on the phone for an hour.
+2018-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+2017-12-31: Celebrated the new year with Marie Curie in New York City. @partying
+2017-11-15: Talked to George Washington Carver on the phone for an hour.
 ```
 
 You can adjust how many activities are shown:
 
 ```bash
 $ friends list activities --limit 2
-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
+2018-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+2017-12-31: Celebrated the new year with Marie Curie in New York City. @partying
 ```
 
 Or only list the activities you did with a certain friend:
 
 ```bash
 $ friends list activities --with George
-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.
+2018-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+2017-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
+2018-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
 ```
 
 Or filter your activities by location:
 
 ```bash
 $ friends list activities --in "New York"
-2014-12-31: Celebrated the new year with Marie Curie in New York City. @partying
+2017-12-31: Celebrated the new year with Marie Curie in New York City. @partying
 ```
 
 Or by tag:
 
 ```bash
 $ friends list activities --tagged food
-2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+2018-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
+2018-07-04: Summer picnic with @work colleagues. @fun
 ```
 
 Or by date:
 
 ```bash
-$ 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
+$ friends list activities --since 'December 31st 2017'
+2018-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+2017-12-31: Celebrated the new year with Marie Curie in New York City. @partying
 ```
 
 ```bash
-$ 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.
+$ friends list activities --until 'December 31st 2017'
+2017-12-31: Celebrated the new year with Marie Curie in New York City. @partying
+2017-11-15: Talked to George Washington Carver on the phone for an hour.
 ```
 
 And you can mix and match these options to your heart's content:
 
 ```bash
 $ friends list activities --tagged food --with Grace --with George
-2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
+2018-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
 ```
 
 #### `list favorite friends`

data/friends.gemspec

@@ -25,9 +25,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "chronic", "~> 0.10"
   spec.add_dependency "gli", "~> 2.12"
-  spec.add_dependency "memoist", "~> 0.15"
-  spec.add_dependency "paint", "~> 1.0"
-  spec.add_dependency "semverse", "~> 1.2"
+  spec.add_dependency "paint", "~> 2.0"
+  spec.add_dependency "semverse", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "coveralls", "~> 0.8"

data/friends.md

@@ -1,8 +1,8 @@
 ### Activities:
-- 2015-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute. @food
-- 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.
+- 2018-11-01: **Grace Hopper** and I went to _Marie's Diner_. George had to cancel at the last minute. @food
+- 2018-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
+- 2017-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying
+- 2017-11-15: Talked to **George Washington Carver** on the phone for an hour.
 
 ### Friends:
 - George Washington Carver

data/lib/friends.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "friends/introvert"
 require "friends/version"
 
 module Friends

data/lib/friends/activity.rb

@@ -3,7 +3,6 @@
 # Activity represents an activity you've done with one or more Friends.
 
 require "chronic"
-require "memoist"
 require "paint"
 require "set"
 
@@ -12,7 +11,6 @@ require "friends/serializable"
 module Friends
   class Activity
     extend Serializable
-    extend Memoist
 
     SERIALIZATION_PREFIX = "- "
     DATE_PARTITION = ": "
@@ -143,16 +141,14 @@ module Friends
     # Find the names of all friends in this description.
     # @return [Array] list of all friend names in the description
     def friend_names
-      @description.scan(/(?<=\*\*)\w[^\*]*(?=\*\*)/).uniq
+      @_friend_names ||= @description.scan(/(?<=\*\*)\w[^\*]*(?=\*\*)/).uniq
     end
-    memoize :friend_names
 
     # Find the names of all locations in this description.
     # @return [Array] list of all location names in the description
     def location_names
-      @description.scan(/(?<=_)\w[^_]*(?=_)/).uniq
+      @_location_names ||= @description.scan(/(?<=_)\w[^_]*(?=_)/).uniq
     end
-    memoize :location_names
 
     private
 

data/lib/friends/commands/graph.rb

@@ -30,29 +30,12 @@ command :graph do |graph|
              type: InputDate
 
   graph.action do |_, options|
-    # This math is taken from Minitest's Pride plugin (the PrideLOL class).
-    PI_3 = Math::PI / 3
-
-    colors = (0...(6 * 7)).map do |n|
-      n *= 1.0 / 6
-      r  = (3 * Math.sin(n) + 3).to_i
-      g  = (3 * Math.sin(n + 2 * PI_3) + 3).to_i
-      b  = (3 * Math.sin(n + 4 * PI_3) + 3).to_i
-
-      [r, g, b].map { |c| c * 51 }
-    end
-
-    data = @introvert.graph(
+    @introvert.graph(
       with: options[:with],
       location_name: options[:in],
       tagged: options[:tagged],
       since_date: options[:since],
       until_date: options[:until]
     )
-
-    data.each do |month, count|
-      print "#{month} |"
-      puts colors.take(count).map { |rgb| Paint["█", rgb] }.join
-    end
   end
 end

data/lib/friends/graph.rb

@@ -7,47 +7,65 @@ module Friends
     DATE_FORMAT = "%b %Y"
 
     # @param activities [Array<Friends::Activity>] a list of activities to graph
-    def initialize(activities:)
-      @activities = activities
-      unless @activities.empty?
-        @start_date = @activities.last.date
-        @end_date = @activities.first.date
+    def initialize(filtered_activities:, all_activities:)
+      @filtered_activities = filtered_activities
+      @all_activities = all_activities
+      unless @all_activities.empty?
+        @start_date = @all_activities.last.date
+        @end_date = @all_activities.first.date
       end
     end
 
+    # Prints the graph to STDOUT, with colors.
+    def draw
+      to_h.each do |month, (filtered_count, total_count)|
+        str = "#{month} |"
+        str += Array.new(filtered_count) do |count|
+          Paint["█", color(count)]
+        end.join
+        if total_count > filtered_count
+          str += Array.new(total_count - filtered_count) do |count|
+            Paint["∙", color(filtered_count + count)]
+          end.join + Paint["|", color(total_count + 1)]
+        end
+        puts str
+      end
+    end
+
+    private
+
     # Render the graph as a hash in the format:
     #
     #   {
-    #     "Jan 2015" => 3, # The number of activities during each month.
-    #     "Feb 2015" => 0,
-    #     "Mar 2015" => 9
+    #     "Jan 2015" => [3, 4], # [# filtered activities, # total activities]
+    #     "Feb 2015" => [0, 0],
+    #     "Mar 2015" => [0, 9]
     #   }
     #
     # @return [Hash{String => Integer}]
     def to_h
       empty_graph.tap do |graph|
-        activities.each do |activity|
-          graph[format_date(activity.date)] += 1
+        @filtered_activities.each do |activity|
+          graph[format_date(activity.date)][0] += 1
+        end
+        @all_activities.each do |activity|
+          graph[format_date(activity.date)][1] += 1
         end
       end
     end
 
-    private
-
-    attr_accessor :start_date, :end_date, :activities
-
     # Render an empty graph as a hash in the format:
     #
     #   {
-    #     "Jan 2015" => 0,
-    #     "Feb 2015" => 0,
-    #     "Mar 2015" => 0
+    #     "Jan 2015" => [0, 0] # [# filtered activities, # total activities]
+    #     "Feb 2015" => [0, 0]
+    #     "Mar 2015" => [0, 0]
     #   }
     #
     # @return [Hash{String => Integer}]
     def empty_graph
-      Hash[(start_date && end_date ? (start_date..end_date) : []).map do |date|
-        [format_date(date), 0]
+      Hash[(@start_date && @end_date ? (@start_date..@end_date) : []).map do |date|
+        [format_date(date), [0, 0]]
       end]
     end
 
@@ -57,5 +75,38 @@ module Friends
     def format_date(date)
       date.strftime(DATE_FORMAT)
     end
+
+    # @param x [Integer] the x coordinate we want to color; x >= 0
+    # @return [Array<Integer>] the color we should use to paint
+    #   a point on the graph at the given x coordinate
+    def color(x)
+      COLORS[x % COLORS.size]
+    end
+
+    # Originally generated by executing the code in Minitest's Pride plugin (the PrideLOL class),
+    # and then pulling the unique values out and doubling them to create a more even distribution
+    # of colors.
+    COLORS = [
+      [153, 255, 0], [153, 255, 0],
+      [153, 204, 0], [153, 204, 0],
+      [204, 204, 0], [204, 204, 0],
+      [255, 153, 0], [255, 153, 0],
+      [255, 102, 0], [255, 102, 0],
+      [255, 51, 51], [255, 51, 51],
+      [255, 0, 102], [255, 0, 102],
+      [255, 0, 153], [255, 0, 153],
+      [204, 0, 204], [204, 0, 204],
+      [153, 0, 255], [153, 0, 255],
+      [102, 0, 255], [102, 0, 255],
+      [51, 51, 255], [51, 51, 255],
+      [0, 102, 255], [0, 102, 255],
+      [0, 153, 255], [0, 153, 255],
+      [0, 204, 204], [0, 204, 204],
+      [0, 255, 153], [0, 255, 153],
+      [0, 255, 102], [0, 255, 102],
+      [51, 255, 51], [51, 255, 51],
+      [102, 255, 0], [102, 255, 0]
+    ].freeze
+    private_constant :COLORS
   end
 end

data/lib/friends/introvert.rb

@@ -310,7 +310,7 @@ module Friends
     # @raise [FriendsError] if friend, location or tag cannot be found or
     #   is ambiguous
     def graph(with:, location_name:, tagged:, since_date:, until_date:)
-      activities_to_graph = filtered_activities(
+      filtered_activities_to_graph = filtered_activities(
         with: with,
         location_name: location_name,
         tagged: tagged,
@@ -318,7 +318,24 @@ module Friends
         until_date: until_date
       )
 
-      Graph.new(activities: activities_to_graph).to_h
+      # If the user wants to graph in a specific date range, we explicitly
+      # limit our output to that date range. We don't just use the date range
+      # of the first and last `filtered_activities_to_graph` because those
+      # activities might not include others in the full range (for instance,
+      # if only one filtered activity matches a query, we don't want to only
+      # show unfiltered activities that occurred on that specific day).
+      all_activities_to_graph = filtered_activities(
+        with: [],
+        location_name: nil,
+        tagged: [],
+        since_date: since_date,
+        until_date: until_date
+      )
+
+      Graph.new(
+        filtered_activities: filtered_activities_to_graph,
+        all_activities: all_activities_to_graph
+      ).draw
     end
 
     # Suggest friends to do something with.

data/lib/friends/version.rb

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

data/test/commands/add/activity_spec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "date"
+
 require "./test/helper"
 
 def date_parsing_specs(test_stdout: true)

data/test/commands/clean_spec.rb

@@ -4,12 +4,15 @@ require "./test/helper"
 
 clean_describe "clean" do
   subject { run_cmd("clean") }
+  let(:content) { nil }
 
   it "outputs a message" do
     stdout_only "File cleaned: \"#{filename}\""
   end
 
   describe "when file does not exist" do
+    let(:content) { nil }
+
     it "does not create the file" do
       File.exist?(filename).must_equal false
     end

data/test/commands/graph_spec.rb

@@ -6,6 +6,8 @@ clean_describe "graph" do
   subject { run_cmd("graph") }
 
   describe "when file does not exist" do
+    let(:content) { nil }
+
     it "prints no output" do
       stdout_only ""
     end
@@ -20,13 +22,35 @@ clean_describe "graph" do
   end
 
   describe "when file has content" do
-    let(:content) { CONTENT } # Content must be sorted to avoid errors.
+    # Content must be sorted to avoid errors.
+    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-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_.
+- 2015-01-05: Did even more things in _Paris_.
+- 2014-12-31: Celebrated the new year in _Paris_ with **Marie Curie**. @partying @food
+- 2014-11-15: 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
+- Marie's Diner
+- Paris
+      FILE
+    end
 
     it "graphs all activities" do
       stdout_only <<-OUTPUT
 Nov 2014 |█
 Dec 2014 |█
-Jan 2015 |█
+Jan 2015 |████
 Feb 2015 |
 Mar 2015 |
 Apr 2015 |
@@ -40,6 +64,16 @@ Nov 2015 |█
       OUTPUT
     end
 
+    describe "when there are more activities than colors" do
+      let(:content) do
+        (["### Activities:"] + (["- 2017-06-01: Did something."] * 100)).join("\n")
+      end
+
+      it "displays the correct number of activities" do
+        stdout_only("Jun 2017 |" + ("█" * 100))
+      end
+    end
+
     describe "--in" do
       subject { run_cmd("graph --in #{location_name}") }
 
@@ -54,7 +88,19 @@ Nov 2015 |█
         let(:location_name) { "paris" }
         it "matches location case-insensitively" do
           stdout_only <<-OUTPUT
+Nov 2014 |∙|
 Dec 2014 |█
+Jan 2015 |███∙|
+Feb 2015 |
+Mar 2015 |
+Apr 2015 |
+May 2015 |
+Jun 2015 |
+Jul 2015 |
+Aug 2015 |
+Sep 2015 |
+Oct 2015 |
+Nov 2015 |∙|
           OUTPUT
         end
       end
@@ -85,8 +131,18 @@ Dec 2014 |█
         it "matches friend case-insensitively" do
           stdout_only <<-OUTPUT
 Nov 2014 |█
-Dec 2014 |
-Jan 2015 |█
+Dec 2014 |∙|
+Jan 2015 |█∙∙∙|
+Feb 2015 |
+Mar 2015 |
+Apr 2015 |
+May 2015 |
+Jun 2015 |
+Jul 2015 |
+Aug 2015 |
+Sep 2015 |
+Oct 2015 |
+Nov 2015 |∙|
           OUTPUT
         end
       end
@@ -97,7 +153,21 @@ Jan 2015 |█
         let(:friend_name2) { "grace" }
 
         it "matches all friends case-insensitively" do
-          stdout_only "Jan 2015 |█"
+          stdout_only <<-OUTPUT
+Nov 2014 |∙|
+Dec 2014 |∙|
+Jan 2015 |█∙∙∙|
+Feb 2015 |
+Mar 2015 |
+Apr 2015 |
+May 2015 |
+Jun 2015 |
+Jul 2015 |
+Aug 2015 |
+Sep 2015 |
+Oct 2015 |
+Nov 2015 |∙|
+          OUTPUT
         end
       end
     end
@@ -107,7 +177,9 @@ Jan 2015 |█
 
       it "matches tag case-sensitively" do
         stdout_only <<-OUTPUT
-Jan 2015 |█
+Nov 2014 |∙|
+Dec 2014 |█
+Jan 2015 |█∙∙∙|
 Feb 2015 |
 Mar 2015 |
 Apr 2015 |
@@ -125,33 +197,33 @@ Nov 2015 |█
         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 |█"
+          stdout_only <<-OUTPUT
+Nov 2014 |∙|
+Dec 2014 |█
+Jan 2015 |∙∙∙∙|
+Feb 2015 |
+Mar 2015 |
+Apr 2015 |
+May 2015 |
+Jun 2015 |
+Jul 2015 |
+Aug 2015 |
+Sep 2015 |
+Oct 2015 |
+Nov 2015 |∙|
+          OUTPUT
         end
       end
     end
 
     describe "--since" do
-      subject { run_cmd("graph --since 'January 4th 2015'") }
+      subject { run_cmd("graph --since 'January 6th 2015'") }
 
       it "graphs activities on and after the specified date" do
         stdout_only <<-OUTPUT
-Jan 2015 |█
+Jan 2015 |███
 Feb 2015 |
 Mar 2015 |
 Apr 2015 |
@@ -166,14 +238,36 @@ Nov 2015 |█
       end
     end
 
-    describe "--after" do
-      subject { run_cmd("graph --until 'January 4th 2015'") }
+    describe "--until" do
+      subject { run_cmd("graph --until 'January 6th 2015'") }
 
       it "graphs activities before and on the specified date" do
         stdout_only <<-OUTPUT
 Nov 2014 |█
 Dec 2014 |█
-Jan 2015 |█
+Jan 2015 |███
+        OUTPUT
+      end
+    end
+
+    describe "combining filters" do
+      subject { run_cmd("graph --since 'January 6th 2015' --with Grace") }
+
+      it "only shows other activities within the same period as the filtered ones" 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
+Jan 2015 |█∙∙|
+Feb 2015 |
+Mar 2015 |
+Apr 2015 |
+May 2015 |
+Jun 2015 |
+Jul 2015 |
+Aug 2015 |
+Sep 2015 |
+Oct 2015 |
+Nov 2015 |█
         OUTPUT
       end
     end

data/test/commands/help_spec.rb

@@ -4,6 +4,7 @@ require "./test/helper"
 
 clean_describe "help" do
   subject { run_cmd("help") }
+  let(:content) { nil }
 
   describe "with no subcommand passed" do
     it "prints overall help message" do

data/test/commands/list/activities_spec.rb

@@ -6,6 +6,8 @@ clean_describe "list activities" do
   subject { run_cmd("list activities") }
 
   describe "when file does not exist" do
+    let(:content) { nil }
+
     it "does not list anything" do
       stdout_only ""
     end
@@ -157,7 +159,7 @@ FILE
       end
     end
 
-    describe "--after" do
+    describe "--until" do
       subject { run_cmd("list activities --until 'January 4th 2015'") }
 
       it "lists activities before and on the specified date" do

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

@@ -6,6 +6,8 @@ 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

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

@@ -6,6 +6,8 @@ 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

data/test/commands/list/friends_spec.rb

@@ -6,6 +6,8 @@ clean_describe "list friends" do
   subject { run_cmd("list friends") }
 
   describe "when file does not exist" do
+    let(:content) { nil }
+
     it "does not list anything" do
       stdout_only ""
     end

data/test/commands/list/locations_spec.rb

@@ -6,6 +6,8 @@ clean_describe "list locations" do
   subject { run_cmd("list locations") }
 
   describe "when file does not exist" do
+    let(:content) { nil }
+
     it "does not list anything" do
       stdout_only ""
     end

data/test/commands/list/tags_spec.rb

@@ -6,6 +6,8 @@ clean_describe "list tags" do
   subject { run_cmd("list tags") }
 
   describe "when file does not exist" do
+    let(:content) { nil }
+
     it "does not list anything" do
       stdout_only ""
     end

data/test/commands/stats_spec.rb

@@ -6,6 +6,8 @@ clean_describe "stats" do
   subject { run_cmd("stats") }
 
   describe "when file does not exist" do
+    let(:content) { nil }
+
     it "returns the stats" do
       stdout_only <<-FILE
 Total activities: 0

data/test/commands/suggest_spec.rb

@@ -6,6 +6,8 @@ clean_describe "suggest" do
   subject { run_cmd("suggest") }
 
   describe "when file does not exist" do
+    let(:content) { nil }
+
     it "prints a no-data message" do
       stdout_only <<-FILE
 Distant friend: None found

data/test/commands/update_spec.rb

@@ -4,6 +4,7 @@ require "./test/helper"
 
 clean_describe "update" do
   subject { run_cmd("update") }
+  let(:content) { nil }
 
   it "prints a status message" do
     subject[:stderr].must_equal ""

data/test/helper.rb

@@ -89,6 +89,7 @@ def ensure_trailing_newline_unless_empty(str)
 end
 
 def stdout_only(expected)
+  puts subject[:stderr] unless subject[:stderr] == ""
   subject[:stdout].must_equal ensure_trailing_newline_unless_empty(expected)
   subject[:stderr].must_equal ""
   subject[:status].must_equal 0
@@ -123,7 +124,6 @@ end
 def clean_describe(desc, *additional_desc, &block)
   describe desc, *additional_desc do
     let(:filename) { "test/tmp/friends#{SecureRandom.uuid}.md" }
-    let(:content) { nil }
 
     before { File.write(filename, content) unless content.nil? }
     after { File.delete(filename) if File.exist?(filename) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.30'
+  version: '0.31'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -38,48 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
-- !ruby/object:Gem::Dependency
-  name: memoist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: semverse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement