buildr 1.4.2-x86-mswin32 → 1.4.3-x86-mswin32

data/lib/buildr/core/doc.rb

@@ -74,7 +74,6 @@ module Buildr
       # Returns the documentation tool options.
       attr_reader :options
 
-      
       attr_reader :project # :nodoc:
 
       def initialize(*args) #:nodoc:
@@ -158,6 +157,19 @@ module Buildr
         @engine ||= guess_engine
       end
 
+      # :call-seq:
+      #   engine?(clazz) => boolean
+      #
+      # Check if the underlying engine is an instance of the given class
+      def engine?(clazz)
+        begin
+          @engine ||= guess_engine if project.compile.language
+        rescue
+          return false
+        end
+        @engine.is_a?(clazz) if @engine
+      end
+
       # :call-seq:
       #   from(*sources) => self
       #
@@ -221,15 +233,14 @@ module Buildr
       Project.local_task :doc
     end
 
-    before_define do |project|
+    before_define(:doc) do |project|
       DocTask.define_task('doc').tap do |doc|
         doc.send(:associate_with, project)
         doc.into project.path_to(:target, :doc)
-        doc.using :windowtitle=>project.comment || project.name
       end
     end
 
-    after_define do |project|
+    after_define(:doc) do |project|
       project.doc.from project
     end
 

data/lib/buildr/core/run.rb

@@ -0,0 +1,43 @@
+# 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/run'
+require 'buildr/java/commands'
+require 'buildr/core/util'
+
+module Buildr
+  module Run
+
+    class JavaRunner < Base
+      include Shell::JavaRebel
+
+      specify :name => :java, :languages => [:java, :scala, :groovy, :clojure]
+
+      def run(task)
+        fail "Missing :main option" unless task.options[:main]
+        cp = project.compile.dependencies + [project.path_to(:target, :classes)] + task.classpath
+        Java::Commands.java(task.options[:main], {
+          :properties => rebel_props(project).merge(task.options[:properties] || {}),
+          :classpath => cp,
+          :java_args => rebel_args + (task.options[:java_args] || [])
+        })
+      end
+    end # JavaRunnner
+
+  end
+end
+
+Buildr::Run.runners << Buildr::Run::JavaRunner
+

data/lib/buildr/core/util.rb

@@ -54,7 +54,7 @@ module Buildr
     def ruby(*args)
       options = Hash === args.last ? args.pop : {}
       cmd = []
-      ruby_bin = File.normalize_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
+      ruby_bin = normalize_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
       if options.delete(:sudo) && !(win_os? || Process.uid == File.stat(ruby_bin).uid)
         cmd << 'sudo' << '-u' << "##{File.stat(ruby_bin).uid}"
       end
@@ -142,8 +142,20 @@ module Buildr
       # is not running interactively (on a tty)
       def install(*dependencies)
         raise ArgumentError, "Expected at least one argument" if dependencies.empty?
-        remote = dependencies.map{ |dep| Gem.source_index.search(dep).last || Gem::SpecFetcher.fetcher.fetch( dep, true ).map{ |spec, source| spec }.last } 
-        not_found_deps, to_install = remote.partition { |gem| gem.is_a?(Gem::Dependency) || gem.nil? }
+        not_found_deps = []
+        to_install = []
+        remote = dependencies.each do |dep|
+          if spec = Gem.source_index.search(dep).last
+            # Found in local repo
+            to_install << spec
+          elsif (spec = Gem::SpecFetcher.fetcher.fetch(dep, true).map { |spec, source| spec }.last)
+            # Found in remote repo
+            to_install << spec
+          else
+            # Not found anywhere
+            not_found_deps << "#{dep.name} #{dep.requirement}"
+          end
+        end
         fail Gem::LoadError, "Build requires the gems #{not_found_deps.join(', ')}, which cannot be found in local or remote repository." unless not_found_deps.empty?
         uses = "This build requires the gems #{to_install.map(&:full_name).join(', ')}:"
         fail Gem::LoadError, "#{uses} to install, run Buildr interactively." unless $stdout.isatty
@@ -330,6 +342,12 @@ end
 if Buildr::Util.java_platform?
   require 'ffi'
 
