assaf-buildr 1.3.3 → 1.3.4

data/lib/buildr/core/checks.rb

@@ -15,10 +15,7 @@
 
 
 require 'buildr/core/project'
-require 'buildr/packaging/zip'
-#require 'test/unit'
-require 'spec/matchers'
-require 'spec/expectations'
+autoload :Spec, 'spec'
 
 
 module Buildr
@@ -118,8 +115,8 @@ module Buildr
         # - All matchers defined by Buildr and RSpec.
         klass = Class.new
         klass.instance_eval do
-          context.class.instance_methods(false).each do |method|
-            define_method(method) { |*args| context.send(method, *args) }
+          context.class.instance_methods.each do |method|
+            define_method(method) { |*args| context.send(method, *args) } unless instance_methods.include?(method)
           end
           define_method(:it) { subject }
           define_method(:description) { description }
@@ -252,131 +249,6 @@ module Rake #:nodoc:
 end
 
 
-module Zip #:nodoc:
-  class ZipEntry
-
-    # :call-seq:
-    #   exist() => boolean
-    #
-    # Returns true if this entry exists.
-    def exist?()
-      Zip::ZipFile.open(zipfile) { |zip| zip.file.exist?(@name) }
-    end
-
-    # :call-seq:
-    #   empty?() => boolean
-    #
-    # Returns true if this entry is empty.
-    def empty?()
-      Zip::ZipFile.open(zipfile) { |zip| zip.file.read(@name) }.empty?
-    end
-
-    # :call-seq:
-    #   contain(patterns*) => boolean
-    #
-    # Returns true if this ZIP file entry matches against all the arguments. An argument may be
-    # a string or regular expression.
-    def contain?(*patterns)
-      content = Zip::ZipFile.open(zipfile) { |zip| zip.file.read(@name) }
-      patterns.map { |pattern| Regexp === pattern ? pattern : Regexp.new(Regexp.escape(pattern.to_s)) }.
-        all? { |pattern| content =~ pattern }
-    end
-
-  end
-end
-
-
-class Buildr::ArchiveTask
-
-  class Path #:nodoc:
-
-    # :call-seq:
-    #   exist() => boolean
-    #
-    # Returns true if this path exists. This only works if the path has any entries in it,
-    # so exist on path happens to be the opposite of empty.
-    def exist?()
-      !entries.empty?
-    end
-
-    # :call-seq:
-    #   empty?() => boolean
-    #
-    # Returns true if this path is empty (has no other entries inside).
-    def empty?()
-      entries.all? { |entry| entry.empty? }
-    end
-
-    # :call-seq:
-    #   contain(file*) => boolean
-    #
-    # Returns true if this ZIP file path contains all the specified files. You can use relative
-    # file names and glob patterns (using *, **, etc).
-    def contain?(*files)
-      files.all? { |file| entries.detect { |entry| File.fnmatch(file, entry.to_s, File::FNM_PATHNAME) } }
-    end
-
-    # :call-seq:
-    #   entry(name) => ZipEntry
-    #
-    # Returns a ZIP file entry. You can use this to check if the entry exists and its contents,
-    # for example:
-    #   package(:jar).path("META-INF").entry("LICENSE").should contain(/Apache Software License/)
-    def entry(name)
-      root.entry("#{@path}#{name}")
-    end
-
-  protected
-
-    def entries() #:nodoc:
-      return root.entries unless @path
-      @entries ||= root.entries.inject([]) { |selected, entry|
-        selected << entry.name.sub(@path, "") if entry.name.index(@path) == 0
-        selected
-      }
-    end
-
-  end
-
-  # :call-seq:
-  #   empty?() => boolean
-  #
-  # Returns true if this ZIP file is empty (has no other entries inside).
-  def empty?()
-    path("").empty
-  end
-
-  # :call-seq:
-  #   contain(file*) => boolean
-  #
-  # Returns true if this ZIP file contains all the specified files. You can use absolute
-  # file names and glob patterns (using *, **, etc).
-  def contain?(*files)
-    path("").contain?(*files)
-  end
-
-end
-
-
-class Buildr::ZipTask #:nodoc:
-
-  # :call-seq:
-  #   entry(name) => Entry
-  #
-  # Returns a ZIP file entry. You can use this to check if the entry exists and its contents,
-  # for example:
-  #   package(:jar).entry("META-INF/LICENSE").should contain(/Apache Software License/)
-  def entry(entry_name)
-    ::Zip::ZipEntry.new(name, entry_name)
-  end
-
-  def entries() #:nodoc:
-    @entries ||= Zip::ZipFile.open(name) { |zip| zip.entries }
-  end
-
-end
-
-
 class Buildr::Project
   include Buildr::Checks
 end

