From 60be842f652218ca5391245b87bff3fa193b153c Mon Sep 17 00:00:00 2001 From: gunnaraasen Date: Sat, 21 Nov 2015 08:25:05 -0800 Subject: [PATCH] influxdb 0.9.5 Closes Homebrew/homebrew#46231. Signed-off-by: Dominyk Tiller --- Formula/influxdb.rb | 152 +++++++++++++++++++++++++------------------- 1 file changed, 85 insertions(+), 67 deletions(-) diff --git a/Formula/influxdb.rb b/Formula/influxdb.rb index 38d245c82d..545d93ca84 100644 --- a/Formula/influxdb.rb +++ b/Formula/influxdb.rb @@ -3,9 +3,8 @@ require "language/go" class Influxdb < Formula desc "Time series, events, and metrics database" homepage "https://influxdb.com" - url "https://github.com/influxdb/influxdb/archive/v0.9.4.2.tar.gz" - sha256 "aaea27228d7f242fe37d436506592189081beda0e7d2fba3f82c6b233fd913bc" - revision 1 + url "https://github.com/influxdb/influxdb/archive/v0.9.5.tar.gz" + sha256 "701620608cd3c2ee973b59835dc3d4677ec8719dc50e4b5760b56e64b05e0372" bottle do cellar :any_skip_relocation @@ -16,84 +15,103 @@ class Influxdb < Formula head do url "https://github.com/influxdb/influxdb.git" - - go_resource "github.com/dgryski/go-bitstream" do - url "https://github.com/dgryski/go-bitstream.git", :revision => "8c62433445abdcf8c50094b3d67a15f728d8292b" - end - - go_resource "github.com/dgryski/go-bits" do - url "https://github.com/dgryski/go-bits.git", :revision => "2c7641e7dfe3945a0fe755f58c85ab306624956d" - end - - go_resource "github.com/jwilder/encoding" do - url "https://github.com/jwilder/encoding.git", :revision => "07d88d4f35eec497617bee0c7bfe651a796dae13" - end end depends_on "go" => :build go_resource "github.com/BurntSushi/toml" do - url "https://github.com/BurntSushi/toml.git", :revision => "056c9bc7be7190eaa7715723883caffa5f8fa3e4" + url "https://github.com/BurntSushi/toml.git", + :revision => "056c9bc7be7190eaa7715723883caffa5f8fa3e4" end go_resource "github.com/armon/go-metrics" do - url "https://github.com/armon/go-metrics.git", :revision => "6c5fa0d8f48f4661c9ba8709799c88d425ad20f0" + url "https://github.com/armon/go-metrics.git", + :revision => "6c5fa0d8f48f4661c9ba8709799c88d425ad20f0" end go_resource "github.com/bmizerany/pat" do - url "https://github.com/bmizerany/pat.git", :revision => "b8a35001b773c267eb260a691f4e5499a3531600" + url "https://github.com/bmizerany/pat.git", + :revision => "b8a35001b773c267eb260a691f4e5499a3531600" end go_resource "github.com/boltdb/bolt" do - url "https://github.com/boltdb/bolt.git", :revision => "51f99c862475898df9773747d3accd05a7ca33c1" + url "https://github.com/boltdb/bolt.git", + :revision => "0b00effdd7a8270ebd91c24297e51643e370dd52" + end + + go_resource "github.com/dgryski/go-bits" do + url "https://github.com/dgryski/go-bits.git", + :revision => "2c7641e7dfe3945a0fe755f58c85ab306624956d" + end + + go_resource "github.com/dgryski/go-bitstream" do + url "https://github.com/dgryski/go-bitstream.git", + :revision => "8c62433445abdcf8c50094b3d67a15f728d8292b" end go_resource "github.com/gogo/protobuf" do - url "https://github.com/gogo/protobuf.git", :revision => "200875106f3bf0eb01eb297dae30b250a25ffc84" - end - - go_resource "github.com/golang/protobuf" do - url "https://github.com/golang/protobuf.git", :revision => "3d2510a4dd961caffa2ae781669c628d82db700a" - end - - go_resource "github.com/hashicorp/go-msgpack" do - url "https://github.com/hashicorp/go-msgpack.git", :revision => "fa3f63826f7c23912c15263591e65d54d080b458" - end - - go_resource "github.com/hashicorp/raft" do - url "https://github.com/hashicorp/raft.git", :revision => "9dabbbab966c04a0b6efed3cff6960299fed0642" - end - - go_resource "github.com/hashicorp/raft-boltdb" do - url "https://github.com/hashicorp/raft-boltdb.git", :revision => "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee" - end - - go_resource "github.com/kimor79/gollectd" do - url "https://github.com/kimor79/gollectd.git", :revision => "61d0deeb4ffcc167b2a1baa8efd72365692811bc" - end - - go_resource "github.com/peterh/liner" do - url "https://github.com/peterh/liner.git", :revision => "b850cf8c6d0ee52309aad09ac610508c6c75e819" - end - - go_resource "github.com/rakyll/statik" do - url "https://github.com/rakyll/statik.git", :revision => "274df120e9065bdd08eb1120e0375e3dc1ae8465" - end - - go_resource "golang.org/x/crypto" do - url "https://go.googlesource.com/crypto.git", :revision => "c8b9e6388ef638d5a8a9d865c634befdc46a6784" - end - - go_resource "gopkg.in/fatih/pool.v2" do - url "https://github.com/fatih/pool.git", :revision => "cba550ebf9bce999a02e963296d4bc7a486cb715" - end - - go_resource "collectd.org" do - url "https://github.com/collectd/go-collectd.git", :revision => "9fc824c70f713ea0f058a07b49a4c563ef2a3b98" + url "https://github.com/gogo/protobuf.git", + :revision => "d3235f01ecae4901dd9f7ea6af57a352c0189deb" end go_resource "github.com/golang/snappy" do - url "https://github.com/golang/snappy.git", :revision => "723cc1e459b8eea2dea4583200fd60757d40097a" + url "https://github.com/golang/snappy.git", + :revision => "723cc1e459b8eea2dea4583200fd60757d40097a" + end + + go_resource "github.com/hashicorp/go-msgpack" do + url "https://github.com/hashicorp/go-msgpack.git", + :revision => "fa3f63826f7c23912c15263591e65d54d080b458" + end + + go_resource "github.com/hashicorp/raft" do + url "https://github.com/hashicorp/raft.git", + :revision => "d136cd15dfb7876fd7c89cad1995bc4f19ceb294" + end + + go_resource "github.com/hashicorp/raft-boltdb" do + url "https://github.com/hashicorp/raft-boltdb.git", + :revision => "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee" + end + + go_resource "github.com/influxdb/enterprise-client" do + url "https://github.com/influxdb/enterprise-client.git", + :revision => "25665cba4f54fa822546c611c9414ac31aa10faa" + end + + go_resource "github.com/jwilder/encoding" do + url "https://github.com/jwilder/encoding.git", + :revision => "07d88d4f35eec497617bee0c7bfe651a796dae13" + end + + go_resource "github.com/kimor79/gollectd" do + url "https://github.com/kimor79/gollectd.git", + :revision => "61d0deeb4ffcc167b2a1baa8efd72365692811bc" + end + + go_resource "github.com/rakyll/statik" do + url "https://github.com/rakyll/statik.git", + :revision => "274df120e9065bdd08eb1120e0375e3dc1ae8465" + end + + go_resource "golang.org/x/crypto" do + url "https://go.googlesource.com/crypto.git", + :revision => "346896d57731cb5670b36c6178fc5519f3225980" + end + + go_resource "gopkg.in/fatih/pool.v2" do + url "https://gopkg.in/fatih/pool.v2.git", + :revision => "cba550ebf9bce999a02e963296d4bc7a486cb715" + end + + go_resource "github.com/peterh/liner" do + url "https://github.com/peterh/liner.git", + :revision => "4d47685ab2fd2dbb46c66b831344d558bc4be5b9" + end + + go_resource "collectd.org" do + url "https://github.com/collectd/go-collectd.git", + :revision => "9fc824c70f713ea0f058a07b49a4c563ef2a3b98" end def install @@ -105,17 +123,17 @@ class Influxdb < Formula cd influxdb_path do if build.head? - system "go", "install", "-ldflags", "-X main.version 0.9.5-HEAD -X main.branch master -X main.commit #{`git rev-parse HEAD`.strip}", "./..." + system "go", "install", "-ldflags", "-X main.version 0.9.6-HEAD -X main.branch master -X main.commit #{`git rev-parse HEAD`.strip}", "./..." else - system "go", "install", "-ldflags", "-X main.version 0.9.4.1 -X main.branch 0.9.4 -X main.commit c4f85f84765e27bfb5e58630d0dea38adeacf543", "./..." + system "go", "install", "-ldflags", "-X main.version 0.9.5 -X main.branch 0.9.5 -X main.commit 770b0ecf9f1f61a9d3a97136d5b6d7dd21afea1e", "./..." end end inreplace influxdb_path/"etc/config.sample.toml" do |s| - s.gsub! "/var/opt/influxdb/data", "#{var}/influxdb/data" - s.gsub! "/var/opt/influxdb/meta", "#{var}/influxdb/meta" - s.gsub! "/var/opt/influxdb/hh", "#{var}/influxdb/hh" - s.gsub! "/var/opt/influxdb/wal", "#{var}/influxdb/wal" + s.gsub! "/var/lib/influxdb/data", "#{var}/influxdb/data" + s.gsub! "/var/lib/influxdb/meta", "#{var}/influxdb/meta" + s.gsub! "/var/lib/influxdb/hh", "#{var}/influxdb/hh" + s.gsub! "/var/lib/influxdb/wal", "#{var}/influxdb/wal" end bin.install buildpath/"bin/influxd"