friends 0.38 → 0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be5bfb57559485e598831f2e273f27fc57eca790
-  data.tar.gz: afbd6cd665503573e8cff620073e22617a18f810
+  metadata.gz: 248e66382022349640d9109c60f0d8f09a0ab10d
+  data.tar.gz: 0c50f046b289c31153acee14945b22717353fa39
 SHA512:
-  metadata.gz: 5da144c036b93a8e05bed9cc00e37167a168d6f64031c864827a6b348e7f96902a193c886ae0b3af8bd758aebefce576bcb5b931241bf0f91b3e5b539a6b3b91
-  data.tar.gz: 8d25dbdde17277d93a73fe7e9ed19472e7e29abfcd647bf7a2545346f3cabdd164bd03b88d3a4bfe8153d82522f9c0b0d267aadc923e314c892a7bece849a7f7
+  metadata.gz: e99a4e59121ab6cf0df9afb36e29a18444b39be4450ba1c84e19874456c3b4dee42858a7c7127ce7117cea9720313be1421d655c46feede9f202f317389b3444
+  data.tar.gz: 17cef72eb8ffaa3ee04bcc2b818f207e3f639b5a0217c524e50f6844727b5aa8fd9d0cbe986a76e912ceb1583b216d736ec9cb6e97e1adfcbb9bd34ded8cbf05

data/CHANGELOG.md

@@ -14,6 +14,17 @@ making a small donation (🙏) to show you appreciate its continued development.
 
 👆 Donate with these buttons! 👆
 
+## [v0.39](https://github.com/JacobEvelyn/friends/tree/v0.39) (2018-08-02)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.38...v0.39)
+
+**Fixed bugs:**
+
+- Don't treat multiple additions of the same friend in `friends edit` as conflicting friends [\#199](https://github.com/JacobEvelyn/friends/issues/199)
+
+**Merged pull requests:**
+
+- Correctly handle duplicate new friends/locations when editing [\#204](https://github.com/JacobEvelyn/friends/pull/204) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [v0.38](https://github.com/JacobEvelyn/friends/tree/v0.38) (2018-07-24)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.37...v0.38)
 

data/RELEASING.md

@@ -2,15 +2,16 @@
 
 These are steps for the maintainer to take to release a new version of this gem.
 
-1. On the `master` branch, update the `VERSION` constant in
-   `lib/friends/version.rb`.
-2. Commit the change (`git add -A && git commit -m 'Bump to vX.X'`).
-3. Add a tag (`git tag -am "vX.X" vX.X`).
-4. `git push && git push --tags`
-5. `CHANGELOG_GITHUB_TOKEN=... github_changelog_generator`
-6. Confirm the `CHANGELOG` looks correct with `git diff`
-7. Copy-paste the donation info from the `README` to the `CHANGELOG`.
-8. `git add -A && git commit -m 'Update CHANGELOG for vX.X'`
-9. `git push`
-10. `gem build friends.gemspec && gem push *.gem && rm *.gem`
-11. Celebrate!
+1.  On the `master` branch, update the `VERSION` constant in
+    `lib/friends/version.rb`.
+2.  Commit the change (`git add -A && git commit -m 'Bump to vX.X'`).
+3.  Add a tag (`git tag -am "vX.X" vX.X`).
+4.  `git push && git push --tags`
+5.  Copy the top of `CHANGELOG` to the clipboard.
+6.  `CHANGELOG_GITHUB_TOKEN=... github_changelog_generator`
+7.  Paste from the clipboard to the top of the `CHANGELOG`.
+8.  Confirm the `CHANGELOG` looks correct with `git diff`
+9.  `git add -A && git commit -m 'Update CHANGELOG for vX.X'`
+10. `git push`
+11. `gem build friends.gemspec && gem push *.gem && rm *.gem`
+12. Celebrate!

data/lib/friends/introvert.rb

@@ -43,11 +43,17 @@ module Friends
       # locations.
       (@activities + @notes).each do |event|
         event.friend_names.each do |name|
-          add_friend(name: name) unless friend_names.include? name
+          unless friend_names.include? name
+            add_friend(name: name)
+            friend_names << name
+          end
         end
 
         event.location_names.each do |name|
-          add_location(name: name) unless location_names.include? name
+          unless location_names.include? name
+            add_location(name: name)
+            location_names << name
+          end
         end
       end
 

data/lib/friends/version.rb

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

data/test/commands/edit_spec.rb

@@ -81,6 +81,7 @@ Not cleaning file: "#{filename}" ("exit 1 #" did not exit successfully)
 - 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-12-16: Okay, yep, I definitely just saw **Bigfoot** in the _Mysterious Mountains_!
 - 2014-12-15: I just had a possible **Bigfoot** sighting! I think I may have seen **Bigfoot** in the _Mysterious Mountains_.
 - 2014-11-15: Talked to **George Washington Carver** on the phone for an hour.
 

data/test/editor

@@ -9,7 +9,13 @@ filename = ARGV[0]
 current_file_contents = File.read(filename).split("\n")
 File.open(filename, "w") do |file|
   file.puts current_file_contents[0]
+
+  # We add two activities that contain the same new friend and new
+  # location, to test that this doesn't crash `friends edit` as
+  # previously happened.
   file.puts "- 2014-12-15: I just had a possible **Bigfoot** sighting! "\
             "I think I may have seen **Bigfoot** in the _Mysterious Mountains_."
+  file.puts "- 2014-12-16: Okay, yep, I definitely just saw **Bigfoot** in "\
+            "the _Mysterious Mountains_!"
   file.puts current_file_contents.drop(1)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.38'
+  version: '0.39'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -295,4 +295,3 @@ test_files:
 - test/editor
 - test/helper.rb
 - test/tmp/.keep
-has_rdoc: