Merge pull request #3220 from yzguy/yzguy/cask_available_languages_to_info

add available languages to cask info command

6 files changed, 104 insertions, 0 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/cli/info.rb b/Library/Homebrew/cask/lib/hbc/cli/info.rb
index 9cdada62e..2b4db9530 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/info.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/info.rb
@@ -23,6 +23,7 @@ module Hbc
         installation_info(cask)
         repo_info(cask)
         name_info(cask)
+        language_info(cask)
         artifact_info(cask)
         Installer.print_caveats(cask)
       end
@@ -51,6 +52,13 @@ module Hbc
         puts cask.name.empty? ? Formatter.error("None") : cask.name
       end
 
+      def self.language_info(cask)
+        return if cask.languages.empty?
+
+        ohai "Languages"
+        puts cask.languages.join(", ")
+      end
+
       def self.repo_info(cask)
         user, repo, token = QualifiedToken.parse(Hbc.all_tokens.detect { |t| t.split("/").last == cask.token })
 
diff --git a/Library/Homebrew/cask/lib/hbc/dsl.rb b/Library/Homebrew/cask/lib/hbc/dsl.rb
index 1d048bffd..8d5b6c9a9 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl.rb
+++ b/Library/Homebrew/cask/lib/hbc/dsl.rb
@@ -63,6 +63,7 @@ module Hbc
       :gpg,
       :homepage,
       :language,
+      :languages,
       :name,
       :sha256,
       :staged_path,
@@ -145,6 +146,12 @@ module Hbc
       @language = @language_blocks.default.call
     end
 
+    def languages
+      return [] if @language_blocks.nil?
+
+      @language_blocks.keys.flatten
+    end
+
     def url(*args, &block)
       set_unique_stanza(:url, args.empty? && !block_given?) do
         begin
diff --git a/Library/Homebrew/test/cask/cli/info_spec.rb b/Library/Homebrew/test/cask/cli/info_spec.rb
index aec7080de..df02bb1e5 100644
--- a/Library/Homebrew/test/cask/cli/info_spec.rb
+++ b/Library/Homebrew/test/cask/cli/info_spec.rb
@@ -90,6 +90,38 @@ describe Hbc::CLI::Info, :cask do
     EOS
   end
 
+  it "prints languages specified in the Cask" do
+    expect {
+      Hbc::CLI::Info.run("with-languages")
+    }.to output(<<-EOS.undent).to_stdout
+      with-languages: 1.2.3
+      http://example.com/local-caffeine
+      Not installed
+      From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/with-languages.rb
+      ==> Name
+      None
+      ==> Languages
+      zh, en-US
+      ==> Artifacts
+      Caffeine.app (App)
+    EOS
+  end
+
+  it 'does not print "Languages" section divider if the languages block has no output' do
+    expect {
+      Hbc::CLI::Info.run("without-languages")
+    }.to output(<<-EOS.undent).to_stdout
+      without-languages: 1.2.3
+      http://example.com/local-caffeine
+      Not installed
+      From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/without-languages.rb
+      ==> Name
+      None
+      ==> Artifacts
+      Caffeine.app (App)
+    EOS
+  end
+
   describe "when no Cask is specified" do
     it "raises an exception" do
       expect {
diff --git a/Library/Homebrew/test/cask/dsl_spec.rb b/Library/Homebrew/test/cask/dsl_spec.rb
index aec1e917f..7df8de6f8 100644
--- a/Library/Homebrew/test/cask/dsl_spec.rb
+++ b/Library/Homebrew/test/cask/dsl_spec.rb
@@ -177,6 +177,36 @@ describe Hbc::DSL, :cask do
       expect(cask.call.sha256).to eq("xyz789")
       expect(cask.call.url.to_s).to eq("https://example.org/en-US.zip")
     end
+
+    it "returns an empty array if no languages are specified" do
+      cask = lambda do
+        Hbc::Cask.new("cask-with-apps") do
+          url "https://example.org/file.zip"
+        end
+      end
+
+      expect(cask.call.languages).to be_empty
+    end
+
+    it "returns an array of available languages" do
+      cask = lambda do
+        Hbc::Cask.new("cask-with-apps") do
+          language "zh" do
+            sha256 "abc123"
+            "zh-CN"
+          end
+
+          language "en-US", default: true do
+            sha256 "xyz789"
+            "en-US"
+          end
+
+          url "https://example.org/file.zip"
+        end
+      end
+
+      expect(cask.call.languages).to eq(["zh", "en-US"])
+    end
   end
 
   describe "app stanza" do
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-languages.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-languages.rb
new file mode 100644
index 000000000..90ff63846
--- /dev/null
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-languages.rb
@@ -0,0 +1,18 @@
+cask 'with-languages' do
+  version '1.2.3'
+  
+  language "zh" do
+    sha256 "abc123"
+    "zh-CN"
+  end
+
+  language "en-US", default: true do
+    sha256 "xyz789"
+    "en-US"
+  end
+
+  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
+  homepage 'http://example.com/local-caffeine'
+ 
+  app 'Caffeine.app'
+end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/without-languages.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/without-languages.rb
new file mode 100644
index 000000000..4c0ce955a
--- /dev/null
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/without-languages.rb
@@ -0,0 +1,9 @@
+cask 'without-languages' do
+  version '1.2.3'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
+  
+  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
+  homepage 'http://example.com/local-caffeine'
+ 
+  app 'Caffeine.app'
+end