aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-05-22 02:15:58 +0800
committerJeremy Daer <jeremydaer@gmail.com>2016-05-21 12:41:01 -0700
commit61483b18bcbfaa054113a67f40515c7bf3e892b2 (patch)
tree53213ccb0531342915f3784cab8529985982b069
parent26c0e2cab4ed1da4ffc99ccdd32ae6f9bae0f691 (diff)
downloadrails-61483b18bcbfaa054113a67f40515c7bf3e892b2.tar.gz
rails-61483b18bcbfaa054113a67f40515c7bf3e892b2.tar.bz2
rails-61483b18bcbfaa054113a67f40515c7bf3e892b2.zip
Remove Blade gem dependency
Apps that depend on Action Cable don't need Blade for app development, so we can remove the gem dependency. We do need Blade for Action Cable dev, so we bundle it in the Gemfile. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock40
-rw-r--r--actioncable/actioncable.gemspec2
3 files changed, 41 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 477309fa9b..75adda01af 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,6 +64,7 @@ group :cable do
gem 'redis', require: false
gem 'faye-websocket', require: false
+ gem 'blade', '~> 0.5.1', require: false
end
# Add your own local bundler stuff.
diff --git a/Gemfile.lock b/Gemfile.lock
index 504364e552..6761292398 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,6 +105,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
+ addressable (2.4.0)
amq-protocol (2.0.1)
arel (7.0.0)
backburner (1.3.0)
@@ -115,6 +116,19 @@ GEM
bcrypt (3.1.11-x86-mingw32)
beaneater (1.0.0)
benchmark-ips (2.6.1)
+ blade (0.5.1)
+ activesupport (>= 3.0.0)
+ blade-qunit_adapter (~> 1.20.0)
+ coffee-script (~> 2.4.0)
+ coffee-script-source (~> 1.10.0)
+ curses (~> 1.0.0)
+ eventmachine (~> 1.2.0)
+ faye (~> 1.1.1)
+ sprockets (~> 3.6.0)
+ thin (~> 1.6.0)
+ thor (~> 0.19.1)
+ useragent (~> 0.16.7)
+ blade-qunit_adapter (1.20.0)
builder (3.2.2)
bunny (2.2.2)
amq-protocol (>= 2.0.1)
@@ -125,16 +139,35 @@ GEM
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
+ cookiejar (0.3.0)
+ curses (1.0.2)
+ daemons (1.2.3)
dalli (2.7.6)
dante (0.2.0)
em-hiredis (0.3.1)
eventmachine (~> 1.0)
hiredis (~> 0.6.0)
+ em-http-request (1.1.3)
+ addressable (>= 2.3.4)
+ cookiejar (<= 0.3.0)
+ em-socksify (>= 0.3)
+ eventmachine (>= 1.0.3)
+ http_parser.rb (>= 0.6.0)
+ em-socksify (0.3.1)
+ eventmachine (>= 1.0.0.beta.4)
erubis (2.7.0)
eventmachine (1.2.0.1)
eventmachine (1.2.0.1-x64-mingw32)
eventmachine (1.2.0.1-x86-mingw32)
execjs (2.6.0)
+ faye (1.1.2)
+ cookiejar (>= 0.3.0)
+ em-http-request (>= 0.3.0)
+ eventmachine (>= 0.12.0)
+ faye-websocket (>= 0.9.1)
+ multi_json (>= 1.0.0)
+ rack (>= 1.0.0)
+ websocket-driver (>= 0.5.1)
faye-websocket (0.10.3)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
@@ -144,6 +177,7 @@ GEM
globalid (0.3.6)
activesupport (>= 4.1.0)
hiredis (0.6.1)
+ http_parser.rb (0.6.0)
i18n (0.7.0)
jquery-rails (4.1.1)
rails-dom-testing (>= 1, < 3)
@@ -260,6 +294,10 @@ GEM
stackprof (0.2.9)
sucker_punch (2.0.2)
concurrent-ruby (~> 1.0.0)
+ thin (1.6.2)
+ daemons (>= 1.0.9)
+ eventmachine (>= 1.0.0)
+ rack (>= 1.0.0)
thor (0.19.1)
thread (0.1.7)
thread_safe (0.3.5)
@@ -270,6 +308,7 @@ GEM
tzinfo (>= 1.0.0)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
+ useragent (0.16.7)
vegas (0.1.11)
rack (>= 1.0.0)
w3c_validators (1.2)
@@ -292,6 +331,7 @@ DEPENDENCIES
backburner
bcrypt (~> 3.1.11)
benchmark-ips
+ blade (~> 0.5.1)
byebug
coffee-rails!
dalli (>= 2.2.1)
diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec
index f301049d4f..c65ff7871f 100644
--- a/actioncable/actioncable.gemspec
+++ b/actioncable/actioncable.gemspec
@@ -22,6 +22,4 @@ Gem::Specification.new do |s|
s.add_dependency 'nio4r', '~> 1.2'
s.add_dependency 'websocket-driver', '~> 0.6.1'
-
- s.add_development_dependency 'blade', '~> 0.5.1'
end