From 6bb01ba43b894faac8ae4870ffe4d817065671a5 Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 02:15:00 -0400
Subject: [PATCH 01/14] Add cask for colloquy irc client.

---
 Casks/colloquy.rb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Casks/colloquy.rb

diff --git a/Casks/colloquy.rb b/Casks/colloquy.rb
new file mode 100644
index 000000000..823f0c802
--- /dev/null
+++ b/Casks/colloquy.rb
@@ -0,0 +1,6 @@
+class Colloquy < Cask
+  url 'http://colloquy.info/downloads/colloquy-2.4.zip'
+  homepage 'http://colloquy.info/'
+  version '2.4'
+end
+

From 939b8c7f2d513b00c2679c6ee387ccdc1860f66f Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 02:24:57 -0400
Subject: [PATCH 02/14] Add cask for GitX git gui.

---
 Casks/gitx.rb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Casks/gitx.rb

diff --git a/Casks/gitx.rb b/Casks/gitx.rb
new file mode 100644
index 000000000..11cede448
--- /dev/null
+++ b/Casks/gitx.rb
@@ -0,0 +1,6 @@
+class Gitx < Cask
+  url 'http://frim.frim.nl/GitXStable.app.zip'
+  homepage 'http://gitx.frim.nl/'
+  version 'latest'
+end
+

From ec3d5189dd8eae9d1fceb733f765603fbbf8887b Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 02:30:04 -0400
Subject: [PATCH 03/14] Add cask for laullon version of GitX git gui.

More up to date and developed than original GitX client.
---
 Casks/gitx-l.rb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Casks/gitx-l.rb

diff --git a/Casks/gitx-l.rb b/Casks/gitx-l.rb
new file mode 100644
index 000000000..9fdcfa3b1
--- /dev/null
+++ b/Casks/gitx-l.rb
@@ -0,0 +1,6 @@
+class GitxL < Cask
+  url 'https://github.com/downloads/laullon/gitx/GitX-L_v0.8.4.zip'
+  homepage 'http://gitx.laullon.com/'
+  version '0.8.4'
+end
+

From 79f0c029e957b2f7985cb8ed5bce2fa0e4254708 Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 02:36:58 -0400
Subject: [PATCH 04/14] Add cask for arq.

Haystack Software's online backup program.
---
 Casks/arq.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/arq.rb

diff --git a/Casks/arq.rb b/Casks/arq.rb
new file mode 100644
index 000000000..f20e853d2
--- /dev/null
+++ b/Casks/arq.rb
@@ -0,0 +1,5 @@
+class Arq < Cask
+  url 'http://www.haystacksoftware.com/arq/Arq.zip'
+  homepage 'http://www.haystacksoftware.com/arq/'
+  version 'latest'
+end

From 282605348086e92eb0f30702fefbf7cdbe25c601 Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 02:44:58 -0400
Subject: [PATCH 05/14] Add cask for Aquamacs version of emacs.

---
 Casks/aquamacs.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/aquamacs.rb

diff --git a/Casks/aquamacs.rb b/Casks/aquamacs.rb
new file mode 100644
index 000000000..8451c91f1
--- /dev/null
+++ b/Casks/aquamacs.rb
@@ -0,0 +1,5 @@
+class Aquamacs < Cask
+  url 'http://downloads.sourceforge.net/project/aquamacs/Releases/Aquamacs-Emacs-2.4.dmg'
+  homepage 'http://aquamacs.org/'
+  version '2.4'
+end

From e8a095928cd7722839e3914d991b108939b91065 Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 02:51:45 -0400
Subject: [PATCH 06/14] Add cask for BootXChanger.

Allows you to change the OS X boot image.
---
 Casks/boot-x-changer.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/boot-x-changer.rb

diff --git a/Casks/boot-x-changer.rb b/Casks/boot-x-changer.rb
new file mode 100644
index 000000000..2f7d7fe9f
--- /dev/null
+++ b/Casks/boot-x-changer.rb
@@ -0,0 +1,5 @@
+class BootXChanger < Cask
+  url 'http://namedfork.net/_media/bootxchanger_2.0.dmg'
+  homepage 'http://namedfork.net/bootxchanger'
+  version '2.0'
+end

From e3f2dc8774484b1c49875786adc3c0fa1a2e184e Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 03:16:23 -0400
Subject: [PATCH 07/14] Add cask for back-in-time.

Time machine backup exploration software.
---
 Casks/back-in-time.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/back-in-time.rb

diff --git a/Casks/back-in-time.rb b/Casks/back-in-time.rb
new file mode 100644
index 000000000..e7c81b935
--- /dev/null
+++ b/Casks/back-in-time.rb
@@ -0,0 +1,5 @@
+class BackInTime < Cask
+  url 'http://www.tri-edre.com/pub/files/backintime203.dmg'
+  homepage 'http://www.tri-edre.fr/english/backintime.html'
+  version '2.0.3'
+end

From 97a3272e0329a32f7182712d2e55a897cca469eb Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 03:23:44 -0400
Subject: [PATCH 08/14] Add cask for Moom.

A 'window manager' for OS X.
---
 Casks/moom.rb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Casks/moom.rb

diff --git a/Casks/moom.rb b/Casks/moom.rb
new file mode 100644
index 000000000..895e4fdd1
--- /dev/null
+++ b/Casks/moom.rb
@@ -0,0 +1,6 @@
+class Moom < Cask
+  url 'http://manytricks.com/download/moom'
+  homepage 'http://manytricks.com/moom/'
+  version 'latest'
+end
+

From 0e0b81b26d2df1b0fbcb155a7406399f548cdaaa Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 03:31:15 -0400
Subject: [PATCH 09/14] Add cask for fluid.

