buildr 1.4.6-x86-mswin32 → 1.4.7-x86-mswin32

data/doc/packaging.textile

@@ -581,6 +581,16 @@ task 'upload'=>'docs' do
 end
 {% endhighlight %}
 
+h3(#uploading-options). Uploading Options
+
+For convenience, you can also pass "any option of Net::SSH":http://net-ssh.github.com/ssh/v2/api/classes/Net/SSH.html#M000002 when configuring the remote repository.
+
+If you need to enforce to use password-only authentication for example, you can set this option:
+
+{% highlight ruby %}
+# Set password authentication only
+repositories.release_to[:options] = {:ssh_options=>{:auth_methods=> 'password'}}
+{% endhighlight %}
 
 h2(#source_javadoc). Packaging Sources and JavaDocs
 

data/doc/settings_profiles.textile

@@ -81,7 +81,7 @@ repositories:
    - https://intra.net/maven2
    - http://example.com
 
-  relase_to:
+  release_to:
     url: http://intra.net/maven2
     username: john
     password: secret
@@ -97,7 +97,7 @@ im:
 Later your buildfile or addons can reference user preferences using the  hash returned by the @Buildr.settings.user@ accessor.
 
 {% highlight ruby %}
-task 'relase-notification' do
+task 'release-notification' do
  usr, pwd, server = settings.user['im'].values_at('usr', 'pwd', 'server')
  jabber = JabberAPI.new(server, usr, pwd)
  jabber.msg("We are pleased to announce the last stable version #{VERSION}")

data/etc/KEYS

@@ -187,3 +187,47 @@ sIHg4pUCB3Z7wT6vvSs/eQ3jARt7mok3JE56JL0sV2+Z2SePiFUn/ixKdn1lKP8d
 +THIYJ/ZdpxUZeNKy7f1djoctqAk5T7ujVJh2d6xRXwqvQcJKoeW
 =6E9O
 -----END PGP PUBLIC KEY BLOCK-----
+pub   2048R/C694390E 2012-05-19 [expires: 2016-05-19]
+uid                  Peter Donald <peter.j.donald@gmail.com>
+sig 3        C694390E 2012-05-19  Peter Donald <peter.j.donald@gmail.com>
+sub   2048R/0C53F414 2012-05-19 [expires: 2016-05-19]
+sig          C694390E 2012-05-19  Peter Donald <peter.j.donald@gmail.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+mQENBE+3DnEBCACZZ1LEEPx0C5sTfAJqnFo5uUJWV9d7OPEOV4QkbYkprGAP2C80
+3L7urVzNUQQeG4XDcY89fUKpNLXtn05AKnsZLUHiPFaJnNGVnMLuGfrxAyfhAeG3
+r0XXL1t4PV1Uieq+VEO+5jmEpU9nPEE6V0EiQ5FIZvEeT3k14PFLKMOxqYIQJEHi
+tgPJySwzdhLAzPyqYUJFEOSRl3IZuibXoMf5NkGYTRuz5uZfMxrH2ht9N27L3c/e
+LpLRdXpJwP/vXuZyZ5tCEu5rIai+bjPjuza7Dd7PxMJDwj155Eg+ff2pwnhMqPXb
+K/dgP1Ek0hiRhgu6VZMe1JYE4caD0IkUQTobABEBAAG0J1BldGVyIERvbmFsZCA8
+cGV0ZXIuai5kb25hbGRAZ21haWwuY29tPokBPwQTAQIAKQUCT7cOcQIbLwUJB4Yf
+gAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEEwEMYnGlDkOIloH/iReMb39
+60hcoSV5ySR1rKlyXSIu0dgLExRMPAPc16KP7zE3q8sM1bjEolmYB8lRTnHXK2MV
+u/ukosN9CXJtp22QEJp+IQyl3aI05JEMU0/m81t9fznknUXymIvyTb1JGWqGDCaV
+/N0x71rjF+oIuUv+QeIpEki/Fy4frG4uAQkeSdwaWi9XTKyIKIgHRceZ+cOnjHuf
+RP0LmLeu1djdleJwZuIqhN5z5pOLK3Nctpg8uxCyDzVks2E47dziqwbKKoKLJrCm
+Pau05xVfV0iU0hPGG3z2Vtj1B/UqbuXAPtoz5azMloJ9idDy80rVaXsvxQ/MWbYy
+nWKM9VEAmcGw8MK5AQ0ET7cOcQEIANBmwD7KQx3bFpUl7M9rwsB5X4888fo1wXOT
+S4GsGf8J3WXh0HQR3H0u6LAfmfvaCMptJL2KwoG8w8faHYJ8W2x3kGOLkCoaTVRZ
+Paeja59+PVCFtk5VENOVL0Bgoo0BTsgRz3vA9M5riShLyvBh5bvxKOLjLpVFBalO
+7dkRQkG5mCAxF+/FwnY/nvsp2edxviLKqTn3lpyYyxS8HriTHVoIRsSLq8ybNwcz
+Us8cKkTBArV0yhbGSNcoC9AbUNpl4QPu4JBB7sI0AyrrW1wkHaPAtjdRikKbG9wL
+4Ec+M3bGiDWv7Jit7JcLAe6wLgJSZpsGLCJsZe0pEvIrActkCZ0AEQEAAYkCRAQY
+AQIADwUCT7cOcQIbLgUJB4YfgAEpCRBMBDGJxpQ5DsBdIAQZAQIABgUCT7cOcQAK
+CRBYyoUHDFP0FJIMCAClB/aYgeL4V04LcQK1dWLxg8pTXiI25TVmWCc+ZwTlN5dN
+SujGZ6ctjjmZAfl/sG5AtQMKLlMh6csuYjjBvuloyFAmTvEPSlTMAmyPuUPWvcYh
+l+1rB3J07+IDEIRppUngXqqd3m6hDbZlTFZWVPyl7lByaiim9R9C9s0Bo03jzogc
+ueVDOMeDYuXfjYR/bMFLvyCwpHgdr5xg7IVmaJLMiAOqtnT2mJylBv5mSZse+XG8
+nExh2tRpdX+yKlS8R1Kbf4T9F5XnA91bR3J2Gd2YaGuCXhBKnKTeBDISVhuuv5bX
+ATKD57tKl8nVPdH9SKZvosFv5t+UQ+SA+iBf6nbgQ9wH/jRFStYfDJTeyhQOoFQL
+zIz/zuq6iddlV6T5E6DRbjj//e1nBWYFUzHyJ57ZKMvopRidhHRiFY+ZAdlhn/wf
+efq/08hyqtAb0Y4bXdAPMLOIxC1vD8rlk8t36Ec8jepLzgB6g7+oxc4/zfTZIFdX
+h/xR2AmxTe9fsE6xYWOFKb036s5fbr2ED1qWCPN14o+8ZgV93rq3deQS8TzCqFZ0
+yYEv5T1E0TZ2YD4O3+Ftnd+Q46US1KXCHmSkv461wvTnPaLnGK7D+uZzXlQsGI37
+ApsiYNbEfoq0U4Fj3PFsWXMHngom5lNWLlVSpn7zvhAIwpXY/Np3YFx5BVchCDBG
+IAU=
+=dNyx
+-----END PGP PUBLIC KEY BLOCK-----

data/lib/buildr.rb

@@ -17,12 +17,75 @@ unless defined?(Buildr::VERSION)
   require 'buildr/version'
 end
 
-require 'buildr/core'
-require 'buildr/packaging'
-require 'buildr/java'
-require 'buildr/ide'
+require 'rake'
+include Rake::DSL
+Rake::TaskManager.record_task_metadata = true
+
+require 'rbconfig'
+require 'pathname'
+autoload :Tempfile, 'tempfile'
+autoload :YAML, 'yaml'
+autoload :REXML, 'rexml/document'
+autoload :XmlSimple, 'xmlsimple'
+autoload :Builder, 'builder' # A different kind of buildr, one we use to create XML.
+require 'highline/import'
+autoload :RSpec, 'rspec'
+require 'erb'
+require 'find'
+require 'uri'
+require 'stringio'
+require 'fileutils'
+
+require 'buildr/core/util'
+require 'buildr/core/common'
+require 'buildr/core/application'
+require 'buildr/core/jrebel'
+require 'buildr/core/project'
+require 'buildr/core/environment'
+require 'buildr/core/help'
+require 'buildr/core/checks'
+require 'buildr/core/build'
+require 'buildr/core/filter'
+require 'buildr/core/compile'
+require 'buildr/core/test'
 require 'buildr/shell'
+require 'buildr/java/commands'
+require 'buildr/core/shell'
 require 'buildr/run'
+require 'buildr/core/run'
+require 'buildr/core/transports'
+require 'buildr/java/pom'
+require 'buildr/core/generate'
+require 'buildr/core/cc'
+require 'buildr/core/doc'
+require 'buildr/core/osx' if RUBY_PLATFORM =~ /darwin/
+require 'buildr/core/linux' if RUBY_PLATFORM =~ /linux/
+require 'buildr/packaging/version_requirement'
+require 'buildr/packaging/artifact_namespace'
+require 'buildr/packaging/artifact'
+require 'buildr/packaging/package'
+require 'buildr/packaging/archive'
+require 'buildr/packaging/ziptask'
+require 'buildr/packaging/tar'
+require 'buildr/packaging/gems'
+require 'buildr/packaging/zip'
+require RUBY_PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
+require 'buildr/java/ant'
+require 'buildr/java/compiler'
+require 'buildr/java/external'
+require 'buildr/java/tests'
+require 'buildr/java/test_result'
+require 'buildr/java/bdd'
+require 'buildr/java/packaging'
+require 'buildr/java/commands'
+require 'buildr/java/doc'
+require 'buildr/java/deprecated'
+require 'buildr/ide/idea'
+require 'buildr/ide/eclipse'
+# Order is significant for auto-detection, from most specific to least
+require 'buildr/ide/eclipse/plugin'
+require 'buildr/ide/eclipse/scala'
+require 'buildr/ide/eclipse/java'
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)
 # and class methods when invoked like Buildr.artifacts().

data/lib/buildr/clojure.rb

@@ -14,8 +14,6 @@
 # the License.
 
 
-require 'buildr/core/util'
-
 module Buildr::Clojure
 
   REQUIRES = ArtifactNamespace.for(self) do |ns|

data/lib/buildr/core/application.rb

@@ -36,18 +36,10 @@
 # SOFTWARE.
 
 
-require 'rake'
-require 'highline/import'
-require 'rubygems/source_info_cache' if Gem::VERSION =~ /1.[0-4]/
-require 'buildr/core/util'
-Gem.autoload :SourceInfoCache, 'rubygems/source_info_cache' if Gem::VERSION =~ /1.[0-4]/
-
-
 # Gem::user_home is nice, but ENV['HOME'] lets you override from the environment.
 ENV['HOME'] ||= File.expand_path(Gem::user_home)
 ENV['BUILDR_ENV'] ||= 'development'
 
-
 module Buildr
 
   # Provide settings that come from three sources.
@@ -428,36 +420,35 @@ module Buildr
 
     # Load/install all Gems specified in build.yaml file.
     def load_gems #:nodoc:
-      missing_deps, installed = listed_gems.partition { |gem| gem.is_a?(Gem::Dependency) }
+      installed, missing_deps = listed_gems
       unless missing_deps.empty?
-        newly_installed = Util::Gems.install(*missing_deps)
-        installed += newly_installed
-      end
-      installed.each do |spec|
-        if gem(spec.name, spec.version.to_s)
-          # TODO: is this intended to load rake tasks from the installed gems?
-          # We should use a convention like .. if the gem has a _buildr.rb file, load it.
-
-          #FileList[spec.require_paths.map { |path| File.expand_path("#{path}/*.rb", spec.full_gem_path) }].
-          #  map { |path| File.basename(path) }.each { |file| require file }
-          #FileList[File.expand_path('tasks/*.rake', spec.full_gem_path)].each do |file|
-          #  Buildr.application.add_import file
-          #end
-        end
+        fail Gem::LoadError, "Build requires the gems #{missing_deps.join(', ')}, which cannot be found in the local repository. Please install the gems before attempting to build project."
       end
+      installed.each { |spec| spec.activate }
       @gems = installed
     end
 
-    # Returns Gem::Specification for every listed and installed Gem, Gem::Dependency
-    # for listed and uninstalled Gem, which is the installed before loading the buildfile.
+    # Returns two lists. The first contains a Gem::Specification for every listed and installed
+    # Gem, the second contains a Gem::Dependency for every listed and uninstalled Gem.
     def listed_gems #:nodoc:
-      Array(settings.build['gems']).map do |dep|
-        name, trail = dep.scan(/^\s*(\S*)\s*(.*)\s*$/).first
-        versions = trail.scan(/[=><~!]{0,2}\s*[\d\.]+/)
-        versions = ['>= 0'] if versions.empty?
-        dep = Gem::Dependency.new(name, versions)
-        Gem::SourceIndex.from_installed_gems.search(dep).last || dep
+      found = []
+      missing = []
+      Array(settings.build['gems']).each do |dep|
+        name, versions = parse_gem_dependency(dep)
+        begin
+          found << Gem::Specification.find_by_name(name, versions)
+        rescue Exception
+          missing << Gem::Dependency.new(name, versions)
+        end
       end
+      return [found, missing]
+    end
+
+    def parse_gem_dependency(dep) #:nodoc:
+      name, trail = dep.scan(/^\s*(\S*)\s*(.*)\s*$/).first
+      versions = trail.scan(/[=><~!]{0,2}\s*[\d\.]+/)
+      versions = ['>= 0'] if versions.empty?
+      return name, versions
     end
 
     # Load artifact specs from the build.yaml file, making them available
@@ -637,7 +628,7 @@ def trace?(*category)
   options = Buildr.application.options
   return options.trace if category.empty?
   return true if options.trace_all
-  return false unless Buildr.application.options.trace_categories
+  return false unless options.trace_categories
   options.trace_categories.include?(category.first)
 end
 

data/lib/buildr/core/build.rb

@@ -13,13 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-require 'buildr/core/checks'
-require 'buildr/core/environment'
-
-
 module Buildr
 
   class Options

data/lib/buildr/core/cc.rb

@@ -13,11 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/core/common'
-require 'buildr/core/project'
-require 'buildr/core/build'
-require 'buildr/core/compile'
-
 module Buildr
   class CCTask < Rake::Task
     attr_accessor :delay

data/lib/buildr/core/checks.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-autoload :RSpec, 'rspec'
-
 module Buildr
   # Methods added to Project to allow checking the build.
   module Checks

data/lib/buildr/core/common.rb

@@ -13,11 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'rake'
-require 'buildr/core/util'
-
-
 module Buildr
 
   # :call-seq:

data/lib/buildr/core/compile.rb

@@ -13,11 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/common'
-require 'find'
-
-
 module Buildr
 
   # The underlying compiler used by CompileTask.
@@ -51,9 +46,9 @@ module Buildr
       def compilers
         @compilers ||= []
       end
-      
+
       private
-      
+
       # Only used by our specs.
       def compilers=(compilers)
         @compilers = compilers
@@ -92,8 +87,8 @@ module Buildr
           paths = task.sources + [sources].flatten.map { |src| Array(project.path_to(:source, task.usage, src.to_sym)) }
           paths.flatten!
           ext_glob = Array(source_ext).join(',')
-          
-          paths.each { |path| 
+
+          paths.each { |path|
             Find.find(path) {|found|
               if (!File.directory?(found)) && found.match(/.*\.#{Array(source_ext).join('|')}/)
                 return true
@@ -192,7 +187,7 @@ module Buildr
           else
             # try to extract package name from .java or .scala files
             if ['.java', '.scala', '.groovy'].include? File.extname(source)
-              package = findFirst(source, /^\s*package\s+(\S+)\s*;?\s*$/)
+              package = findFirst(source, /^\s*package\s+([^\s;]+)\s*;?\s*/)
               map[source] = package ? File.join(target, package[1].gsub('.', '/'), File.basename(source).ext(target_ext)) : target
             elsif
               map[source] = target

data/lib/buildr/core/doc.rb

@@ -112,7 +112,13 @@ module Buildr
       # Includes additional source files and directories when generating the documentation
       # and returns self. When specifying a directory, includes all source files in that directory.
       def include(*files)
-        @files.include *files.flatten.compact
+        files.each do |file|
+          if file.respond_to? :to_ary
+            include(*file.to_ary)
+          else
+            @files.include *files.flatten.compact.collect { |f| File.expand_path(f.to_s) }
+          end
+        end
         self
       end
 
@@ -121,7 +127,7 @@ module Buildr
       #
       # Excludes source files and directories from generating the documentation.
       def exclude(*files)
-        @files.exclude *files
+        @files.exclude *files.collect{|f|File.expand_path(f)}
         self
       end
 
@@ -205,7 +211,7 @@ module Buildr
       def source_files #:nodoc:
         @source_files ||= @files.map(&:to_s).map do |file|
           Array(engine.class.source_ext).map do |ext|
-            File.directory?(file) ? FileList[File.join(file, "**/*.#{ext}")] : file
+            File.directory?(file) ? FileList[File.join(file, "**/*.#{ext}")] : File.expand_path(file)
           end
         end.flatten.reject { |file| @files.exclude?(file) }
       end

data/lib/buildr/core/environment.rb

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

data/lib/buildr/core/filter.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'erb'
-
-
 module Buildr
 
   # A filter knows how to copy files from one directory to another, applying mappings to the
@@ -364,7 +360,6 @@ module Buildr
         else
           bnd = config.instance_eval { binding }
         end
-        require 'erb'
         ERB.new(content).result(bnd)
       end
 

data/lib/buildr/core/generate.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/java/pom'
-
-
 module Buildr
   module Generate #:nodoc:
 
@@ -56,7 +52,7 @@ GROUP = "#{name}"
 COPYRIGHT = ""
 
 # Specify Maven 2.0 remote repositories here, like this:
-repositories.remote << "http://www.ibiblio.org/maven2/"
+repositories.remote << "http://repo1.maven.org/maven2"
 
 desc "The #{name.capitalize} project"
 define "#{name}" do
@@ -126,7 +122,7 @@ define "#{name}" do
             legacy = repository["layout"].to_s =~ /legacy/
             !legacy
           } rescue nil
-          repositories = [{"name" => "Standard maven2 repository", "url" => "http://www.ibiblio.org/maven2"}] if repositories.nil? || repositories.empty?
+          repositories = [{"name" => "Standard maven2 repository", "url" => "http://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
           repositories.each do |repository|
             name, url = repository["name"], repository["url"]
             script << "# #{name}"