friends 0.50 → 0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa472946e4b1055d2168cac599d3723c53f42c751afd9de3c2561184e6886da
-  data.tar.gz: 2bea663a17650429b4b5bfb7dd0a6bd292891d77ccd889c67a76b77a4ed20174
+  metadata.gz: 1a48314cd65423f48134663c087be43e3978f940c9c26d47dd25e83f9d3d7af1
+  data.tar.gz: cb6064161d7ff10e4b2300127aa22a0740f02fec6051a93e90288ed1268f8595
 SHA512:
-  metadata.gz: 158f60b3d085a2f4fbeaabb6d418bd71e8bc34fdf4a1a9965dc1df6828362ef71f3ba1998e8b01421d9d6357789fa5a4022a04e5533c133305800d75638eb26f
-  data.tar.gz: 2365522a4994fd2581ec2acecfb09cfd1c0ae4a10122f3f316bfffd284c9fed1cb076eef54b7dced2e38d819c95b559e6a305539c0a1805f89f8954966d7dea5
+  metadata.gz: 941c76dab927034c7b9663b48f06f1299b522b2595e92ccb5b829c4adea7fc52b37e7ac8f03d50810b799422cf59441b56b26851f11b2835d380b26ba244a0f3
+  data.tar.gz: 4e079a3d0e94d69f4e18d30e3313a4e0e520f9c3917528c313d2ac919a7ac920c1dbdf5e3ad0d6afe95d44bda47ce85bd06c3fd64fdad4b3a45f96a7ece3b16e

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
@@ -10,9 +10,18 @@ Layout/ClosingHeredocIndentation:
 Layout/DotPosition:
   EnforcedStyle: trailing
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
+Layout/LineLength:
+  Max: 100
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -28,9 +37,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 100
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -46,6 +52,15 @@ Naming/AccessorMethodName:
 Style/Documentation:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/MultilineBlockChain:
   Enabled: false
 

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
@@ -15,7 +13,7 @@ matrix:
       gemfile: Gemfile
       script:
         - bundle exec rake test
-        - gem install --no-document rubocop -v 0.67 && rubocop
+        - gem install --no-document rubocop && rubocop
       env:
         - CODE_COVERAGE=true
 branches:

data/CHANGELOG.md

@@ -4,6 +4,22 @@
 making a small donation (🙏) with the **Sponsor** button at the top of this page to
 show you appreciate its continued development.
 
