nsq 0.2.31

This commit also removes the ``godep`` binary that had been previously
included in the formula. All Go dependencies are instead vendored via
Homebrew's Go dependency helper.

Closes #32141.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 43 insertions, 10 deletions

diff --git a/Library/Formula/nsq.rb b/Library/Formula/nsq.rb
index f7c313509..676aa0b53 100644
--- a/Library/Formula/nsq.rb
+++ b/Library/Formula/nsq.rb
@@ -1,9 +1,10 @@
 require "formula"
+require "language/go"
 
 class Nsq < Formula
   homepage "http://bitly.github.io/nsq"
-  url "https://github.com/bitly/nsq/archive/v0.2.30.tar.gz"
-  sha1 "e8e9df1b472782d912bca6fe451f25ec35b9c3e6"
+  url "https://github.com/bitly/nsq/archive/v0.2.31.tar.gz"
+  sha1 "614e66746c6b785cffb48a6412e44dd5e0c7b0bd"
 
   bottle do
     sha1 "fa6980ba138a8448cbe330cb0f3abb994f39981f" => :mavericks
@@ -12,11 +13,45 @@ class Nsq < Formula
   end
 
   depends_on "go" => :build
-  depends_on :hg # some package dependencies are mercurial repos
 
-  resource "godep" do
-    url "http://bitly-downloads.s3.amazonaws.com/nsq/godep.tar.gz"
-    sha1 "396a62055bb5b4eb4f58cffc64b2ac8deafbacac"
+  go_resource "code.google.com/p/snappy-go" do
+    url "https://code.google.com/p/snappy-go/", :using => :hg,
+      :revision => "12e4b4183793ac4b061921e7980845e750679fd0"
+  end
+
+  go_resource "github.com/BurntSushi/toml" do
+    url "https://github.com/BurntSushi/toml.git",
+      :revision => "2dff11163ee667d51dcc066660925a92ce138deb"
+  end
+
+  go_resource "github.com/bitly/go-hostpool" do
+    url "https://github.com/bitly/go-hostpool.git",
+      :revision => "58b95b10d6ca26723a7f46017b348653b825a8d6"
+  end
+
+  go_resource "github.com/bitly/go-nsq" do
+    url "https://github.com/bitly/go-nsq.git",
+      :revision => "ac221df5bdb6d5bfc624a297b5b00b59d7065be2"
+  end
+
+  go_resource "github.com/bitly/go-simplejson" do
+    url "https://github.com/bitly/go-simplejson.git",
+      :revision => "fc395a5db941cf38922b1ccbc083640cd76fe4bc"
+  end
+
+  go_resource "github.com/bmizerany/perks" do
+    url "https://github.com/bmizerany/perks.git",
+      :revision => "6cb9d9d729303ee2628580d9aec5db968da3a607"
+  end
+
+  go_resource "github.com/mreiferson/go-options" do
+    url "https://github.com/mreiferson/go-options.git",
+      :revision => "896a539cd709f4f39d787562d1583c016ce7517e"
+  end
+
+  go_resource "github.com/mreiferson/go-snappystream" do
+    url "https://github.com/mreiferson/go-snappystream.git",
+      :revision => "307a466b220aaf34bcee2d19c605ed9e96b4bcdb"
   end
 
   def install
@@ -24,11 +59,9 @@ class Nsq < Formula
     (buildpath + "src/github.com/bitly/nsq").install "util", "nsqlookupd", "nsqd"
     (buildpath + "src/github.com/bitly/nsq/nsqadmin").install "nsqadmin/templates" => "templates"
 
-    # godep is only needed to *build* so don't install somewhere permanent
-    buildpath.install resource("godep")
-
     ENV["GOPATH"] = buildpath
-    system "#{buildpath}/godep restore"
+    Language::Go.stage_deps resources, buildpath/"src"
+
     system "make"
     system "make", "DESTDIR=#{prefix}", "PREFIX=", "install"
   end