alpha_omega 0.0.125 → 0.0.126

data/VERSION

@@ -1 +1 @@
-0.0.125
+0.0.126

data/lib/alpha_omega/utils.rb

@@ -141,9 +141,9 @@ module AlphaOmega
   end
 
   def self.what_branch (allowed = %w(production staging master develop) + [%r(/)])
-    current = `git branch`.split("\n").find {|b| b.split(" ")[0] == '*' } # use Grit
-    if current
-      star, branch_name = current.split(" ")
+    current = `cat .git/HEAD`.strip
+    if current[0] == "ref:"
+      branch_name = current[1].split("/")[2..-1].join("/")
       if allowed.any? {|rx| rx.match(branch_name) }
         branch_name
       else
@@ -151,8 +151,7 @@ module AlphaOmega
         abort
       end
     else
-      puts "could not find a suitable branch"
-      abort
+      current[0]
     end
   end
 

data/libexec/proxy

@@ -4,11 +4,15 @@ hst_proxy="${GATEWAY:=deploy}"
 
 # remote arguments
 git_url="$(git config --list | grep remote.origin.url | cut -d= -f2-)"
-git_branch="$(git branch | grep '^\*' | awk '{print $2}' | head -1)"
-if [[ $git_branch = "(no" ]]; then
+
+git_ref=$(cat .git/HEAD)
+if echo "$git_ref" | egrep -q "^ref:"; then
+  git_branch=$(echo "$git_ref" | awk '{print $1}' | cut -d/ -f3-)
+  git_head=$(git show-ref --hash "$(echo "$git_ref" | awk '{print $2}')")
+else
   git_branch=""
+  git_head=$git_ref
 fi
-git_head="$(git show-ref --head HEAD |  awk '$2 == "HEAD" {print $1}')"
 
 if [[ -z $git_head ]]; then
   echo "ERROR: could not find the SHA for HEAD" 1>&2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 229
+  hash: 227
   prerelease: 
   segments: 
   - 0
   - 0
-  - 125
-  version: 0.0.125
+  - 126
+  version: 0.0.126
 platform: ruby
 authors: 
 - David Nghiem