Compare commits

...

3 Commits

Author SHA1 Message Date
Jonathan Abbett
6d91ce0788 Remove requires from engine 2018-05-08 14:23:55 -04:00
Jonathan Abbett
9c7c393a6c Attempt to yarnify as well 2018-05-08 14:07:04 -04:00
Jonathan Abbett
44ee9c771d Bugfix: Reorder Gemfile 2018-05-08 13:33:26 -04:00
5 changed files with 100 additions and 96 deletions

View File

@ -7,11 +7,11 @@ source 'http://rails-assets.org'
# development dependencies will be added by default to the :development group. # development dependencies will be added by default to the :development group.
gemspec gemspec
# These rails-assets dependencies need to be added to the developer's Gemfile
# since there's no way to specify a source in the gemspec.
source 'http://rails-assets.org' do source 'http://rails-assets.org' do
gem 'rails-assets-shepherd.js', '~> 1.8' gem 'rails-assets-shepherd.js', '~> 1.8'
gem 'rails-assets-js-cookie', '~> 2.1' gem 'rails-assets-js-cookie', '~> 2.1'
gem 'rails-assets-tether', '~> 1.4'
end end
# Declare any dependencies that are still in development here instead of in # Declare any dependencies that are still in development here instead of in
@ -21,6 +21,3 @@ end
# To use a debugger # To use a debugger
# gem 'byebug', group: [:development, :test] # gem 'byebug', group: [:development, :test]
# Avoid the 'multiple sources' confusion
gem 'rails-assets-tether', :source => 'http://rails-assets.org/'

View File

