Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
9353679
Update Google API Client to the latest version and attempt to fix the…
s0ph0s-dog May 28, 2017
ca77708
Add a NullCalendar for when the Google API client is misconfigured
s0ph0s-dog May 28, 2017
6e6fe6a
Add Cinch's rate limiting configuration options
s0ph0s-dog May 29, 2017
ed84ab9
Merge pull request #83 from s0ph0s-2/BUGFIX/ratelimit
rikai May 29, 2017
9582b8b
Add cinch-cooldown to the Gemfile. Require at least v1.2.0, since ear…
s0ph0s-dog Jun 2, 2017
f7d16de
Add an example cooldown configuration to cinchize.yml.example
s0ph0s-dog Jun 2, 2017
ee8eac0
Enforce cooldowns in all plugins except admin.rb and suggest.rb, sinc…
s0ph0s-dog Jun 2, 2017
54c0410
Merge branch 'devel' into FEATURE/add-cinch-cooldown
s0ph0s-2 Jun 2, 2017
41b60d4
Merge pull request #85 from s0ph0s-2/FEATURE/add-cinch-cooldown
rikai Jul 25, 2017
07da339
Minimal implementation of discord
rikai Aug 10, 2017
97557b4
Added shows_test.rb
thefirstofthe300 Aug 13, 2017
1e1dceb
Fix errors thrown on startup due to refactoring
thefirstofthe300 Aug 13, 2017
e62c5c5
Add a working travis.yml file to allow for Travis-CI integration.
thefirstofthe300 Aug 15, 2017
92604db
Update README to reflect the current minimum version of Ruby and add …
thefirstofthe300 Aug 15, 2017
8b56f77
There are existing badges, dumb-dumb
thefirstofthe300 Aug 15, 2017
be5192a
Merge pull request #90 from thefirstofthe300/travis-ci
rikai Aug 15, 2017
847d3d6
Update Gemfile.lock to satisfy Travis
thefirstofthe300 Aug 15, 2017
e583e48
Merge pull request #91 from thefirstofthe300/travis-ci
rikai Aug 15, 2017
574be6f
Add rspec tests to keep the test suite uniform
thefirstofthe300 Aug 22, 2017
b20540d
Merge branch 'devel' into shows-test
thefirstofthe300 Aug 22, 2017
d593710
Update Rakefile
thefirstofthe300 Aug 22, 2017
3b6c9ca
Add a working travis.yml file to allow for Travis-CI integration.
thefirstofthe300 Aug 15, 2017
ff8e0f9
Update README to reflect the current minimum version of Ruby and add …
thefirstofthe300 Aug 15, 2017
7f2a417
There are existing badges, dumb-dumb
thefirstofthe300 Aug 15, 2017
4c9a22c
Added tests for quotelist.rb as well as did some refactoring to remov…
thefirstofthe300 Aug 22, 2017
446c09c
Update rspec unit tests
thefirstofthe300 Aug 22, 2017
9653cde
Merge branch 'shows-test' of github.com:thefirstofthe300/Showbot into…
thefirstofthe300 Aug 22, 2017
095da9e
Update travis to reflect actual passing tests
thefirstofthe300 Aug 22, 2017
32aa92e
Merge pull request #92 from thefirstofthe300/shows-test
rikai Aug 22, 2017
63bc460
Remove version restriction on 'mail' to let 'google-api-client' updat…
s0ph0s-dog Aug 27, 2017
cfeed38
Update Google API Client to the latest version and attempt to fix the…
s0ph0s-dog May 28, 2017
e54a547
Add a NullCalendar for when the Google API client is misconfigured
s0ph0s-dog May 28, 2017
416956d
Remove version restriction on 'mail' to let 'google-api-client' updat…
s0ph0s-dog Aug 27, 2017
502e0f0
Fix merge conflicts due to my inability to Git
s0ph0s-dog Aug 27, 2017
ef5f302
Run bundle update again so that the Discord gems are in the lockfile
s0ph0s-dog Aug 27, 2017
d649f76
Update rspec test for the calendar to reflect the new Google API Clie…
s0ph0s-dog Aug 27, 2017
faf7030
Add test for NullCalendar
s0ph0s-dog Aug 27, 2017
caf00cd
Update README version to the Ruby version I tested on
s0ph0s-dog Aug 27, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ S3_KEEP=your_info_here
LIVE_MODE=true

# Digital Ocean Droplet Admin
# DO_API_KEY=xxxxxxxxx
DO_API_KEY=your_info_here

# Discord Authentication
DISCORD_TOKEN=your_info_here
DISCORD_CLIENT_ID=your_info_here

############################################################
# SOCKET_KEY_ID
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: ruby
rvm:
- 2.1
18 changes: 12 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ gem 'fog'
gem 'whenever', require: false
gem 'net-ssh', ['>= 2.3.0', '<= 2.5.2']
gem 'excon', '~> 0.17.0'
gem 'mail', '~> 2.5.0'
gem 'mail'

# Discord
gem 'discordrb'
gem 'rest-client', '~> 2.0.2'

# Web
gem 'sinatra'
gem 'sinatra-reloader'
gem 'sinatra', '< 2.0.0'
gem 'sinatra-websocket'
gem 'sinatra-reloader'
gem 'thin'
gem 'haml'
gem 'sass'
Expand All @@ -34,9 +38,10 @@ gem 'cinchize'
gem 'chronic'
gem 'chronic_duration'
gem 'tweetstream'
gem 'google-api-client', '<0.9'
gem 'google-api-client'
gem 'htmlentities'
gem 'cinch-identify'
gem 'cinch-cooldown', '>= 1.2.0'
gem 'stopwords', '0.2'
gem 'droplet_kit'
gem 'nokogiri', '>= 1.6.8'
Expand All @@ -61,10 +66,11 @@ group :development do
gem 'dm-sqlite-adapter'
gem 'foreman'
gem 'rb-fsevent'
# gem 'irbtools-more', '~> 2.0'
gem 'did_you_mean', '~> 0.9'
gem 'faraday', '0.9.2'
end

group :test do
gem 'rack-test', require: false
end


Loading