buildr 1.4.11-java → 1.4.12-java

data/lib/buildr/core/cc.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
   class CCTask < Rake::Task
     attr_accessor :delay
     attr_reader :project

data/lib/buildr/core/checks.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
   # Methods added to Project to allow checking the build.
   module Checks
 
@@ -243,7 +243,6 @@ module Rake #:nodoc:
   end
 end
 
-
-class Buildr::Project
+class Buildr::Project #:nodoc:
   include Buildr::Checks
 end

data/lib/buildr/core/common.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # :call-seq:
   #   struct(hash) => Struct

data/lib/buildr/core/compile.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # The underlying compiler used by CompileTask.
   # To add a new compiler, extend Compiler::Base and add your compiler using:

data/lib/buildr/core/doc.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
   module Doc
     include Extension
 
@@ -275,8 +275,7 @@ module Buildr
     end
   end
 
-
-  class Project
+  class Project #:nodoc:
     include Doc
   end
 end

data/lib/buildr/core/environment.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # Collection of options for controlling Buildr.
   class Options

data/lib/buildr/core/filter.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # A filter knows how to copy files from one directory to another, applying mappings to the
   # contents of these files.

data/lib/buildr/core/generate.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
   module Generate #:nodoc:
 
     task 'generate' do

data/lib/buildr/core/help.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   module Help #:nodoc:
     class << self

data/lib/buildr/core/jrebel.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
   module JRebel
     def jrebel_home
       unless @jrebel_home

data/lib/buildr/core/progressbar.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
+#
 class ProgressBar
 
   class << self

data/lib/buildr/core/project.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # Symbolic mapping for directory layout.  Used for both the default and custom layouts.
   #

data/lib/buildr/core/run.rb

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  module Run
+module Buildr #:nodoc:
+  module Run #:nodoc:
 
     class JavaRunner < Base
       include Buildr::JRebel

data/lib/buildr/core/shell.rb

@@ -13,9 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-
-  module Shell
+module Buildr #:nodoc:
+  module Shell #:nodoc:
 
     class BeanShell < Base
       include Buildr::JRebel

data/lib/buildr/core/test.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # The underlying test framework used by TestTask.
   # To add a new test framework, extend TestFramework::Base and add your framework using:

data/lib/buildr/core/util.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   module Util
     extend self

data/lib/buildr/groovy/bdd.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
+# The Groovy module
 module Buildr::Groovy
 
   # EasyB is a Groovy based BDD framework.

data/lib/buildr/groovy/compiler.rb

@@ -14,6 +14,7 @@
 # the License.
 
 
+#
 module Buildr::Groovy
 
   REQUIRES = ArtifactNamespace.for(self) do |ns|

data/lib/buildr/groovy/doc.rb

@@ -13,10 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  module Doc
+module Buildr #:nodoc:
+  module Doc #:nodoc:
 
-    module GroovydocDefaults
+    module GroovydocDefaults #:nodoc:
       include Extension
 
       # Default groovydoc -doc-title to project's comment or name
@@ -64,7 +64,7 @@ module Buildr
     end
   end
 
-  class Project
+  class Project #:nodoc:
     include GroovydocDefaults
   end
 end

data/lib/buildr/groovy/shell.rb

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  module Groovy
+module Buildr #:nodoc:
+  module Groovy #:nodoc:
     class GroovySH < Buildr::Shell::Base
       include JRebel
 

data/lib/buildr/ide/eclipse.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
   module Eclipse #:nodoc:
     include Extension
 

data/lib/buildr/ide/idea.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
   module IntellijIdea
     def self.new_document(value)
       REXML::Document.new(value, :attribute_quote => :quote)
@@ -253,15 +253,35 @@ module Buildr
 
       def add_gwt_facet(modules = {}, options = {})
         name = options[:name] || "GWT"
+        detected_gwt_version = nil
+        if options[:gwt_dev_artifact]
+          a = Buildr.artifact(options[:gwt_dev_artifact])
+          a.invoke
+          detected_gwt_version = a.to_s
+        end
+
         settings =
           {
             :webFacet => "Web",
             :compilerMaxHeapSize => "512",
             :compilerParameters => "-draftCompile -localWorkers 2 -strict",
-            :gwtSdkUrl => "file://$GWT_TOOLS$",
             :gwtScriptOutputStyle => "PRETTY"
           }.merge(options[:settings] || {})
 