+  # Workaround for BUILDR-535: when requiring 'ffi', JRuby defines an :error
+  # method with arity 0.
+  class Module
+    remove_method :error if method_defined?(:error)
+  end
+
   # Fix for BUILDR-292.
   # JRuby fails to rename a file on different devices
   # this monkey-patch wont be needed when JRUBY-3381 gets resolved.

data/lib/buildr/java/doc.rb

@@ -18,6 +18,18 @@ require 'buildr/core/doc'
 module Buildr
   module Doc
 
+    module JavadocDefaults
+      include Extension
+
+      # Default javadoc -windowtitle to project's comment or name
+      after_define(:javadoc => :doc) do |project|
+        if project.doc.engine? Javadoc
+          options = project.doc.options
+          options[:windowtitle] = (project.comment || project.name) unless options[:windowtitle]
+        end
+      end
+    end
+
     # A convenient task for creating Javadocs from the project's compile task. Minimizes all
     # the hard work to calling #from and #using.
     #
@@ -65,6 +77,10 @@ module Buildr
       end
     end
   end
+
+  class Project
+    include JavadocDefaults
+  end
 end
 
 Buildr::Doc.engines << Buildr::Doc::Javadoc

data/lib/buildr/java/packaging.rb

@@ -56,9 +56,14 @@ module Buildr
           #
           # Parse the MANIFEST.MF entry of a ZIP (or JAR) file and return a new Manifest.
           def from_zip(file)
-            Zip::ZipFile.open(file.to_s) do |zip|
-              Manifest.parse zip.read('META-INF/MANIFEST.MF') rescue Manifest.new
+            Zip::ZipInputStream::open(file.to_s) do |zip|
+              while (entry = zip.get_next_entry)
+                if entry.name == 'META-INF/MANIFEST.MF'
+                  return Manifest.parse zip.read
+                end
+              end
             end
+            Manifest.new
           end
 
           # :call-seq:
@@ -257,7 +262,7 @@ module Buildr
           @classes = []
           @libs = []
           enhance do |war|
-            @libs.each {|lib| lib.invoke}
+            @libs.each {|lib| lib.invoke if lib.respond_to?(:invoke) }
             @classes.to_a.flatten.each { |classes| include classes, :as => 'WEB-INF/classes' }
             path('WEB-INF/lib').include Buildr.artifacts(@libs) unless @libs.nil? || @libs.empty?
           end
@@ -625,7 +630,7 @@ module Buildr
           selected = options[:only] ? projects(options[:only]) :
             options[:except] ? ([self] + projects - projects(options[:except])) :
             [self] + projects
-          selected.reject { |project| project.compile.sources.empty? }.
+          selected.reject { |project| project.compile.sources.empty? && project.resources.target.nil? }.
             each { |project| project.package(:sources) }
         end
       end

data/lib/buildr/packaging/archive.rb

@@ -202,7 +202,7 @@ module Buildr
     end
 
     def include_as(source, as)
-        
+
         @sources << proc { source }
         @actions << proc do |file_map|
           file = source.to_s
@@ -212,19 +212,19 @@ module Buildr
                 path = rel_path.split('/')[1..-1]
                 path.unshift as unless as == '.'
                 dest = "#{@path}#{path.join('/')}"
-                unless excluded?(dest) 
+                unless excluded?(dest)
                   trace "Adding #{dest}"
                   file_map[dest] = file
                 end
               end
               unless as == "."
                 trace "Adding #{@path}#{as}/"
-                file_map["#{@path}#{as}/"] = file #as is a folder, so the trailing / is required.
+                file_map["#{@path}#{as}/"] = nil # :as is a folder, so the trailing / is required.
               end
             else
               file_map["#{@path}#{as}"] = file
             end
-            
+
           end
         end
       end

data/lib/buildr/packaging/artifact.rb

@@ -488,23 +488,23 @@ module Buildr
     end
 
    protected
-  
+
     # :call-seq:
     #   needed?
     #
     # Validates whether artifact is required to be downloaded from repository
     def needed?