---
 Casks/fluid.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/fluid.rb

diff --git a/Casks/fluid.rb b/Casks/fluid.rb
new file mode 100644
index 000000000..95c50e9e2
--- /dev/null
+++ b/Casks/fluid.rb
@@ -0,0 +1,5 @@
+class Fluid < Cask
+  url 'http://fluidapp.com/dist/Fluid_1.6.1.zip'
+  homepage 'http://fluidapp.com/'
+  version '1.6.1'
+end

From 72e070686a2985fb4d9a013145933f3146f1eff6 Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 03:37:14 -0400
Subject: [PATCH 10/14] Add cask for Gimp.

---
 Casks/gimp.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/gimp.rb

diff --git a/Casks/gimp.rb b/Casks/gimp.rb
new file mode 100644
index 000000000..79567406f
--- /dev/null
+++ b/Casks/gimp.rb
@@ -0,0 +1,5 @@
+class Gimp < Cask
+  url 'ftp://ftp.gimp.org/pub/gimp/v2.8/osx/gimp-2.8.2-dmg-2.dmg'
+  homepage 'http://www.gimp.org'
+  version '2.8.2'
+end

From 7fb27c2f79d3eb7e37042883a8c1834cc0a31125 Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 03:42:27 -0400
Subject: [PATCH 11/14] Add cask for Divvy.

OS X 'window manager'
---
 Casks/divvy.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/divvy.rb

diff --git a/Casks/divvy.rb b/Casks/divvy.rb
new file mode 100644
index 000000000..c83e5a1a7
--- /dev/null
+++ b/Casks/divvy.rb
@@ -0,0 +1,5 @@
+class Divvy < Cask
+  url 'http://mizage.com/downloads/Divvy.zip'
+  homepage 'http://mizage.com/divvy/'
+  version 'latest'
+end

From ee3a1b467e4efb5dfdfd1367dec7c7e7202fb4c6 Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 03:50:34 -0400
Subject: [PATCH 12/14] Add cask for Google Chrome Canary.

---
 Casks/google-chrome-canary.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/google-chrome-canary.rb

diff --git a/Casks/google-chrome-canary.rb b/Casks/google-chrome-canary.rb
new file mode 100644
index 000000000..eb443ab0b
--- /dev/null
+++ b/Casks/google-chrome-canary.rb
@@ -0,0 +1,5 @@
+class GoogleChromeCanary < Cask
+  url 'https://storage.googleapis.com/chrome-canary/GoogleChromeCanary.dmg'  
+  homepage 'https://tools.google.com/dlpage/chromesxs'
+  version 'latest'
+end

From da6a3c807d0b02d4fc5bdbd391732a5a4a7e943a Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 03:58:01 -0400
Subject: [PATCH 13/14] Add cask for livestation.

Service to watch tv from around the world.
---
 Casks/livestation.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Casks/livestation.rb

diff --git a/Casks/livestation.rb b/Casks/livestation.rb
new file mode 100644
index 000000000..d387241d0
--- /dev/null
+++ b/Casks/livestation.rb
@@ -0,0 +1,5 @@
+class Livestation < Cask
+  url 'http://updates.livestation.com/releases/Livestation-3.2.0-intel.dmg'
+  homepage 'http://www.livestation.com'
+  version '3.2.0'
+end

From 444973c5b4f6789145d8826e10c596edb2fe0b23 Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@monkeysnatchbanana.com>
Date: Sun, 14 Oct 2012 04:30:39 -0400
Subject: [PATCH 14/14] Add cask for Jumpcut.

Jumpcut is a tgz file whose handling isn't currently supported.
This commit adds support for it.

The test for tar.gz and tar.bz are very similar and could probably
be refactored. Leaving that as an exercise for another time.
Should have more use cases before opening that up.
---
 Casks/jumpcut.rb      |  6 ++++++
 lib/cask/installer.rb | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 Casks/jumpcut.rb

diff --git a/Casks/jumpcut.rb b/Casks/jumpcut.rb
new file mode 100644
index 000000000..f66e70fee
--- /dev/null
+++ b/Casks/jumpcut.rb
@@ -0,0 +1,6 @@
+class Jumpcut < Cask
+  url 'http://downloads.sourceforge.net/project/jumpcut/jumpcut/0.63/Jumpcut_0.63.tgz'
+  homepage 'http://jumpcut.sourceforge.net/'
+  version '0.63'
+end
+
diff --git a/lib/cask/installer.rb b/lib/cask/installer.rb
index b189132ec..021597436 100644
--- a/lib/cask/installer.rb
+++ b/lib/cask/installer.rb
@@ -41,7 +41,7 @@ class Cask::Installer
         ensure
           `rm -rf '#{destdir}'`
         end
-      elsif _tar_bzip?(path)
+      elsif _tar?(path)
         destdir = "/tmp/brewcask_#{@title}_extracted"
         `mkdir -p '#{destdir}'`
         `tar jxf '#{path}' -C '#{destdir}'`
@@ -65,9 +65,18 @@ class Cask::Installer
       output.chomp.include? 'compressed-encoding=application/zip; charset=binary; charset=binary'
     end
 
+    def _tar?(path)
+      _tar_bzip?(path) || _tar_gzip?(path)
+    end
+
     def _tar_bzip?(path)
       output = `file -Izb '#{path}'`
       output.chomp == 'application/x-tar; charset=binary compressed-encoding=application/x-bzip2; charset=binary; charset=binary'
     end
+
+    def _tar_gzip?(path)
+      output = `file -Izb '#{path}'`
+      output.chomp == 'application/x-tar; charset=binary compressed-encoding=application/x-gzip; charset=binary; charset=binary'
+    end
   end
 end