Skip to content

Commit

Permalink
Merge 64d2c54 into b915466
Browse files Browse the repository at this point in the history
  • Loading branch information
@knu
knu committed Apr 24, 2020
2 parents b915466 + 64d2c54 commit 036b278
Show file tree
Hide file tree
Showing 15 changed files with 229 additions and 92 deletions.
3 changes: 3 additions & 0 deletions .env.example
View file
Expand Up @@ -155,6 +155,9 @@ EVERNOTE_OAUTH_SECRET=
# Set to true in development, false in production
USE_EVERNOTE_SANDBOX=true

GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=

#############################
# AWS and Mechanical Turk #
#############################
Expand Down
16 changes: 10 additions & 6 deletions Gemfile
View file
Expand Up @@ -47,22 +47,22 @@ gem 'hypdf', '~> 1.0.10' # PDFInfoAgent
gem 'weibo_2', github: 'albertsun/weibo_2', branch: 'master'

# GoogleCalendarPublishAgent and GoogleTranslateAgent
gem 'google-api-client', '~> 0.13'
gem 'google-cloud-translate', '~> 1.0.0', require: 'google/cloud/translate'
gem 'google-api-client'
gem 'google-cloud-translate', require: 'google/cloud/translate'

# Twitter Agents
gem 'twitter', github: 'sferik/twitter' # Must to be loaded before cantino-twitter-stream.
gem 'twitter-stream', github: 'cantino/twitter-stream', branch: 'huginn'
gem 'omniauth-twitter', '~> 1.3.0'
gem 'omniauth-twitter'

# Tumblr Agents
# until merge of https://github.com/tumblr/tumblr_client/pull/61
gem 'tumblr_client', github: 'albertsun/tumblr_client', branch: 'master', ref: 'e046fe6e39291c173add0a49081630c7b60a36c7'
gem 'omniauth-tumblr', '~> 1.2'
gem 'omniauth-tumblr'

# Dropbox Agents
gem 'dropbox-api', github: 'dsander/dropbox-api', ref: '86cb7b5a1254dc5b054de7263835713c4c1018c7'
gem 'omniauth-dropbox-oauth2', github: 'bamorim/omniauth-dropbox-oauth2', ref: '35046706fb781ed3b57dfb9c3cd44ed0f3d3f8ea'
gem 'omniauth-dropbox-oauth2', github: 'huginn/omniauth-dropbox-oauth2'

# UserLocationAgent
gem 'haversine'
Expand All @@ -77,6 +77,10 @@ gem 'listen', '~> 3.0.5', require: false
# S3Agent
gem 'aws-sdk-core', '~> 2.2.15'

# ImapFolderAgent
gem 'omniauth-google-oauth2', '>= 0.8.0'
gem 'gmail_xoauth' # support for Gmail using OAuth

# Optional Services.
gem 'omniauth-37signals' # BasecampAgent
gem 'omniauth-wunderlist'
Expand Down Expand Up @@ -117,7 +121,7 @@ gem 'loofah', '~> 2.0'
gem 'mini_magick', ">= 4.9.4"
gem 'multi_xml'
gem "nokogiri", ">= 1.10.8"
gem 'omniauth', '~> 1.6.1'
gem 'omniauth'
gem 'rails', '~> 5.2.0'
gem 'sprockets', '~> 3.7.2'
gem 'rails-html-sanitizer', '~> 1.0.4'
Expand Down
152 changes: 88 additions & 64 deletions Gemfile.lock
View file
Expand Up @@ -30,14 +30,6 @@ GIT
oauth2 (~> 1)
rest-client (>= 2.0)

GIT
remote: https://github.com/bamorim/omniauth-dropbox-oauth2.git
revision: 35046706fb781ed3b57dfb9c3cd44ed0f3d3f8ea
ref: 35046706fb781ed3b57dfb9c3cd44ed0f3d3f8ea
specs:
omniauth-dropbox-oauth2 (0.3.0)
omniauth-oauth2 (~> 1.3.1)

GIT
remote: https://github.com/cantino/twitter-stream.git
revision: a80822d579509802124d4e219bb771eb663efdb7
Expand Down Expand Up @@ -75,6 +67,13 @@ GIT
erector (0.10.0)
treetop (>= 1.2.3)

GIT
remote: https://github.com/huginn/omniauth-dropbox-oauth2.git
revision: 9468fb33af0af2bad880dcfb42236fde474017a2
specs:
omniauth-dropbox-oauth2 (0.3.0)
omniauth-oauth2 (>= 1.6.0)