@ -6,140 +6,152 @@ PATH
rails (~> 5.0.0, >= 5.0.0.1) rails (~> 5.0.0, >= 5.0.0.1)
rails-assets-js-cookie (~> 2.1) rails-assets-js-cookie (~> 2.1)
rails-assets-shepherd.js (~> 1.8) rails-assets-shepherd.js (~> 1.8)
rails-assets-tether (~> 1.4)
sass-rails (~> 5.0) sass-rails (~> 5.0)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
remote: http://rails-assets.org/ remote: http://rails-assets.org/
specs: specs:
actioncable (5.0.0.1) actioncable (5.0.7)
actionpack (= 5.0.0.1) actionpack (= 5.0.7)
nio4r (~> 1.2) nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1) websocket-driver (~> 0.6.1)
actionmailer (5.0.0.1) actionmailer (5.0.7)
actionpack (= 5.0.0.1) actionpack (= 5.0.7)
actionview (= 5.0.0.1) actionview (= 5.0.7)
activejob (= 5.0.0.1) activejob (= 5.0.7)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.0.0.1) actionpack (5.0.7)
actionview (= 5.0.0.1) actionview (= 5.0.7)
activesupport (= 5.0.0.1) activesupport (= 5.0.7)
rack (~> 2.0) rack (~> 2.0)
rack-test (~> 0.6.3) rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0.1) actionview (5.0.7)
activesupport (= 5.0.0.1) activesupport (= 5.0.7)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.0.1) activejob (5.0.7)
activesupport (= 5.0.0.1) activesupport (= 5.0.7)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.0.0.1) activemodel (5.0.7)
activesupport (= 5.0.0.1) activesupport (= 5.0.7)
activerecord (5.0.0.1) activerecord (5.0.7)
activemodel (= 5.0.0.1) activemodel (= 5.0.7)
activesupport (= 5.0.0.1) activesupport (= 5.0.7)
arel (~> 7.0) arel (~> 7.0)
activesupport (5.0.0.1) activesupport (5.0.7)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (7.1.4) arel (7.1.4)
ast (2.3.0) ast (2.4.0)
builder (3.2.2) builder (3.2.3)
concurrent-ruby (1.0.3) concurrent-ruby (1.0.5)
crass (1.0.4)
erubis (2.7.0) erubis (2.7.0)
globalid (0.3.7) ffi (1.9.23)
activesupport (>= 4.1.0) globalid (0.4.1)
i18n (0.7.0) activesupport (>= 4.2.0)
jquery-rails (4.2.1) i18n (1.0.1)
concurrent-ruby (~> 1.0)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
loofah (2.0.3) loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.4) mail (2.7.0)
mime-types (>= 1.16, < 4) mini_mime (>= 0.1.1)
method_source (0.8.2) method_source (0.9.0)
mime-types (3.1) mini_mime (1.0.0)
mime-types-data (~> 3.2015) mini_portile2 (2.3.0)
mime-types-data (3.2016.0521) minitest (5.11.3)
mini_portile2 (2.1.0) nio4r (2.3.1)
minitest (5.10.1) nokogiri (1.8.2)
nio4r (1.2.1) mini_portile2 (~> 2.3.0)
nokogiri (1.6.8.1) parallel (1.12.1)
mini_portile2 (~> 2.1.0) parser (2.5.1.0)
parser (2.3.2.0) ast (~> 2.4.0)
ast (~> 2.2)
powerpack (0.1.1) powerpack (0.1.1)
rack (2.0.1) rack (2.0.5)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (5.0.0.1) rails (5.0.7)
actioncable (= 5.0.0.1) actioncable (= 5.0.7)
actionmailer (= 5.0.0.1) actionmailer (= 5.0.7)
actionpack (= 5.0.0.1) actionpack (= 5.0.7)
actionview (= 5.0.0.1) actionview (= 5.0.7)
activejob (= 5.0.0.1) activejob (= 5.0.7)
activemodel (= 5.0.0.1) activemodel (= 5.0.7)
activerecord (= 5.0.0.1) activerecord (= 5.0.7)
activesupport (= 5.0.0.1) activesupport (= 5.0.7)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0)
railties (= 5.0.0.1) railties (= 5.0.7)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-assets-js-cookie (2.1.3) rails-assets-js-cookie (2.2.0)
rails-assets-shepherd.js (1.8.1) rails-assets-shepherd.js (1.8.1)
rails-assets-tether (>= 1.0.1, < 2) rails-assets-tether (>= 1.0.1, < 2)
rails-assets-tether (1.4.0) rails-assets-tether (1.4.3)
rails-dom-testing (2.0.1) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0, < 6.0) activesupport (>= 4.2.0)
nokogiri (~> 1.6.0) nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.4)
loofah (~> 2.0) loofah (~> 2.2, >= 2.2.2)
railties (5.0.0.1) railties (5.0.7)
actionpack (= 5.0.0.1) actionpack (= 5.0.7)
activesupport (= 5.0.0.1) activesupport (= 5.0.7)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.1.0) rainbow (3.0.0)
rake (12.0.0) rake (12.3.1)
rubocop (0.45.0) rb-fsevent (0.10.3)
parser (>= 2.3.1.1, < 3.0) rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rubocop (0.55.0)
parallel (~> 1.10)
parser (>= 2.5)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1) ruby-progressbar (1.9.0)
sass (3.4.22) sass (3.5.6)
sass-rails (5.0.6) sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6) railties (>= 4.0.0, < 6)
sass (~> 3.1) sass (~> 3.1)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sprockets (3.7.0) sprockets (3.7.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.0) sprockets-rails (3.2.1)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.3.12) sqlite3 (1.3.13)
thor (0.19.4) thor (0.20.0)
thread_safe (0.3.5) thread_safe (0.3.6)
tilt (2.0.5) tilt (2.0.8)
tzinfo (1.2.2) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
unicode-display_width (1.1.1) unicode-display_width (1.3.2)
websocket-driver (0.6.4) websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2) websocket-extensions (0.1.3)
PLATFORMS PLATFORMS
ruby ruby
@ -148,9 +160,9 @@ DEPENDENCIES
abraham! abraham!
rails-assets-js-cookie (~> 2.1)! rails-assets-js-cookie (~> 2.1)!
rails-assets-shepherd.js (~> 1.8)! rails-assets-shepherd.js (~> 1.8)!
rails-assets-tether! rails-assets-tether (~> 1.4)!
rubocop rubocop
sqlite3 sqlite3
BUNDLED WITH BUNDLED WITH
1.13.7 1.16.1

View File

@ -20,8 +20,6 @@ Gem::Specification.new do |s|
s.add_dependency 'rails', '~> 5.0.0', '>= 5.0.0.1' s.add_dependency 'rails', '~> 5.0.0', '>= 5.0.0.1'
s.add_dependency 'sass-rails', '~> 5.0' s.add_dependency 'sass-rails', '~> 5.0'
s.add_dependency 'jquery-rails' s.add_dependency 'jquery-rails'
s.add_dependency 'rails-assets-shepherd.js', '~> 1.8'
s.add_dependency 'rails-assets-js-cookie', '~> 2.1'
s.add_development_dependency 'sqlite3' s.add_development_dependency 'sqlite3'
s.add_development_dependency 'rubocop' s.add_development_dependency 'rubocop'

View File

@ -2,7 +2,7 @@
//= require jquery_ujs //= require jquery_ujs
//= require js-cookie //= require js-cookie
//= require tether //= require tether
//= require shepherd.js.js //= require tether-shepherd
$(document).on('turbolinks:before-cache', function() { $(document).on('turbolinks:before-cache', function() {
// Remove visible product tours // Remove visible product tours

View File

@ -3,8 +3,5 @@ require 'rubygems'
module Abraham module Abraham
class Engine < ::Rails::Engine class Engine < ::Rails::Engine
require 'rails-assets-shepherd.js'
require 'jquery-rails'
require 'rails-assets-js-cookie'
end end
end end