+## [v0.51](https://github.com/JacobEvelyn/friends/tree/v0.51) (2020-04-05)
+
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.50...v0.51)
+
+**Implemented enhancements:**
+
+- Drop Semverse dependency [\#256](https://github.com/JacobEvelyn/friends/issues/256)
+
+**Closed issues:**
+
+- Drop support for Ruby \<2.3 [\#257](https://github.com/JacobEvelyn/friends/issues/257)
+
+**Merged pull requests:**
+
+- Remove Semverse dependency, and require Ruby 2.3+ [\#258](https://github.com/JacobEvelyn/friends/pull/258) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [v0.50](https://github.com/JacobEvelyn/friends/tree/v0.50) (2020-04-03)
 
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.49...v0.50)

data/bin/friends

@@ -12,7 +12,6 @@ end
 require "gli"
 require "paint"
 require "readline"
-require "semverse"
 
 require "friends/introvert"
 require "friends/version"
@@ -48,10 +47,7 @@ class Stripped; end
 accept(Stripped, &:strip)
 
 class InputDate; end
-accept(InputDate) do |value|
-  time = Chronic.parse(value)
-  time && time.to_date
-end
+accept(InputDate) { |value| Chronic.parse(value)&.to_date }
 
 switch [:quiet],
        negatable: false,
@@ -102,7 +98,7 @@ post do
     rescue Errno::ENOENT
       # If the pager is not installed, just print the output.
       puts @introvert.output
-    rescue Errno::EPIPE # rubocop:disable Lint/HandleExceptions
+    rescue Errno::EPIPE
       # Occurs when quitting the pager.
     end
   end

data/friends.gemspec

@@ -23,17 +23,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  # We need Ruby 2.1's default-less keyword arguments and default UTF-8
-  # encoding.
-  spec.required_ruby_version = ">= 2.1"
+  # We need Ruby 2.3's safe navigation operator.
+  spec.required_ruby_version = ">= 2.3"
 
   spec.add_dependency "chronic", "~> 0.10"
   spec.add_dependency "gli", "~> 2.14"
   spec.add_dependency "paint", "~> 2.0"
-  spec.add_dependency "semverse", ">= 2", "< 4"
   spec.add_dependency "tty-pager", "~> 0.11"
 
   spec.add_development_dependency "minitest", "~> 5.5"
   spec.add_development_dependency "minitest-proveit", "~> 1.0"
-  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rake", "~> 13.0"
 end

data/lib/friends/commands/update.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "friends/post_install_message"
+require "friends/sem_ver_comparator"
 
 desc "Updates the `friends` program"
 command :update do |update|
@@ -9,8 +10,7 @@ command :update do |update|
     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)
+      if Friends::SemVerComparator.greater?(remote_version, Friends::VERSION)
         `gem update friends && gem cleanup friends`
 
         unless global_options[:quiet]

data/lib/friends/event.rb

@@ -14,8 +14,8 @@ module Friends
   class Event
     extend Serializable
 
-    SERIALIZATION_PREFIX = "- ".freeze
-    DATE_PARTITION = ": ".freeze
+    SERIALIZATION_PREFIX = "- "
+    DATE_PARTITION = ": "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex

data/lib/friends/friend.rb

@@ -10,13 +10,13 @@ module Friends
   class Friend
     extend Serializable
 
-    SERIALIZATION_PREFIX = "- ".freeze
-    NICKNAME_PREFIX = "a.k.a. ".freeze
+    SERIALIZATION_PREFIX = "- "
+    NICKNAME_PREFIX = "a.k.a. "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex
       # Note: this regex must be on one line because whitespace is important
-      /(#{SERIALIZATION_PREFIX})?(?<name>[^\(\[@]*[^\(\[@\s])(\s+\(#{NICKNAME_PREFIX}(?<nickname_str>.+)\))?(\s+\[(?<location_name>[^\]]+)\])?(\s+(?<tags_str>(#{TAG_REGEX}\s*)+))?/ # rubocop:disable Metrics/LineLength
+      /(#{SERIALIZATION_PREFIX})?(?<name>[^\(\[@]*[^\(\[@\s])(\s+\(#{NICKNAME_PREFIX}(?<nickname_str>.+)\))?(\s+\[(?<location_name>[^\]]+)\])?(\s+(?<tags_str>(#{TAG_REGEX}\s*)+))?/ # rubocop:disable Layout/LineLength
     end
 
     # @return [Regexp] the string of what we expected during deserialization
@@ -32,11 +32,9 @@ module Friends
       tags_str: nil
     )
       @name = name
-      @nicknames = nickname_str &&
-                   nickname_str.split(" #{NICKNAME_PREFIX}") ||
-                   []
+      @nicknames = nickname_str&.split(" #{NICKNAME_PREFIX}") || []
       @location_name = location_name
-      @tags = tags_str && tags_str.split(/\s+/) || []
+      @tags = tags_str&.split(/\s+/) || []
     end
 
     attr_accessor :name

data/lib/friends/graph.rb

@@ -4,7 +4,7 @@
 
 module Friends
   class Graph
-    DATE_FORMAT = "%b %Y".freeze
+    DATE_FORMAT = "%b %Y"
     SCALED_SIZE = 20
 
     # @param filtered_activities [Array<Friends::Activity>] a list of activities to highlight in

data/lib/friends/introvert.rb

@@ -16,10 +16,10 @@ require "friends/friends_error"
 
 module Friends
   class Introvert
-    ACTIVITIES_HEADER = "### Activities:".freeze
-    NOTES_HEADER = "### Notes:".freeze
-    FRIENDS_HEADER = "### Friends:".freeze
-    LOCATIONS_HEADER = "### Locations:".freeze
+    ACTIVITIES_HEADER = "### Activities:"
+    NOTES_HEADER = "### Notes:"
+    FRIENDS_HEADER = "### Friends:"
+    LOCATIONS_HEADER = "### Locations:"
 
     # @param filename [String] the name of the friends Markdown file
     def initialize(filename:)
@@ -725,8 +725,8 @@ module Friends
 
       begin
         instance_variable_get("@#{stage.id}") << stage.klass.deserialize(line)
-      rescue StandardError => ex
-        bad_line(ex, line_num)
+      rescue StandardError => e
+        bad_line(e, line_num)
       end
 
       state
@@ -808,7 +808,7 @@ module Friends
           a.default_location && a.default_location != activity.default_location
         end
 
-        str += " to #{Paint[(later_activity.date if later_activity) || 'present', :bold]}"
+        str += " to #{Paint[later_activity&.date || 'present', :bold]}"
       end
 
       str += " already" if earlier_activity_with_default_location != activity

data/lib/friends/location.rb

@@ -9,7 +9,7 @@ module Friends
   class Location
     extend Serializable
 
-    SERIALIZATION_PREFIX = "- ".freeze
+    SERIALIZATION_PREFIX = "- "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex

data/lib/friends/post_install_message.rb

@@ -3,6 +3,5 @@
 module Friends
   POST_INSTALL_MESSAGE = "\nfriends is a volunteer project. If you find it useful, please "\
                          "consider making a small donation:\n\n\t"\
-                         "https://github.com/JacobEvelyn/friends#contributing-its-encouraged\n\n".
-                         freeze
+                         "https://github.com/JacobEvelyn/friends#contributing-its-encouraged\n\n"
 end

data/lib/friends/regex_builder.rb

@@ -6,26 +6,26 @@ module Friends
   class RegexBuilder
     # We don't want to match strings that are "escaped" with a leading
     # backslash.
-    NO_LEADING_BACKSLASH = "(?<!\\\\)".freeze
+    NO_LEADING_BACKSLASH = "(?<!\\\\)"
 
     # We don't want to match strings that are directly touching double asterisks
     # as these are treated as sacred by our program.
-    NO_LEADING_ASTERISKS = "(?<!\\*\\*)".freeze
-    NO_TRAILING_ASTERISKS = "(?!\\*\\*)".freeze
+    NO_LEADING_ASTERISKS = "(?<!\\*\\*)"
+    NO_TRAILING_ASTERISKS = "(?!\\*\\*)"
 
     # We don't want to match strings that are directly touching underscores
     # as these are treated as sacred by our program.
-    NO_LEADING_UNDERSCORES = "(?<!_)".freeze
-    NO_TRAILING_UNDERSCORES = "(?!_)".freeze
+    NO_LEADING_UNDERSCORES = "(?<!_)"
+    NO_TRAILING_UNDERSCORES = "(?!_)"
 
     # We don't want to match strings that are part of other words.
-    NO_LEADING_ALPHABETICALS = "(?<![A-z])".freeze
-    NO_TRAILING_ALPHABETICALS = "(?![A-z])".freeze
+    NO_LEADING_ALPHABETICALS = "(?<![A-z])"
+    NO_TRAILING_ALPHABETICALS = "(?![A-z])"
 
     # We ignore case within the regex as opposed to globally to allow consumers
     # of this API the ability to pass in strings that turn off this modifier
     # with the "(?-i)" string.
-    IGNORE_CASE = "(?i)".freeze
+    IGNORE_CASE = "(?i)"
 
     def self.regex(str)
       Regexp.new(

data/lib/friends/sem_ver_comparator.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Friends
+  module SemVerComparator
+    SEPARATOR = "."
+    NUMBER_REGEX = /\d+/.freeze
+
+    def self.greater?(version_a, version_b)
+      version_a.split(SEPARATOR).zip(version_b.split(SEPARATOR)) do |a, b|
+        a_num = a&.[](NUMBER_REGEX)&.to_i
+        b_num = b&.[](NUMBER_REGEX)&.to_i
+        return false if a_num.nil?
+        return true if b_num.nil? || a_num > b_num
+        return false if a_num < b_num
+      end
+
+      false
+    end
+  end
+end

data/lib/friends/version.rb

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

data/test/add_event_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def date_parsing_specs(test_stdout: true)
   describe "date parsing" do
     let(:description) { "Test." }
@@ -123,7 +125,7 @@ def description_parsing_specs(test_stdout: true)
 
         it { line_added "- #{date}: Met **Grace Hopper**, and others, at 12." }
         if test_stdout
-          it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper, and others, at 12.\"" } # rubocop:disable Metrics/LineLength
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper, and others, at 12.\"" } # rubocop:disable Layout/LineLength
         end
       end
 
@@ -132,7 +134,7 @@ def description_parsing_specs(test_stdout: true)
 
         it { line_added "- #{date}: Met **Grace Hopper**, King James, and others at 12." }
         if test_stdout
-          it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper, King James, and others at 12.\"" } # rubocop:disable Metrics/LineLength
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met Grace Hopper, King James, and others at 12.\"" } # rubocop:disable Layout/LineLength
         end
       end
 