+        buildr_project.compile.dependencies.each do |d|
+          if d.to_s =~ /\/com\/google\/gwt\/gwt-dev\/(.*)\//
+            detected_gwt_version = d.to_s
+            break
+          end
+        end unless detected_gwt_version
+
+        if detected_gwt_version
+          settings[:gwtSdkUrl] = resolve_path(File.dirname(detected_gwt_version))
+          settings[:gwtSdkType] = "maven"
+        else
+          settings[:gwtSdkUrl] = "file://$GWT_TOOLS$"
+        end
+
         add_facet(name, "gwt") do |f|
           f.configuration do |c|
             settings.each_pair do |k, v|
@@ -531,7 +551,6 @@ module Buildr
 
     # IdeaModule represents an .ipr file
     class IdeaProject < IdeaFile
-      attr_accessor :vcs
       attr_accessor :extra_modules
       attr_accessor :artifacts
       attr_accessor :configurations
@@ -540,7 +559,6 @@ module Buildr
       def initialize(buildr_project)
         super()
         @buildr_project = buildr_project
-        @vcs = detect_vcs
         @extra_modules = []
         @artifacts = []
         @configurations = []
@@ -719,14 +737,6 @@ module Buildr
         "ipr"
       end
 
-      def detect_vcs
-        if File.directory?(buildr_project._('.svn'))
-          "svn"
-        elsif File.directory?(buildr_project._('.git'))
-          "Git"
-        end
-      end
-
       def base_document
         target = StringIO.new
         Builder::XmlMarkup.new(:target => target).project(:version => "4")
@@ -802,9 +812,30 @@ module Buildr
       end
 
       def vcs_component
-        if vcs
+        project_directories = buildr_project.projects.select { |p| p.iml? }.collect { |p| p.base_dir }
+        project_directories << buildr_project.base_dir
+        # Guess the iml file is in the same dir as base dir
+        project_directories += self.extra_modules.collect { |p| File.dirname(p) }
+
+        project_directories = project_directories.sort.uniq
+
+        mappings = {}
+
+        project_directories.each do |dir|
+          if File.directory?("#{dir}/.git")
+            mappings[dir] = "Git"
+          elsif File.directory?("#{dir}/.svn")
+            mappings[dir] = "svn"
+          end
+        end
+
+        if mappings.size > 1
           create_component("VcsDirectoryMappings") do |xml|
-            xml.mapping :directory => "", :vcs => vcs
+            mappings.each_pair do |dir, vcs_type|
+              resolved_dir = resolve_path(dir)
+              mapped_dir = resolved_dir == '$PROJECT_DIR$/.' ? buildr_project.base_dir : resolved_dir
+              xml.mapping :directory => mapped_dir, :vcs => vcs_type
+            end
           end
         end
       end

data/lib/buildr/java/ant.rb

@@ -18,7 +18,7 @@ gem 'atoulme-Antwrap'
 autoload :Antwrap, 'antwrap'
 autoload :Logger, 'logger'
 
-module Buildr
+module Buildr #:nodoc:
   module Ant
 
     # Which version of Ant we're using by default.

data/lib/buildr/java/bdd.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # Mixin for test frameworks using src/spec/{lang}
   class TestFramework::JavaBDD < TestFramework::Java #:nodoc:

data/lib/buildr/java/cobertura.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # Provides the <code>cobertura:html</code>, <code>cobertura:xml</code> and <code>cobertura:check</code> tasks.
   # Require explicitly using <code>require "buildr/java/cobertura"</code>.

data/lib/buildr/java/compiler.rb

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  module Compiler
+module Buildr #:nodoc:
+  module Compiler #:nodoc:
 
     # Javac compiler:
     #   compile.using(:javac)
@@ -123,6 +123,6 @@ module Buildr
 end
 
 Buildr::Compiler << Buildr::Compiler::Javac
-class Buildr::Project
+class Buildr::Project #:nodoc:
   include Buildr::Apt
 end

data/lib/buildr/java/deprecated.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Java
+module Java #:nodoc:
 
   # *Deprecated:* In earlier versions, Java.wrapper served as a wrapper around RJB/JRuby.
   # From this version forward, we apply with JRuby style for importing Java classes:

data/lib/buildr/java/doc.rb

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  module Doc
+module Buildr #:nodoc:
+  module Doc #:nodoc:
 
     module JavadocDefaults
       include Extension
@@ -76,7 +76,7 @@ module Buildr
     end
   end
 
-  class Project
+  class Project #:nodoc:
     include JavadocDefaults
   end
 end

data/lib/buildr/java/ecj.rb

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  module Compiler
+module Buildr #:nodoc:
+  module Compiler #:nodoc:
 
     class Ecj < Javac