rake-builder 0.7.0 → 0.8.0

data/lib/rake/builder/installer.rb

@@ -0,0 +1,37 @@
+require 'fileutils'
+
+class Rake::Builder
+  class Installer
+    def install(source_pathname, destination_path)
+      ensure_file_exists source_pathname
+      raise "The path '#{destination_path}' does not exist" unless File.exist?(destination_path)
+      raise "'#{destination_path}' is not a directory" unless File.directory?(destination_path)
+      ensure_directory_writable destination_path, "Cannot copy files to the directory '#{destination_path}'"
+      filename = File.basename(source_pathname)
+      destination_pathname = File.join(destination_path, filename)
+      if File.file?(destination_pathname) and not File.writable?(destination_pathname)
+        raise "The file '#{destination_pathname}' cannot be overwritten"
+      end
+
+      FileUtils.copy_file source_pathname, destination_path
+    end
+
+    def uninstall(installed_pathname)
+      return unless File.exist?(installed_pathname)
+      ensure_directory_writable File.dirname(installed_pathname)
+      File.unlink installed_pathname
+    end
+
+    private
+
+    def ensure_file_exists(pathname)
+      raise "File '#{pathname}' does not exist" unless File.exist?(pathname)
+    end
+
+    def ensure_directory_writable(path, message = nil)
+      message ||= "The directory '#{path}' is not writable"
+      raise message unless File.writable?(path)
+    end
+  end
+end
+

data/lib/rake/{local_config.rb → builder/local_config.rb}

@@ -1,43 +1,42 @@
 require 'yaml'
 
-module Rake
-
+class Rake::Builder
   class LocalConfig
-
     VERSIONS = ['1.0', '1.1']
 
     attr_accessor :include_paths
     attr_accessor :compilation_options
 
-    def initialize( file_name )
+    def initialize(file_name)
       @file_name           = file_name
       @include_paths       = []
       @compilation_options = []
     end
 
     def load
-      config = YAML.load_file( @file_name )
+      config = YAML.load_file(@file_name)
 
-      version             = config[:rake_builder][:config_file][:version]
-      @include_paths       = config[:include_paths]
-      @compilation_options = config[:compilation_options]
-      if not VERSIONS.find_index(version)
+      version              = config[:rake_builder][:config_file][:version]
+      if not VERSIONS.include?(version)
         raise Rake::Builder::Error.new('Config file version incorrect') 
       end
+      @include_paths       = config[:include_paths]
+      @compilation_options = config[:compilation_options]
     end
 
     def save
-      File.open( @file_name, 'w' ) do | file |
+      File.open(@file_name, 'w') do |file|
         file.write config.to_yaml
       end
     end
 
     def config
-      { :rake_builder        => { :config_file => { :version => VERSIONS[-1] } },
+      {
+        :rake_builder        => {:config_file => {:version => VERSIONS[-1]}},
         :include_paths       => @include_paths,
-        :compilation_options => @compilation_options }
+        :compilation_options => @compilation_options
+      }
     end
-
   end
-
 end
+

data/lib/rake/builder/logger/formatter.rb

@@ -1,5 +1,11 @@
+require 'logger'
+
 class Rake::Builder
-  class Formatter < Logger::Formatter
+  module Logger; end
+end
+
+module Rake::Builder::Logger
+  class Formatter < ::Logger::Formatter
     def call(severity, time, progname, msg)
       msg2str(msg) << "\n"
     end

data/lib/rake/builder/presenters/makefile/builder_presenter.rb

@@ -4,44 +4,84 @@ module Rake::Builder::Presenters::Makefile
   class BuilderPresenter
     def initialize(builder)
       @builder = builder
+      check_target_type
     end
 
     def to_s