@@ -141,7 +143,7 @@ def description_parsing_specs(test_stdout: true)
 
         it { line_added "- #{date}: Met someone—**Grace Hopper**?! At 12." }
         if test_stdout
-          it { stdout_only "#{capitalized_event} added: \"#{date}: Met someone—Grace Hopper?! At 12.\"" } # rubocop:disable Metrics/LineLength
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met someone—Grace Hopper?! At 12.\"" } # rubocop:disable Layout/LineLength
         end
       end
 
@@ -150,7 +152,7 @@ def description_parsing_specs(test_stdout: true)
 
         it { line_added "- #{date}: Met someone {**Grace Hopper**}—at 12." }
         if test_stdout
-          it { stdout_only "#{capitalized_event} added: \"#{date}: Met someone {Grace Hopper}—at 12.\"" } # rubocop:disable Metrics/LineLength
+          it { stdout_only "#{capitalized_event} added: \"#{date}: Met someone {Grace Hopper}—at 12.\"" } # rubocop:disable Layout/LineLength
         end
       end
 

data/test/editor

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 # This is an example "editor" used to test the `friends edit` command.
 # It inserts a new activity into the second line of the file, allowing
 # us to test that friends and locations added in an `edit` command are

data/test/helper.rb

@@ -24,7 +24,7 @@ require "securerandom"
 
 require "friends"
 
