git-duo 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64384ac284b927b84534146a3b8844f1ab2121d9
-  data.tar.gz: 3ba0c3a766cb167a514148d68ce2d6eb46a39b92
+  metadata.gz: 334ed769bcf2938a93223b52d97ce68da4facf0d
+  data.tar.gz: 8b6272a505c246e2b5adeba24c095c997db92938
 SHA512:
-  metadata.gz: 95de54667e5908f9989d7fcdcca6d433e5a8850fee5b5640c3a1dd29af307d9593322ebf9955d6721eb6dba74391c53d67162b5feb7a4ffb2d6ffdd34b97d4c8
-  data.tar.gz: 6a5ac59e8373c0c887ec9d21280cb1b14e7970ac39e804d0fd95abedba1b11786560dcb1e960aada9903f4b1e5d96ac967bb324ba3aa75b594e18e13fae7ef25
+  metadata.gz: a5d4f2352701c68369b8bd245a02c346460b2e5a4403b9e6d4ccb395a8c315a3017351c9e7642cee42528bfd7f3a1ba8a372c5a37569d18cd5cdaf9b615ac3d2
+  data.tar.gz: 2983b9120e5a5d1114f7c8b84f113f060fada5469213e99656f63fd87cd3b8dc836c679f882194f16f3657f3e55d06e4179dc74518557218e4dd73201875a2dc

data/README.md

@@ -37,6 +37,12 @@ $ git duo alfred bruce jim
 Alfred Pennyworth + Bruce Wayne + Jim Gordon <dev+alfred+bruce+jim@gotham.travel>
 ```
 
+```bash
+$ git duo --add "Jim Gordon <jim@gotham.travel>"
+$ git duo jim alfred
+Alfred Pennyworth + Jim Gordin <dev+alfred+jim@gotham.travel>
+```
+
 ```bash
 $ git duo alfred
 Alfred Pennyworth <alfred@gotham.travel>

data/lib/git/duo/author.rb

@@ -1,15 +1,10 @@
 module Git
   module Duo
     class Author
-      EMAIL_REGEXP = /(?:<?(.+@[^>]+)>?)/
-
       def self.import(new_author)
-        key, *author = new_author.split(?\s)
-        first, last, email = author
+        key, first, last, email = extract_author new_author
 
-        new({ key: key,
-              name: "#{first} #{last}",
-              email: email.match(EMAIL_REGEXP)[1] })
+        new({ key: key, name: "#{first} #{last}", email: email })
       end
 
       attr_reader :key, :name, :email
@@ -27,6 +22,19 @@ module Git
       def to_s
         "#{name} <#{email}>"
       end
+
+      private
+
+      def self.extract_author new_author
+        name, email = new_author.split(/^(.*) <(.*)>/)[1, 2]
+
+        if name.split.size == 2
+          key = name.split.first.downcase
+          [key, name.split, email].flatten
+        elsif name.split.size == 3
+          [name.split, email].flatten
+        end
+      end
     end
   end
 end

data/lib/git/duo/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Duo
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/test/git/duo/author_test.rb

@@ -17,26 +17,38 @@ module Git::Duo
 
     def test_author_requires_name
       author = Author.new author_options.merge(name: nil)
-      refute author.valid?
+
+      refute_predicate author, :valid?
     end
 
     def test_author_requires_email
       author = Author.new author_options.merge(email: nil)
-      refute author.valid?
+
+      refute_predicate author, :valid?
     end
 
     def test_author_requires_key
       author = Author.new author_options.merge(key: nil)
-      refute author.valid?
+
+      refute_predicate author, :valid?
     end
 
     def test_import
       author = Author.import("bruce Bruce Wayne <bruce@gotham.travel>")
-      assert author.valid?
+
+      assert_predicate author, :valid?
+    end
+
+    def test_import_without_key
+      author = Author.import("Bruce Wayne <bruce@gotham.travel>")
+
+      assert_predicate author, :valid?
+      assert_equal "bruce", author.key
     end
 
     def test_to_s
       expected = "Alfred Pennyworth <alfred@gotham.travel>"
+
       assert_equal expected, author.to_s
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-duo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Teo Ljungberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".autotest"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -134,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Git pairing made easy

data/.autotest

@@ -1,5 +0,0 @@
-require "autotest/suffix"
-
-Autotest.add_hook :initialize do |at|
-  at.testlib = 'minitest/autorun'
-end