-      objects      = @builder.object_files.collect { |f| f.sub(@builder.objects_path, '$(OBJECT_DIR)') }
-      objects_list = objects.join( ' ' )
-      case @builder.target_type
+      check_target_type
+
+      variables = main_variables
+      rules     = main_rules
+
+      source_groups = group_files_by_path(@builder.source_files)
+      source_groups.each.with_index do |gp, i|
+        variables << "SOURCE_#{i + 1} = #{gp[0]}\n"
+        rules     << <<EOT
+
+$(OBJECT_DIR)/%.o: $(SOURCE_#{i + 1})/%.cpp
+	$(COMPILER) -c $(COMPILER_FLAGS) -o $@ $<
+EOT
+      end
+      variables + rules
+    end
+
+    def save
+      File.open(@builder.makefile_name, 'w') do |file|
+        file.write to_s
+      end
+    end
+
+    private
+
+    def target_type
+      @builder.target_type
+    end
+
+    def target_name
+      case target_type
+      when :executable
+        'EXECUTABLE_TARGET'
+      when :static_library
+        'LIB_TARGET'
+      when :shared_library
+        'LIB_TARGET'
+      end
+    end
+
+    def target_ref
+      "$(#{target_name})"
+    end
+
+    def target_actions
+      case target_type
       when :executable
-        target_name = 'EXECUTABLE_TARGET'
-        target_ref  = "$(#{target_name})"
-        target_actions =
 "	$(LINKER) $(LINK_FLAGS) -o #{target_ref} $(OBJECTS)
 "
       when :static_library
-        target_name = 'LIB_TARGET'
-        target_ref  = "$(#{target_name})"
-        target_actions =
 "	rm -f #{target_ref}
 	ar -cq #{target_ref} $(OBJECTS)
 	ranlib #{target_ref}
 "
       when :shared_library
-        target_name = 'LIB_TARGET'
-        target_ref  = "$(#{target_name})"
-        target_actions =
 "	$(LINKER) -shared -o #{target_ref} $(OBJECTS) $(LINK_FLAGS)
 "
       end
+    end
 
-      variables = <<EOT
+    def main_variables
+      <<EOT
 COMPILER       = #{@builder.compiler}
 COMPILER_FLAGS = #{@builder.compiler_flags}
 LINKER         = #{@builder.linker}
 LINK_FLAGS     = #{@builder.link_flags}
 OBJECT_DIR     = #{@builder.objects_path}
 OBJECTS        = #{objects_list}
-#{ target_name } = #{@builder.target}
+#{target_name} = #{@builder.target}
 EOT
-      rules = <<EOT
+    end
+
+    def main_rules
+      <<EOT
 
 all: #{target_ref}
 
@@ -52,30 +92,23 @@ clean:
 #{target_ref}: $(OBJECTS)
 #{target_actions}
 EOT
+    end
 
-      source_groups = group_files_by_path(@builder.source_files)
-      source_groups.each.with_index do | gp, i |
-        variables << "SOURCE_#{i + 1} = #{gp[0]}\n"
-        rules     << <<EOT
-
-$(OBJECT_DIR)/%.o: $(SOURCE_#{i + 1})/%.cpp
-	$(COMPILER) -c $(COMPILER_FLAGS) -o $@ $<
-EOT
-      end
-      variables + rules
+    def objects_list
+      objects = @builder.object_files.map { |f| f.sub(@builder.objects_path, '$(OBJECT_DIR)') }
+      objects.join(' ')
     end
 
-    def save
-      File.open(@builder.makefile_name, 'w') do |file|
-        file.write to_s
+    def group_files_by_path(files)
+      files.group_by do |f|
+        m = f.match(/(.*?)?\/?([^\/]+)$/)
+        m[1]
       end
     end
 
-    def group_files_by_path( files )
-      files.group_by do | f |
-        m = f.match( /(.*?)?\/?([^\/]+)$/ )
-        m[ 1 ]
-      end
+    def check_target_type
+      return if [:executable, :shared_library, :static_library].include?(target_type)
+      raise "Unknown build target type '#{target_type}'"
     end
   end
 end

data/lib/rake/builder/presenters/makefile_am/builder_presenter.rb

@@ -1,4 +1,4 @@
-module Rake; class Builder; module Presenters; module MakefileAm
+module Rake::Builder::Presenters::MakefileAm
   class BuilderPresenter
     attr_accessor :builder
 
@@ -7,13 +7,13 @@ module Rake; class Builder; module Presenters; module MakefileAm
     end
 
     def to_s
-      [sources, cpp_flags, ld_flags, libraries, ''].compact.join("/n")
+      [sources, cpp_flags, ld_flags, libraries, ''].compact.join("\n")
     end
 
     private
 
     def sources
-      "#{builder.label}_SOURCES = #{builder.source_paths.join(' ')}"
+      "#{builder.label}_SOURCES = #{builder.source_files.join(' ')}"
     end
 
     def cpp_flags
@@ -36,5 +36,5 @@ module Rake; class Builder; module Presenters; module MakefileAm
       end
     end
   end
-end; end; end; end
+end
 

data/lib/rake/builder/qt_builder.rb

@@ -47,8 +47,6 @@ module Rake
 
       super
 
-      @resource_files      = Rake::Path.expand_all_with_root( @resource_files, @rakefile_path )
-      @ui_files            = Rake::Path.expand_all_with_root( @ui_files, @rakefile_path )
       @compilation_options += [ '-pipe', '-g', '-gdwarf-2', '-Wall', '-W' ]
       @include_paths << @objects_path # for UI headers
     end
@@ -161,8 +159,7 @@ module Rake
     end
 
     def ui_header_path( ui_file )
-      header_name = 'ui_' + File.basename( ui_file ).gsub( '.ui', '.h' )
-      Rake::Path.expand_with_root( header_name, @objects_path )
+      'ui_' + File.basename(ui_file).gsub('.ui', '.h')
     end
 
     # MOC
@@ -191,8 +188,7 @@ module Rake
     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 )
+      'moc_' + File.basename(header_name).gsub('.' + @header_file_extension, '.cpp')
     end
 
     # Resources
@@ -214,8 +210,7 @@ module Rake
     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 )
