buildr 1.2.7 → 1.2.8

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.2.8 (11/1/2007)
+* Added: Resolving Maven snapshots from remote repository (Rhett Sutphin)
+* Changed: scala options.target now takes number, e.g. "1.5" instead of "jvm-1.5" (Nathan Hamblen)
+* Changed: Eclipse task uses updated Scala plugin nature and builder (Alex Boisvert)
+* Fixed: Bringing Buildr back to 1.0.9, XMLBeans fix.
+
 1.2.7 (10/29/2007)
 * Added: You can create an artifact from a given file using artifact(<spec>).from(<path>).  You can then install it into the local repository or upload it to the release server using install(<artifacts>) and upload(<artifacts>). (Idea: Shane Witbeck and Tommy Mason).
 * Added: ANTLR support.

data/Rakefile

@@ -44,7 +44,7 @@ def specify(platform)
   end
 end
 
-spec = specify(Gem::Platform::RUBY) { |spec| spec.add_dependency "rjb", "= 1.0.6" }
+spec = specify(Gem::Platform::RUBY) { |spec| spec.add_dependency "rjb", ">= 1.0.9" }
 jruby_spec = specify('java')
 package = Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_tar = true

data/lib/buildr.rb

@@ -30,7 +30,7 @@ require "builder"
 
 
 module Buildr
-  VERSION = "1.2.7".freeze # unless const_defined?(:VERSION)
+  VERSION = "1.2.8".freeze # unless const_defined?(:VERSION)
 end
 
 

data/lib/buildr/scala.rb

@@ -9,12 +9,12 @@ module Buildr
 
   module Scala
     class << self
-      def scala_base
-        ENV["SCALA_HOME"] + "/share/scala"
+      def scala_home
+        ENV["SCALA_HOME"]
       end
 
       def scala_lib
-        scala_lib = scala_base + "/lib/scala-library.jar"
+        scala_lib = scala_home + "/lib/scala-library.jar"
       end
 
       def scalac(*args)
@@ -32,7 +32,7 @@ module Buildr
         cmd_args = []
         use_fsc = !(ENV["USE_FSC"] =~ /^(no|off|false)$/i)
         classpath = classpath_from(options)
-        scala_cp = [ classpath,  FileList["#{scala_base}/lib/*"] ].flatten.join(File::PATH_SEPARATOR)
+        scala_cp = [ classpath,  FileList["#{scala_home}/lib/*"] ].flatten.join(File::PATH_SEPARATOR)
         cmd_args << "-cp" << scala_cp unless scala_cp.empty?
         cmd_args << "-sourcepath" << options[:sourcepath].join(File::PATH_SEPARATOR) if options[:sourcepath]
         cmd_args << "-d" << options[:output].to_s if options[:output]
@@ -154,7 +154,7 @@ module Buildr
           args << "-g" if debug
           args << "-deprecation" if deprecation
           args << "-source" << source.to_s if source
-          args << "-target" << target.to_s if target
+          args << "-target:jvm-" + target.to_s if target
           case lint
           when Array
             args << "-Xlint:#{lint.join(',')}"

data/lib/buildr/xmlbeans.rb

@@ -6,7 +6,9 @@ module Buildr
   # Provides XMLBeans schema compiler. Require explicitly using <code>require "buildr/xmlbeans"</code>.
   module XMLBeans
 
-    REQUIRES = [ "xmlbeans:xbean:jar:2.2.0", "stax:stax-api:jar:1.0" ]
+    STAX = "stax:stax-api:jar:1.0"
+    XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.3.0"
+    REQUIRES = [ STAX, XMLBEANS ]
 
     class << self
 
@@ -44,7 +46,7 @@ module Buildr
         XMLBeans.compile args.flatten, :output=>task.name,
           :javasource=>compile.options.source, :xsb=>compile.target
       end
-      compile.from(generated).with(JAVAX.stream, XMLBEANS)
+      compile.from(generated).with(STAX, XMLBEANS)
       # Once compiled, we need to copy the generated XSB/XSD and one (magical?) class file
       # into the target directory, or the rest is useless.
       compile do |task|

data/lib/java/artifact.rb

@@ -37,6 +37,10 @@ module Buildr
     # Optional artifact classifier.
     attr_reader :classifier
 
