git-duo 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35b30a370fc3eed420ab7c87edde586defa46824
-  data.tar.gz: f109937687adf8431fb2626e6eef823b5ab60987
+  metadata.gz: 40f8168f622c8da055f2eb8f42b38ddfbdaf03f8
+  data.tar.gz: 1cb5c9448e9cc10a4542402177e798299eb210b4
 SHA512:
-  metadata.gz: d92c5d12b61c21dd034613de5878739e7d3cef29149de49055522d246e38528bd7afc1ad28a0a5924cf86df3ccce068ecbb459c674e48275dcd36f77ffb756c0
-  data.tar.gz: e3189107ead1043efb8a1ccd96819275fab79395c47fc7a7e6d58501459eec38b9648d50992aa2432bf7730f98098c2a93fd55ddaed8c43ae642c0e3936ad25a
+  metadata.gz: cb2c80be744a702bdb89a366ad99033369a43eda5cfea75104eea2c22de48ee113a332caa2a10093da15cd76a64339045fcc9e2a639a3a18acb06bf291f7c6a0
+  data.tar.gz: ce390009f2dc542a8a387684af82e5000ff14d87b000ac1b34abf81a6ce27bbb00a82fea172627fb90c20da88b9fd855ac0773c7f75d4311d64b1decf58f4867

data/lib/git/duo/author_collection.rb

@@ -12,7 +12,9 @@ module Git
         result += opts.
           select {|k, _| authors.sample.respond_to? k }.
           map {|k, v|
-            authors.select {|o| o.send(k) =~ /#{v}/i }
+            authors.
+              sort_by(&:key).
+              select {|o| o.send(k) =~ /#{v}/i }
           }.flatten
       rescue NoMethodError
         result

data/lib/git/duo/cli.rb

@@ -8,19 +8,19 @@ module Git
         parser = OptionParser.new do |opts|
           puts current_repo.committer if ARGV.empty?
 
-          opts.on '--add AUTHOR', 'Add an author. Format: "key Firstname Lastname <author@example.com>"' do |string|
+          opts.on '--add AUTHOR', '-a AUTHOR', 'Add an author. Format: "key Firstname Lastname <author@example.com>"' do |string|
             current_repo.authors = Author.import string
           end
 
-          opts.on '--list', 'Lists the authors in the repository' do
+          opts.on '--list', '-l',  'Lists the authors in the repository' do
             puts current_repo.authors
           end
 
-          opts.on '--email EMAIL', 'Set email format. Format: dev@example.com' do |email|
+          opts.on '--email EMAIL', '-e EMAIL', 'Set email format. Format: dev@example.com' do |email|
             current_repo.email = email
           end
 
-          opts.on '--import=PATH/TO/REPO', 'Import pairs from another repo' do |path|
+          opts.on '--import=PATH/TO/REPO', '-i PATH/TO/REPO', 'Import pairs from another repo' do |path|
             import_repo = Repo.new path
             current_repo.email = import_repo.email
             current_repo.authors = import_repo.authors

data/lib/git/duo/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Duo
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/test/git/duo/author_collection_test.rb

@@ -21,6 +21,16 @@ module Git::Duo
       assert_equal "Alfred Pennyworth", result.name
     end
 
+    def test_where_partial_matches_closest
+      collection = AuthorCollection.new alexander_and_al
+
+      search = collection.where(key: 'al')
+      result = search.first
+
+      refute_predicate search, :empty?
+      assert_equal "Alfred Pennyworth", result.name
+    end
+
     def test_where_with_nonexisting_keys
       assert_empty collection.where(omg: 0)
     end

data/test/git/duo/pair_test.rb

@@ -13,22 +13,17 @@ module Git::Duo
         returns(["board+%names@gotham.travel"]).at_least_once
 
       pair = Pair.new alfred_and_bruce_rachel, wrapper: wrapper
-      expected_name = "Alfred Pennyworth + Bruce Wayne + Rachel Dawes"
-      expected_email = "board+alfred+bruce+rachel@gotham.travel"
 
-      assert_equal expected_name, pair.name
-      assert_equal expected_email, pair.email
+      assert_equal "Alfred Pennyworth + Bruce Wayne + Rachel Dawes", pair.name
+      assert_equal "board+alfred+bruce+rachel@gotham.travel", pair.email
     end
 
     def test_pair_supports_one_single_author
       author = alfred_and_bruce.first
       pair = Pair.new [author], wrapper: wrapper
 
-      expected_name = "Alfred Pennyworth"
-      expected_email = "alfred@gotham.travel"
-
-      assert_equal expected_name, pair.name
-      assert_equal expected_email, pair.email
+      assert_equal "Alfred Pennyworth", pair.name
+      assert_equal "alfred@gotham.travel", pair.email
     end
 
     def test_name
@@ -40,16 +35,14 @@ module Git::Duo
       wrapper.expects(:config).with("git-duo.email").
         returns(["board+%names@gotham.travel"]).at_least_once
 
-      expected = 'board+alfred+bruce@gotham.travel'
-      assert_equal expected, pair.email
+      assert_equal "board+alfred+bruce@gotham.travel", pair.email
     end
 
     def test_email_guesses_the_email_domain_from_authors
       wrapper.expects(:config).with("git-duo.email").
         returns([]).at_least_once
 
-      expected = "dev+alfred+bruce@gotham.travel"
-      assert_equal expected, pair.email
+      assert_equal "dev+alfred+bruce@gotham.travel", pair.email
     end
 
     def test_email_raises_error_if_domain_could_not_be_guessed
@@ -65,8 +58,10 @@ module Git::Duo
       wrapper.expects(:config).with("git-duo.email").
         returns(["board+%names@gotham.travel"]).at_least_once
 
-      expected = 'Alfred Pennyworth + Bruce Wayne <board+alfred+bruce@gotham.travel>'
-      assert_equal expected, pair.to_s
+      name = "Alfred Pennyworth + Bruce Wayne"
+      email = "<board+alfred+bruce@gotham.travel>"
+
+      assert_equal "#{name} #{email}", pair.to_s
     end
 
     def test_inspect_is_to_s

data/test/test_helper.rb

@@ -27,6 +27,13 @@ def jim_and_harvey
   ]
 end
 
+def alexander_and_al
+  [
+    Git::Duo::Author.import('alexander Alexander Knox <alexander@gotham.travel>'),
+    Git::Duo::Author.import('al Alfred Pennyworth <alfred@gotham.travel>')
+  ]
+end
+
 class DummyWrapper < Struct.new(:directory)
   def config(*)
     git_config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-duo
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Teo Ljungberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Git pairing made easy