Skip to content

Commit

Permalink
Merge pull request #79 from seanpdoyle/cleanup-rake-tasks
Browse files Browse the repository at this point in the history
Cleanup Rake Tasks
  • Loading branch information
rwz committed Feb 9, 2015
2 parents 8a857fc + a7f9bf4 commit b8bbeb3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
10 changes: 0 additions & 10 deletions lib/ember-cli/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,5 @@ def rails_config_for(key, default=false)
config = Rails.configuration
config.respond_to?(key) ? config.public_send(key) : default
end

def override_assets_precompile_task!
Rake.application.instance_eval do
@tasks["assets:precompile:original"] = @tasks.delete("assets:precompile")
dependencies = ["ember-cli:install_dependencies", "ember-cli:compile"]
Rake::Task.define_task "assets:precompile", [:assets, :precompile] => dependencies do
Rake::Task["assets:precompile:original"].execute
end
end
end
end
end
2 changes: 0 additions & 2 deletions lib/ember-cli/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ class Railtie < Rails::Railtie
end

rake_tasks do
require "sprockets/rails/task"
load "tasks/ember-cli.rake"
Helpers.override_assets_precompile_task!
end
end
end
4 changes: 3 additions & 1 deletion lib/tasks/ember-cli.rake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace "ember-cli" do
desc "Runs `ember build` for each App"
task compile: :environment do
task compile: :install_dependencies do
EmberCLI.compile!
end

Expand All @@ -14,3 +14,5 @@ namespace "ember-cli" do
EmberCLI.install_dependencies!
end
end

task "assets:precompile" => "ember-cli:compile"

0 comments on commit b8bbeb3

Please sign in to comment.