fontana_client_support 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32de00430365d7865f4ae1d9358c4465767bcd86
-  data.tar.gz: 5872211dd0a0ca9743e1478155053b28cf6fbe1c
+  metadata.gz: 15e1aa491f241c88c91e639d7949ca10fb0f28a6
+  data.tar.gz: 2dfd77efd5874b539404c6c26e22d794bd22e4fe
 SHA512:
-  metadata.gz: a6a0ecca172127313f4cf511ecdea9870e15d1720d20090a72ce555188e160176170637b8f9677a55ef9e4a7780c92e532f41976b28d9ae4a399aab1df7c30ef
-  data.tar.gz: 361fe52894855f7296d3e7c815505ccf081b9febf3a14e62a965c0cf5cb9ab4d9434d53e49c4f55f1aa318b27965bd9aad3e6a646bdc385620e1f9a8d2bcadfd
+  metadata.gz: 50a8a27c2731eee668faad8b87d9347a9ab922190c58441f008c37ec1ff9d92a6714de480d267746cab64db30c88b60bcc6243fa057924d6cc28f9b22b0c91ae
+  data.tar.gz: 987660b4ac6d7c63d8309b7f0c349fda9f1a8af0bad977134f26c26f84ba6d33da53c1830f88dbbd864905c2d7337bb2da4c934158623831c45ce1b7e03c4d10

data/lib/fontana_client_support.rb

@@ -17,17 +17,20 @@ module FontanaClientSupport
 
     def current_branch_name
       unless @current_branch_name
-        work = `git log --decorate -1 --branches`.scan(/^commit\s[0-9a-f]+\s\((.+)\)/).
-          flatten.first.split(/,/).map(&:strip).reject{|s| s =~ /HEAD\Z/}
-        r = work.select{|s| s =~ /origin\//}.first
-        r ||= work.first
-        @current_branch_name = r.sub(/\Aorigin\//, '')
+        @current_branch_name = `git status`.scan(/On branch\s*(.+)\s*$/).flatten.first
+        unless @current_branch_name
+          work = `git log --decorate -1`.scan(/^commit\s[0-9a-f]+\s\((.+)\)/).
+            flatten.first.split(/,/).map(&:strip).reject{|s| s =~ /HEAD\Z/}
+          r = work.select{|s| s =~ /origin\//}.first
+          r ||= work.first
+          @current_branch_name = r.sub(/\Aorigin\//, '')
+        end
       end
       @current_branch_name
     rescue => e
       puts "[#{e.class}] #{e.message}"
       puts "Dir.pwd: #{Dir.pwd}"
-      puts "git log --decorate -1\n" << `git log --decorate -1`
+      puts "git status\n" << `git status`
       raise e
     end
 

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler