buildr 1.3.5 → 1.4.0

data/lib/buildr/core/application.rb

@@ -115,8 +115,8 @@ module Buildr
   class Application < Rake::Application #:nodoc:
 
     # Deprecated: rakefile/Rakefile, removed in 1.5
-    DEFAULT_BUILDFILES = ['buildfile', 'Buildfile'] + DEFAULT_RAKEFILES
-    
+    DEFAULT_BUILDFILES = ['buildfile', 'Buildfile', 'buildfile.rb', 'Buildfile.rb'] + DEFAULT_RAKEFILES
+
     attr_reader :rakefiles, :requires
     private :rakefiles, :requires
 
@@ -125,7 +125,7 @@ module Buildr
       @rakefiles = DEFAULT_BUILDFILES.dup
       @top_level_tasks = []
       @home_dir = File.expand_path('.buildr', ENV['HOME'])
-      mkpath @home_dir unless File.exist?(@home_dir)
+      mkpath @home_dir if !File.exist?(@home_dir) && File.writable?(ENV['HOME'])
       @settings = Settings.new(self)
       @on_completion = []
       @on_failure = []
@@ -173,7 +173,7 @@ module Buildr
 
     # Files that complement the buildfile itself
     def build_files #:nodoc:
-      deprecated 'Please call buildfile.prerequisites instead' 
+      deprecated 'Please call buildfile.prerequisites instead'
       buildfile.prerequisites
     end
 
@@ -208,7 +208,7 @@ module Buildr
     end
 
   protected
-    
+
     def load_buildfile # replaces load_rakefile
       standard_exception_handling do
         find_buildfile
@@ -255,10 +255,10 @@ module Buildr
         opts.banner = "buildr [-f rakefile] {options} targets..."
         opts.separator ""
         opts.separator "Options are ..."
-        
+
         opts.on_tail("-h", "--help", "-H", "Display this help message.") do
           puts opts
-          exit
+          exit 0
         end
         standard_buildr_options.each { |args| opts.on(*args) }
       end.parse!
@@ -275,18 +275,18 @@ module Buildr
         ],
         ['--execute',  '-E CODE',
           "Execute some Ruby code after loading the buildfile",
-          lambda { |value| options.execute = value }            
+          lambda { |value| options.execute = value }
         ],
         ['--environment',  '-e ENV',
           "Environment name (e.g. development, test, production).",
-          lambda { |value| ENV['BUILDR_ENV'] = value }            
+          lambda { |value| ENV['BUILDR_ENV'] = value }
         ],
         ['--generate [PATH]',
          "Generate buildfile from either pom.xml file or directory path.",
           lambda { |value|
             value ||= File.exist?('pom.xml') ? 'pom.xml' : Dir.pwd
             raw_generate_buildfile value
-            exit
+            exit 0
           }
         ],
         ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
@@ -302,8 +302,8 @@ module Buildr
           lambda { |value| verbose(false) }
         ],
         ['--buildfile', '-f FILE', "Use FILE as the buildfile.",
-          lambda { |value| 
-            @rakefiles.clear 
+          lambda { |value|
+            @rakefiles.clear
             @rakefiles << value
           }
         ],
@@ -354,8 +354,8 @@ module Buildr
         ],
         ['--version', '-V', "Display the program version.",
           lambda { |value|
-            puts "Buildr #{Buildr::VERSION} #{RUBY_PLATFORM[/java/] && '(JRuby '+JRUBY_VERSION+')'}"
-            exit
+            puts "Buildr #{Buildr::VERSION}#{RUBY_PLATFORM[/java/] ? " (JRuby #{JRUBY_VERSION})" : ""}"
+            exit 0
           }
         ]
       ]
@@ -434,7 +434,7 @@ module Buildr
       end
     end
 
-    # Load artifact specs from the build.yaml file, making them available 
+    # Load artifact specs from the build.yaml file, making them available
     # by name ( ruby symbols ).
     def load_artifact_ns #:nodoc:
       hash = settings.build['artifacts']