+    def snapshot?
+      version =~ /-SNAPSHOT$/
+    end
+
     # :call-seq:
     #   to_spec_hash() => Hash
     #
@@ -127,6 +131,10 @@ module Buildr
       ARTIFACT_ATTRIBUTES.each { |key| instance_variable_set("@#{key}", spec[key]) }
       self
     end
+    
+    def group_path
+      group.gsub(".", "/")
+    end
 
   end
 
@@ -295,13 +303,12 @@ module Buildr
     # which they are returned from #remote, until successful. It always downloads the POM first.
     def download()
       puts "Downloading #{to_spec}" if Rake.application.options.trace
-      remote = Buildr.repositories.remote
+      remote = Buildr.repositories.remote.map { |repo_url| URI === repo_url ? repo_url : URI.parse(repo_url) }
+      remote = remote.each { |repo_url| repo_url.path += "/" unless repo_url.path[-1] == "/" }
       fail "No remote repositories defined!" if remote.empty?
-      remote.find do |repo_url|
-        repo_url = URI.parse(repo_url) unless URI === repo_url
-        repo_url.path += "/" unless repo_url.path[-1] == "/"
+      exact_success = remote.find do |repo_url|
         begin
-          path = group.gsub(".", "/") + "/#{id}/#{version}/#{File.basename(name)}"
+          path = "#{group_path}/#{id}/#{version}/#{File.basename(name)}"
           mkpath File.dirname(name), :verbose=>false
           URI.download repo_url + path, name
           true
@@ -312,9 +319,50 @@ module Buildr
           puts error.backtrace.join("\n") if Rake.application.options.trace
           false
         end
-      end or fail "Failed to download #{to_spec}, tried the following repositories:\n#{remote.join("\n")}"
+      end
+
+      if exact_success
+        return
+      elsif snapshot?
+        download_m2_snapshot(remote)
+      else
+        fail_download(remote)
+      end
     end
 
+    def download_m2_snapshot(remote_uris)
+      remote_uris.find do |repo_url|
+        snapshot_url = current_snapshot_repo_url(repo_url)
+        if snapshot_url
+          begin
+            URI.download snapshot_url, name
+          rescue URI::NotFoundError
+            false
+          end
+        else
+          false
+        end
+      end or fail_download(remote_uris)
+    end
+
+    def current_snapshot_repo_url(repo_url)
+      begin
+        metadata_path = "#{group_path}/#{id}/#{version}/maven-metadata.xml"
+        metadata_xml = StringIO.new
+        URI.download repo_url + metadata_path, metadata_xml
+        metadata = REXML::Document.new(metadata_xml.string).root
+        timestamp = REXML::XPath.first(metadata, "//timestamp").text
+        build_number = REXML::XPath.first(metadata, "//buildNumber").text
+        snapshot_of = version[0, version.size - 9]
+        repo_url + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp}-#{build_number}.#{type}"
+      rescue URI::NotFoundError
+        nil
+      end
+    end
+
+    def fail_download(remote_uris)
+      fail "Failed to download #{to_spec}, tried the following repositories:\n#{remote_uris.join("\n")}"
+    end
   end
 
 

data/lib/java/eclipse.rb

@@ -15,6 +15,7 @@ module Buildr
 
       # 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
@@ -22,6 +23,9 @@ module Buildr
       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
 
+      # 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)/ }
         eclipse.enhance [ file(project.path_to(".classpath")), file(project.path_to(".project")) ]
@@ -45,6 +49,8 @@ module Buildr
             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 = cp.uniq
 
               # Convert classpath elements into applicable Project objects
               cp.collect! { |path| projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
@@ -59,8 +65,17 @@ module Buildr
               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'
-
-              srcs = project.compile.sources.map { |src| relative[src] } + generated.map { |src| relative[src] }
+              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
@@ -118,9 +133,17 @@ module Buildr
                 xml.buildCommand do
                   xml.name "org.eclipse.jdt.core.javabuilder"
                 end
+                if scala
+                  xml.buildCommand do
+                    #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
               end
             end
           end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
-date: 2007-10-29 00:00:00 -07:00
+  version: 1.2.8
+date: 2007-11-01 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib
@@ -198,7 +198,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.6
+        version: 1.0.9
     version: