friends 0.0.6 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788d17a21f2929e7936d68922b971ffcc907a8c4
-  data.tar.gz: f710eec4282c863b8e51d1d556478e3b23622aad
+  metadata.gz: 594e797cfad3741eac04b32f65fad9bdaa79e6d6
+  data.tar.gz: d4db59517521f8d5110b85426533d8a199db2d75
 SHA512:
-  metadata.gz: b1de80c141a69d80ed9ce39f7629f0563a7bdf9efc48617036eaf410935b2b7f8b5bd4f08f60e5965462aea610f570882958024962e05fcb43e0e23509574116
-  data.tar.gz: 25b629ba4fd48f298c38ca17cb351f548001dd6320e0987a560dc29a6197605c15425f8bcd83ebe52a3cb18a871e79643b826ba4cab29e7c9ef92e8da96fed29
+  metadata.gz: 2dc7bb05e42a152f8fc5e5d532069295525bceb3c5f30b8a35cbf9b32dcd8561644d947f205a5a0cb964b4d1a2ae084bc745ee14bfa1e48daeb1c880130cf4fe
+  data.tar.gz: e675e071c9be2c956c7d138c327ef15a5c20823643480b754304d7ef9b219159d8de3c853351d054fd9648a0bdd519691be8bafea31d87cb9cbf1dcef6d160e6

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.2.2

data/bin/friends

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
 
+# Todo:
+# - Allow easy editing of most recent entry.
+# - Make automatching use context better. (David & Meryl vs. David & Patricia)
+# - Allow escape char to prevent automatching. ("\Zane wasn't there.")
+
 require "gli"
+require "minitest/pride"
 
 require "friends/introvert"
 require "friends/version"
@@ -105,12 +111,28 @@ arg_name "NAME"
 command :graph do |graph|
   graph.action do |_, _, args|
     data = @introvert.graph(name: args.first)
+
     data.each do |month, count|
-      puts "#{month} |#{'█' * count}"
+      print "#{month} |"
+
+      colorer = Minitest::PrideLOL.new($stdout)
+      count.times { print colorer.pride "█" }
+      puts
     end
   end
 end
 
+desc "Suggest"
+command :suggest do |suggest|
+  suggest.action do
+    suggestions = @introvert.suggest
+
+    puts "Distant friend: \e[1m#{suggestions[:distant].sample}\e[0m"
+    puts "Moderate friend: \e[1m#{suggestions[:moderate].sample}\e[0m"
+    puts "Close friend: \e[1m#{suggestions[:close].sample}\e[0m"
+  end
+end
+
 desc "Cleans your friends.md file"
 command :clean do |clean|
   clean.action do
@@ -145,5 +167,5 @@ on_error do |error|
   abort "Error: #{error}"
 end
 
-# Run the program and return the exit code corresponding to the its success.
+# Run the program and return the exit code corresponding to its success.
 exit run(ARGV)

data/lib/friends/activity.rb

@@ -13,7 +13,7 @@ module Friends
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex
-      /(#{SERIALIZATION_PREFIX})?((?<date_s>\d{4}-\d\d-\d\d):\s)?(?<description>.+)/
+      /(#{SERIALIZATION_PREFIX})?((?<date_s>\d{4}-\d\d-\d\d)(:\s)?)?(?<description>.+)?/
     end
 
     # @return [Regexp] the string of what we expected during deserialization
@@ -24,18 +24,18 @@ module Friends
     # @param date_s [String] the activity's date, parsed using Date.parse()
     # @param description [String] the activity's description
     # @return [Activity] the new activity
-    def initialize(date_s: Date.today.to_s, description:)
+    def initialize(date_s: Date.today.to_s, description: nil)
       @date = Date.parse(date_s)
       @description = description
     end
 
     attr_reader :date
-    attr_reader :description
+    attr_accessor :description
 
     # @return [String] the command-line display text for the activity
     def display_text
       date_s = "\e[1m#{date}\e[0m"
-      description_s = description
+      description_s = description.to_s
       while match = description_s.match(/(\*\*)([^\*]+)(\*\*)/)
         description_s =
           "#{match.pre_match}\e[1m#{match[2]}\e[0m#{match.post_match}"

data/lib/friends/introvert.rb

@@ -2,6 +2,8 @@
 # able to be used directly within another Ruby program, without needing to call
 # the command-line script explicitly.
 
+require "readline"
+
 require "friends/activity"
 require "friends/friend"
 require "friends/friends_error"
@@ -80,6 +82,9 @@ module Friends
         raise FriendsError, e
       end
 
+      # If there's no description, prompt the user for one.
+      activity.description ||= Readline.readline(activity.display_text)
+
       activity.highlight_friends(introvert: self, friends: friends)
       activities << activity
       clean # Write a cleaned file.
@@ -174,6 +179,32 @@ module Friends
       act_table
     end
 
+    # @return [Hash] of the format:
+    #   {
+    #     distant: ["Distant Friend 1 Name", "Distant Friend 2 Name", ...],
+    #     moderate: ["Moderate Friend 1 Name", "Moderate Friend 2 Name", ...],
+    #     close: ["Close Friend 1 Name", "Close Friend 2 Name", ...]
+    #   }
+    def suggest
+      set_n_activities! # Set n_activities for all friends.
+
+      # Sort our friends, with the least favorite friend first.
+      sorted_friends = friends.sort_by(&:n_activities)
+
+      output = Hash.new { |h, k| h[k] = [] }
+
+      # First, get not-so-good friends.
+      while sorted_friends.first.n_activities < 2 do
+        output[:distant] << sorted_friends.shift.name
+      end
+
+      output[:moderate] = sorted_friends.slice!(0, sorted_friends.size * 3 / 4).
+                          map!(&:name)
+      output[:close] = sorted_friends.map!(&:name)
+
+      output
+    end
+
     # Sets the n_activities field on each friend.
     def set_n_activities!
       # Construct a hash of friend name to frequency of appearance.

data/lib/friends/serializable.rb

@@ -12,7 +12,7 @@ module Serializable
   #   - deserialization_expectation
   #       a string for what was expected, if the regex does not match
   def deserialize(str)
-    match = str.match(deserialization_regex)
+    match = str.to_s.match(deserialization_regex)
 
     unless match
       raise SerializationError,

data/lib/friends/version.rb

@@ -1,3 +1,3 @@
 module Friends
-  VERSION = "0.0.6"
+  VERSION = "0.2"
 end

data/test/activity_spec.rb

@@ -35,10 +35,12 @@ describe Friends::Activity do
       end
     end
 
-    describe "when string is malformed" do
+    describe "when no description is present" do
       let(:serialized_str) { "" }
 
-      it { proc { subject }.must_raise Serializable::SerializationError }
+      it "sets no description in deserialization" do
+        subject.description.must_equal nil
+      end
     end
   end
 

data/test/introvert_spec.rb

@@ -262,6 +262,22 @@ describe Friends::Introvert do
     end
   end
 
+  describe "#suggest" do
+    subject { introvert.suggest }
+
+    it "returns distant, moderate, and close friends" do
+      introvert.stub(:friends, friends) do
+        introvert.stub(:activities, activities) do
+          subject.must_equal(
+            distant: ["George Washington Carver"],
+            moderate: [],
+            close: ["Betsy Ross"]
+          )
+        end
+      end
+    end
+  end
+
   describe "#graph" do
     subject { introvert.graph(name: friend_name) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: '0.2'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Spend time with the people you care about.