data/lib/buildr/core/common.rb

@@ -15,11 +15,7 @@
 
 
 require 'rake'
-require 'tempfile'
-require 'open-uri'
-$LOADED_FEATURES << 'rubygems/open-uri.rb' # avoid loading rubygems' open-uri
 require 'buildr/core/util'
-require 'buildr/core/transports'
 
 
 module Buildr

data/lib/buildr/core/compile.rb

@@ -407,7 +407,7 @@ module Buildr
       @filter = Buildr::Filter.new
       @filter.using Buildr.settings.profile['filter'] if Hash === Buildr.settings.profile['filter']
       enhance do
-        filter.run if target
+        target.invoke if target
       end
     end
 
@@ -490,12 +490,6 @@ module Buildr
     end
 
     after_define do |project|
-      # TODO: Is this necessary?
-      #if project.resources.target
-      #  file project.resources.target.to_s=>project.resources do |task|
-      #    mkpath task.name, :verbose=>false
-      #  end
-      #end
       if project.compile.target
         # This comes last because the target path is set inside the project definition.
         project.build project.compile.target

data/lib/buildr/core/environment.rb

@@ -14,9 +14,6 @@
 # the License.
 
 
-require 'yaml'
-
-
 module Buildr
 
   # Collection of options for controlling Buildr.

data/lib/buildr/core/filter.rb

@@ -13,6 +13,10 @@
 # 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
@@ -165,19 +169,19 @@ module Buildr
           reject { |file| @exclude.any? { |pattern| File.fnmatch(pattern, file, File::FNM_PATHNAME) } }
         files.each do |file|
           src, dest = File.expand_path(file, source), File.expand_path(file, target.to_s)
-          map[file] = src if !File.exist?(dest) || File.stat(src).mtime > File.stat(dest).mtime
+          map[file] = src if !File.exist?(dest) || File.stat(src).mtime >= File.stat(dest).mtime
         end
         map
       end
         
-      mkpath target.to_s
+      mkpath target.to_s, :verbose=>Buildr.application.options.trace
       return false if copy_map.empty?
 
       verbose(Buildr.application.options.trace || false) do
         copy_map.each do |path, source|
           dest = File.expand_path(path, target.to_s)
           if File.directory?(source)
-            mkpath dest
+            mkpath dest, :verbose=>false
           else
             mkpath File.dirname(dest)
             if @mapper.mapper_type

data/lib/buildr/core/generate.rb

@@ -20,13 +20,13 @@ require 'buildr/java/pom'
 module Buildr
   module Generate #:nodoc:
 
-    task "generate" do
+    task 'generate' do
       script = nil 
       choose do |menu|
         menu.header = "To use Buildr you need a buildfile. Do you want me to create one?"
 
-        menu.choice("From maven2 pom file") { script = Generate.from_maven2_pom(true).join("\n") } if File.exists?("pom.xml")
-        menu.choice("From directory structure") { script = Generate.from_directory(true).join("\n") }
+        menu.choice("From maven2 pom file") { script = Generate.from_maven2_pom('pom.xml').join("\n") } if File.exists?("pom.xml")
+        menu.choice("From directory structure") { script = Generate.from_directory(Dir.pwd).join("\n") }
         menu.choice("Skip") { }
       end
        
@@ -39,58 +39,58 @@ module Buildr
 
     class << self
 
-
       HEADER = "# Generated by Buildr #{Buildr::VERSION}, change to your liking\n\n"
 
