20 files changed, 84 insertions, 11 deletions
diff --git a/actioncable/.gitignore b/actioncable/.gitignore
new file mode 100644
index 0000000000..0a04b29786
--- /dev/null
+++ b/actioncable/.gitignore
@@ -0,0 +1,2 @@
+/lib/assets/compiled
+/tmp
diff --git a/actioncable/Rakefile b/actioncable/Rakefile
index b6c56e9195..1d77fc7067 100644
--- a/actioncable/Rakefile
+++ b/actioncable/Rakefile
@@ -1,9 +1,16 @@
 require 'rake/testtask'
+require 'pathname'
+require 'sprockets'
+require 'coffee-script'
+require 'action_cable'
 
 dir = File.dirname(__FILE__)
 
 task :default => :test
 
+task :package => "assets:compile"
+task "package:clean" => "assets:clean"
+
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = Dir.glob("#{dir}/test/**/*_test.rb")
@@ -11,3 +18,40 @@ Rake::TestTask.new do |t|
   t.verbose = true
   t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 end
+
+namespace :assets do
+  root_path = Pathname.new(dir)
+  destination_path = root_path.join("lib/assets/compiled")
+
+  desc "Compile dist/action_cable.js"
+  task :compile do
+    puts 'Compiling Action Cable assets...'
+
+    precompile_list = %w(action_cable.js)
+
+    environment = Sprockets::Environment.new
+    environment.gzip = false
+    Pathname.glob(root_path.join("app/assets/*/")) do |subdir|
+      environment.append_path subdir
+    end
+
+    compile_path = root_path.join("tmp/sprockets")
+    compile_path.rmtree if compile_path.exist?
+    compile_path.mkpath
+
+    manifest = Sprockets::Manifest.new(environment.index, compile_path)
+    manifest.compile(precompile_list)
+
+    destination_path.rmtree if destination_path.exist?
+    manifest.assets.each do |path, fingerprint_path|
+      destination_path.join(path).dirname.mkpath
+      FileUtils.cp(compile_path.join(fingerprint_path), destination_path.join(path))
+    end
+
+    puts 'Done'
+  end
+
+  task :clean do
+    destination_path.rmtree if destination_path.exist?
+  end
+end
diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec
index 14f968f1ef..8d35d819cf 100644
--- a/actioncable/actioncable.gemspec
+++ b/actioncable/actioncable.gemspec
@@ -20,13 +20,15 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'actionpack', version
 
-  s.add_dependency 'coffee-rails',     '~> 4.1.0'
   s.add_dependency 'nio4r',            '~> 1.2'
   s.add_dependency 'websocket-driver', '~> 0.6.1'
 
-  s.add_development_dependency 'em-hiredis', '~> 0.3.0'
+  s.add_development_dependency 'coffee-script',        '~> 2.4.1'
+  s.add_development_dependency 'coffee-script-source', '~> 1.10.0'
+  s.add_development_dependency 'em-hiredis',           '~> 0.3.0'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'pg'
   s.add_development_dependency 'puma'
-  s.add_development_dependency 'redis',      '~> 3.0'
+  s.add_development_dependency 'redis',                '~> 3.0'
+  s.add_development_dependency 'sprockets',            '~> 3.5.2'
 end
diff --git a/actioncable/lib/assets/javascripts/action_cable.coffee.erb b/actioncable/app/assets/javascripts/action_cable.coffee.erb
index 7daea4ebcd..18a48c0610 100644
--- a/actioncable/lib/assets/javascripts/action_cable.coffee.erb
+++ b/actioncable/app/assets/javascripts/action_cable.coffee.erb
@@ -1,5 +1,5 @@
 #= require_self
-#= require action_cable/consumer
+#= require ./action_cable/consumer
 
 @ActionCable =
   INTERNAL: <%= ActionCable::INTERNAL.to_json %>
diff --git a/actioncable/lib/assets/javascripts/action_cable/connection.coffee b/actioncable/app/assets/javascripts/action_cable/connection.coffee
index fbd7dbd35b..fbd7dbd35b 100644
--- a/actioncable/lib/assets/javascripts/action_cable/connection.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/connection.coffee
diff --git a/actioncable/lib/assets/javascripts/action_cable/connection_monitor.coffee b/actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee
index 99b9a1c6d5..99b9a1c6d5 100644
--- a/actioncable/lib/assets/javascripts/action_cable/connection_monitor.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee
diff --git a/actioncable/lib/assets/javascripts/action_cable/consumer.coffee b/actioncable/app/assets/javascripts/action_cable/consumer.coffee
index fcd8d0fb6c..717c0641a9 100644
--- a/actioncable/lib/assets/javascripts/action_cable/consumer.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/consumer.coffee
@@ -1,7 +1,7 @@
-#= require action_cable/connection
-#= require action_cable/connection_monitor
-#= require action_cable/subscriptions
-#= require action_cable/subscription
+#= require ./connection
+#= require ./connection_monitor
+#= require ./subscriptions
+#= require ./subscription
 
 # The ActionCable.Consumer establishes the connection to a server-side Ruby Connection object. Once established,
 # the ActionCable.ConnectionMonitor will ensure that its properly maintained through heartbeats and checking for stale updates.
