Merge branch 'master' of github.com:ZeusWPI/Tap

This commit is contained in:
Tom Naessens 2015-09-08 13:30:24 +02:00
commit 81691282f8
3 changed files with 5 additions and 32 deletions

View file

@ -1,7 +1,7 @@
Tab Tap
=== ===
[![Code Climate](https://codeclimate.com/github/ZeusWPI/Tab/badges/gpa.svg)](https://codeclimate.com/github/ZeusWPI/Tab) [![Code Climate](https://codeclimate.com/github/ZeusWPI/Tap/badges/gpa.svg)](https://codeclimate.com/github/ZeusWPI/Tap)
[![Travis CI](https://travis-ci.org/ZeusWPI/Tab.svg)](https://travis-ci.org/ZeusWPI/Tab) [![Travis CI](https://travis-ci.org/ZeusWPI/Tap.svg)](https://travis-ci.org/ZeusWPI/Tap)
[![Coverage Status](https://coveralls.io/repos/ZeusWPI/Tab/badge.svg?branch=master)](https://coveralls.io/r/ZeusWPI/Tab?branch=master) [![Coverage Status](https://coveralls.io/repos/ZeusWPI/Tap/badge.svg?branch=master&service=github)](https://coveralls.io/github/ZeusWPI/Tap?branch=master)
Yes. We have to drink. But we also have to pay. This combines both. Yes. We have to drink. But we also have to pay. This is the drinking part.

View file

@ -1,24 +0,0 @@
class Webhook
DEFAULT_USERNAME = "Tab"
attr_accessor :hook
def initialize(attributes = {})
options = {
channel: (attributes[:channel]),
username: (attributes[:username] || DEFAULT_USERNAME),
icon_url: attributes[:icon_url],
icon_emoji: attributes[:icon_emoji]
}
self.hook = Tarumi::Bot.new(
"zeuswpi",
Rails.application.secrets.zeus_token,
options
)
end
def ping(text)
self.hook.ping(text)
end
end

View file

@ -14,12 +14,10 @@ development:
secret_key_base: 5d40610321e19e4f71ee2ba8af4f426fe15096c405da3800c6b33bed6779f2d11f55a0edc455974b19a01fd71f6cd508dba980305dbc55ff82521a2d12f891d8 secret_key_base: 5d40610321e19e4f71ee2ba8af4f426fe15096c405da3800c6b33bed6779f2d11f55a0edc455974b19a01fd71f6cd508dba980305dbc55ff82521a2d12f891d8
omniauth_client_id: tomtest omniauth_client_id: tomtest
omniauth_client_secret: blargh omniauth_client_secret: blargh
zeus_token: "token"
access_token: "token" access_token: "token"
test: test:
secret_key_base: 961437e28e7d6055ffaad9cf1f8d614354f57f10cb2d7601c9d6ede72a03b9c9535ad9e63507e3eb31252c4895970a63117493408f2e9a46c7a0c4a5a7836b81 secret_key_base: 961437e28e7d6055ffaad9cf1f8d614354f57f10cb2d7601c9d6ede72a03b9c9535ad9e63507e3eb31252c4895970a63117493408f2e9a46c7a0c4a5a7836b81
zeus_token: "token"
access_token: "token" access_token: "token"
# Do not keep production secrets in the repository, # Do not keep production secrets in the repository,
@ -28,5 +26,4 @@ production:
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
omniauth_client_id: "" omniauth_client_id: ""
omniauth_client_secret: "" omniauth_client_secret: ""
zeus_token: ""
access_token: "" access_token: ""