@@ -443,12 +443,18 @@ module Buildr
       # Currently we only use one artifact namespace to rule them all. (the root NS)
       Buildr::ArtifactNamespace.load(:root => hash)
     end
-    
-    # Loads buildr.rb files from users home directory and project directory.
+
+    # Loads buildr.rb files from home/.buildr directory and project directory.
     # Loads custom tasks from .rake files in tasks directory.
     def load_tasks #:nodoc:
       # TODO: this might need to be split up, look for deprecated features, better method name.
-      files = [ File.expand_path('buildr.rb', ENV['HOME']), 'buildr.rb' ].select { |file| File.exist?(file) }
+      old = File.expand_path('buildr.rb', ENV['HOME'])
+      new = File.expand_path('buildr.rb', home_dir)
+      if File.exist?(old) && !File.exist?(new)
+        warn "Deprecated: Please move buildr.rb from your home directory to the .buildr directory in your home directory"
+      end
+      # Load home/.buildr/buildr.rb in preference
+      files = [ File.exist?(new) ? new : old, 'buildr.rb' ].select { |file| File.exist?(file) }
       files += [ File.expand_path('buildr.rake', ENV['HOME']), File.expand_path('buildr.rake') ].
         select { |file| File.exist?(file) }.each { |file| warn "Please use '#{file.ext('rb')}' instead of '#{file}'" }
       files += (options.rakelib || []).collect { |rlib| Dir["#{rlib}/*.rake"] }.flatten
@@ -501,13 +507,14 @@ module Buildr
         $stderr.puts $terminal.color(ex.message, :red)
         exit(1)
       rescue Exception => ex
-        title, message = "Your build failed with an error", "#{Dir.pwd}:\n#{ex.message}"
+        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
         # Exit with error message
         $stderr.puts "Buildr aborted!"
-        $stderr.puts $terminal.color(ex.message, :red)
+        $stderr.puts $terminal.color(ex_msg, :red)
         if options.trace
           $stderr.puts ex.backtrace.join("\n")
         else
@@ -519,13 +526,13 @@ module Buildr
     end
 
   end
-  
-  
+
+
   # This task stands for the buildfile and all its associated helper files (e.g., buildr.rb, build.yaml).
   # By using this task as a prerequisite for other tasks, you can ensure these tasks will be needed
   # whenever the buildfile changes.
   class BuildfileTask < Rake::FileTask #:nodoc:
-    
+
     def timestamp
       ([name] + prerequisites).map { |f| File.stat(f).mtime }.max rescue Time.now
     end
@@ -561,14 +568,13 @@ end
 
 
 # Add a touch of color when available and running in terminal.
+HighLine.use_color = false
 if $stdout.isatty
   begin
-    require 'Win32/Console/ANSI' if Config::CONFIG['host_os'] =~ /mswin/
+    require 'Win32/Console/ANSI' if Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i
     HighLine.use_color = true
   rescue LoadError
   end
-else
-  HighLine.use_color = false
 end
 
 
@@ -629,7 +635,7 @@ module Rake #:nodoc
           old_chain, Thread.current[:rake_chain] = Thread.current[:rake_chain], new_chain
           execute(task_args) if needed?
         ensure
-          Thread.current[:rake_chain] = nil
+          Thread.current[:rake_chain] = old_chain
         end
       end
     end

data/lib/buildr/core/build.rb

@@ -52,7 +52,7 @@ module Buildr
       task 'default'=>'build'
     end
 
-    before_define do |project|
+    before_define(:build => [:compile, :test]) do |project|
       project.recursive_task 'build'
       project.recursive_task 'clean'
       project.clean do
@@ -61,6 +61,7 @@ module Buildr
       end
     end
 
+    after_define(:build)
 
     # *Deprecated:* Use +path_to(:target)+ instead.
     def target
