buildr 1.2.10 → 1.3.0

data/lib/buildr/ide.rb

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+
+require 'buildr/ide/eclipse'
+require 'buildr/ide/idea'
+require 'buildr/ide/idea7x'

data/lib/{java → buildr/ide}/eclipse.rb

@@ -1,18 +1,40 @@
-require "pathname"
-require "core/project"
-require "java/artifact"
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+
+require 'buildr/core/project'
+require 'buildr/packaging'
+
 
 module Buildr
+  module Eclipse #:nodoc:
 
-  # Global task "eclipse" generates artifacts for all projects.
-  desc "Generate Eclipse artifacts for all projects"
-  Project.local_task "eclipse"=>"artifacts"
+    include Extension
 
-  Project.on_define do |project|
-    eclipse = project.recursive_task("eclipse")
+    first_time do
+      # Global task "eclipse" generates artifacts for all projects.
+      desc "Generate Eclipse artifacts for all projects"
+      Project.local_task "eclipse"=>"artifacts"
+    end
 
-    project.enhance do |project|
+    before_define do |project|
+      project.recursive_task("eclipse")
+    end
 
+    after_define do |project|
+      eclipse = project.task("eclipse")
       # We need paths relative to the top project's base directory.
       root_path = lambda { |p| f = lambda { |p| p.parent ? f[p.parent] : p.base_dir } ; f[p] }[project]
 
@@ -20,14 +42,17 @@ module Buildr
       # the Buildfile (buildr.rb, separate file listing dependencies, etc), so we add anything required
       # after the Buildfile. So which don't know where Buildr shows up exactly, ignore files that show
       # in $LOADED_FEATURES that we cannot resolve.
-      sources = Buildr.build_files.map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
-      sources << File.expand_path(Rake.application.rakefile, root_path) if Rake.application.rakefile
+      sources = Buildr.application.build_files.map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
+      sources << File.expand_path(Buildr.application.buildfile, root_path) if Buildr.application.buildfile
 
       # Check if project has scala facet
-      scala = project.task("scalac") if Rake::Task.task_defined?(project.name+":"+"scalac")
-      
-      # Only for projects that are Eclipse packagable.
-      if project.packages.detect { |pkg| pkg.type.to_s =~ /(jar)|(war)|(rar)|(mar)|(aar)/ }
+      scala = project.compile.language == :scala
+
+      # Only for projects that we support
+      supported_languages = [:java, :scala]
+      supported_packaging = %w(jar war rar mar aar)
+      if (supported_languages.include? project.compile.language || 
+          project.packages.detect { |pkg| supported_packaging.include?(pkg.type.to_s) })
         eclipse.enhance [ file(project.path_to(".classpath")), file(project.path_to(".project")) ]
 
         # The only thing we need to look for is a change in the Buildfile.
@@ -36,9 +61,10 @@ module Buildr
 
           # Find a path relative to the project's root directory.
           relative = lambda do |path|
+            path or raise "Invalid path '#{path.inspect}'"
             msg = [:to_path, :to_str, :to_s].find { |msg| path.respond_to? msg }
             path = path.__send__(msg)
-            Pathname.new(File.expand_path(path)).relative_path_from(Pathname.new(project.path_to)).to_s
+            Util.relative_path(File.expand_path(path), project.path_to)
           end
 
           m2repo = Buildr::Repositories.instance.local
@@ -48,12 +74,11 @@ module Buildr
             xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
             xml.classpath do
               # Note: Use the test classpath since Eclipse compiles both "main" and "test" classes using the same classpath
-              cp = project.test.compile.classpath.map(&:to_s) - [ project.compile.target.to_s ]
-              cp += scala.classpath.map(&:to_s) if scala
+              cp = project.test.compile.dependencies.map(&:to_s) - [ project.compile.target.to_s, project.resources.target.to_s ]
               cp = cp.uniq
 
               # Convert classpath elements into applicable Project objects
