admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #1352 from reitermarkus/fix-repo-info

Browse Source 
Fix failing test caused by `repo_info`.
This commit is contained in:
Markus Reiter 2016-10-23 17:26:24 +02:00 committed by GitHub
commit 773d20fb0c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cask/lib/hbc/cli/info.rb
View File

@ -20,7 +20,7 @@ module Hbc
puts "#{cask.token}: #{cask.version}"
puts Formatter.url(cask.homepage) if cask.homepage
installation_info(cask)
puts "From: #{Formatter.url(repo_info(cask))}" if repo_info(cask)
puts "From: #{Formatter.url(repo_info(cask))}"
name_info(cask)
artifact_info(cask)
Installer.print_caveats(cask)
@ -53,7 +53,11 @@ module Hbc
def self.repo_info(cask)
user, repo, token = QualifiedToken.parse(Hbc.all_tokens.detect { |t| t.split("/").last == cask.token })
remote_tap = Tap.fetch(user, repo)
return remote_tap.remote.to_s if remote_tap.custom_remote?
if remote_tap.custom_remote? && !remote_tap.remote.nil?
return remote_tap.remote.to_s
end
"#{remote_tap.default_remote}/blob/master/Casks/#{token}.rb"
end

10
Library/Homebrew/cask/test/cask/cli/info_test.rb
View File

@ -8,7 +8,7 @@ describe Hbc::CLI::Info do
local-caffeine: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-testcasks/blob/master/Casks/local-caffeine.rb
From: https://github.com/caskroom/homebrew-test/blob/master/Casks/local-caffeine.rb
==> Name
None
==> Artifacts
@ -22,7 +22,7 @@ describe Hbc::CLI::Info do
local-caffeine: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-testcasks/blob/master/Casks/local-caffeine.rb
From: https://github.com/caskroom/homebrew-test/blob/master/Casks/local-caffeine.rb
==> Name
None
==> Artifacts
@ -30,7 +30,7 @@ describe Hbc::CLI::Info do
local-transmission: 2.61
http://example.com/local-transmission
Not installed
From: https://github.com/caskroom/homebrew-testcasks/blob/master/Casks/local-transmission.rb
From: https://github.com/caskroom/homebrew-test/blob/master/Casks/local-transmission.rb
==> Name
None
==> Artifacts
@ -58,7 +58,7 @@ describe Hbc::CLI::Info do
with-caveats: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-testcasks/blob/master/Casks/with-caveats.rb
From: https://github.com/caskroom/homebrew-test/blob/master/Casks/with-caveats.rb
==> Name
None
==> Artifacts
@ -84,7 +84,7 @@ describe Hbc::CLI::Info do
with-conditional-caveats: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-testcasks/blob/master/Casks/with-conditional-caveats.rb
From: https://github.com/caskroom/homebrew-test/blob/master/Casks/with-conditional-caveats.rb
==> Name
None
==> Artifacts