Verified Commit 570e7b2a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Change some files


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 6f6d7e7e
...@@ -6,12 +6,18 @@ module Popen ...@@ -6,12 +6,18 @@ module Popen
   
def popen(cmd, path=nil) def popen(cmd, path=nil)
unless cmd.is_a?(Array) unless cmd.is_a?(Array)
raise "System commands must be given as an array of strings" raise RuntimeError, "System commands must be given as an array of strings"
end end
   
path ||= Dir.pwd path ||= Dir.pwd
vars = { "PWD" => path }
options = { chdir: path } vars = {
"PWD" => path
}
options = {
chdir: path
}
   
unless File.directory?(path) unless File.directory?(path)
FileUtils.mkdir_p(path) FileUtils.mkdir_p(path)
...@@ -19,6 +25,7 @@ module Popen ...@@ -19,6 +25,7 @@ module Popen
   
@cmd_output = "" @cmd_output = ""
@cmd_status = 0 @cmd_status = 0
Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr| Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
@cmd_output << stdout.read @cmd_output << stdout.read
@cmd_output << stderr.read @cmd_output << stderr.read
......
...@@ -19,14 +19,12 @@ module Gitlab ...@@ -19,14 +19,12 @@ module Gitlab
end end
   
def archive_formats_regex def archive_formats_regex
#|zip|tar| tar.gz | tar.bz2 | /(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/
/(zip|tar|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/
end end
   
def git_reference_regex def git_reference_regex
# Valid git ref regex, see: # Valid git ref regex, see:
# https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
%r{ %r{
(?! (?!
(?# doesn't begins with) (?# doesn't begins with)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment