buildr 1.4.11 → 1.4.12

data/lib/buildr/java/emma.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>emma:html</code> and <code>emma:xml</code> tasks.
   # Require explicitly using <code>require "buildr/emma"</code>.

data/lib/buildr/java/external.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 ExternalJavac< Buildr::Compiler::Javac
 
       OPTIONS = [:jvm, :warnings, :debug, :deprecation, :source, :target, :lint, :other]

data/lib/buildr/java/packaging.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
   module Packaging #:nodoc:
 
     # Adds packaging for Java projects: JAR, WAR, AAR, EAR, Javadoc.
@@ -724,7 +724,6 @@ module Buildr
   end
 end
 
-
-class Buildr::Project
+class Buildr::Project #:nodoc:
   include Buildr::Packaging::Java
 end

data/lib/buildr/java/pom.rb

@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+#
 module Buildr
   class POM
 

data/lib/buildr/java/rjb.rb

@@ -145,8 +145,7 @@ module Java
 
 end
 
-
-class Array
+class Array #:nodoc:
   # Converts a Ruby array into a typed Java array, argument specifies the element type.
   # This is necessary for JRuby and causes no harm on RJB.
   def to_java(cls)

data/lib/buildr/java/test_result.rb

@@ -18,7 +18,7 @@ require 'yaml'
 require 'rspec/core/formatters/base_formatter'
 
 module Buildr #:nodoc:
-  module TestFramework
+  module TestFramework #:nodoc:
 
     # A class used by buildr for jruby based frameworks, so that buildr can know
     # which tests succeeded/failed.

data/lib/buildr/java/tests.rb

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   class TestFramework::Java < TestFramework::Base
 

data/lib/buildr/java/version_requirement.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-module Buildr
+module Buildr #:nodoc:
 
   #
   # See ArtifactNamespace#need

data/lib/buildr/packaging/archive.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # Base class for ZipTask, TarTask and other archives.
   class ArchiveTask < Rake::FileTask
@@ -186,7 +186,7 @@ module Buildr
         when ArtifactNamespace
           set |= file.artifacts
         when Symbol, Hash
-          set |= [artifact(file)]
+          set |= [Buildr.artifact(file)]
         when /([^:]+:){2,4}/ # A spec as opposed to a file name.
           set |= [Buildr.artifact(file)]
         when Project

data/lib/buildr/packaging/artifact.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   desc 'Download all artifacts'
   task 'artifacts'

data/lib/buildr/packaging/artifact_namespace.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # An ArtifactNamespace is a hierarchical dictionary used to manage ArtifactRequirements.
   # It can be used to have different artifact versions per project

data/lib/buildr/packaging/artifact_search.rb

@@ -13,10 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 autoload :Hpricot, 'hpricot'
 
-module Buildr
+module Buildr #:nodoc:
 
   # Search best artifact version from remote repositories
   module ArtifactSearch

data/lib/buildr/packaging/gems.rb

@@ -16,7 +16,7 @@
 autoload :RubyForge, 'rubyforge'
 Gem.autoload :Package, 'rubygems/package'
 
-module Buildr
+module Buildr #:nodoc:
 
   class PackageGemTask < ArchiveTask
 

data/lib/buildr/packaging/package.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 support packaging and tasks for packaging,
   # installing and uploading packages.
   module Package

data/lib/buildr/packaging/tar.rb

@@ -16,7 +16,7 @@
 autoload :Archive, 'archive/tar/minitar'
 autoload :Zlib, 'zlib'
 
-module Buildr
+module Buildr #:nodoc:
 
   # The TarTask creates a new Tar file. You can include any number of files and and directories,
   # use exclusion patterns, and include files into specific directories.

data/lib/buildr/packaging/test_jar.rb

@@ -0,0 +1,32 @@
+# 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.
+
+module Buildr #:nodoc:
+  module PackageAsTestJar
+    def package_as_test_jar_spec(spec) #:nodoc:
+      spec.merge(:type => :jar, :classifier => 'test-jar')
+    end
+
+    def package_as_test_jar(file_name) #:nodoc:
+      ZipTask.define_task(file_name).tap do |zip|
+        zip.include :from => [test.compile.target, test.resources.target].compact
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::PackageAsTestJar
+end

data/lib/buildr/packaging/version_requirement.rb

@@ -30,7 +30,7 @@ unless Gem::Version.new(0).respond_to?(:version=)
   end
 end
 
-module Buildr
+module Buildr #:nodoc:
 
   #
   # See ArtifactNamespace#need

data/lib/buildr/packaging/zip.rb

@@ -176,8 +176,11 @@ module Zip #:nodoc:
   end
 
   class ZipEntrySet
+    alias_method :original_push, :"<<"
+    alias_method :push, :"<<"
+
     def <<(entry)
-      @entrySet[entry.name.to_s] = entry if entry != nil
+      original_push(entry) if entry != nil
     end
   end
 end

