mgit 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dfe68603ee914a9494b127c7f0c8a98633761c8
-  data.tar.gz: 57fdc98db3ca9786a403e3e7232019550aea9987
+  metadata.gz: 06e1ae3652e0ef938b2ab3718e16138819fa7cef
+  data.tar.gz: 0de46a8745d26340c709fa541cd285b4495bf2e4
 SHA512:
-  metadata.gz: be374ec58e4585ee035cc539d72bc67964ce65bb9df5aabc6bc0dcdbc1b82dc1b3c0ad5799537a0e8517180bb1b69697cd40ef972d0efd5eebd49e8750cd0ee3
-  data.tar.gz: cac6c01aad691150654f783a5a9e9d00839d2d5f8276bce9d83f8b118b033d9ad0a92d9cb0cd2e9553eb1d49ffb4012078acbe1f144057b421ce88e1bb98ef36
+  metadata.gz: ad59a05c35345e75306e78a086a2ae2543236ae58c3b88e2286c846ba636b7824cc15d6a3a321553ec1d1170d06899b80fc618cd62f64f31f9d42ff5c3b228ed
+  data.tar.gz: 4e1286094835753887f271eaed10589875dd391b064b4362adf6dc7724e41e5840a2f4485de0f9f6e871654ca8acbb059b666d9870b2bf2c0cdc4ed454f0c8a8

data/lib/mgit/commands/status.rb

@@ -41,7 +41,9 @@ module MGit
 
     def decorate_divergence_flags(divergence)
       divergence.map do |d|
-        "#{d.first[0].to_s.capitalize} of #{d.first[1][:branch]} by #{d.first[1][:by]}".blue
+        d.map do |k, v|
+          "#{k.to_s.capitalize} of #{v[:branch]} by #{v[:by]}".blue
+        end
       end
     end
   end

data/lib/mgit/repository.rb

@@ -79,7 +79,7 @@ module MGit
         when '??'
           flags << :untracked
         when '##'
-          if /## ([\w,\/]+)\.\.\.([\w,\/]+) \[(\w+) (\d+)\]/ =~ s
+          if /## [\w,\/]+\.\.\.[\w,\/]+ \[.+\]/ =~ s
             flags << :diverged
           elsif /## HEAD \(no branch\)/ =~ s
             flags << :detached
@@ -93,7 +93,9 @@ module MGit
       divergence = []
       status_lines do |s|
         if s.split[0] == '##'
-          if(m = /## ([\w,\/]+)\.\.\.([\w,\/]+) \[(\w+) (\d+)\]/.match(s))
+          if(m = /## ([\w,\/]+)\.\.\.([\w,\/]+) \[ahead (\d+), behind (\d+)\]/.match(s))
+            divergence << { :ahead => { :branch => m[2], :by => m[3] }, :behind => { :branch => m[2], :by => m[4] } }
+          elsif(m = /## ([\w,\/]+)\.\.\.([\w,\/]+) \[(\w+) (\d+)\]/.match(s))
             if m[3] =~ /behind/
               divergence << { :behind => { :branch => m[2], :by => m[4] } }
             else

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize