friends 0.28 → 0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ada45e644c5d8473d57a70508d64f360dd3541
-  data.tar.gz: dc6d98844de09d8bfd8110dbe1fd0b2b468a6711
+  metadata.gz: 266cfedd5b0654ca5ebd434c11ead3d8c21d4e9e
+  data.tar.gz: 76d290e42cc9babe0dcfe3dd9419dded6ca4825d
 SHA512:
-  metadata.gz: fd6409785d7d579a2ba0106757572970a28b5e23eb52c2e7c1dd227fbeeed92f7107c75f8780c3d6f397332b3ce41d23d0af3394f812d993e17147724814ed87
-  data.tar.gz: 3a9d5fa932b44adc0a27d4d73044d5eefb060cd6a363e4934d19d0274668d171eaab2f08914732bbcbd9da467ab1b31d65a3e82ac551e532191dc8e832f5ca4b
+  metadata.gz: 41e311c6cd3f8dc4a0c9e86d5268badad683731307626f6f50ef33eaf15edfc930754adce617f2934262b6915caa87b3167b138741b3e6b99025d0c4cc542a06
+  data.tar.gz: e838474558ec1a065cd7d72a828fb6073adafac32a6aec23b4bc6e930063f5838e55129d9a6d82d01bf0236a79777db936a31a32b15104fce83cdd3c146e1c5c

data/.rubocop.yml

@@ -74,9 +74,6 @@ Delegate:
 DeprecatedClassMethods:
   Enabled: false
 
-DeprecatedHashMethods:
-  Enabled: false
-
 Documentation:
   Enabled: false
 
@@ -132,7 +129,7 @@ LineEndConcatenation:
   Enabled: false
 
 LineLength:
-  Max: 80
+  Max: 100
 
 LiteralInCondition:
   Enabled: false
@@ -146,6 +143,9 @@ Loop:
 MethodLength:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 ModuleFunction:
   Enabled: false
 

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.4.0

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
 - 2.1.0
+- 2.2.0
 - 2.3.0