-
-      def from_directory(root = false)
-        name = File.basename(Dir.pwd)
-        if root
-          script = HEADER.split("\n")
-          header = <<-EOF
-# Version number for this release
-VERSION_NUMBER = "1.0.0"
-# Group identifier for your projects
-GROUP = "#{name}"
-COPYRIGHT = ""
-
-# Specify Maven 2.0 remote repositories here, like this:
-repositories.remote << "http://www.ibiblio.org/maven2/"
-
-desc "The #{name.capitalize} project"
-define "#{name}" do
-
-  project.version = VERSION_NUMBER
-  project.group = GROUP
-  manifest["Implementation-Vendor"] = COPYRIGHT
-EOF
-          script += header.split("\n")
-        else
-          script = [ %{define "#{name}" do} ]
-        end
-        script <<  "  compile.with # Add classpath dependencies" if File.exist?("src/main/java")
-        script <<  "  resources" if File.exist?("src/main/resources")
-        script <<  "  test.compile.with # Add classpath dependencies" if File.exist?("src/test/java")
-        script <<  "  test.resources" if File.exist?("src/test/resources")
-        if File.exist?("src/main/webapp")
-          script <<  "  package(:war)"
-        elsif File.exist?("src/main/java")
-          script <<  "  package(:jar)"
-        end
-        dirs = FileList["*"].exclude("src", "target", "report").
-          select { |file| File.directory?(file) && File.exist?(File.join(file, "src")) }
-        unless dirs.empty?
-          script << ""
-          dirs.sort.each do |dir|
-            Dir.chdir(dir) { script << from_directory.flatten.map { |line| "  " + line } << "" }
+      def from_directory(path = Dir.pwd, root = true)
+        Dir.chdir(path) do
+          name = File.basename(path)
+          if root
+            script = HEADER.split("\n")
+            header = <<-EOF
+  # Version number for this release
+  VERSION_NUMBER = "1.0.0"
+  # Group identifier for your projects
+  GROUP = "#{name}"
+  COPYRIGHT = ""
+
+  # Specify Maven 2.0 remote repositories here, like this:
+  repositories.remote << "http://www.ibiblio.org/maven2/"
+
+  desc "The #{name.capitalize} project"
+  define "#{name}" do
+
+    project.version = VERSION_NUMBER
+    project.group = GROUP
+    manifest["Implementation-Vendor"] = COPYRIGHT
+  EOF
+            script += header.split("\n")
+          else
+            script = [ %{define "#{name}" do} ]
+          end
+          script <<  "  compile.with # Add classpath dependencies" if File.exist?("src/main/java")
+          script <<  "  resources" if File.exist?("src/main/resources")
+          script <<  "  test.compile.with # Add classpath dependencies" if File.exist?("src/test/java")
+          script <<  "  test.resources" if File.exist?("src/test/resources")
+          if File.exist?("src/main/webapp")
+            script <<  "  package(:war)"
+          elsif File.exist?("src/main/java")
+            script <<  "  package(:jar)"
+          end
+          dirs = FileList["*"].exclude("src", "target", "report").
+            select { |file| File.directory?(file) && File.exist?(File.join(file, "src")) }
+          unless dirs.empty?
+            script << ""
+            dirs.sort.each do |dir|
+              script << from_directory(dir, false).flatten.map { |line| "  " + line } << ""
+            end
           end
+          script << "end"
+          script.flatten
         end
-        script << "end"
-        script.flatten
       end
 
-      def from_maven2_pom(root = false)
-        pom = Buildr::POM.load('pom.xml')
+      def from_maven2_pom(path = 'pom.xml', root = true)
+        pom = Buildr::POM.load(path)
         project = pom.project
 
         artifactId = project['artifactId'].first
@@ -183,7 +183,7 @@ EOF
         if modules
           script << ""
           modules.each do |mod|
-            chdir(mod) { script << from_maven2_pom.flatten.map { |line| "  " + line } << "" }
+            script << from_maven2_pom(File.join(File.dirname(path), mod, 'pom.xml'), false).flatten.map { |line| "  " + line } << ""
           end
         end
         script << "end"