-      return true if snapshot? && File.exist?(name) && old?
-      super      
+      return true if snapshot? && File.exist?(name) && (update_snapshot? || old?)
+      super
     end
-    
+
   private
-  
+
     # :call-seq:
     #   download_artifact
     #
-    # Downloads artifact from given repository, 
-    # supports downloading snapshot artifact with relocation on succeed to local repository 
+    # Downloads artifact from given repository,
+    # supports downloading snapshot artifact with relocation on succeed to local repository
     def download_artifact(path)
       download_file = "#{name}.#{Time.new.to_i}"
       begin
@@ -517,7 +517,7 @@ module Buildr
         File.delete(download_file) if File.exist?(download_file)
       end
     end
-    
+
     # :call-seq:
     #   :download_needed?
     #
@@ -529,22 +529,22 @@ module Buildr
         return false if offline? && File.exist?(name)
         return true if update_snapshot? || old?
       end
-      
+
       return false
     end
-    
+
     def update_snapshot?
       Buildr.application.options.update_snapshots
     end
-    
+
     def offline?
       Buildr.application.options.work_offline
     end
-    
+
     # :call-seq:
     #   old?
     #
-    # Checks whether existing artifact is older than period from build settings or one day 
+    # Checks whether existing artifact is older than period from build settings or one day
     def old?
       settings = Buildr.application.settings
       time_to_be_old = settings.user[:expire_time] || settings.build[:expire_time] || 60 * 60 * 24
@@ -706,7 +706,8 @@ module Buildr
     #   repositories.release_to[:password] = 'secret'
     def release_to
       unless @release_to
-        value = Buildr.settings.user['repositories'] && Buildr.settings.user['repositories']['release_to']
+        value = (Buildr.settings.user['repositories'] && Buildr.settings.user['repositories']['release_to']) \
+          || (Buildr.settings.build['repositories'] && Buildr.settings.build['repositories']['release_to'])
         @release_to = Hash === value ? value.inject({}) { |hash, (key, value)| hash.update(key.to_sym=>value) } : { :url=>Array(value).first }
       end
       @release_to
@@ -757,7 +758,7 @@ module Buildr
       Rake::Task['rake:artifacts'].enhance [task]
       Artifact.register(task)
       unless spec[:type] == :pom
-        Rake::Task['artifacts:sources'].enhance [task.sources_artifact] 
+        Rake::Task['artifacts:sources'].enhance [task.sources_artifact]
         Rake::Task['artifacts:javadoc'].enhance [task.javadoc_artifact]
       end
     end

data/lib/buildr/packaging/package.rb

@@ -237,7 +237,7 @@ module Buildr
 
     def package_as_sources(file_name) #:nodoc:
       ZipTask.define_task(file_name).tap do |zip|
-        zip.include :from=>compile.sources
+        zip.include :from=>[compile.sources, resources.target].compact
       end
     end
 

data/lib/buildr/packaging/ziptask.rb

@@ -59,14 +59,16 @@ module Buildr
       Zip::ZipOutputStream.open name do |zip|
         seen = {}
         mkpath = lambda do |dir|
-          unless dir == '.' || seen[dir]
-            mkpath.call File.dirname(dir)
-            zip.put_next_entry(dir + '/', compression_level)
-            seen[dir] = true
+          dirname = (dir[-1..-1] =~ /\/$/) ? dir : dir + '/'
+          unless dir == '.' || seen[dirname]
+            mkpath.call File.dirname(dirname)
+            zip.put_next_entry(dirname, compression_level)
+            seen[dirname] = true
           end
         end
 
         file_map.each do |path, content|
+          warn "Warning:  Path in zipfile #{name} contains backslash: #{path}" if path =~ /\\/
           mkpath.call File.dirname(path)
           if content.respond_to?(:call)
             zip.put_next_entry(path, compression_level)

data/lib/buildr/run.rb