data/lib/buildr/packaging/ziptask.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   # The ZipTask creates a new Zip file. You can include any number of files and and directories,
   # use exclusion patterns, and include files into specific directories.

data/lib/buildr/run.rb

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

data/lib/buildr/scala/bdd.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr::Scala
+module Buildr::Scala #:nodoc:
 
   # Specs is a Scala based BDD framework.
   # To use in your project:
@@ -247,7 +247,7 @@ module Buildr::Scala
 end
 
 # Backwards compatibility stuff.  Remove in 1.5.
-module Buildr
+module Buildr #:nodoc:
   ScalaSpecs = Scala::Specs
 end
 

data/lib/buildr/scala/compiler.rb

@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+# The Scala Module
 module Buildr::Scala
   DEFAULT_VERSION = '2.9.2'
 
@@ -381,7 +382,7 @@ end
 # projects that mix Scala and Java code by spotting Scala code first.
 Buildr::Compiler.compilers.unshift Buildr::Scala::Scalac
 
-class Buildr::Project
+class Buildr::Project #:nodoc:
   include Buildr::Scala::ProjectExtension
 end
 

data/lib/buildr/scala/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 ScaladocDefaults
       include Extension
@@ -88,12 +88,13 @@ module Buildr
             when Buildr::Scala.version?("2.7")
               [ "org.scala-tools:vscaladoc:jar:#{VERSION}" ]
             else
+              warn "VScalaDoc not supported for Scala 2.8+"
               []
           end
         end
       end
 
-      Java.classpath << dependencies
+      Java.classpath << lambda { dependencies }
 
       specify :language => :scala, :source_ext => 'scala'
 
@@ -145,7 +146,7 @@ module Buildr
     end
   end
 
-  class Project
+  class Project #:nodoc:
     include ScaladocDefaults
     include Packaging::Scala
   end

data/lib/buildr/scala/shell.rb

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

data/lib/buildr/scala/tests.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr::Scala
+module Buildr::Scala#:nodoc:
 
   # Mockito is available when running ScalaTest
   module Mockito
@@ -212,7 +212,7 @@ end
 
 
 # Backwards compatibility stuff.  Remove in 1.5.
-module Buildr
+module Buildr#:nodoc:
   ScalaCheck = Scala::Check
   ScalaTest = Scala::ScalaTest
 end

data/lib/buildr/shell.rb

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

data/lib/buildr/version.rb

@@ -13,6 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  VERSION = '1.4.11'.freeze
+module Buildr #:nodoc:
+  VERSION = '1.4.12'.freeze
 end

data/rakelib/doc.rake

@@ -91,11 +91,10 @@ end
 
 # Publish prerequisites to Web site.
 desc "Publish complete web site"
-task 'publish' => 'site' do
-  target = "people.apache.org:/www/#{spec.name}.apache.org/"
-  puts "Uploading new site to #{target} ..."
-  sh 'rsync', '--progress', '--recursive', '--delete', '_site/', target
-  sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
+task 'publish' => %w(site setup-local-site-svn) do
+  puts "Uploading new site ..."
+  sh 'rsync', '--progress', '--recursive', '--delete', '--exclude=.svn','_site/', 'site'
+  task('publish-site-svn').invoke
   puts 'Done'
 end
 

data/rakelib/stage.rake

@@ -102,7 +102,7 @@ task 'stage' => %w(clobber prepare) do |task, args|
   mkpath '_staged'
 
   lambda do
-    puts 'Ensuring all files have appropraite group and other permissions...'
+    puts 'Ensuring all files have appropriate group and other permissions...'
     sh 'find . -type f | xargs chmod go+r'
     sh 'find . -type d | xargs chmod go+rx'
     puts '[X] File permissions updated/validted.'

data/spec/core/build_spec.rb

@@ -421,9 +421,13 @@ describe Release do
       Release.find.should be_instance_of(SvnRelease)
     end
 
-    it 'should return nil if no known release process' do
-      Dir.chdir(Dir.tmpdir) do
-        Release.find.should be_nil
+    # TravisCI seems to place the tmp directory
+    # sub-ordinate to git repository so this will not work
+    unless ENV['TRAVIS_BUILD_ID']
+      it 'should return nil if no known release process' do
+        Dir.chdir(Dir.tmpdir) do
+          Release.find.should be_nil
+        end
       end
     end
 
@@ -807,9 +811,14 @@ describe GitRelease do
   end
 
   describe '#applies_to?' do
-    it 'should reject a non-git repo' do
-      Dir.chdir(Dir.tmpdir) do
-        GitRelease.applies_to?.should be_false
+
+    # TravisCI seems to place the tmp directory
+    # sub-ordinate to git repository so this will not work
+    unless ENV['TRAVIS_BUILD_ID']
+      it 'should reject a non-git repo' do
+        Dir.chdir(Dir.tmpdir) do
+          GitRelease.applies_to?.should be_false
+        end
       end
     end