aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/source/git
diff options
context:
space:
mode:
authorJames Wen <jrw2175@columbia.edu>2016-04-05 01:15:30 -0400
committerJames Wen <jrw2175@columbia.edu>2016-04-05 01:15:30 -0400
commit4d05a21c05f7dce6f932ebbce7705fd7fbab324a (patch)
tree1b75e3fe8435d9dffe315fb1c5f7d7ebd0568a93 /lib/bundler/source/git
parent7173d3ea6862685f381732c52f46eb3b90576be2 (diff)
downloadbundler-4d05a21c05f7dce6f932ebbce7705fd7fbab324a.tar.gz
Ensure that `URICredentialsFilter#credential_filtered_uri` returns same
type as input parameter - Improve clarity of URICredentialsFilter method names
Diffstat (limited to 'lib/bundler/source/git')
-rw-r--r--lib/bundler/source/git/git_proxy.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb
index 9ea7a22f..9b0e95d1 100644
--- a/lib/bundler/source/git/git_proxy.rb
+++ b/lib/bundler/source/git/git_proxy.rb
@@ -86,12 +86,12 @@ module Bundler
def checkout
if path.exist?
return if has_revision_cached?
- Bundler.ui.info "Fetching #{URICredentialsFilter.anonymized_uri(uri)}"
+ Bundler.ui.info "Fetching #{URICredentialsFilter.credential_filtered_uri(uri)}"
in_path do
git_retry %(fetch --force --quiet --tags #{uri_escaped_with_configured_credentials} "refs/heads/*:refs/heads/*")
end
else
- Bundler.ui.info "Fetching #{URICredentialsFilter.anonymized_uri(uri)}"
+ Bundler.ui.info "Fetching #{URICredentialsFilter.credential_filtered_uri(uri)}"
SharedHelpers.filesystem_access(path.dirname) do |p|
FileUtils.mkdir_p(p)
end
@@ -145,12 +145,12 @@ module Bundler
end
def git(command, check_errors = true, error_msg = nil)
- command_with_no_credentials = URICredentialsFilter.credentials_filtered_string(command, uri)
+ command_with_no_credentials = URICredentialsFilter.credential_filtered_string(command, uri)
raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
out = SharedHelpers.with_clean_git_env { `git #{command}` }
- stdout_with_no_credentials = URICredentialsFilter.credentials_filtered_string(out, uri)
+ stdout_with_no_credentials = URICredentialsFilter.credential_filtered_string(out, uri)
raise GitCommandError.new(command_with_no_credentials, path, error_msg) if check_errors && !$?.success?
stdout_with_no_credentials
end