buildr 1.4.4 → 1.4.5

data/lib/buildr/core/application.rb

@@ -38,9 +38,9 @@
 
 require 'rake'
 require 'highline/import'
-require 'rubygems/source_info_cache'
+require 'rubygems/source_info_cache' if Gem::VERSION =~ /1.[0-4]/
 require 'buildr/core/util'
-Gem.autoload :SourceInfoCache, 'rubygems/source_info_cache'
+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.
@@ -187,6 +187,20 @@ module Buildr
       @on_failure << block
     end
 
+    # Call on_completion hooks with the given title and message
+    def build_completed(title, message)
+      @on_completion.each do |block|
+        block.call(title, message) rescue nil
+      end
+    end
+
+    # Call on_failure hooks with the given title, message and exception
+    def build_failed(title, message, ex = nil)
+      @on_failure.each do |block|
+        block.call(title, message, ex) rescue nil
+      end
+    end
+
     # :call-seq:
     #   deprecated(message)
     #
@@ -241,9 +255,7 @@ module Buildr
           # On OS X this will load Cocoa and Growl which takes half a second we
           # don't want to measure, so put this after the console message.
           title, message = "Your build has completed", "#{Dir.pwd}\nbuildr #{@top_level_tasks.join(' ')}"
-          @on_completion.each do |block|
-            block.call(title, message) rescue nil
-          end
+          build_completed(title, message)
         end
       end
     end
@@ -530,9 +542,7 @@ module Buildr
       rescue Exception => ex
         ex_msg = ex.class.name == "Exception" ? ex.message : "#{ex.class.name} : #{ex.message}"
         title, message = "Your build failed with an error", "#{Dir.pwd}:\n#{ex_msg}"
-        @on_failure.each do |block|
-          block.call(title, message, ex) rescue nil
-        end
+        build_failed(title, message, ex)
         # Exit with error message
         $stderr.puts "Buildr aborted!"
         $stderr.puts $terminal.color(ex_msg, :red)

data/lib/buildr/core/build.rb

@@ -211,7 +211,7 @@ module Buildr
     end
 
     def copy(dir, url, message)
-      svn 'copy', dir, url, '-m', message
+      svn 'copy', '--parents', dir, url, '-m', message
     end
 
     def remove(url, message)
@@ -513,4 +513,4 @@ end
 
 class Buildr::Project
   include Buildr::Build
-end
+end

data/lib/buildr/core/cc.rb

@@ -33,117 +33,112 @@ module Buildr
 
   private
 
+    # run block on sub-projects depth-first, then on this project
+    def each_project(&block)
+      depth_first = lambda do |p|
+        p.projects.each { |c| depth_first.call(c, &block) }
+        block.call(p)
+      end
+      depth_first.call(@project)
+    end
+
     def associate_with(project)
       @project = project
     end
 
     def monitor_and_compile
-      # we don't want to actually fail if our dependencies don't succede
+      # we don't want to actually fail if our dependencies don't succeed
       begin
-        [:compile, 'test:compile'].each { |name| project.task(name).invoke }
-        notify_build_status(true, project)
+        each_project { |p| p.test.compile.invoke }
+        build_completed(project)
       rescue Exception => ex
         $stderr.puts $terminal.color(ex.message, :red)
         $stderr.puts
 
-        notify_build_status(false, project)
+        build_failed(project, ex)
       end
 
-      main_dirs = project.compile.sources.map(&:to_s)
-      test_dirs = project.task('test:compile').sources.map(&:to_s)
-      res_dirs = project.resources.sources.map(&:to_s)
-      
-      main_ext = Buildr::Compiler.select(project.compile.compiler).source_ext.map(&:to_s) unless project.compile.compiler.nil?
-      test_ext = Buildr::Compiler.select(project.task('test:compile').compiler).source_ext.map(&:to_s) unless project.task('test:compile').compiler.nil?
-
-      test_tail = if test_dirs.empty? then '' else ",{#{test_dirs.join ','}}/**/*.{#{test_ext.join ','}}" end
-      res_tail = if res_dirs.empty? then '' else ",{#{res_dirs.join ','}}/**/*" end
-
-      pattern = "{{#{main_dirs.join ','}}/**/*.{#{main_ext.join ','}}#{test_tail}#{res_tail}}"
-
-      times, _ = check_mtime pattern, {}     # establish baseline
-
-      dir_names = (main_dirs + test_dirs + res_dirs).map { |file| strip_filename project, file }
-      if dir_names.length == 1
-        info "Monitoring directory: #{dir_names.first}"
+      dirs = []
+      each_project do |p|
+        dirs += p.compile.sources.map(&:to_s)
+        dirs += p.test.compile.sources.map(&:to_s)
+        dirs += p.resources.sources.map(&:to_s)
+      end
+      if dirs.length == 1
+        info "Monitoring directory: #{dirs.first}"
       else
-        info "Monitoring directories: [#{dir_names.join ', '}]"
+        info "Monitoring directories: [#{dirs.join ', '}]"
       end
