Author: donaldp
Date: Tue Apr 26 05:05:12 2011
New Revision: 1096664
URL: http://svn.apache.org/viewvc?rev=1096664&view=rev
Log:
BUILDR-582 - Revert the name change for the task to generate Intellij project
files to 'idea'
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/ide/idea.rb
buildr/trunk/spec/ide/idea_spec.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1096664&r1=1096663&r2=1096664&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Apr 26 05:05:12 2011
@@ -1,4 +1,6 @@
1.4.6 (Pending)
+* Fixed: BUILDR-582 Revert the name change for the task to generate Intellij
+ project files to 'idea'
* Change: BUILDR-579 Format generated IDEA project files to look more like what
IntelliJ generates (Peter Royal)
* Change: BUILDR-574 Enhance idea task to generate test resources with test
scope
Modified: buildr/trunk/lib/buildr/ide/idea.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea.rb?rev=1096664&r1=1096663&r2=1096664&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea.rb Tue Apr 26 05:05:12 2011
@@ -488,19 +488,19 @@ module Buildr
first_time do
desc "Generate Intellij IDEA artifacts for all projects"
- Project.local_task "idea:generate" => "artifacts"
+ Project.local_task "idea" => "artifacts"
desc "Delete the generated Intellij IDEA artifacts"
Project.local_task "idea:clean"
end
before_define do |project|
- project.recursive_task("idea:generate")
+ project.recursive_task("idea")
project.recursive_task("idea:clean")
end
after_define do |project|
- idea = project.task("idea:generate")
+ idea = project.task("idea")
files = [
(project.iml if project.iml?),
Modified: buildr/trunk/spec/ide/idea_spec.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/spec/ide/idea_spec.rb?rev=1096664&r1=1096663&r2=1096664&view=diff
==============================================================================
--- buildr/trunk/spec/ide/idea_spec.rb (original)
+++ buildr/trunk/spec/ide/idea_spec.rb Tue Apr 26 05:05:12 2011
@@ -20,7 +20,7 @@ require File.expand_path(File.join(File.
describe Buildr::IntellijIdea do
def invoke_generate_task
- task('idea:generate').invoke
+ task('idea').invoke
end
def invoke_clean_task
@@ -97,7 +97,7 @@ describe Buildr::IntellijIdea do
end
end
- describe "idea:generate" do
+ describe "idea task" do
def order_entry_xpath
"/module/component[@name='NewModuleRootManager']/orderEntry"
@@ -1048,12 +1048,12 @@ PROJECT_XML
end
describe "project extension" do
- it "provides an 'idea:generate' task" do
- Rake::Task.tasks.detect { |task| task.to_s == "idea:generate"
}.should_not be_nil
+ it "provides an 'idea' task" do
+ Rake::Task.tasks.detect { |task| task.to_s == "idea" }.should_not be_nil
end
- it "documents the 'idea:generate' task" do
- Rake::Task.tasks.detect { |task| task.to_s == "idea:generate"
}.comment.should_not be_nil
+ it "documents the 'idea' task" do
+ Rake::Task.tasks.detect { |task| task.to_s == "idea"
}.comment.should_not be_nil
end
it "provides an 'idea:clean' task" do
@@ -1064,18 +1064,6 @@ PROJECT_XML
Rake::Task.tasks.detect { |task| task.to_s == "idea:clean"
}.comment.should_not be_nil
end
- it "removes the 'idea' task" do
- Rake::Task.tasks.detect { |task| task.to_s == "idea" }.should be_nil
- end
-
- it "removes the 'idea7x' task" do
- Rake::Task.tasks.detect { |task| task.to_s == "idea7x" }.should be_nil
- end
-
- it "removes the 'idea7x:clean' task" do
- Rake::Task.tasks.detect { |task| task.to_s == "idea7x:clean" }.should
be_nil
- end
-
describe "#no_iml" do
it "makes #iml? false" do
@foo = define "foo" do