@@ -187,7 +188,7 @@ module Buildr
     def commit(file, message)
       svn 'commit', '-m', message, file
     end
-    
+
     # :call-seq:
     #   tag_url(svn_url, version) => tag_url
     #
@@ -208,24 +209,36 @@ module Buildr
     def repo_url
       svn('info', '--xml')[/<url>(.*?)<\/url>/, 1].strip
     end
-    
+
     def copy(dir, url, message)
       svn 'copy', dir, url, '-m', message
     end
-    
+
     def remove(url, message)
       svn 'remove', url, '-m', message
     end
 
   end
-  
+
 
   class Release #:nodoc:
 
     THIS_VERSION_PATTERN  = /(THIS_VERSION|VERSION_NUMBER)\s*=\s*(["'])(.*)\2/
 
     class << self
-      
+
+      # Use this to specify a different tag name for tagging the release in source control.
+      # You can set the tag name or a proc that will be called with the version number,
+      # for example:
+      #   Release.tag_name = lambda { |ver| "foo-#{ver}" }
+      attr_accessor :tag_name
+
+      # Use this to specify a different commit message to commit the buildfile with the next version in source control.
+      # You can set the commit message or a proc that will be called with the next version number,
+      # for example:
+      #   Release.commit_message = lambda { |ver| "Changed version number to #{ver}" }
+      attr_accessor :commit_message
+
       # :call-seq:
       #     add(MyReleaseClass)
       #
@@ -251,18 +264,6 @@ module Buildr
       end
 
     end
- 
-    # Use this to specify a different tag name for tagging the release in source control.
-    # You can set the tag name or a proc that will be called with the version number,
-    # for example:
-    #   Release.tag_name = lambda { |ver| "foo-#{ver}" }
-    attr_accessor :tag_name
-
-    # Use this to specify a different commit message to commit the buildfile with the next version in source control.
-    # You can set the commit message or a proc that will be called with the next version number,
-    # for example:
-    #   Release.commit_message = lambda { |ver| "Changed version number to #{ver}" }
-    attr_accessor :commit_message
 
     # :call-seq:
     #   make()
@@ -274,12 +275,12 @@ module Buildr
         args = '-S', 'buildr', "_#{Buildr::VERSION}_", '--buildfile', release_candidate_buildfile
         args << '--environment' << Buildr.environment unless Buildr.environment.to_s.empty?
         args << 'clean' << 'upload' << 'DEBUG=no'
-        ruby *args 
+        ruby *args
       end
       tag_release resolve_tag
       update_version_to_next
     end
-    
+
     # :call-seq:
     #   extract_version() => this_versin
     #
@@ -291,9 +292,19 @@ module Buildr
     rescue
       fail 'Looking for THIS_VERSION = "..." in your Buildfile, none found'
     end
-    
+
+    # Use this to specify a different tag name for tagging the release in source control.
+    # You can set the tag name or a proc that will be called with the version number,
+    # for example:
+    #   Release.find.tag_name = lambda { |ver| "foo-#{ver}" }
+    # Deprecated: you should use Release.tag_name instead
+    def tag_name=(tag_proc)
+      warn("Release.find.tag_name is deprecated. You should use Release.tag_name instead")
+      Release.tag_name=(tag_proc)
+    end
+
   protected
-    
+
     # :call-seq:
     #   with_release_candidate_version() { |filename| ... }
     #
@@ -341,7 +352,7 @@ module Buildr
     # Return the name of the tag to tag the release with.
     def resolve_tag
       version = extract_version
-      tag = tag_name || version
+      tag = Release.tag_name || version
       tag = tag.call(version) if Proc === tag
       tag
     end
@@ -355,7 +366,7 @@ module Buildr
     # Return the message to use to cimmit the buildfile with the next version
     def message
       version = extract_version
-      msg = commit_message || "Changed version number to #{version}"
+      msg = Release.commit_message || "Changed version number to #{version}"
       msg = msg.call(version) if Proc === msg
       msg
     end
@@ -372,7 +383,9 @@ module Buildr
         if File.exist? '.git/config'
           true
         else
-          File.expand_path(Dir.pwd) != '/' && Dir.chdir('..') do
+          curr_pwd = Dir.pwd
+          Dir.chdir('..') do
+            return false if curr_pwd == Dir.pwd # Means going up one level is not possible.
             applies_to?
           end
         end
@@ -408,7 +421,7 @@ module Buildr
       Git.push if Git.remote
     end
   end
-  
+
 
   class SvnRelease < Release
     class << self
@@ -416,7 +429,7 @@ module Buildr
         File.exist?('.svn')
       end
     end
-    
+
     def check
       fail "Uncommitted files violate the First Principle Of Release!\n"+Svn.uncommitted_files.join("\n") unless Svn.uncommitted_files.empty?
       fail "SVN URL must contain 'trunk' or 'branches/...'" unless Svn.repo_url =~ /(trunk)|(branches.*)$/
@@ -433,7 +446,7 @@ module Buildr
       Svn.commit Buildr.application.buildfile.to_s, message
     end
   end
-  
+
   Release.add SvnRelease
   Release.add GitRelease
 

data/lib/buildr/core/cc.rb

@@ -0,0 +1,172 @@
+# 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/core/common'
+require 'buildr/core/project'
+require 'buildr/core/build'
+require 'buildr/core/compile'
+
+module Buildr
+  class CCTask < Rake::Task
+    attr_accessor :delay
+    attr_reader :project
+
+    def initialize(*args)
+      super
+      @delay = 0.2
+      enhance do
+        monitor_and_compile
+      end
+    end
+
+  private
+
+    def associate_with(project)
+      @project = project
+    end
+
+    def monitor_and_compile
+      # we don't want to actually fail if our dependencies don't succede
+      begin
+        [:compile, 'test:compile'].each { |name| project.task(name).invoke }
+        notify_build_status(true, project)
+      rescue Exception => ex
+        $stderr.puts $terminal.color(ex.message, :red)
+        $stderr.puts
+
+        notify_build_status(false, project)
+      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}"
+      else
+        info "Monitoring directories: [#{dir_names.join ', '}]"
+      end
+      trace "Monitoring extensions: [#{main_ext.join ', '}]"
+
+      while true
+        sleep delay
+
+        times, changed = check_mtime pattern, 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 }
+          end
+
+          in_test = test_dirs.any? do |dir|
+            changed.any? { |file| file.index(dir) == 0 }
+          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
+          rescue Exception => ex
+            $stderr.puts $terminal.color(ex.message, :red)
+            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
+    end
+
+    def check_mtime(pattern, old_times)
+      times = {}
+      changed = []
+
+      Dir.glob pattern do |fname|
+        times[fname] = File.mtime fname
+        if old_times[fname].nil? || old_times[fname] < File.mtime(fname)
+          changed << fname
+        end
+      end
+
+      # detect deletion (slower than it could be)
+      old_times.each_key do |fname|
+        changed << fname unless times.has_key? fname
+      end
+
+      [times, changed]
+    end
+
+    def strip_filename(project, name)
+      name.gsub project.base_dir + File::SEPARATOR, ''
+    end
+  end
+
+  module CC
+    include Extension
+
+    first_time do
+      desc 'Execute continuous compilation, listening to changes'
+      Project.local_task('cc') { |name|  "Executing continuous compilation for #{name}" }
+    end
+
+    before_define do |project|
+      cc = CCTask.define_task :cc
+      cc.send :associate_with, project
+      project.recursive_task(:cc)
+    end
+
+    def cc
+      task :cc
+    end
+  end
+
+  class Project
+    include CC
+  end
+end