-CONTENT = <<-FILE.freeze
+CONTENT = <<-FILE
 ### Activities:
 - 2018-02-06: @science:indoors:agronomy-with-hydroponics: **Norman Borlaug** and **George Washington Carver** scored a tour of _Atlantis_' hydroponics gardens through wetplants@example.org and they took me along.
 - 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.
@@ -52,7 +52,7 @@ CONTENT = <<-FILE.freeze
 FILE
 
 # This is CONTENT but with activities, friends, and locations unsorted.
-SCRAMBLED_CONTENT = <<-FILE.freeze
+SCRAMBLED_CONTENT = <<-FILE
 ### Activities:
 - 2015-01-04: Got lunch with **Grace Hopper** and **George Washington Carver**. @food
 - 2015-11-01: **Grace Hopper** and I went to _Martha's Vineyard_. George had to cancel at the last minute.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.50'
+  version: '0.51'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -52,26 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: semverse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: tty-pager
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 description: Spend time with the people you care about. Introvert-tested. Extrovert-approved.
 email:
 - jacobevelyn@gmail.com
@@ -177,6 +157,7 @@ files:
 - lib/friends/note.rb
 - lib/friends/post_install_message.rb
 - lib/friends/regex_builder.rb
+- lib/friends/sem_ver_comparator.rb
 - lib/friends/serializable.rb
 - lib/friends/tag_regex.rb
 - lib/friends/version.rb
@@ -224,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="