@@ -0,0 +1,202 @@
+# 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
+  module Run
+    include Extension
+
+    class << self
+      def runners
+        @runners ||= []
+      end
+
+      def select_by_lang(lang)
+        fail 'Unable to define run task for nil language' if lang.nil?
+        runners.detect { |e| e.languages.nil? ? false : e.languages.include?(lang.to_sym) }
+      end
+
+      alias_method :select, :select_by_lang
+
+      def select_by_name(name)
+        fail 'Unable to define run task for nil' if name.nil?
+        runners.detect { |e| e.to_sym == name.to_sym }
+      end
+
+    end
+
+    # Base class for any run provider.  Defines most
+    # common functionality (things like @lang@, @build?@ and friends).
+    class Base
+      attr_reader :project
+
+      class << self
+        attr_accessor :name, :languages
+
+        def specify(options)
+          @name ||= options[:name]
+          @languages ||= options[:languages]
+        end
+
+        def to_sym
+          @name ||= name.split('::').last.downcase.to_sym
+        end
+      end
+
+      def initialize(project)
+        @project = project
+      end
+
+      def build?
+        true
+      end
+
+      def launch
+        fail 'Not implemented'
+      end
+    end
+
+    class RunTask < Rake::Task
+      # Classpath dependencies.
+      attr_accessor :classpath
+
+      # Returns the run options.
+      attr_reader :options
+
+      # Returns file dependencies
+      attr_reader :files
+
+      attr_reader :project # :nodoc:
+
+      def initialize(*args) # :nodoc:
+        super
+        @options = {}
+        @classpath = []
+        @files = FileList[]
+      end
+
+      # :call-seq:
+      #   with(*artifacts) => self
+      #
+      # Adds files and artifacts as classpath dependencies, and returns self.
+      def with(*specs)
+        @classpath |= Buildr.artifacts(specs.flatten).uniq
+        self
+      end
+
+      # :call-seq:
+      #   using(options) => self
+      #
+      # Sets the run options from a hash and returns self.
+      #
+      # For example:
+      #   run.using :main=>'org.example.Main'
+      def using(*args)
+        args.pop.each { |key, value| @options[key.to_sym] = value } if Hash === args.last
+
+        until args.empty?
+          new_runner = Run.select_by_name(args.pop)
+          @runner = new_runner.new(project) unless new_runner.nil?
+        end
+
+        self
+      end
+
+      # :call-seq:
+      #   requires(*files) => self
+      #
+      # Adds additional files and directories as dependencies to the task and returns self.
+      # When specifying a directory, includes all files in that directory.
+      def requires(*files)
+        @files.include *files.flatten.compact
+        self
+      end
+
+      def runner
+        @runner ||= guess_runner
+      end
+
+      # :call-seq:
+      #   runner?(clazz) => boolean
+      #
+      # Check if the underlying runner is an instance of the given class.
+      # If no class is supplied, simply check if runner is defined.
+      def runner?(clazz = nil)
+        begin
+          @runner ||= guess_runner if project.compile.language
+        rescue
+          return false
+        end
+        return !@runner.nil? unless clazz
+        @runner.is_a?(clazz) if @runner
+      end
+
+      def run
+        runner.run(self) if runner?
+      end
+
+      def prerequisites #:nodoc:
+        super + @files + classpath
+      end
+
+    private
+
+      def guess_runner
+        runner = Run.select project.compile.language
+        fail 'Unable to guess runner for project.' unless runner
+        runner.new project
+      end
+
+      def associate_with(project)
+        @project ||= project
+      end
+    end
+
+    first_time do
+      Project.local_task 'run'
+    end
+
+    before_define(:run => :test) do |project|
+      RunTask.define_task('run').tap do |run|
+        run.send(:associate_with, project)
+        run.enhance([project.compile, project.test]) do |t|
+          # double-enhance to execute the runner last
+          run.enhance { |t| t.run }
+        end
+      end
+    end
+
+    after_define(:run => :test) do |project|
+      project.run.with project.test.compile.dependencies
+      project.run.with project.test.compile.target if project.test.compile.target
+    end
+
+    # :call-seq:
+    #   run(&block) => RunTask
+    #
+    # This method returns the project's run task. It also accepts a block to be executed
+    # when the run task is invoked.
+    def run(&block)
+      task('run').tap do |t|
+        t.enhance &block if block
+      end
+    end
+
+  end
+
+  class Project
+    include Run
+  end
+end