GIT
remote: https://github.com/sferik/twitter.git
revision: d11707edf4abd13f7ada0eef57fc1eaa1062d75b
Expand Down Expand Up @@ -143,8 +142,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
airbrussh (1.3.1)
sshkit (>= 1.6.1, != 1.7.0)
arel (9.0.0)
Expand Down Expand Up @@ -207,7 +206,7 @@ GEM
crass (1.0.5)
daemons (1.1.9)
debug_inspector (0.0.3)
declarative (0.0.9)
declarative (0.0.10)
declarative-option (0.1.0)
delayed_job (4.1.5)
activesupport (>= 3.0, < 5.3)
Expand Down Expand Up @@ -240,12 +239,12 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
evernote-thrift (1.25.1)
evernote-thrift (1.25.2)
evernote_oauth (0.2.3)
evernote-thrift
oauth (>= 0.4.1)
execjs (2.7.0)
faraday (0.12.1)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
Expand All @@ -270,29 +269,51 @@ GEM
rails (>= 3.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
google-api-client (0.13.0)
gmail_xoauth (0.4.2)
oauth (>= 0.3.6)
google-api-client (0.37.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.5)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-cloud-core (1.0.0)
signet (~> 0.12)
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
googleauth (~> 0.5.1)
google-cloud-env (1.0.0)
faraday (~> 0.11)
google-cloud-translate (1.0.0)
google-cloud-core (~> 1.0)
googleauth (~> 0.5.1)
googleauth (0.5.1)
faraday (~> 0.9)
jwt (~> 1.4)
logging (~> 2.0)
memoist (~> 0.12)
google-cloud-errors (~> 1.0)
google-cloud-env (1.3.1)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.0)
google-cloud-translate (2.2.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-core (~> 1.2)
google-gax (~> 1.8)
googleapis-common-protos (>= 1.3.9, < 2.0)
googleapis-common-protos-types (>= 1.0.4, < 2.0)
google-gax (1.8.1)
google-protobuf (~> 3.9)
googleapis-common-protos (>= 1.3.9, < 2.0)
googleauth (~> 0.9)
grpc (~> 1.24)
rly (~> 0.2.3)
google-protobuf (3.11.4)
googleapis-common-protos (1.3.9)
google-protobuf (~> 3.0)
googleapis-common-protos-types (~> 1.0)
grpc (~> 1.0)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.11.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
os (>= 0.9, < 2.0)
signet (~> 0.12)
grpc (1.27.0)
google-protobuf (~> 3.11)
googleapis-common-protos-types (~> 1.0)
guard (2.14.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
Expand All @@ -313,7 +334,7 @@ GEM
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hashdiff (0.3.8)
hashie (3.5.6)
hashie (3.5.7)
haversine (0.3.0)
hipchat (1.2.0)
httparty
Expand Down Expand Up @@ -349,7 +370,7 @@ GEM
jsonpath (1.0.1)
multi_json
to_regexp (~> 0.2.1)
jwt (1.5.6)
jwt (2.2.1)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
Expand Down Expand Up @@ -377,10 +398,6 @@ GEM
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand All @@ -391,25 +408,25 @@ GEM
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
memoist (0.16.0)
memoist (0.16.2)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.2)
mime-types (3.1)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2019.1009)
mimemagic (0.3.3)
mini_magick (4.9.5)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_racer (0.2.9)
libv8 (>= 6.9.411)
minitest (5.11.3)
mqtt (0.3.1)
msgpack (1.2.4)
multi_json (1.13.1)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
multipart-post (2.1.1)
mysql2 (0.5.2)
naught (1.1.0)
nenv (0.3.0)
Expand All @@ -424,15 +441,15 @@ GEM
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
oauth (0.4.7)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
oauth (0.5.4)
oauth2 (1.4.4)
faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.6.1)
hashie (>= 3.4.6, < 3.6.0)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
omniauth-37signals (1.0.5)
omniauth (~> 1.0)
Expand All @@ -441,23 +458,27 @@ GEM
evernote-thrift
multi_json (~> 1.0)
omniauth-oauth (~> 1.0)
omniauth-google-oauth2 (0.8.0)
jwt (>= 2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.6)
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-oauth2 (1.6.0)
oauth2 (~> 1.1)
omniauth (~> 1.9)
omniauth-tumblr (1.2)
multi_json
omniauth-oauth (~> 1.0)
omniauth-twitter (1.3.0)
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
omniauth-wunderlist (0.0.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
orm_adapter (0.5.0)
os (0.9.6)
os (1.0.1)
pg (1.1.3)
poltergeist (1.8.1)
capybara (~> 2.1)
Expand All @@ -473,8 +494,8 @@ GEM
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
public_suffix (3.0.2)
rack (2.0.8)
public_suffix (4.0.3)
rack (2.2.2)
rack-livereload (0.3.16)
rack
rack-test (1.1.0)
Expand Down Expand Up @@ -525,7 +546,8 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (3.0.2)
retriable (3.1.2)
rly (0.2.3)
rr (1.1.2)
rspec (3.7.0)
rspec-core (~> 3.7.0)
Expand Down Expand Up @@ -575,10 +597,10 @@ GEM
shellany (0.0.1)
shoulda-matchers (4.0.1)
activesupport (>= 4.2.0)
signet (0.7.3)
signet (0.13.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (~> 1.5)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simple_oauth (0.3.1)
simplecov (0.14.1)
Expand Down Expand Up @@ -694,8 +716,9 @@ DEPENDENCIES
foreman (~> 0.63.0)
geokit (~> 1.8.4)
geokit-rails (~> 2.2.0)
google-api-client (~> 0.13)
google-cloud-translate (~> 1.0.0)
gmail_xoauth
google-api-client
google-cloud-translate
guard (~> 2.14.1)
guard-livereload (~> 2.5.1)
guard-rspec (~> 4.7.3)
Expand All @@ -721,12 +744,13 @@ DEPENDENCIES
mysql2 (~> 0.5.2)
net-ftp-list (~> 3.2.8)
nokogiri (>= 1.10.8)
omniauth (~> 1.6.1)
omniauth
omniauth-37signals
omniauth-dropbox-oauth2!
omniauth-evernote
omniauth-tumblr (~> 1.2)
omniauth-twitter (~> 1.3.0)
omniauth-google-oauth2 (>= 0.8.0)
omniauth-tumblr
omniauth-twitter
omniauth-wunderlist
pg (~> 1.1.3)
poltergeist
Expand Down
3 changes: 2 additions & 1 deletion app/assets/stylesheets/application.scss.erb
View file
Expand Up @@ -281,7 +281,8 @@ $service-colors: (
tumblr: #2c4762,
dropbox: #007EE5,
wunderlist: #ED5F27,
evernote: #00C85A
evernote: #00C85A,
google: #4285F4
);

@mixin services {
Expand Down

0 comments on commit 036b278

Please sign in to comment.