summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-11 21:09:54 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-11 21:09:54 +0000
commit4f8e91fac043f09ea94a3542eeff9734db33645a (patch)
tree8a51b305bf9b714445a43af099229d40d05f8164
parent627b29c5fee98de08b245eb518e0609428bd66d4 (diff)
parent939cd374e7831d10b8e3c8b65dd9a2380e8f2393 (diff)
downloadgitlab-shell-4f8e91fac043f09ea94a3542eeff9734db33645a.tar.gz
Merge branch 'dup-frozen-argv-key' into 'master'
In order to use chomp! on the input later, we need to dup the ARGV input string for keys Also updated the gitlab_key tests to freeze the ARGV variables. Fixes https://gitlab.com/gitlab-org/gitlab-shell/issues/56 See merge request !84
-rw-r--r--lib/gitlab_keys.rb3
-rw-r--r--spec/gitlab_keys_spec.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
index eb359f8..0eb04eb 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -22,7 +22,8 @@ class GitlabKeys
def initialize
@command = ARGV.shift
@key_id = ARGV.shift
- @key = ARGV.shift
+ key = ARGV.shift
+ @key = key.dup if key
@auth_file = GitlabConfig.new.auth_file
end
diff --git a/spec/gitlab_keys_spec.rb b/spec/gitlab_keys_spec.rb
index d944278..67f9f40 100644
--- a/spec/gitlab_keys_spec.rb
+++ b/spec/gitlab_keys_spec.rb
@@ -284,7 +284,7 @@ describe GitlabKeys do
def argv(*args)
args.each_with_index do |arg, i|
- ARGV[i] = arg
+ ARGV[i] = arg.freeze
end
end