branchy 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed3b4d0d61cab54a877cdfe1189243e29fca9706
-  data.tar.gz: 7e8edebf165f2de57c3965613e42edcc72a91f2a
+  metadata.gz: 708d94cf9a7312815cb9f02ffbdfa66677d8aab1
+  data.tar.gz: f19c689a44f991826d6ed41d1b228a752ec87b77
 SHA512:
-  metadata.gz: fc1b13b2dfc60097984d7b62a55d553ed2fb8caf4d51f8568f845fa37a31117482f1d06f6e311869e9bd3f11e4639d4397a88a00f8b72922165fbc750a3038db
-  data.tar.gz: 604d96dd3f37bbd1191f6cbff430f0cf6e9436aaa2491bd6b8201bbdb65a4ad8aa782cdf5ab3f4b64aae4984be46b1096ed74625a7be204b2b1dcab66f41a9ce
+  metadata.gz: e96c3cdee3afdebe75cdcbd26ffdaafd2d7b53178553be3e533bad1c2cde6943a890a554a638174494ce4641343d281d20e671f1fd9a0f08d600030876f2ff4e
+  data.tar.gz: 9b2869343c0ae5af0129a88b11fce89c8fef35cd450114458a581dbc6898707aeb4652ab37dfeea040b647154120ec11b6ad52ba5c5fb88ecc4344c13eea6dc1

data/lib/branchy/drivers/git.rb

@@ -7,8 +7,7 @@ module Branchy
 
       # Returns the git branch or tag name
       def self.branch
-        digest = exec_or_raise('git rev-parse HEAD')
-        exec_or_raise("git name-rev --name-only #{digest}").sub(/^tags\//, '').sub(/\^0$/, '')
+        branch_name || tag_name
       end
 
       # Returns true if it's the master/trunk/mainline branch.
@@ -30,6 +29,19 @@ module Branchy
       def self.disable!
         exec_or_raise("git config --bool branch.#{branch}.database false")
       end
+
+      private
+
+      def self.branch_name
+        name = exec_or_raise('git rev-parse --abbrev-ref HEAD')
+        name == 'HEAD'.freeze ? nil : name
+      end
+
+      def self.tag_name
+        log = exec_or_raise("git reflog show --decorate -1")
+        match = log.match(/, tag: ([^,]+), /)
+        match ? match.captures[0] : nil
+      end
     end
   end
 end

data/lib/branchy/version.rb

@@ -1,4 +1,4 @@
 module Branchy
   # The gem version
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branchy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Coleman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies: []
 description: Use a different database for each of your branches!
 email: jordan@jordanhollinger.com