+- 2.4.0
 script:
   - bundle exec rake test
   - bundle exec rubocop

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## [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)
+
+**Implemented enhancements:**
+
+- Add `--since \<date\>` and `--until \<date\>` flags, and remove extraneous months from `graph` [\#153](https://github.com/JacobEvelyn/friends/issues/153)
+- Add integration tests for bin/friends? [\#127](https://github.com/JacobEvelyn/friends/issues/127)
+
+**Merged pull requests:**
+
+- Add --since and --until flags to `graph` and `list activities` [\#157](https://github.com/JacobEvelyn/friends/pull/157) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Restructuring [\#155](https://github.com/JacobEvelyn/friends/pull/155) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [v0.28](https://github.com/JacobEvelyn/friends/tree/v0.28) (2016-06-25)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.27...v0.28)
 

data/README.md

@@ -42,7 +42,7 @@ lots of help), and give feedback!**
     - `rename`
       - [`rename friend`](#rename-friend)
       - [`rename location`](#rename-location)
-    - [`set location`](#set)
+    - [`set location`](#set-location)
     - [`stats`](#stats)
     - [`suggest`](#suggest)
     - [`update`](#update)
@@ -55,9 +55,8 @@ lots of help), and give feedback!**
 
 ## Overview
 
-`friends` is both a Ruby library and a command-line interface that
-allows you to keep track of your relationships with the people you
-care about.
+`friends` is a command-line program that helps you to keep track of your relationships with the
+people you care about.
 
 `friends` gives you:
 - More organization around staying in touch with friends and
@@ -364,10 +363,27 @@ Jan 2015 |
 Feb 2015 |█
 ```
 
+Or graph only activities on or after a certain date:
+
+```bash
+$ friends graph --since 'January 1st 2015'
+Jan 2015 |███████
+Feb 2015 |█████
+```
+
+Or graph only activities before or on a certain date:
+
+```bash
+$ friends graph --until 'January 1st 2015'
+Nov 2014 |███
+Dec 2014 |██
+Jan 2015 |███████
+```
+
 And you can use multiple of these flags together:
 
 ```bash
-$ friends graph --in Paris --tagged food --with George
+$ friends graph --in Paris --tagged food --with George --after 'September 2014'
 Nov 2014 |█
 ```
 
@@ -441,6 +457,20 @@ $ friends list activities --tagged food
 2015-01-04: Got lunch with Grace Hopper and George Washington Carver. @food
 ```
 
+Or by date:
+
+```bash
+$ friends graph --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'
+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.
+```
+
 And you can mix and match these options to your heart's content:
 
 ```bash

data/Rakefile

@@ -4,7 +4,7 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new do |t|
-  t.test_files = FileList["test/*_spec.rb"]
+  t.test_files = FileList["test/**/*_spec.rb"]
 end
 
 task default: :test

data/bin/friends

@@ -39,6 +39,12 @@ end
 class Stripped; end
 accept(Stripped, &:strip)
 
+class InputDate; end
+accept(InputDate) do |value|
+  time = Chronic.parse(value)
+  time && time.to_date
+end
+
 switch [:quiet],
        negatable: false,
        desc: "Quiet output messages"
@@ -56,385 +62,7 @@ switch [:colorless],
        negatable: false,
        desc: "Disable output colorization and other effects"
 
-desc "Updates the `friends` program"
-command :update do |update|
-  update.action do
-    # rubocop:disable Lint/AssignmentInCondition
-    if match = `gem search friends`.match(/^friends\s\(([^\)]+)\)$/)
-      # rubocop:enable Lint/AssignmentInCondition
-      remote_version = match[1]
-      if Semverse::Version.coerce(remote_version) >
-         Semverse::Version.coerce(Friends::VERSION)
-        `gem update friends && gem cleanup friends`
-        if $?.success?
-          @message = Paint[
-            "Updated to friends #{remote_version}", :bold, :green
-          ]
-        else
-          @message = Paint[
-            "Error updating to friends version #{remote_version}", :bold, :red
-          ]
-        end
-      else
-        @message = Paint[
-          "Already up-to-date (#{Friends::VERSION})", :bold, :green
-        ]
-      end
-    end
-  end
-end
-
-desc "Opens the `friends.md` file in $EDITOR for manual editing"
-command :edit do |edit|
-  edit.action do |global_options|
-    editor = ENV["EDITOR"] || "vim"
-    filename = global_options[:filename]
-
-    puts "Opening \"#{filename}\" in #{editor}" unless global_options[:quiet]
-    Kernel.exec "#{editor} #{filename}"
-  end
-end
-
-desc "Lists friends, activities, and locations"
-command :list do |list|
-  list.desc "List all friends"
-  list.command :friends do |list_friends|
-    list_friends.flag [:in],
-                      arg_name: "LOCATION",
-                      desc: "List only friends in the given location",
-                      type: Stripped
-
-    list_friends.flag [:tagged],
-                      arg_name: "@TAG",
-                      desc: "List only friends with the given tag",
-                      type: Tag
-
-    list_friends.switch [:verbose],
-                        negatable: false,
-                        desc: "Output friend nicknames, locations, and tags"
-
-    list_friends.action do |_, options|
-      puts @introvert.list_friends(
-        location_name: options[:in],
-        tagged: options[:tagged],
-        verbose: options[:verbose]
-      )
-    end
-  end
-
-  list.desc "Lists all activities"
-  list.command :activities do |list_activities|
-    list_activities.flag [:limit],
-                         arg_name: "NUMBER",
-                         desc: "The number of activities to return",
-                         default_value: 10,
-                         type: Integer
-
-    list_activities.flag [:with],
-                         arg_name: "NAME",
-                         desc: "List only activities with the given friend",
-                         type: Stripped
-
-    list_activities.flag [:in],
-                         arg_name: "LOCATION",
-                         desc: "List only activities in the given location",
-                         type: Stripped
-
-    list_activities.flag [:tagged],
-                         arg_name: "@TAG",
-                         desc: "List only activities with the given tag",
-                         type: Tag
-
-    list_activities.action do |_, options|
-      puts @introvert.list_activities(
-        limit: options[:limit],
-        with: options[:with],
-        location_name: options[:in],
-        tagged: options[:tagged]
-      )
-    end
-  end
-
-  list.desc "List all locations"
-  list.command :locations do |list_locations|
-    list_locations.action do
-      puts @introvert.list_locations
-    end
-  end
-
-  list.desc "List all tags used"
-  list.command :tags do |list_tags|
-    list_tags.flag [:from],
-                   arg_name: '"activities" or "friends" (default: both)',
-                   desc: "List only tags from activities or friends instead of"\
-                         "both"
-    list_tags.action do |_, options|
-      puts @introvert.list_tags(from: options[:from])
-    end
-  end
-
-  list.desc "List favorite friends and locations"
-  list.command :favorite do |list_favorite|
-    list_favorite.desc "List favorite friends"
-    list_favorite.command :friends do |list_favorite_friends|
-      list_favorite_friends.flag [:limit],
-                                 arg_name: "NUMBER",
-                                 desc: "The number of friends to return",
-                                 default_value: 10,
-                                 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
-      end
-    end
-
-    list_favorite.desc "List favorite locations"
-    list_favorite.command :locations do |list_favorite_locations|
-      list_favorite_locations.flag [:limit],
-                                   arg_name: "NUMBER",
-                                   desc: "The number of locations to return",
-                                   default_value: 10,
-                                   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
-      end
-    end
-  end
-end
-
-desc "Adds a friend (or nickname), activity, or location"
-command :add do |add|
-  add.desc "Adds a friend"
-  add.arg_name "NAME"
-  add.command :friend do |add_friend|
-    add_friend.action do |_, _, args|
-      friend = @introvert.add_friend(name: args.join(" "))
-      @message = "Friend added: \"#{friend.name}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-
-  add.desc "Adds an activity"
-  add.arg_name "DESCRIPTION"
-  add.command :activity do |add_activity|
-    add_activity.action do |_, _, args|
-      activity = @introvert.add_activity(serialization: args.join(" "))
-
-      # If there's no description, prompt the user for one.
-      if activity.description.nil? || activity.description.empty?
-        activity.description = Readline.readline(activity.to_s)
-        activity.highlight_description(introvert: @introvert)
-      end
-
-      @message = "Activity added: \"#{activity}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-
-  add.desc "Adds a location"
-  add.arg_name "LOCATION"
-  add.command :location do |add_location|
-    add_location.action do |_, _, args|
-      location = @introvert.add_location(name: args.join(" "))
-      @message = "Location added: \"#{location.name}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-
-  add.desc "Adds a nickname to a friend"
-  add.arg_name "NAME NICKNAME"
-  add.command :nickname do |add_nickname|
-    add_nickname.action do |_, _, args|
-      friend = @introvert.add_nickname(name: args.first, nickname: args[1])
-      @message = "Nickname added: \"#{friend}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-
-  add.desc "Adds a tag to a friend"
-  add.arg_name "NAME @TAG"
-  add.command :tag do |add_tag|
-    add_tag.action do |_, _, args|
-      friend = @introvert.add_tag(
-        name: args[0..-2].join(" "),
-        tag: Tag.convert_to_tag(args.last)
-      )
-      @message = "Tag added to friend: \"#{friend}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-end
-
-desc "Set data about friends"
-command :set do |set|
-  set.desc "Set a friend's location"
-  set.arg_name "NAME LOCATION"
-  set.command :location do |set_location|
-    set_location.action do |_, _, args|
-      friend = @introvert.set_location(name: args.first, location_name: args[1])
-      @message = "#{friend.name}'s location set to: #{friend.location_name}"
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-end
-
-desc "Remove a nickname"
-command :remove do |remove|
-  remove.desc "Removes a nickname from a friend"
-  remove.arg_name "NAME NICKNAME"
-  remove.command :nickname do |remove_nickname|
-    remove_nickname.action do |_, _, args|
-      friend = @introvert.remove_nickname(name: args.first, nickname: args[1])
-      @message = "Nickname removed: \"#{friend}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-
-  remove.desc "Removes a tag from a friend"
-  remove.arg_name "NAME @TAG"
-  remove.command :tag do |remove_tag|
-    remove_tag.action do |_, _, args|
-      friend = @introvert.remove_tag(
-        name: args[0..-2].join(" "),
-        tag: Tag.convert_to_tag(args.last)
-      )
-      @message = "Tag removed from friend: \"#{friend}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-end
-
-desc "Graph activities over time"
-command :graph do |graph|
-  graph.flag [:with],
-             arg_name: "NAME",
-             desc: "Graph activities with the given friend",
-             type: Stripped
-
-  graph.flag [:in],
-             arg_name: "LOCATION",
-             desc: "Graph activities in the given location",
-             type: Stripped
-
-  graph.flag [:tagged],
-             arg_name: "@TAG",
-             desc: "Graph activities with the given tag",
-             type: Tag
-
-  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(
-      with: options[:with],
-      location_name: options[:in],
-      tagged: options[:tagged]
-    )
-
-    data.each do |month, count|
-      print "#{month} |"
-      puts colors.take(count).map { |rgb| Paint["█", rgb] }.join
-    end
-  end
-end
-
-desc "Suggest friends to do activities with"
-command :suggest do |suggest|
-  suggest.flag [:in],
-               arg_name: "LOCATION",
-               desc: "Suggest only friends in the given location",
-               type: Stripped
-
-  suggest.action do |_, options|
-    suggestions = @introvert.suggest(location_name: options[:in])
-
-    puts "Distant friend: "\
-      "#{Paint[suggestions[:distant].sample || 'None found', :bold, :magenta]}"
-    puts "Moderate friend: "\
-      "#{Paint[suggestions[:moderate].sample || 'None found', :bold, :magenta]}"
-    puts "Close friend: "\
-      "#{Paint[suggestions[:close].sample || 'None found', :bold, :magenta]}"
-  end
-end
-
-desc "Cleans your friends.md file"
-command :clean do |clean|
-  clean.action do
-    @clean_command = true
-    @dirty = true # Mark the file for cleaning.
-  end
-end
-
-desc "List all stats"
-command :stats do |stats|
-  stats.action do
-    puts "Total activities: #{@introvert.total_activities}"
-    puts "Total friends: #{@introvert.total_friends}"
-    days = @introvert.elapsed_days
-    puts "Total time elapsed: #{days} day#{'s' if days != 1}"
-  end
-end
-
-desc "Renames a friend or location"
-command :rename do |rename|
-  rename.desc "Renames a friend"
-  rename.arg_name "NAME NEW_NAME"
-  rename.command :friend do |rename_friend|
-    rename_friend.action do |_, _, args|
-      friend = @introvert.rename_friend(
-        old_name: args.first,
-        new_name: args[1]
-      )
-      @message = "Name changed: \"#{friend}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-
-  rename.desc "Renames a location"
-  rename.arg_name "NAME NEW_NAME"
-  rename.command :location do |rename_location|
-    rename_location.action do |_, _, args|
-      location = @introvert.rename_location(
-        old_name: args.first,
-        new_name: args[1]
-      )
-      @message = "Location renamed: \"#{location.name}\""
-      @dirty = true # Mark the file for cleaning.
-    end
-  end
-end
+commands_from "friends/commands"
 
 # Before each command, clean up all arguments and create the global Introvert.
 pre do |global_options, cmd, options|