From aad1599396f863c1e15c110993e3a050a8789791 Mon Sep 17 00:00:00 2001 From: Jonathan Abbett Date: Mon, 19 Dec 2016 23:40:30 -0500 Subject: [PATCH 1/5] gemfile --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a38bc96..3f0a93c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - abraham (1.0.0) + abraham (1.1.0) jquery-rails rails (~> 5.0.0, >= 5.0.0.1) rails-assets-js-cookie (~> 2.1) From 5baed41d165b4e8762a6b4066a19e2a9c30a8cad Mon Sep 17 00:00:00 2001 From: Jonathan Abbett Date: Tue, 20 Dec 2016 10:11:52 -0500 Subject: [PATCH 2/5] Fixing dependencies --- Gemfile.lock | 2 +- abraham.gemspec | 4 ++-- lib/abraham/version.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f0a93c..4f51a4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - abraham (1.1.0) + abraham (1.1.1.rc1) jquery-rails rails (~> 5.0.0, >= 5.0.0.1) rails-assets-js-cookie (~> 2.1) diff --git a/abraham.gemspec b/abraham.gemspec index aac7376..ff5bb17 100644 --- a/abraham.gemspec +++ b/abraham.gemspec @@ -19,11 +19,11 @@ Gem::Specification.new do |s| s.add_dependency 'rails', '~> 5.0.0', '>= 5.0.0.1' s.add_dependency 'sass-rails', '~> 5.0' - 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 'rubocop' s.add_runtime_dependency 'jquery-rails' + s.add_runtime_dependency 'rails-assets-shepherd.js', '~> 1.8' + s.add_runtime_dependency 'rails-assets-js-cookie', '~> 2.1' end diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb index 0a8df9d..8df2971 100644 --- a/lib/abraham/version.rb +++ b/lib/abraham/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Abraham - VERSION = '1.1.0' + VERSION = '1.1.1.rc1' end From e84ba2b4e4ea6a29432c231e6ba4be37c23a305f Mon Sep 17 00:00:00 2001 From: Jonathan Abbett Date: Tue, 20 Dec 2016 10:54:57 -0500 Subject: [PATCH 3/5] change dependencies --- Gemfile.lock | 2 +- lib/abraham/engine.rb | 6 +++--- lib/abraham/version.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4f51a4d..f841d2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - abraham (1.1.1.rc1) + abraham (1.1.1.rc2) jquery-rails rails (~> 5.0.0, >= 5.0.0.1) rails-assets-js-cookie (~> 2.1) diff --git a/lib/abraham/engine.rb b/lib/abraham/engine.rb index 94d287d..7273ae4 100644 --- a/lib/abraham/engine.rb +++ b/lib/abraham/engine.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true require 'rubygems' -require 'rails-assets-shepherd.js' -require 'jquery-rails' -require 'rails-assets-js-cookie' module Abraham class Engine < ::Rails::Engine + require 'rails-assets-shepherd.js' + require 'jquery-rails' + require 'rails-assets-js-cookie' end end diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb index 8df2971..2340b6b 100644 --- a/lib/abraham/version.rb +++ b/lib/abraham/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Abraham - VERSION = '1.1.1.rc1' + VERSION = '1.1.1.rc2' end From ad1f35403dcb291f262f3938ed3c9346cb79991b Mon Sep 17 00:00:00 2001 From: Jonathan Abbett Date: Tue, 20 Dec 2016 11:43:45 -0500 Subject: [PATCH 4/5] Bugfix: Sorting out dependencies --- Gemfile | 7 +++++++ Gemfile.lock | 4 +++- README.md | 7 ++++++- abraham.gemspec | 7 +++---- lib/abraham/version.rb | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index feab6f3..c55b781 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,13 @@ source 'http://rails-assets.org' # development dependencies will be added by default to the :development group. 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 + gem 'rails-assets-shepherd.js', '~> 1.8' + gem 'rails-assets-js-cookie', '~> 2.1' +end + # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or # Git. Remember to move these dependencies to your gemspec before releasing diff --git a/Gemfile.lock b/Gemfile.lock index f841d2a..9e3beb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - abraham (1.1.1.rc2) + abraham (1.1.1.rc3) jquery-rails rails (~> 5.0.0, >= 5.0.0.1) rails-assets-js-cookie (~> 2.1) @@ -146,6 +146,8 @@ PLATFORMS DEPENDENCIES abraham! + rails-assets-js-cookie (~> 2.1)! + rails-assets-shepherd.js (~> 1.8)! rails-assets-tether! rubocop sqlite3 diff --git a/README.md b/README.md index 9d79a74..9f3fe3f 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,15 @@ Abraham needs to know the current user to track tour views, e.g. `current_user` ## Installation -Add Abraham to your Gemfile: +Add `abraham` and its JavaScript dependencies to your Gemfile: ``` gem 'abraham' + +source 'https://rails-assets.org' do + gem 'rails-assets-shepherd.js', '~> 1.8' + gem 'rails-assets-js-cookie', '~> 2.1' +end ``` Then run: diff --git a/abraham.gemspec b/abraham.gemspec index ff5bb17..7b3eb29 100644 --- a/abraham.gemspec +++ b/abraham.gemspec @@ -19,11 +19,10 @@ Gem::Specification.new do |s| s.add_dependency 'rails', '~> 5.0.0', '>= 5.0.0.1' s.add_dependency 'sass-rails', '~> 5.0' + 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 'rubocop' - - s.add_runtime_dependency 'jquery-rails' - s.add_runtime_dependency 'rails-assets-shepherd.js', '~> 1.8' - s.add_runtime_dependency 'rails-assets-js-cookie', '~> 2.1' end diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb index 2340b6b..c05f56d 100644 --- a/lib/abraham/version.rb +++ b/lib/abraham/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Abraham - VERSION = '1.1.1.rc2' + VERSION = '1.1.1' end From 4522be97676485c166e908b82787b2358597546d Mon Sep 17 00:00:00 2001 From: Jonathan Abbett Date: Tue, 20 Dec 2016 11:45:03 -0500 Subject: [PATCH 5/5] gemfile --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9e3beb0..92b9bf2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - abraham (1.1.1.rc3) + abraham (1.1.1) jquery-rails rails (~> 5.0.0, >= 5.0.0.1) rails-assets-js-cookie (~> 2.1)