aboutsummaryrefslogtreecommitdiff
path: root/lib/leap_cli/util.rb
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-02-28 22:41:25 -0800
committerelijah <elijah@riseup.net>2013-02-28 22:41:25 -0800
commitdb6be7e8c1fc966d31fc7cba9dd728cf6d65739f (patch)
tree0447f3e9045dfcc1b4467669bda06db1f240b88a /lib/leap_cli/util.rb
parentd78643049e18749994ca39e18f02be3f3d23bd88 (diff)
downloadleap_cli-db6be7e8c1fc966d31fc7cba9dd728cf6d65739f.tar.gz
leap_cli-db6be7e8c1fc966d31fc7cba9dd728cf6d65739f.tar.bz2
added @allow_production_deploy and @platform_branch to Leapfile
Diffstat (limited to 'lib/leap_cli/util.rb')
-rw-r--r--lib/leap_cli/util.rb24
1 files changed, 23 insertions, 1 deletions
diff --git a/lib/leap_cli/util.rb b/lib/leap_cli/util.rb
index 5bab424..155796f 100644
--- a/lib/leap_cli/util.rb
+++ b/lib/leap_cli/util.rb
@@ -74,7 +74,7 @@ module LeapCli
#
def assert_run!(cmd, message=nil)
cmd = cmd + " 2>&1"
- output = `#{cmd}`
+ output = `#{cmd}`.strip
unless $?.success?
exit_status($?.exitstatus)
bail! do
@@ -363,6 +363,28 @@ module LeapCli
ERB.new(string, nil, '%<>-').result(binding)
end
+ ##
+ ## GIT
+ ##
+
+ def is_git_directory?(dir)
+ Dir.chdir(dir) do
+ `which git && git rev-parse 2>/dev/null`
+ return $? == 0
+ end
+ end
+
+ def current_git_branch(dir)
+ Dir.chdir(dir) do
+ branch = `git symbolic-ref HEAD 2>/dev/null`.strip
+ if branch.chars.any?
+ branch.sub /^refs\/heads\//, ''
+ else
+ nil
+ end
+ end
+ end
+
end
end