data/lib/buildr/core/checks.rb

@@ -139,7 +139,7 @@ module Buildr
 
     include Extension
 
-    before_define do |project|
+    before_define(:check => :package) do |project|
       # The check task can do any sort of interesting things, but the most important is running expectations.
       project.task("check") do |task|
         project.expectations.inject(true) do |passed, expect|

data/lib/buildr/core/common.rb

@@ -34,7 +34,7 @@ module Buildr
   #
   #   compile.with COMMONS.logging
   def struct(hash)
-    Struct.new(nil, *hash.keys).new(*hash.values)  
+    Struct.new(nil, *hash.keys).new(*hash.values)
   end
 
   # :call-seq:
@@ -58,17 +58,18 @@ module Buildr
   end
 
   # :call-seq:
-  #   read(name) => string
-  #   read(name) { |string| ... } => result
+  #   read(args) => string
+  #   read(args) { |string| ... } => result
   #
   # Reads and returns the contents of a file. The second form yields to the block and returns
-  # the result of the block.
+  # the result of the block. The args passed to read are passed on to File.open.
   #
   # For example:
   #   puts read('README')
   #   read('README') { |text| puts text }
-  def read(name)
-    contents = File.open(name.to_s) { |f| f.read }
+  def read(*args)
+    args[0] = args[0].to_s
+    contents = File.open(*args) { |f| f.read }
     if block_given?
       yield contents
     else