data/lib/buildr/core/help.rb

@@ -55,7 +55,8 @@ end
 
 task 'help' do
   # Greeater.
-  Buildr.application.usage
+  puts 'Usage:'
+  puts '  buildr [-f rakefile] {options} targets...'
   puts
 
   # Show only the top-level projects.

data/lib/buildr/core/osx.rb

@@ -0,0 +1,49 @@
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+# Let's see if we can use Growl.  Must be running from console in verbose mode.
+if $stdout.isatty && verbose
+  notify = lambda do |type, title, message|
+    begin
+      # Loading Ruby Cocoa can slow the build down (hooks on Object class), so we're
+      # saving the best for last and only requiring it at the very end.
+      require 'osx/cocoa'
+      icon = OSX::NSApplication.sharedApplication.applicationIconImage
+      icon = OSX::NSImage.alloc.initWithContentsOfFile(File.join(File.dirname(__FILE__), '../resources/buildr.icns'))
+
+      # Register with Growl, that way you can turn notifications on/off from system preferences.
+      OSX::NSDistributedNotificationCenter.defaultCenter.
+        postNotificationName_object_userInfo_deliverImmediately(:GrowlApplicationRegistrationNotification, nil,
+          { :ApplicationName=>'Buildr', :AllNotifications=>['Completed', 'Failed'], 
+            :ApplicationIcon=>icon.TIFFRepresentation }, true)
+
+      OSX::NSDistributedNotificationCenter.defaultCenter.
+        postNotificationName_object_userInfo_deliverImmediately(:GrowlNotification, nil,
+          { :ApplicationName=>'Buildr', :NotificationName=>type,
+            :NotificationTitle=>title, :NotificationDescription=>message }, true)
+    rescue Exception
+      # We get here in two cases: system doesn't have Growl installed so one of the OSX
+      # calls raises an exception; system doesn't have osx/cocoa, e.g. MacPorts Ruby 1.9,
+      # so we also need to rescue LoadError.
+    end
+  end  
+  
+  Buildr.application.on_completion { |title, message| notify['Completed', title, message] if verbose }
+  Buildr.application.on_failure { |title, message, ex| notify['Failed', title, message] if verbose }
+end

data/lib/buildr/core/progressbar.rb

@@ -153,4 +153,4 @@ protected
     @total == 0 ? ['%s %8s %s', :title, :count, :elapsed] : ['%s: %s |--| %8s/%s %s', :title, :percentage, :count, :total, :time]
   end
 
-end
+end

data/lib/buildr/core/project.rb

@@ -240,18 +240,19 @@ module Buildr
         rake_check_options options, :scope if options
         raise ArgumentError, 'Only one project name at a time' unless args.size == 1
         @projects ||= {}
-        name = args.first
+        name = args.first.to_s
+        # Make sure parent project is evaluated (e.g. if looking for foo:bar, find foo first)
+        unless @projects[name]
+          parts = name.split(':')
+          project(parts.first, options || {}) if parts.size > 1
+        end
         if options && options[:scope]
           # We assume parent project is evaluated.
           project = options[:scope].split(':').inject([[]]) { |scopes, scope| scopes << (scopes.last + [scope]) }.
             map { |scope| @projects[(scope + [name]).join(':')] }.
             select { |project| project }.last
         end
-        unless project
-          # Parent project not evaluated.
-          name.split(':').tap { |parts| @projects[parts.first].invoke if parts.size > 1 }
-          project = @projects[name]
-        end
+        project ||= @projects[name] # Not found in scope.
         raise "No such project #{name}" unless project
         project.invoke
         project
@@ -864,9 +865,6 @@ module Buildr
   # Forces all the projects to be evaluated before executing any other task.
   # If we don't do that, we don't get to have tasks available when running Rake.
   namespace 'buildr' do
-    task 'initialize' do
-      projects
-    end
 
     desc "Freeze the Buildfile so it always uses Buildr version #{Buildr::VERSION}"
     task 'freeze' do