+      'qrc_' + File.basename(resource_name).gsub('.qrc', '.cpp')
     end
 
   end

data/lib/rake/builder/task_definers/builder_task_definer.rb

@@ -1,6 +1,3 @@
-require 'rake/file_task_alias'
-require 'rake/local_config'
-
 include Rake::DSL
 
 class Rake::Builder
@@ -71,7 +68,7 @@ class Rake::Builder
         @builder.create_local_config
       end
 
-      once_task :load_local_config => scoped_task(@builder.local_config) do
+      once_task :load_local_config => @builder.local_config do
         @builder.load_local_config
       end
 

data/lib/rake/builder/version.rb

@@ -2,7 +2,7 @@ module Rake
   class Builder
     module VERSION #:nodoc:
       MAJOR = 0
-      MINOR = 7
+      MINOR = 8
       TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/rake/{microsecond.rb → microsecond_task.rb}

@@ -1,16 +1,25 @@
-require 'rubygems' if RUBY_VERSION < '1.9'
-require 'rake/tasklib'
 require 'fileutils'
 
 module Rake
-
   module Microsecond
-  # Compensate for file systems with 1s resolution
-
-    class FileTask < Task
-
+    class Base < Task
       attr_accessor :timestamp
 
+      def prerequisites_needed?
+        prerequisites.any? do |n|
+          task = application[n]
+          if task.is_a?(Rake::FileTask) or
+            task.is_a?(self.class)
+            task.timestamp > @timestamp
+          else
+            task.needed?
+          end
+        end
+      end
+    end
+
+    # Compensate for file systems with 1s resolution
+    class FileTask < Base
       def self.define_task( *args, &block )
         task = super( *args, &block )
         task.timestamp = nil
@@ -20,32 +29,21 @@ module Rake
       def needed?
         return true if not File.exist?(self.name)
         @timestamp = File.stat(self.name).mtime if @timestamp.nil?
-        self.prerequisites.any? do |n|
-          task = application[n]
-          if task.is_a?(Rake::FileTask) or
-            task.is_a?(self.class)
-            task.timestamp > @timestamp
-          else
-            task.needed?
-          end
-        end
+        prerequisites_needed?
       end
 
       def execute(*args)
         @timestamp = Time.now
         super(*args)
       end
-
     end
 
-    class DirectoryTask < Task
-
+    class DirectoryTask < Base
       include FileUtils
 
-      attr_accessor :timestamp
       attr_accessor :path
 
-      def self.define_task( *args, &block )
+      def self.define_task(*args, &block)
         task           = super(*args, &block)
         task.path      = args[0]
         task.timestamp = nil
@@ -53,11 +51,11 @@ module Rake
       end
 
       def needed?
-        exists = File.directory?(self.path)
-        if exists && @timestamp.nil?
+        return true if not File.directory?(self.path)
+        if @timestamp.nil?
           @timestamp = File.stat(self.path).mtime
         end
-        ! exists
+        prerequisites_needed?
       end
 
       def execute(*args)
@@ -65,11 +63,8 @@ module Rake
         @timestamp = Time.now
         super(*args)
       end
-
     end
-
   end
-
 end
 
 def microsecond_file(*args, &block)

data/lib/rake/once_task.rb

@@ -1,16 +1,13 @@
-require 'rubygems' if RUBY_VERSION < '1.9'
 require 'rake/tasklib'
 
 module Rake
-
   # A task whick is no longer needed after its first invocation
   class OnceTask < Task
-
     attr_accessor :invoked
     attr_accessor :timestamp
 
-    def self.define_task( *args, &block )
-      task = super( *args, &block )
+    def self.define_task(*args, &block)
+      task = super(*args, &block)
       task.timestamp = nil
       task.invoked = false
       task
@@ -25,9 +22,7 @@ module Rake
     def needed?
       ! @invoked
     end
-
   end
-
 end
 
 def once_task(*args, &block)