-      trace "Monitoring extensions: [#{main_ext.join ', '}]"
+
+      timestamps = lambda do
+        times = {}
+        dirs.each { |d| Dir.glob("#{d}/**/*").map { |f| times[f] = File.mtime f } }
+        times
+      end
+
+      old_times = timestamps.call()
 
       while true
         sleep delay
 
-        times, changed = check_mtime pattern, times
+        new_times = timestamps.call()
+        changed = changed(new_times, old_times)
+        old_times = new_times
+
         unless changed.empty?
           info ''    # better spacing
 
           changed.each do |file|
-            info "Detected changes in #{strip_filename project, file}"
-          end
-
-          in_main = main_dirs.any? do |dir|
-            changed.any? { |file| file.index(dir) == 0 }
+            info "Detected changes in #{file}"
           end
 
-          in_test = test_dirs.any? do |dir|
-            changed.any? { |file| file.index(dir) == 0 }
+          each_project do |p|
+            # transitively reenable prerequisites
+            reenable = lambda do |t|
+              t = task(t)
+              t.reenable
+              t.prerequisites.each { |c| reenable.call(c) }
+            end
+            reenable.call(p.test.compile)
           end
 
-          in_res = res_dirs.any? do |dir|
-            changed.any? { |file| file.index(dir) == 0 }
-          end
-
-          project.task(:compile).reenable if in_main
-          project.task('test:compile').reenable if in_test || in_main
-
           successful = true
           begin
-            project.task(:resources).filter.run if in_res
-            project.task(:compile).invoke if in_main
-            project.task('test:compile').invoke if in_test || in_main
+            each_project { |p| p.test.compile.invoke }
+            build_completed(project)
           rescue Exception => ex
             $stderr.puts $terminal.color(ex.message, :red)
+            build_failed(project, ex)
             successful = false
           end
 
-          notify_build_status(successful, project)
           puts $terminal.color("Build complete", :green) if successful
         end
       end
     end
 
-    def notify_build_status(successful, project)
-       if RUBY_PLATFORM =~ /darwin/ && $stdout.isatty && verbose
-         if successful
-           growl_notify('Completed', 'Your build has completed', project.path_to)
-         else
-           growl_notify('Failed', 'Your build has failed with an error', project.path_to)
-         end
-       end
+    def build_completed(project)
+      Buildr.application.build_completed('Compilation successful', project.path_to)
     end
 
-    def check_mtime(pattern, old_times)
-      times = {}
-      changed = []
+    def build_failed(project, ex = nil)
+      Buildr.application.build_failed('Compilation failed', project.path_to, ex)
+    end
 
-      Dir.glob pattern do |fname|
-        times[fname] = File.mtime fname
-        if old_times[fname].nil? || old_times[fname] < File.mtime(fname)
+    def changed(new_times, old_times)
+      changed = []
+      new_times.each do |(fname,newtime)|
+        if old_times[fname].nil? || old_times[fname] < newtime
           changed << fname
         end
       end
 
       # detect deletion (slower than it could be)
       old_times.each_key do |fname|
-        changed << fname unless times.has_key? fname
+        changed << fname unless new_times.has_key? fname
       end
 
-      [times, changed]
-    end
-
-    def strip_filename(project, name)
-      name.gsub project.base_dir + File::SEPARATOR, ''
+      changed
     end
   end
 
@@ -158,7 +153,6 @@ module Buildr
     before_define do |project|
       cc = CCTask.define_task :cc
       cc.send :associate_with, project
-      project.recursive_task(:cc)
     end
 
     def cc

data/lib/buildr/core/checks.rb

@@ -15,8 +15,7 @@
 
 
 require 'buildr/core/project'
-autoload :Spec, 'spec'
-
+autoload :RSpec, 'rspec'
 
 module Buildr
   # Methods added to Project to allow checking the build.
@@ -90,7 +89,7 @@ module Buildr
         @description = args.pop if String === args.last
         @subject = args.shift
         raise ArgumentError, "Expecting subject followed by description, and either one is optional. Not quite sure what to do with this list of arguments." unless args.empty?
-        @block = block || lambda { info "Pending: #{description}" }
+        @block = block || lambda { |klass| info "Pending: #{description}" }
       end
 
       # :call-seq:
@@ -120,7 +119,7 @@ module Buildr
           end
           define_method(:it) { subject }
           define_method(:description) { description }
-          include Spec::Matchers
+          include ::RSpec::Matchers
           include Matchers
         end
 
@@ -148,8 +147,8 @@ module Buildr
             passed
           rescue Exception=>ex
             if verbose