-              cp.collect! { |path| projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
+              cp.collect! { |path| Buildr.projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
 
               # project_libs: artifacts created by other projects
               project_libs, others = cp.partition { |path| path.is_a?(Project) }
@@ -64,59 +89,54 @@ module Buildr
               # Generated: classpath elements in the project are assumed to be generated
               generated, libs = others.partition { |path| path.to_s.index(project.path_to.to_s) == 0 }
 
-              xml.classpathentry :kind=>'con', :path=>'org.eclipse.jdt.launching.JRE_CONTAINER'
-              xml.classpathentry :kind=>'con', :path=>'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER' if scala
-
               srcs = project.compile.sources
-              srcs << scala.sources if scala
-              
-              # hack until we have sunit task
-              project.path_to("src/test/scala").tap do |dir|
-                srcs += dir if scala and File.exist?(dir)
-              end
-              
+
               srcs = srcs.map { |src| relative[src] } + generated.map { |src| relative[src] }
               srcs.sort.uniq.each do |path|
                 xml.classpathentry :kind=>'src', :path=>path, :excluding=>excludes
               end
 
-              { :output => relative[project.compile.target],
-                :lib    => libs.map(&:to_s),
-                :var    => m2_libs.map { |path| path.to_s.sub(m2repo, 'M2_REPO') }
-              }.each do |kind, paths|
-                paths.sort.uniq.each do |path|
-                  xml.classpathentry :kind=>kind, :path=>path
-                end
-              end
-
-              # Classpath elements from other projects
-              project_libs.map(&:id).sort.uniq.each do |project_id|
-                xml.classpathentry :kind=>'src', :combineaccessrules=>"false", :path=>"/#{project_id}"
-              end
-
               # Main resources implicitly copied into project.compile.target
-              # TODO: find solution that uses project.test.resources.filter.sources
-              [ "src/main/resources" ].each do |path|
+              main_resource_sources = project.resources.sources.map { |src| relative[src] }
+              main_resource_sources.each do |path|
                 if File.exist? project.path_to(path)
                   xml.classpathentry :kind=>'src', :path=>path, :excluding=>excludes
                 end
               end
 
-              # Test classes are generated in a separate output directory
-              test_sources = project.test.compile.sources.map { |src| relative[src] }
-              test_sources.each do |paths|
-                paths.sort.uniq.each do |path|
-                  xml.classpathentry :kind=>'src', :path=>path, :output => relative[project.test.compile.target], :excluding=>excludes
+              if project.test.compile.target
+                # Test classes are generated in a separate output directory
+                test_sources = project.test.compile.sources.map { |src| relative[src] }
+                test_sources.each do |paths|
+                  paths.sort.uniq.each do |path|
+                    xml.classpathentry :kind=>'src', :path=>path, :output => relative[project.test.compile.target], :excluding=>excludes
+                  end
+                end
+
+                # Test resources go in separate output directory as well
+                project.test.resources.sources.each do |path|
+                  if File.exist? project.path_to(path)
+                    xml.classpathentry :kind=>'src', :path=>relative[path], :output => relative[project.test.compile.target], :excluding=>excludes
+                  end
                 end
               end
 
-              # Test resources go in separate output directory as well
-              # TODO: find solution that uses project.test.resources.filter.sources
-              [ "src/test/resources" ].each do |path|
-                if File.exist? project.path_to(path)
-                  xml.classpathentry :kind=>'src', :path=>path, :output => relative[project.test.compile.target], :excluding=>excludes
+              # Classpath elements from other projects
+              project_libs.map(&:id).sort.uniq.each do |project_id|
+                xml.classpathentry :kind=>'src', :combineaccessrules=>"false", :path=>"/#{project_id}" 
+              end
+
+              { :output => relative[project.compile.target],
+                :lib    => libs.map(&:to_s),
+                :var    => m2_libs.map { |path| path.to_s.sub(m2repo, 'M2_REPO') }
+              }.each do |kind, paths|
+                paths.sort.uniq.each do |path|
+                  xml.classpathentry :kind=>kind, :path=>path
                 end
               end
+
+              xml.classpathentry :kind=>'con', :path=>'org.eclipse.jdt.launching.JRE_CONTAINER'
+              xml.classpathentry :kind=>'con', :path=>'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER' if scala
             end
           end
         end
@@ -135,21 +155,27 @@ module Buildr
                 end
                 if scala
                   xml.buildCommand do
-                    #xml.name "ch.epfl.lamp.sdt.core.scalabuilder"
-                    xml.name "scala.plugin.scalabuilder"
+                    xml.name "ch.epfl.lamp.sdt.core.scalabuilder"
+                    #xml.name "scala.plugin.scalabuilder"
                   end
                 end
               end
               xml.natures do
                 xml.nature "org.eclipse.jdt.core.javanature"
-                #xml.nature "ch.epfl.lamp.sdt.core.scalanature" if scala
-                xml.nature "scala.plugin.scalanature" if scala
+                xml.nature "ch.epfl.lamp.sdt.core.scalanature" if scala
+                #xml.nature "scala.plugin.scalanature" if scala
               end
             end
           end
         end
       end
+
     end
-  end
 
+  end
 end # module Buildr
+
+
+class Buildr::Project
+  include Buildr::Eclipse
+end

data/lib/{java → buildr/ide}/idea.ipr.template

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with this
+ work for additional information regarding copyright ownership.  The ASF
+ licenses this file to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ License for the specific language governing permissions and limitations under
+ the License.
+-->
 <project version="4" relativePaths="false">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />

data/lib/buildr/ide/idea.rb

@@ -0,0 +1,194 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+
+require 'buildr/core/project'
+require 'buildr/packaging'
+require 'stringio'
+require 'rexml/document'
+
+
+module Buildr
+  module Idea #:nodoc:
+
+    include Extension
+
+    first_time do
+      # Global task "idea" generates artifacts for all projects.
+      desc "Generate Idea artifacts for all projects"
+      Project.local_task "idea"=>"artifacts"
+    end
+
+    before_define do |project|
+      project.recursive_task("idea")
+    end
+
+    after_define do |project|
+      idea = project.task("idea")
+      # We need paths relative to the top project's base directory.
+      root_path = lambda { |p| f = lambda { |p| p.parent ? f[p.parent] : p.base_dir }; f[p] }[project]
+      # We want the Eclipse files changed every time the Buildfile changes, but also anything loaded by
+      # the Buildfile (buildr.rb, separate file listing dependencies, etc), so we add anything required
+      # after the Buildfile. So which don't know where Buildr shows up exactly, ignore files that show
+      # in $LOADED_FEATURES that we cannot resolve.
+      sources = Buildr.application.build_files.map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
+      sources << File.expand_path(Buildr.application.buildfile, root_path) if Buildr.application.buildfile
+
+      # Find a path relative to the project's root directory.
+      relative = lambda { |path| Util.relative_path(path.to_s, project.path_to) }
+
+      m2repo = Buildr::Repositories.instance.local
+      excludes = [ '**/.svn/', '**/CVS/' ].join('|')
+
+      # Only for projects that are packageable.
+      task_name = project.path_to("#{project.name.gsub(':', '-')}.iml")
+      idea.enhance [ file(task_name) ]
+
+      # The only thing we need to look for is a change in the Buildfile.
+      file(task_name=>sources) do |task|
+        puts "Writing #{task.name}" if verbose
+
+        # Idea handles modules slightly differently if they're WARs
+        idea_types = Hash.new("JAVA_MODULE")
+        idea_types["war"] = "J2EE_WEB_MODULE"
+
+        # Note: Use the test classpath since Eclipse compiles both "main" and "test" classes using the same classpath
+        deps = project.test.compile.dependencies.map(&:to_s) - [ project.compile.target.to_s ]
+
+        # Convert classpath elements into applicable Project objects
+        deps.collect! { |path| Buildr.projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
+
+        # project_libs: artifacts created by other projects
+        project_libs, others = deps.partition { |path| path.is_a?(Project) }
+
+        # Separate artifacts from Maven2 repository
+        m2_libs, others = others.partition { |path| path.to_s.index(m2repo) == 0 }
+
+        # Generated: classpath elements in the project are assumed to be generated
+        generated, libs = others.partition { |path| path.to_s.index(project.path_to.to_s) == 0 }
+
+        # Project type is going to be the first package type
+        if package = project.packages.first
+          File.open(task.name, "w") do |file|
+            xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
+
+            xml.module(:version=>"4", :relativePaths=>"false", :type=>idea_types[package.type.to_s]) do
+              xml.component :name=>"ModuleRootManager"
+              xml.component "name"=>"NewModuleRootManager", "inherit-compiler-output"=>"false" do
+                has_compile_sources = project.compile.target.to_s.size > 0
+                xml.output :url=>"file://$MODULE_DIR$/#{relative[project.compile.target.to_s]}" if has_compile_sources
+                xml.tag! "exclude-output"
+
+                # TODO project.test.target isn't recognized, what's the proper way to get the test compile path?
+                xml.tag! "output-test", :url=>"file://$MODULE_DIR$/target/test-classes"
+
+                xml.content(:url=>"file://$MODULE_DIR$") do
+                  if has_compile_sources
+                    srcs = project.compile.sources.map { |src| relative[src.to_s] } + generated.map { |src| relative[src.to_s] }
+                    srcs.sort.uniq.each do |path|
+                      xml.sourceFolder :url=>"file://$MODULE_DIR$/#{path}", :isTestSource=>"false"
+                    end
+
+                    test_sources = project.test.compile.sources.map { |src| relative[src.to_s] }
+                    test_sources.each do |paths|
+                      paths.sort.uniq.each do |path|
+                        xml.sourceFolder :url=>"file://$MODULE_DIR$/#{path}", :isTestSource=>"true"
+                      end
+                    end
+                  end
+                  [project.resources=>false, project.test.resources=>true].each do |resources, test|
+                    resources.each do |path|
+                      path[0].sources.each do |srcpath|
+                        xml.sourceFolder :url=>"file://#{srcpath}", :isTestSource=>path[1].to_s
+                      end
+                    end
+                  end
+                  xml.excludeFolder :url=>"file://$MODULE_DIR$/#{relative[project.compile.target.to_s]}" if has_compile_sources
+                end
+
+                xml.orderEntry :type=>"sourceFolder", :forTests=>"false"
+                xml.orderEntry :type=>"inheritedJdk"
+
+                # Classpath elements from other projects
+                project_libs.map(&:id).sort.uniq.each do |project_id|
+                  xml.orderEntry :type=>'module', "module-name"=>project_id
+                end
+
+                # Libraries
+                ext_libs = libs.map {|path| "$MODULE_DIR$/#{path.to_s}" } +
+                    m2_libs.map { |path| path.to_s.sub(m2repo, "$M2_REPO$") }
+                ext_libs.each do |path|
+                  xml.orderEntry :type=>"module-library" do
+                    xml.library do
+                      xml.CLASSES do
+                        xml.root :url=>"jar://#{path}!/"
+                      end
+                      xml.JAVADOC
+                      xml.SOURCES
+                    end
+                  end
+                end
+
+                xml.orderEntryProperties
+              end
+            end
+          end
+        end
+      end
+
+      # Root project aggregates all the subprojects.
+      if project.parent == nil
+        task_name = project.path_to("#{project.name.gsub(':', '-')}.ipr")
+        idea.enhance [ file(task_name) ]
+
+        file(task_name=>sources) do |task|
+          puts "Writing #{task.name}" if verbose
+
+          # Generating just the little stanza that chanages from one project to another
+          partial = StringIO.new
+          xml = Builder::XmlMarkup.new(:target=>partial, :indent=>2)
+          xml.component(:name=>"ProjectModuleManager") do
+            xml.modules do
+              project.projects.each do |subp|
+                module_name = subp.name.gsub(":", "-")
+                module_path = subp.name.split(":"); module_path.shift
+                module_path = module_path.join("/")
+                path = "#{module_path}/#{module_name}.iml"
+                xml.module :fileurl=>"file://$PROJECT_DIR$/#{path}", :filepath=>"$PROJECT_DIR$/#{path}"
+              end
+              if package = project.packages.first
+                xml.module :fileurl=>"file://$PROJECT_DIR$/#{project.name}.iml", :filepath=>"$PROJECT_DIR$/#{project.name}.iml"
+              end
+            end
+          end
+
+          # Loading the whole fairly constant crap
+          template_xml = REXML::Document.new(File.open(File.dirname(__FILE__)+"/idea.ipr.template"))
+          include_xml = REXML::Document.new(partial.string)
+          template_xml.root.add_element(include_xml.root)
+          template_xml.write(File.new(task.name, "w"))
+
+        end
+      end
+
+    end #after define
+
+  end #module Idea
+end # module Buildr
+
+
+class Buildr::Project
+  include Buildr::Idea
+end