diff --git a/actioncable/lib/assets/javascripts/action_cable/subscription.coffee b/actioncable/app/assets/javascripts/action_cable/subscription.coffee
index 339d676933..339d676933 100644
--- a/actioncable/lib/assets/javascripts/action_cable/subscription.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/subscription.coffee
diff --git a/actioncable/lib/assets/javascripts/action_cable/subscriptions.coffee b/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
index ae041ffa2b..ae041ffa2b 100644
--- a/actioncable/lib/assets/javascripts/action_cable/subscriptions.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
index d7eecfa322..3c79d61569 100644
--- a/actioncable/test/client_test.rb
+++ b/actioncable/test/client_test.rb
@@ -32,6 +32,7 @@ class ClientTest < ActionCable::TestCase
     server.config.channel_load_paths = [File.expand_path('client', __dir__)]
 
     Thread.new { EventMachine.run } unless EventMachine.reactor_running?
+    Thread.pass until EventMachine.reactor_running?
 
     # faye-websocket is warning-rich
     @previous_verbose, $VERBOSE = $VERBOSE, nil
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 7197ea5e27..54e6cff48d 100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -3,6 +3,9 @@ require 'rake/testtask'
 desc "Default Task"
 task default: [ :test ]
 
+task :package
+task "package:clean"
+
 # Run the unit tests
 Rake::TestTask.new { |t|
   t.libs << "test"
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 601263bfac..37a269cffd 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -5,6 +5,9 @@ test_files = Dir.glob('test/**/*_test.rb')
 desc "Default Task"
 task :default => :test
 
+task :package
+task "package:clean"
+
 # Run the unit tests
 Rake::TestTask.new do |t|
   t.libs << 'test'
diff --git a/actionview/Rakefile b/actionview/Rakefile
index 93be50721d..d41030c650 100644
--- a/actionview/Rakefile
+++ b/actionview/Rakefile
@@ -3,6 +3,9 @@ require 'rake/testtask'
 desc "Default Task"
 task :default => :test
 
+task :package
+task "package:clean"
+
 # Run the unit tests
 
 desc "Run all unit tests"
diff --git a/activejob/Rakefile b/activejob/Rakefile
index d9648a7f16..2a853b4b6b 100644
--- a/activejob/Rakefile
+++ b/activejob/Rakefile
@@ -6,6 +6,9 @@ ACTIVEJOB_ADAPTERS -= %w(queue_classic) if defined?(JRUBY_VERSION)
 task default: :test
 task test: 'test:default'
 
+task :package
+task "package:clean"
+
 namespace :test do
   desc 'Run all adapter tests'
   task :default do
diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index 5a67f0a151..9982d49bcb 100644
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -4,6 +4,9 @@ dir = File.dirname(__FILE__)
 
 task :default => :test
 
+task :package
+task "package:clean"
+
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb")
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 0564dca94a..46df733cfe 100644
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -20,6 +20,9 @@ end
 desc 'Run mysql2, sqlite, and postgresql tests by default'
 task :default => :test
 
+task :package
+task "package:clean"
+
 desc 'Run mysql2, sqlite, and postgresql tests'
 task :test do
   tasks = defined?(JRUBY_VERSION) ?
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index 81c242d4b1..33ee62aa1b 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -1,6 +1,10 @@
 require 'rake/testtask'
 
 task :default => :test
+
+task :package
+task "package:clean"
+
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index 0a8048cc48..fcc90fa503 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -19,9 +19,6 @@ require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'minitest/autorun'
 
-# Ensure backward compatibility with Minitest 4
-Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
-
 class BugTest < Minitest::Test
   def test_stuff
     assert "zomg".present?
diff --git a/railties/Rakefile b/railties/Rakefile
index cf130a5f14..3421d9b464 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -2,6 +2,9 @@ require 'rake/testtask'
 
 task :default => :test
 
+task :package
+task "package:clean"
+
 desc "Run all unit tests"
 task :test => 'test:isolated'
 
diff --git a/tasks/release.rb b/tasks/release.rb
index c7704aa865..de9c51a140 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -13,6 +13,7 @@ directory "pkg"
 
     task :clean do
       rm_f gem
+      sh "cd #{framework} && bundle exec rake package:clean" unless framework == "rails"
     end
 
     task :update_versions do
@@ -48,6 +49,7 @@ directory "pkg"
     task gem => %w(update_versions pkg) do
       cmd = ""
       cmd << "cd #{framework} && " unless framework == "rails"
+      cmd << "bundle exec rake package && " unless framework == "rails"
       cmd << "gem build #{gemspec} && mv #{framework}-#{version}.gem #{root}/pkg/"
       sh cmd
     end