-              error ex.backtrace.select { |line| line =~ /#{Buildr.application.buildfile}/ }.join("\n")
               error ex
+              error ex.backtrace.select { |line| line =~ /#{Buildr.application.buildfile}/ }.join("\n")
             end
             false
           end

data/lib/buildr/core/doc.rb

@@ -204,7 +204,9 @@ module Buildr
 
       def source_files #:nodoc:
         @source_files ||= @files.map(&:to_s).map do |file|
-          File.directory?(file) ? FileList[File.join(file, "**/*.#{engine.class.source_ext}")] : file
+          Array(engine.class.source_ext).map do |ext|
+            File.directory?(file) ? FileList[File.join(file, "**/*.#{ext}")] : file
+          end
         end.flatten.reject { |file| @files.exclude?(file) }
       end
 

data/lib/buildr/core/generate.rb

@@ -47,6 +47,8 @@ module Buildr
           if root
             script = HEADER.split("\n")
             header = <<-EOF
+#{"require 'buildr/scala'\n" if Dir.glob(path + "/**/*.scala").size > 0}
+#{"require 'buildr/groovy'\n" if Dir.glob(path + "/**/*.groovy").size > 0}
 # Version number for this release
 VERSION_NUMBER = "1.0.0"
 # Group identifier for your projects

data/lib/buildr/core/jrebel.rb

@@ -0,0 +1,42 @@
+# 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 JRebel
+    def jrebel_home
+      unless @jrebel_home
+        @jrebel_home = ENV['REBEL_HOME'] || ENV['JREBEL'] || ENV['JREBEL_HOME']
+      end
+
+      (@jrebel_home && File.exists?(@jrebel_home)) ? @jrebel_home : nil
+    end
+
+    def rebel_jar
+      if jrebel_home
+        # jrebel_home may point to jrebel.jar directly
+        File.directory?(jrebel_home) ? File.join(jrebel_home, 'jrebel.jar') : jrebel_home
+      end
+    end
+
+    def jrebel_args
+      rebel_jar ? [ '-noverify', "-javaagent:#{rebel_jar}" ] : []
+    end
+
+    def jrebel_props(project)
+      {}
+    end
+  end
+end
+

data/lib/buildr/core/linux.rb

@@ -0,0 +1,30 @@
+# 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.
+
+
+# Let's see if we can use notify-send.  Must be running from console in verbose mode.
+if $stdout.isatty && verbose
+  system("which notify-send > /dev/null 2>/dev/null")
+  if $?.exitstatus == 0
+    def notify_send(type, title, message)
+      icon = File.join(File.dirname(__FILE__), '../resources/', type.to_s + '.png')
+      system "notify-send -i #{icon} \"#{title}\" \"#{message}\""
+    end
+
+    Buildr.application.on_completion { |title, message| notify_send(:completed, title, message) if verbose }
+    Buildr.application.on_failure { |title, message, ex| notify_send(:failed, title, message) if verbose }
+  end
+end
+

data/lib/buildr/core/project.rb

@@ -235,8 +235,9 @@ module Buildr
       #   project(name) => project
       #
       # See Buildr#project.
-      def project(*args) #:nodoc:
+      def project(*args, &block) #:nodoc:
         options = args.pop if Hash === args.last
+        return define(args.first, options, &block) if block
         rake_check_options options, :scope if options
         raise ArgumentError, 'Only one project name at a time' unless args.size == 1
         @projects ||= {}
@@ -557,7 +558,7 @@ module Buildr
     #   define 'foo' do
     #     project.version = '1.0'
     #   end
-    def project(*args)
+    def project(*args, &block)
       if Hash === args.last
         options = args.pop
       else
@@ -566,7 +567,7 @@ module Buildr
       if args.empty?
         self
       else
-        Project.project *(args + [{ :scope=>self.name }.merge(options)])
+        Project.project *(args + [{ :scope=>self.name }.merge(options)]), &block
       end
     end
 
@@ -641,7 +642,7 @@ module Buildr
     def call_callbacks(phase) #:nodoc:
       remaining = @callbacks.select { |cb| cb.phase == phase }
       known_callbacks = remaining.map { |cb| cb.name }
-      
+
       # call each extension in order
       until remaining.empty?
         callback = first_satisfied(remaining, known_callbacks)
@@ -652,9 +653,9 @@ module Buildr
         callback.blocks.each { |b| b.call(self) }
       end
     end
-    
+
     private
-    
+
     # find first callback with satisfied dependencies
     def first_satisfied(r, known_callbacks)
       remaining_names = r.map { |cb| cb.name }
@@ -944,8 +945,8 @@ module Buildr
   #   end
   #
   #   puts project('myapp:beans').version
-  def project(*args)
-    Project.project *args
+  def project(*args, &block)
+    Project.project *args, &block
   end
 
   # :call-seq:

data/lib/buildr/core/run.rb

@@ -21,7 +21,7 @@ module Buildr
   module Run
 
     class JavaRunner < Base
-      include Shell::JavaRebel
+      include Buildr::JRebel
 
       specify :name => :java, :languages => [:java, :scala, :groovy, :clojure]
 
@@ -29,9 +29,9 @@ module Buildr
         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] || {}),
+          :properties => jrebel_props(project).merge(task.options[:properties] || {}),
           :classpath => cp,
-          :java_args => rebel_args + (task.options[:java_args] || [])
+          :java_args => jrebel_args + (task.options[:java_args] || [])
         })
       end
     end # JavaRunnner