Merge pull request #1992 from rolandwalker/core_fonts

CAB containers

.travis.yml

@@ -1,5 +1,7 @@
 language: objective-c
-before_install: brew update
+before_install:
+ - brew update
+ - brew install cabextract
 install: bundle
 script: bundle exec rake test
 notifications:

lib/cask/container.rb

@@ -1,6 +1,7 @@
 class Cask::Container; end
 
 require 'cask/container/base'
+require 'cask/container/cab'
 require 'cask/container/criteria'
 require 'cask/container/dmg'
 require 'cask/container/naked'
@@ -10,6 +11,7 @@ class Cask::Container; end
 class Cask::Container
   def self.containers
     [
+      Cask::Container::Cab,
       Cask::Container::Dmg,
       Cask::Container::Tar,
       Cask::Container::Zip,

lib/cask/container/cab.rb

@@ -0,0 +1,20 @@
+require 'tmpdir'
+
+class Cask::Container::Cab < Cask::Container::Base
+  def self.me?(criteria)
+    (criteria.file.include? 'application/octet-stream;' or
+     criteria.file.include? 'application/vnd.ms-cab-compressed;') and
+      criteria.cabextract.include? 'All done, no errors'
+  end
+
+  def extract
+    cabextract = HOMEBREW_PREFIX.join('bin/cabextract')
+    if ! Pathname.new(cabextract).exist?
+      raise "Expected to find cabextract executable. Cask #{@cask} must add 'depends_on_formula'"
+    end
+    Dir.mktmpdir do |staging_dir|
+      @command.run!(cabextract, :args => ['-d', staging_dir, '--', @path])
+      @command.run!('/usr/bin/ditto', :args => ['--', staging_dir, @cask.destination_path])
+    end
+  end
+end

lib/cask/container/criteria.rb

@@ -19,4 +19,13 @@ def imageinfo
       :print => false
     )
   end
+
+  def cabextract
+    @cabextract ||= @command.run(
+      HOMEBREW_PREFIX.join('bin/cabextract'),
+      :args => ['-t', '--', path],
+      :stderr => :silence,
+      :print => false
+    )
+  end
 end

test/cask/installer_test.rb

@@ -41,6 +41,25 @@
       application.must_be :directory?
     end
 
+    it "works with cab-based casks" do
+      skip unless HOMEBREW_PREFIX.join('bin/cabextract').exist?
+      cab_container = Cask.load('cab-container')
+
+      # because I don't know how to do the mocking properly
+      def cab_container.depends_on_formula
+        []
+      end
+
+      shutup do
+        Cask::Installer.new(cab_container).install
+      end
+
+      dest_path = Cask.caskroom/'cab-container'/cab_container.version
+      dest_path.must_be :directory?
+      application = dest_path/'cabcontainer/Application.app'
+      application.must_be :directory?
+    end
+
     it "blows up on a bad checksum" do
       bad_checksum = Cask.load('bad-checksum')
       lambda {

test/support/Casks/cab-container.rb

@@ -0,0 +1,8 @@
+class CabContainer < TestCask
+  url TestHelper.local_binary('cabcontainer.cab')
+  homepage 'http://example.com/cab-container'
+  version '1.2.3'
+  sha1 '85bfbcfc8887a995ae0e724796a0c242341b3071'
+  depends_on_formula 'cabextract'
+  link 'cabcontainer/Application.app'
+end

test/test_helper.rb

@@ -96,12 +96,17 @@ def self.install_without_artifacts(cask)
 project_root = Pathname.new(File.expand_path("#{File.dirname(__FILE__)}/../"))
 taps_dest = HOMEBREW_LIBRARY/"Taps"
 
+# create directories
 taps_dest.mkdir
+HOMEBREW_PREFIX.join('bin').mkdir
 
 FileUtils.ln_s project_root, taps_dest/"phinze-cask"
 
 # Common superclass for tests casks for when we need to filter them out
 class TestCask < Cask; end
 
+# jack in some optional utilities
+FileUtils.ln_s '/usr/local/bin/cabextract', HOMEBREW_PREFIX.join('bin/cabextract')
+
 # also jack in some test casks
 FileUtils.ln_s project_root/'test'/'support', taps_dest/"phinze-testcasks"