rake-builder 0.0.10 → 0.0.11

data/CHANGES

@@ -1,4 +1,4 @@
-= Rake::Cpp Changelog
+= Rake::Builder Changelog
 
 == Version 0.0.1
 

data/README.rdoc

@@ -1,4 +1,4 @@
-= rake-builder - Rake for C/C++/Objective-C/Objective-C++ Projects
+= rake-builder - Rake for C, C++, Objective-C and Objective-C++ Projects
 
 rake-builder builds C, C++, Objective-C and Objective-C++
 projects.
@@ -125,7 +125,9 @@ So, if there are two source files with the same name, they will overwrite each o
 
 = Alternatives
 
-* make
-* CMake
+* GNU build system, a.k.a. Autotools: autoconf, configure, make, etc.
 * Boost.Build
+* CMake
 * rakepp - another customisation of Rake for C++ projects
+* Scons
+* waf[http://code.google.com/p/waf/]

data/lib/rake/builder.rb

@@ -2,25 +2,15 @@ require 'rubygems' if RUBY_VERSION < '1.9'
 require 'logger'
 require 'rake'
 require 'rake/tasklib'
+require 'rake/path'
+require 'rake/file_task_alias'
 
 module Rake
 
-  # A task whose behaviour depends on a FileTask
-  class FileTaskAlias < Task
-
-    attr_accessor :target
-
-    def self.define_task( name, target, &block )
-      alias_task = super( { name => [] }, &block )
-      alias_task.target = target
-      alias_task.prerequisites.unshift( target )
-      alias_task
-    end
-
-    def needed?
-      Rake::Task[ @target ].needed?
+  class Formatter < Logger::Formatter
+    def call(severity, time, progname, msg)
+      msg2str(msg) << "\n"
     end
-
   end
 
   # Error indicating that the project failed to build.
@@ -32,25 +22,11 @@ module Rake
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 0
-      TINY  = 10
+      TINY  = 11
  
       STRING = [ MAJOR, MINOR, TINY ].join('.')
     end
 
-    # Expand path to an absolute path relative to the supplied root
-    def self.expand_path_with_root( path, root )
-      if path =~ /^\//
-        File.expand_path( path )
-      else
-        File.expand_path( root + '/' + path )
-      end
-    end
-
-    # Expand an array of paths to absolute paths relative to the supplied root
-    def self.expand_paths_with_root( paths, root )
-      paths.map{ |path| expand_path_with_root( path, root ) }
-    end
-
     # The file to be built
     attr_accessor :target
 
@@ -91,7 +67,7 @@ module Rake
     # The linker that will be used
     attr_accessor :linker
 
-    # Extension of source files (default 'cpp' for C++ and 'c' fo C)
+    # Extension of source files (default 'cpp' for C++ and 'c' for C)
     attr_accessor :source_file_extension
 
     # Extension of header files (default 'h')
@@ -111,12 +87,12 @@ module Rake
 
     # Directories/file globs to search for header files
     # When static libraries are installed,
-    # headers are install too.
+    # headers are installed too.
     # During installation, the destination path is:
     #   /usr/local/include + the relative path
     # This 'relative path' is calculated as follows:
-    # 1. Named files are installed directly under /usr/local/include
-    # 2. Files found by directory are also installed directly under /usr/local/include
+    # 1. Any files named in header_search_paths are installed directly under /usr/local/include
+    # 2. The contents of any directory named in header_search_paths are also installed directly under /usr/local/include
     # 3. Files found by glob have the fixed part of the glob removed and
     #  the relative path calculated:
     # E.g. files found with './include/**/*' will have './include' removed to calculate the
@@ -137,7 +113,7 @@ module Rake
     # Directory to be used for object files
     attr_accessor :objects_path
 
-    # extra options to pass to the compiler
+    # Array of extra options to pass to the compiler
     attr_accessor :compilation_options
 
     # Additional include directories for compilation
@@ -165,7 +141,7 @@ module Rake
     attr_accessor :logger
 
     def initialize( &block )
-      save_rakefile_info( caller[0] )
+      save_rakefile_info( block )
       initialize_attributes
       block.call( self )
       configure
@@ -177,17 +153,20 @@ module Rake
 
     # Source files found in source_search_paths
     def source_files
-      @source_fies ||= find_files( @source_search_paths, @source_file_extension )
+      @source_files ||= find_files( @source_search_paths, @source_file_extension ).uniq
+      @source_files
     end
 
     # Header files found in header_search_paths
     def header_files
-      @header_files ||= find_files( @header_search_paths, @header_file_extension )
+      @header_files ||= find_files( @header_search_paths, @header_file_extension ).uniq
+      @header_files
     end
 
     def initialize_attributes
       @logger                = Logger.new( STDOUT )
       @logger.level          = Logger::UNKNOWN
+      @logger.formatter      = Formatter.new
       @programming_language  = 'c++'
       @header_file_extension = 'h'
       @objects_path          = @rakefile_path.dup
@@ -198,6 +177,7 @@ module Rake
       @header_search_paths   = [ @rakefile_path.dup ]
       @target                = 'a.out'
       @generated_files       = []
+      @compilation_options   = []
     end
 
     def configure
@@ -207,22 +187,21 @@ module Rake
       @linker                ||= KNOWN_LANGUAGES[ @programming_language ][ :linker ]
       @source_file_extension ||= KNOWN_LANGUAGES[ @programming_language ][ :source_file_extension ]
 
-      @source_search_paths   = Rake::Builder.expand_paths_with_root( @source_search_paths, @rakefile_path )
-      @header_search_paths   = Rake::Builder.expand_paths_with_root( @header_search_paths, @rakefile_path )
-      @library_paths         = Rake::Builder.expand_paths_with_root( @library_paths, @rakefile_path )
+      @source_search_paths   = Rake::Path.expand_all_with_root( @source_search_paths, @rakefile_path )
+      @header_search_paths   = Rake::Path.expand_all_with_root( @header_search_paths, @rakefile_path )
+      @library_paths         = Rake::Path.expand_all_with_root( @library_paths, @rakefile_path )
 
       raise "The target name cannot be nil" if @target.nil?
       raise "The target name cannot be an empty string" if @target == ''
-      @objects_path          = Rake::Builder.expand_path_with_root( @objects_path, @rakefile_path )
-      @target                = Rake::Builder.expand_path_with_root( @target, @objects_path )
+      @objects_path          = Rake::Path.expand_with_root( @objects_path, @rakefile_path )
+      @target                = Rake::Path.expand_with_root( @target, @objects_path )
       @target_type           ||= type( @target )
       raise "Building #{ @target_type } targets is not supported" if ! TARGET_TYPES.include?( @target_type )
       @install_path          ||= default_install_path( @target_type )
 
-      @compilation_options   ||= ''
       @linker_options        ||= ''
       @include_paths         ||= @header_search_paths.dup
-      @generated_files       = Rake::Builder.expand_paths_with_root( @generated_files, @rakefile_path )
+      @generated_files       = Rake::Path.expand_all_with_root( @generated_files, @rakefile_path )
 
       @default_task          ||= :build
       @target_prerequisites  << @rakefile
@@ -231,7 +210,7 @@ module Rake
 
       load_local_config
 
-      @include_paths         = Rake::Builder.expand_paths_with_root( @include_paths, @rakefile_path )
+      @include_paths         = Rake::Path.expand_all_with_root( @include_paths, @rakefile_path )
 
       raise "No source files found" if source_files.length == 0
     end
@@ -239,7 +218,7 @@ module Rake
     def local_config
       filename = '.rake-builder'
       filename += '.' + @task_namespace.to_s if @task_namespace
-      Rake::Builder.expand_path_with_root( filename, @rakefile_path )
+      Rake::Path.expand_with_root( filename, @rakefile_path )
     end
 
     def load_local_config
@@ -290,16 +269,7 @@ module Rake
       desc "Build '#{ target_basename }'"
       file @target => [ scoped_task( :compile ), *@target_prerequisites ] do |t|
         shell "rm -f #{ t.name }"
-        case @target_type
-        when :executable
-          shell "#{ @linker } #{ link_flags } -o #{ @target } #{ file_list( object_files ) }"
-        when :static_library
-          @logger.add( Logger::INFO, "Builing library '#{ t.name }'" )
-          shell "ar -cq #{ t.name } #{ file_list( object_files ) }"
-        when :shared_library
-          @logger.add( Logger::INFO, "Builing library '#{ t.name }'" )
-          shell "#{ @linker } -shared -o #{ t.name } #{ file_list( object_files ) } #{ link_flags }"
-        end
+        shell build_command
         raise BuildFailureError if ! File.exist?( t.name )
       end
 
@@ -309,12 +279,7 @@ module Rake
       task :compile => [ @makedepend_file, scoped_task( :load_makedepend ), *object_files ]
 
       source_files.each do |src|
-        object = object_path( src )
-        @generated_files << object
-        file object => [ src ] do |t|
-          @logger.add( Logger::INFO, "Compiling '#{ src }'" )
-          shell "#{ @compiler } #{ compiler_flags } -c -o #{ object } #{ src }"
-        end
+        define_compile_task( src )
       end
 
       file @makedepend_file => [ *project_files ] do
@@ -328,7 +293,7 @@ module Rake
       # the standard rake mkdepend loader doesn't do what we want,
       # as it assumes files will be compiled in their own directory.
       task :load_makedepend => @makedepend_file do
-        object_to_source = source_files.inject( {} ) do |memo, source|
+        object_to_source = source_files.inject( {} ) do | memo, source |
           mapped_object = source.gsub( '.' + @source_file_extension, '.o' )
           memo[ mapped_object ] = source
           memo
@@ -348,14 +313,14 @@ module Rake
 
       desc "List generated files (which are removed with 'rake #{ scoped_task( :clean ) }')"
       task :generated_files do
-        puts @generated_files.inspect
+        puts generated_files.inspect
       end
 
       # Re-implement :clean locally for project and within namespace
       # Standard :clean is a singleton
       desc "Remove temporary files"
       task :clean do
-        @generated_files.each do |file|
+        generated_files.each do |file|
           shell "rm -f #{ file }"
         end
       end
@@ -372,7 +337,7 @@ module Rake
 
       desc "Uninstall '#{ target_basename }' from '#{ @install_path }'"
       task :uninstall, [] => [] do
-        destination = File.join( @install_path, File.basename( @target ) )
+        destination = File.join( @install_path, target_basename )
         if ! File.exist?( destination )
           @logger.add( Logger::INFO, "The file '#{ destination }' does not exist" )
           next
@@ -380,10 +345,9 @@ module Rake
         begin
           shell "rm '#{ destination }'", Logger::INFO
         rescue Errno::EACCES => e
-          raise "You do not have premission to uninstall '#{ destination }'\nTry\n $ sudo rake uninstall"
+          raise "You do not have premission to uninstall '#{ destination }'\nTry\n $ sudo rake #{ scoped_task( :uninstall ) }"
         end
       end
-
     end
 
     def scoped_task( task )
@@ -394,6 +358,26 @@ module Rake
       end
     end
 
+    def define_compile_task( source )
+      object = object_path( source )
+      @generated_files << object
+      file object => [ source ] do |t|
+        @logger.add( Logger::INFO, "Compiling '#{ source }'" )
+        shell "#{ @compiler } -c #{ compiler_flags } -o #{ object } #{ source }"
+      end
+    end
+
+    def build_command
+      case @target_type
+      when :executable
+        "#{ @linker } #{ link_flags } -o #{ @target } #{ file_list( object_files ) }"
+      when :static_library
+        "ar -cq #{ @target } #{ file_list( object_files ) }"
+      when :shared_library
+        "#{ @linker } -shared -o #{ @target } #{ file_list( object_files ) } #{ link_flags }"
+      end
+    end
+
     def type( target )
       case target
       when /\.a/
@@ -412,7 +396,7 @@ module Rake
     end
 
     def compiler_flags
-      include_path + ' ' + @compilation_options
+      include_path + ' ' + compilation_options.join( " " )
     end
 
     def link_flags
@@ -421,14 +405,19 @@ module Rake
 
     # Paths
 
-    def save_rakefile_info( caller )
-      @rakefile      = caller.match(/^([^\:]+)/)[1]
+    def save_rakefile_info( block )
+      if RUBY_VERSION < '1.9'
+        # Hack the path from the block String representation
+        @rakefile = block.to_s.match( /@([^\:]+):/ )[ 1 ]
+      else
+        @rakefile = block.source_location
+      end
       @rakefile_path = File.expand_path( File.dirname( @rakefile ) )
     end
 
     def object_path( source_path_name )
       o_name = File.basename( source_path_name ).gsub( '.' + @source_file_extension, '.o' )
-      Rake::Builder.expand_path_with_root( o_name, @objects_path )
+      Rake::Path.expand_with_root( o_name, @objects_path )
     end
 
     def default_install_path( target_type )
@@ -447,18 +436,8 @@ module Rake
     # Lists of files
 
     def find_files( paths, extension )
-      files = paths.reduce( [] ) do | memo, path |
-        case
-        when File.file?( path )
-          files = FileList[ path ]
-        when ( path =~ /[\*\?]/ )
-          files = FileList[ path ]
-        else
-          files = FileList[ path + '/*.' + extension ]
-        end
-        memo + files
-      end
-      Rake::Builder.expand_paths_with_root( files, @rakefile_path )
+      files = Rake::Path.find_files( paths, extension )
+      Rake::Path.expand_all_with_root( files, @rakefile_path )
     end
 
     # TODO: make this return a FileList, not a plain Array
@@ -486,7 +465,7 @@ module Rake
       # TODO: make install_headers_path a configuration option
       install_headers_path = '/usr/local/include'
 
-      installable_headers.each do | installable_header |
+      project_headers.each do | installable_header |
         destination_path = File.join( install_headers_path, installable_header[ :relative_path ] )
         begin
           `mkdir -p '#{ destination_path }'`
@@ -497,29 +476,25 @@ module Rake
       end
     end
 
-    def subtract_path_prefix( prefix, path )
-      path[ prefix.size .. -1 ]
-    end
-
-    def installable_headers
+    def project_headers
       @header_search_paths.reduce( [] ) do | memo, search |
         non_glob_search = ( search.match( /^([^\*\?]*)/ ) )[ 1 ]
         case
         when ( non_glob_search !~ /#{ @rakefile_path }/ )
           # Skip paths that are not inside the project
         when File.file?( search )
-          full_path = Rake::Builder.expand_path_with_root( search, @rakefile_path )
+          full_path = Rake::Path.expand_with_root( search, @rakefile_path )
           memo << { :source_file => search, :relative_path => '' }
         when File.directory?( search )
           FileList[ search + '/*.' + @header_file_extension ].each do | pathname |
-            full_path = Rake::Builder.expand_path_with_root( pathname, @rakefile_path )
+            full_path = Rake::Path.expand_with_root( pathname, @rakefile_path )
             memo << { :source_file => pathname, :relative_path => '' }
           end
         when ( search =~ /[\*\?]/ )
           FileList[ search ].each do | pathname |
-            full_path = Rake::Builder.expand_path_with_root( pathname, @rakefile_path )
+            full_path = Rake::Path.expand_with_root( pathname, @rakefile_path )
             directory = File.dirname( full_path )
-            relative = subtract_path_prefix( non_glob_search, directory )
+            relative  = Rake::Path.subtract_prefix( non_glob_search, directory )
             memo << { :source_file => pathname, :relative_path => relative }
           end
         else
@@ -538,7 +513,7 @@ module Rake
       end
     end
 
-    def shell( command, log_level = Logger::ERROR )
+    def shell( command, log_level = Logger::DEBUG )
       @logger.add( log_level, command )
       `#{ command }`
     end

data/lib/rake/builder/qt_builder.rb

@@ -0,0 +1,145 @@
+require 'rake/builder'
+
+module Rake
+
+  class QtBuilder < Builder
+
+    # TODO:
+    #   generate Info.plist
+    #   package task
+
+    attr_accessor :frameworks
+    attr_accessor :resource_files
+    attr_accessor :qt_version
+    attr_accessor :architecture
+
+    def initialize( &block )
+      super( &block )
+    end
+
+    private
+
+    # Overrrides
+
+    def initialize_attributes
+      super
+      @programming_language  = 'c++'
+      @header_file_extension = 'h'
+      @frameworks            = [ 'QtGui', 'QtCore' ]
+      @framework_paths       = [ '/Library/Frameworks' ]
+      @compilation_defines   = '-DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED'
+      @moc_defines           = '-D__APPLE__ -D__GNUC__'
+      @resource_files        = []
+    end
+
+    def configure
+      raise 'programming_language must be C++' if @programming_language.downcase != 'c++'
+      raise 'qt_version must be set'           if ! @qt_version
+
+      super
+
+      @resource_files      = Rake::Path.expand_all_with_root( @resource_files, @rakefile_path )
+      @compilation_options += [ '-pipe', '-g', '-gdwarf-2', '-Wall', '-W' ]
+      @compilation_options.uniq!
+      @architecture        ||= 'i386'
+      @compilation_options += [ architecture_option ]
+
+      @frameworks.each do | framework |
+        @include_paths << "/Library/Frameworks/#{ framework }.framework/Versions/#{ qt_major }/Headers"
+        @include_paths << "/usr/include/#{ framework }"
+      end
+    end
+
+    def define
+      super
+      define_moc_tasks
+      define_resource_tasks
+    end
+
+    def generated_files
+      super + moc_files + qrc_files
+    end
+
+    def source_files
+      ( super + moc_files + qrc_files ).uniq
+    end
+
+    def compiler_flags
+      [ compilation_options.join( ' ' ), @compilation_defines, include_path, framework_path_list ].join( ' ' )
+    end
+
+    def link_flags
+      [ '-headerpad_max_install_names', architecture_option, @linker_options, library_paths_list, library_dependencies_list, framework_path_list, framework_list ].join( " " )
+    end
+
+    # QT-specific
+
+    def qt_major
+      @qt_version.match( /^(\d+)/ )[ 1 ]
+    end
+
+    def architecture_option
+      "-arch #{ @architecture }"
+    end
+
+    def framework_path_list
+      @framework_paths.map { |p| "-F#{ p }" }.join( " " )
+    end
+
+    def framework_list
+      @frameworks.map { |p| "-framework #{ p }" }.join( " " )
+    end
+    
+    # MOC
+
+    def define_moc_tasks
+      project_headers.each do | header |
+        header_file = header[ :source_file ]
+        moc         = moc_pathname( header_file )
+
+        file moc => [ header_file ] do |t|
+          command = "moc #{ @compilation_defines } #{ framework_path_list } #{ @moc_defines } #{ header_file } -o #{ moc }"
+          shell command
+        end
+
+        define_compile_task( moc )
+      end
+    end
+
+    def moc_files
+      @moc_files ||= project_headers.collect do | header |
+        moc_pathname( header[ :source_file ] )
+      end
+    end
+
+    def moc_pathname( header_name )
+      moc_name = 'moc_' + File.basename( header_name ).gsub( '.' + @header_file_extension, '.cpp' )
+      Rake::Path.expand_with_root( moc_name, @objects_path )
+    end
+
+    # Resources
+
+    def define_resource_tasks
+      @resource_files.each do | resource |
+        qrc = qrc_pathname( resource )
+        file qrc => [ resource ] do |t|
+          command = "rcc -name #{ target_basename } #{ resource } -o #{ qrc }"
+          shell command
+        end
+      end
+    end
+
+    def qrc_files
+      @resource_files.collect do | resource |
+        qrc_pathname( resource )
+      end
+    end
+
+    def qrc_pathname( resource_name )
+      qrc_name = 'qrc_' + File.basename( resource_name ).gsub( '.qrc', '.cpp' )
+      Rake::Path.expand_with_root( qrc_name, @objects_path )
+    end
+
+  end
+
+end

data/lib/rake/file_task_alias.rb

@@ -0,0 +1,24 @@
+require 'rubygems' if RUBY_VERSION < '1.9'
+require 'rake/tasklib'
+
+module Rake
+
+  # A task whose behaviour depends on a FileTask
+  class FileTaskAlias < Task
+
+    attr_accessor :target
+
+    def self.define_task( name, target, &block )
+      alias_task = super( { name => [] }, &block )
+      alias_task.target = target
+      alias_task.prerequisites.unshift( target )
+      alias_task
+    end
+
+    def needed?
+      Rake::Task[ @target ].needed?
+    end
+
+  end
+
+end

data/lib/rake/path.rb

@@ -0,0 +1,41 @@
+require 'rubygems' if RUBY_VERSION < '1.9'
+
+module Rake
+
+  module Path
+
+    def self.find_files( paths, extension )
+      files = paths.reduce( [] ) do | memo, path |
+        case
+        when File.file?( path )
+          files = FileList[ path ]
+        when ( path =~ /[\*\?]/ )
+          files = FileList[ path ]
+        else
+          files = FileList[ path + '/*.' + extension ]
+        end
+        memo + files
+      end
+    end
+
+    # Expand path to an absolute path relative to the supplied root
+    def self.expand_with_root( path, root )
+      if path =~ /^\//
+        File.expand_path( path )
+      else
+        File.expand_path( root + '/' + path )
+      end
+    end
+
+    # Expand an array of paths to absolute paths relative to the supplied root
+    def self.expand_all_with_root( paths, root )
+      paths.map{ |path| expand_with_root( path, root ) }
+    end
+
+    def self.subtract_prefix( prefix, path )
+      path[ prefix.size .. -1 ]
+    end
+
+  end
+
+end

data/spec/c_project_spec.rb

@@ -5,13 +5,13 @@ describe 'when building a C project' do
   include RakeBuilderHelper
 
   before( :all ) do
-    @test_output_file = Rake::Builder.expand_path_with_root( 'rake-c-testfile.txt', SPEC_PATH )
+    @test_output_file = Rake::Path.expand_with_root( 'rake-c-testfile.txt', SPEC_PATH )
   end
 
   before( :each ) do
     Rake::Task.clear
     @project = c_task( :executable )
-    @expected_generated = Rake::Builder.expand_paths_with_root( [ './main.o',  @project.makedepend_file, @project.target ], SPEC_PATH )
+    @expected_generated = Rake::Path.expand_all_with_root( [ './main.o',  @project.makedepend_file, @project.target ], SPEC_PATH )
     `rm -f #{ @test_output_file }`
     `rm -f #{ @project.target }`
   end

data/spec/cpp_project_spec.rb

@@ -5,11 +5,11 @@ describe 'when building an executable' do
   include RakeBuilderHelper
 
   before( :all ) do
-    @test_output_file = Rake::Builder.expand_path_with_root(
+    @test_output_file = Rake::Path.expand_with_root(
                           'rake-builder-testfile.txt', SPEC_PATH )
-    @expected_target = Rake::Builder.expand_path_with_root(
-                         RakeBuilderHelper::TARGET[ :executable ],
-                         SPEC_PATH )
+    @expected_target  = Rake::Path.expand_with_root(
+                          RakeBuilderHelper::TARGET[ :executable ],
+                          SPEC_PATH )
   end
 
   before( :each ) do
@@ -42,18 +42,6 @@ describe 'when building an executable' do
     missing_tasks.should == []
   end
 
-  it 'finds source files' do
-    expected_sources = Rake::Builder.expand_paths_with_root(
-                         [ 'cpp_project/main.cpp' ], SPEC_PATH )
-    @project.source_files.should == expected_sources
-  end
-
-  it 'finds header files' do
-    expected_headers = Rake::Builder.expand_paths_with_root(
-                         [ 'cpp_project/main.h' ], SPEC_PATH )
-    @project.header_files.should == expected_headers
-  end
-
   it 'builds the program with \'build\'' do
     Rake::Task[ 'build' ].invoke
     exist?( @project.target ).should be_true

data/spec/dependencies_spec.rb

@@ -30,7 +30,7 @@ describe 'the dependencies system' do
     end
     Rake::Task.clear
     @project = cpp_task( :executable )
-    object_file_path = Rake::Builder.expand_path_with_root( 'main.o', SPEC_PATH )
+    object_file_path = Rake::Path.expand_with_root( 'main.o', SPEC_PATH )
     Rake::Task[ object_file_path ].needed?.should be_false
   end
 
@@ -40,16 +40,16 @@ describe 'the dependencies system' do
     end
     Rake::Task.clear
     @project = cpp_task( :executable )
-    source_file_path = Rake::Builder.expand_path_with_root( 'cpp_project/main.cpp', SPEC_PATH )
-    object_file_path = Rake::Builder.expand_path_with_root( 'main.o', SPEC_PATH )
+    source_file_path = Rake::Path.expand_with_root( 'cpp_project/main.cpp', SPEC_PATH )
+    object_file_path = Rake::Path.expand_with_root( 'main.o', SPEC_PATH )
     touching_temporarily( source_file_path, File.mtime( object_file_path ) + 1 ) do
       Rake::Task[ object_file_path ].needed?.should be_true
     end
   end
 
   it 'recompiles source files, if header dependencies' do
-    header_file_path = Rake::Builder.expand_path_with_root( 'cpp_project/main.h', SPEC_PATH )
-    object_file_path = Rake::Builder.expand_path_with_root( 'main.o', SPEC_PATH )
+    header_file_path = Rake::Path.expand_with_root( 'cpp_project/main.h', SPEC_PATH )
+    object_file_path = Rake::Path.expand_with_root( 'main.o', SPEC_PATH )
     isolating_seconds do
       Rake::Task[ 'compile' ].invoke
     end

data/spec/generated_files_spec.rb

@@ -7,7 +7,7 @@ describe 'when handling generated files' do
   before( :each ) do
     Rake::Task.clear
     @project = cpp_task( :executable )
-    @expected_generated = Rake::Builder.expand_paths_with_root(
+    @expected_generated = Rake::Path.expand_all_with_root(
                             [
                              'main.o',
                              'rake-builder-testfile.txt',
@@ -50,7 +50,7 @@ describe 'when adding generated files' do
 
   before( :each ) do
     @file = 'foobar.txt'
-    @file_with_path = Rake::Builder.expand_path_with_root( @file, SPEC_PATH )
+    @file_with_path = Rake::Path.expand_with_root( @file, SPEC_PATH )
   end
 
   it 'includes added files' do

data/spec/local_config_spec.rb

@@ -7,7 +7,7 @@ describe 'local config files' do
   include RakeBuilderHelper
 
   before( :each ) do
-    @local_config_file = Rake::Builder.expand_path_with_root( '.rake-builder', LOCAL_CONFIG_SPEC_PATH )
+    @local_config_file = Rake::Path.expand_with_root( '.rake-builder', LOCAL_CONFIG_SPEC_PATH )
     @expected_path     = "/some/special/path"
     @config            = {:rake_builder=>{:config_file=>{:version=>"1.0"}}, :include_paths=>[ @expected_path ]}
     `rm -f '#{ @local_config_file }'`

data/spec/logger_spec.rb

@@ -18,4 +18,7 @@ describe 'the logger' do
     end.should_not raise_exception
   end
 
+  # TODO: check the output
+  # builder.logger.level = Logger::DEBUG
+
 end

data/spec/objective_c_project_spec.rb

@@ -5,11 +5,11 @@ describe 'when building an Objective-C executable' do
   include RakeBuilderHelper
 
   before( :all ) do
-    @test_output_file = Rake::Builder.expand_path_with_root(
+    @test_output_file = Rake::Path.expand_with_root(
                           'rake-builder-testfile.txt', SPEC_PATH )
-    @expected_target = Rake::Builder.expand_path_with_root(
-                         RakeBuilderHelper::TARGET[ :executable ],
-                         SPEC_PATH )
+    @expected_target  = Rake::Path.expand_with_root(
+                          RakeBuilderHelper::TARGET[ :executable ],
+                          SPEC_PATH )
   end
 
   before( :each ) do
@@ -42,18 +42,6 @@ describe 'when building an Objective-C executable' do
     missing_tasks.should == []
   end
 
-  it 'finds source files' do
-    expected_sources = Rake::Builder.expand_paths_with_root(
-                         [ 'objective_c_project/main.m' ], SPEC_PATH )
-    @project.source_files.should == expected_sources
-  end
-
-  it 'finds header files' do
-    expected_headers = Rake::Builder.expand_paths_with_root(
-                         [ 'objective_c_project/main.h' ], SPEC_PATH )
-    @project.header_files.should == expected_headers
-  end
-
   it 'builds the program with \'build\'' do
     Rake::Task[ 'build' ].invoke
     exist?( @project.target ).should be_true

data/spec/target_spec.rb

@@ -28,7 +28,7 @@ describe 'when creating tasks' do
     builder = Rake::Builder.new do |builder|
       builder.source_search_paths = [ 'cpp_project' ]
     end
-    builder.target.should == Rake::Builder.expand_path_with_root( 'a.out', SPEC_PATH )
+    builder.target.should == Rake::Path.expand_with_root( 'a.out', SPEC_PATH )
   end
 
   it 'raises an error when the supplied target_type is unknown' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake-builder
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Joe Yates
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +01:00
+date: 2010-08-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,10 @@ extensions: []
 extra_rdoc_files: 
 - COPYING
 - README.rdoc
+- lib/rake/builder/qt_builder.rb
 - lib/rake/builder.rb
+- lib/rake/file_task_alias.rb
+- lib/rake/path.rb
 - examples/README.rdoc
 - examples/01_hello_world_cpp/Rakefile
 - examples/02_hello_world_c/Rakefile
@@ -56,7 +59,10 @@ files:
 - COPYING
 - Rakefile
 - README.rdoc
+- lib/rake/builder/qt_builder.rb
 - lib/rake/builder.rb
+- lib/rake/file_task_alias.rb
+- lib/rake/path.rb
 - examples/03_search_paths/include/main.h
 - examples/04_zlib/include/main.h
 - examples/05_tests/include/main.h