data/lib/buildr/core/compile.rb

@@ -37,7 +37,7 @@ module Buildr
       end
 
       # Adds a compiler to the list of supported compiler.
-      #   
+      #
       # For example:
       #   Buildr::Compiler << Buildr::Javac
       def add(compiler)
@@ -188,7 +188,7 @@ module Buildr
       end
 
     private
-      
+
       def findFirst(file, pattern)
         match = nil
         File.open(file, "r") do |infile|
@@ -264,7 +264,7 @@ module Buildr
     #   compile.from('src/java').into('classes').with('module1.jar')
     def from(*sources)
       @sources |= sources.flatten
-      guess_compiler if @compiler.nil? && sources.flatten.any? { |source| File.exist?(source) }
+      guess_compiler if @compiler.nil? && sources.flatten.any? { |source| File.exist?(source.to_s) }
       self
     end
 
@@ -369,7 +369,6 @@ module Buildr
     def compiler=(name) #:nodoc:
       cls = Compiler.select(name) or raise ArgumentError, "No #{name} compiler available. Did you install it?"
       return self if cls === @compiler
-      raise "#{compiler} compiler already selected for this project" if @compiler
       @compiler = cls.new(project, options)
       from Array(cls.sources).map { |path| project.path_to(:source, usage, path) }.
         select { |path| File.exist?(path) } if sources.empty?
@@ -383,7 +382,7 @@ module Buildr
       @project, @usage = project, usage
       guess_compiler
     end
-    
+
     # Try to guess if we have a compiler to match source files.
     def guess_compiler #:nodoc:
       candidate = Compiler.compilers.detect { |cls| cls.applies_to?(project, self) }
@@ -497,7 +496,7 @@ module Buildr
       Project.local_task('compile') { |name| "Compiling #{name}" }
     end
 
-    before_define do |project|
+    before_define(:compile) do |project|
       resources = ResourcesTask.define_task('resources')
       resources.send :associate_with, project, :main
       project.path_to(:source, :main, :resources).tap { |dir| resources.from dir if File.exist?(dir) }
@@ -507,7 +506,7 @@ module Buildr
       project.recursive_task('compile')
     end
 
-    after_define do |project|
+    after_define(:compile) do |project|
       if project.compile.target
         # This comes last because the target path is set inside the project definition.
         project.build project.compile.target
@@ -517,7 +516,7 @@ module Buildr
       end
     end
 
-      
+
     # :call-seq:
     #   compile(*sources) => CompileTask
     #   compile(*sources) { |task| .. } => CompileTask