Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move analytics into main code base #3942

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 12 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ gem 'closed_struct'
gem 'pg'
gem 'scenic'

# Dashboard analytics
gem 'energy-sparks_analytics', github: 'Energy-Sparks/energy-sparks_analytics', tag: '6.0.10'
# gem 'energy-sparks_analytics', path: '../energy-sparks_analytics'

# Using master due to it having a patch which doesn't override Enumerable#sum if it's already defined
# Last proper release does that, causing all kinds of weird behaviour (+ not defined etc)
gem 'statsample', github: 'Energy-Sparks/statsample', branch: 'ruby32'
Expand All @@ -56,6 +52,7 @@ gem 'aws-sdk-s3'
gem 'eventbrite_sdk' # Eventbrite for training page
gem 'faraday'
gem 'faraday-follow_redirects'
gem 'faraday-retry'
gem 'MailchimpMarketing'
gem 'mailgun_rails' # Email service
gem 'twilio-ruby' # For SMS notifications
Expand Down Expand Up @@ -116,6 +113,17 @@ gem 'premailer-rails'
gem 'flipper-active_record', '~> 1.3'
gem 'flipper-ui', '~> 1.3'

# from analytics
gem 'benchmark-memory'
gem 'chroma'
gem 'hashdiff'
gem 'html-table'
gem 'interpolate'
gem 'ruby-limiter'
gem 'ruby-sun-times'
gem 'structured_warnings'
gem 'write_xlsx'

group :development, :test do
gem 'bullet', require: false # use bullet to optimise queries
gem 'climate_control'
Expand Down
35 changes: 10 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
GIT
remote: https://github.com/Energy-Sparks/energy-sparks_analytics.git
revision: 40ed3d5248f0cb1c2e6bc3059c718978bbd428bd
tag: 6.0.10
specs:
energy-sparks_analytics (1.2.1)
activesupport (>= 6.0, < 7.3)
benchmark-memory (~> 0)
chroma (~> 0)
faraday (~> 2)
faraday-retry (~> 2)
hashdiff (~> 1)
html-table (~> 1)
interpolate (~> 0.3.0)
require_all (~> 3)
roo (~> 2)
roo-xls (~> 1)
ruby-limiter (~> 2)
ruby-sun-times (~> 0)
statsample (~> 2)
structured_warnings (~> 0)
write_xlsx (~> 1)

GIT
remote: https://github.com/Energy-Sparks/roo.git
revision: 058a8e3d1c711c04c59a686805bbe1962d2b2ed1
Expand Down Expand Up @@ -597,7 +574,6 @@ GEM
io-console (~> 0.5)
request_store (1.5.1)
rack (>= 1.4)
require_all (3.0.0)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
Expand Down Expand Up @@ -811,6 +787,7 @@ DEPENDENCIES
annotate
auto_strip_attributes (~> 2.5)
aws-sdk-s3
benchmark-memory
better_errors
binding_of_caller
bootsnap
Expand All @@ -823,19 +800,20 @@ DEPENDENCIES
cancancan (~> 3)
capybara
capybara-email
chroma
climate_control
closed_struct
cocoon
debug
devise
dotenv-rails
energy-sparks_analytics!
erb_lint
eventbrite_sdk
factory_bot_rails
fakefs
faraday
faraday-follow_redirects
faraday-retry
fasterer
flipper-active_record (~> 1.3)
flipper-ui (~> 1.3)
Expand All @@ -848,9 +826,12 @@ DEPENDENCIES
guard-rspec
guard-rubocop
handlebars_assets
hashdiff
html-table
i18n-tasks (~> 1.0.14)
image_processing (~> 1.13)
importmap-rails
interpolate
jbuilder (~> 2.12)
jquery-rails
knapsack
Expand Down Expand Up @@ -885,6 +866,8 @@ DEPENDENCIES
rubocop-performance
rubocop-rails
rubocop-rspec_rails
ruby-limiter
ruby-sun-times
sass-rails
sassc!
scenic
Expand All @@ -898,6 +881,7 @@ DEPENDENCIES
sprockets
stateful_enum
statsample!
structured_warnings
terminal-notifier
terminal-notifier-guard
terser
Expand All @@ -909,6 +893,7 @@ DEPENDENCIES
webmock
wisper
wisper-rspec
write_xlsx

RUBY VERSION
ruby 3.2.4p170
Expand Down
Loading
Loading