rake-builder 0.8.0 → 0.9.0

data/lib/rake/builder.rb

@@ -165,6 +165,10 @@ module Rake
     # Each instance has its own logger
     attr_accessor :logger
 
+    # Command line parameters to pass to the target when it is executed
+    # with the `run` task. Default: []
+    attr_accessor :target_parameters
+
     # All Rake::Builder instances that get defined
     # This allows us to create scripts for configure
     @instances = []
@@ -215,11 +219,14 @@ module Rake
       old_dir = Dir.pwd
       Dir.chdir rakefile_path
       command = File.join('.', target)
+      if target_parameters.size > 0
+        command << " " << target_parameters.join(" ")
+      end
       begin
         output, error = shell(command, ::Logger::INFO)
         $stdout.print output
         $stderr.print error
-        raise Exception.new("Running #{command} failed with status #{$?.exitstatus}") if not $?.success?
+        raise Exception.new("Running #{command} failed with status #{$?.exitstatus}") if ! $?.success?
       ensure
         Dir.chdir old_dir
       end
@@ -327,12 +334,8 @@ module Rake
       File.basename(@target)
     end
 
-    def primary_name
-      Rake::Path.relative_path(target, rakefile_path, :initial_dot_slash => false)
-    end
-
     def label
-      primary_name.gsub(%r(\.), '_')
+      target.gsub(%r(\.), '_')
     end
 
     # Source files found in source_search_paths
@@ -411,6 +414,7 @@ module Rake
       @compilation_options   = []
       @include_paths         = ['./include']
       @installable_headers   ||= []
+      @target_parameters     = []
     end
 
     def configure
@@ -520,7 +524,6 @@ module Rake
 
     def project_headers
       @installable_headers.reduce([]) do |memo, search|
-        non_glob_search = (search.match(/^([^\*\?]*)/))[1]
         case
         when search.start_with?('/'), search.start_with?('..')
           # Skip paths that are not inside the project
@@ -530,11 +533,13 @@ module Rake
           FileList[search + '/*.' + @header_file_extension].each do |pathname|
             memo << {:source_file => pathname, :relative_path => ''}
           end
-        when (search =~ /[\*\?]/)
+        when search.match(/[\*\?]/)
+          non_glob_part = search[/^([^\*\?]*\/)/, 1]
+          base_path     = File.expand_path(non_glob_part, rakefile_path)
           FileList[search].each do |pathname|
-            full_path = Rake::Path.expand_with_root(pathname, @rakefile_path)
+            full_path = File.expand_path(pathname, rakefile_path)
             directory = File.dirname(full_path)
-            relative  = Rake::Path.relative_path(directory, non_glob_search)
+            relative  = File.relative_path(base_path, directory)
             memo << {:source_file => pathname, :relative_path => relative}
           end
         else

data/lib/rake/builder/local_config.rb

@@ -30,6 +30,8 @@ class Rake::Builder
       end
     end
 
+    private
+
     def config
       {
         :rake_builder        => {:config_file => {:version => VERSIONS[-1]}},

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

@@ -4,11 +4,7 @@ class Rake::Builder::BuilderCollectionTaskDefiner
     task :autoconf, [:project_title, :version] => [] do |task, args|
       raise 'No Rake::Builder projects have been defined' unless Rake::Builder.instances.size > 0
       first = Rake::Builder.instances[0]
-      source = Rake::Path.relative_path(
-        first.source_files[0],
-        first.rakefile_path
-      )
-      Rake::Builder.create_autoconf(args.project_title, args.version, source)
+      Rake::Builder.create_autoconf(args.project_title, args.version, first.source_files[0])
     end
   end
 end

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

@@ -1,3 +1,6 @@
+require 'logger'
+require 'rake'
+
 include Rake::DSL
 
 class Rake::Builder
@@ -20,10 +23,6 @@ class Rake::Builder
     private
 
     def define
-      once_task :environment do
-        @builder.logger.level = Logger::DEBUG if ENV['DEBUG']
-      end
-
       if @builder.target_type == :executable
         desc "Run '#{@builder.target_basename}'"
         task :run => :build do
@@ -61,6 +60,23 @@ class Rake::Builder
         define_compile_task(source, object)
       end
 
+      # Re-implement :clean locally for project and within namespace
+      # Standard :clean is a singleton
+      desc "Remove temporary files"
+      task :clean do
+        @builder.clean
+      end
+
+      desc "Install '#{@builder.target_basename}' in '#{@builder.install_path}'"
+      task :install, [] => [scoped_task(:build)] do
+        @builder.install
+      end
+
+      desc "Uninstall '#{@builder.target_basename}' from '#{@builder.install_path}'"
+      task :uninstall, [] => [] do
+        @builder.uninstall
+      end
+
       # TODO: Does this need to be microsecond?
       microsecond_directory @builder.objects_path
 
@@ -98,27 +114,14 @@ class Rake::Builder
         end
       end
 
-      # Re-implement :clean locally for project and within namespace
-      # Standard :clean is a singleton
-      desc "Remove temporary files"
-      task :clean do
-        @builder.clean
-      end
-
-      desc "Install '#{@builder.target_basename}' in '#{@builder.install_path}'"
-      task :install, [] => [scoped_task(:build)] do
-        @builder.install
-      end
-
-      desc "Uninstall '#{@builder.target_basename}' from '#{@builder.install_path}'"
-      task :uninstall, [] => [] do
-        @builder.uninstall
-      end
-
       desc "Create a '#{@builder.makefile_name}' to build the project"
       file "#{@builder.makefile_name}" => [@builder.makedepend_file, scoped_task(:load_makedepend)] do
         Rake::Builder::Presenters::Makefile::BuilderPresenter.new(@builder).save
       end
+
+      once_task :environment do
+        @builder.logger.level = ::Logger::DEBUG if ENV['DEBUG']
+      end
     end
 
     def define_default

data/lib/rake/builder/version.rb

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

data/lib/rake/path.rb

@@ -1,46 +1,18 @@
 module Rake
   module Path
-    def self.find_files( paths, extension )
-      files = paths.reduce( [] ) do | memo, 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 ]
+        when File.file?(path)
+          files = FileList[path]
+        when path.match(/[\*\?]/)
+          files = FileList[path]
         else
-          files = FileList[ path + '/*.' + extension ]
+          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.relative_path( path, prefix, options = {} )
-      return path if prefix.nil?
-      m = path.match( /^#{ prefix }\/?/ )
-      if ! m.nil?
-        if options[ :initial_dot_slash ]
-          "./#{ m.post_match }"
-        else
-          m.post_match
-        end
-      else
-        path
-      end
-    end
   end
 end
 

data/spec/unit/rake/builder/local_config_spec.rb

@@ -49,5 +49,32 @@ describe Rake::Builder::LocalConfig do
       expect(subject.compilation_options).to eq(compilation_options)
     end
   end
+
+  context '#save' do
+    let(:file) { stub('File') }
+
+    before do
+      File.stub(:open).with(local_config_file, 'w') do |&block|
+        block.call file
+      end
+    end
+
+    it 'write to the file' do
+      File.should_receive(:open).with(local_config_file, 'w') {}
+
+      subject.save
+    end
+
+    it 'saves the data' do
+      expected = {
+        :rake_builder        => {:config_file => {:version => '1.1'}},
+        :include_paths       => [],
+        :compilation_options => []
+      }.to_yaml
+      file.should_receive(:write).with(expected)
+
+      subject.save
+    end
+  end
 end
 

data/spec/unit/rake/builder/task_definers/builder_task_definer_spec.rb

@@ -44,6 +44,7 @@ describe Rake::Builder::BuilderTaskDefiner do
   let(:executable_target) { self.class.executable_target }
   let(:objects_path) { self.class.objects_path }
   let(:custom_prerequisite) { self.class.custom_prerequisite }
+  let(:logger) { stub('Logger') }
   let(:builder) do
     stub(
       'Rake::Builder',
@@ -63,6 +64,7 @@ describe Rake::Builder::BuilderTaskDefiner do
       :install_path => 'install/path',
       :makefile_name => self.class.makefile_name,
       :default_task => :build,
+      :logger       => logger,
     )
   end
   let(:namespaced_builder) { builder.stub(:task_namespace => 'foo'); builder }
@@ -178,6 +180,63 @@ describe Rake::Builder::BuilderTaskDefiner do
       Rake::Builder::BuilderTaskDefiner.new(builder).run
     end
 
+    context 'run' do
+      it 'runs the builder' do
+        clear_prerequisites 'run'
+
+        builder.should_receive(:run)
+
+        Rake::Task['run'].invoke
+      end
+    end
+
+    context 'the target' do
+      it 'builds the target' do
+        clear_prerequisites executable_target
+
+        builder.should_receive(:build)
+
+        Rake::Task[executable_target].invoke
+      end
+    end
+
+    context 'clean' do
+      it 'cleans the build' do
+        builder.should_receive(:clean)
+
+        Rake::Task['clean'].invoke
+      end
+    end
+
+    context 'install' do
+      it 'installs the target' do
+        clear_prerequisites 'install'
+
+        builder.should_receive(:install)
+
+        Rake::Task['install'].invoke
+      end
+    end
+
+    context 'uninstall' do
+      it 'uninstalls the target' do
+        builder.should_receive(:uninstall)
+
+        Rake::Task['uninstall'].invoke
+      end
+    end
+
+    context 'compile file' do
+      it 'compiles the file' do
+        clear_prerequisites 'src/file1.o'
+
+        builder.should_receive(:compile).
+          with('src/file1.cpp', 'src/file1.o')
+
+        Rake::Task['src/file1.o'].invoke
+      end
+    end
+
     context 'local_config' do
       it 'creates local config' do
         builder.should_receive(:create_local_config)
@@ -251,6 +310,32 @@ describe Rake::Builder::BuilderTaskDefiner do
         expect(Rake::Task[@object_file].prerequisites).to include('include/header1.h')
       end
     end
+
+    context 'makefile' do
+      let(:presenter) { stub('BuilderPresenter') }
+
+      it 'creates a makefile' do
+        clear_prerequisites self.class.makefile_name
+
+        Rake::Builder::Presenters::Makefile::BuilderPresenter.
+          should_receive(:new).
+          with(builder).
+          and_return(presenter)
+        presenter.should_receive(:save)
+
+        Rake::Task[self.class.makefile_name].invoke
+      end
+    end
+
+    context 'environment' do
+      it 'sets the logger level if required' do
+        ENV['DEBUG'] = 'true'
+
+        logger.should_receive(:level=).with(0)
+
+        Rake::Task['environment'].invoke
+      end
+    end
   end
 end
 

data/spec/unit/rake/builder_spec.rb

@@ -5,10 +5,12 @@ describe Rake::Builder do
   
   let(:target_pathname) { File.join('foo', 'bar', 'my_prog.exe') }
   let(:source_paths) { ['src/file1.cpp'] }
+  let(:target_parameters) { [] }
   let(:builder) do
     Rake::Builder.new do |b|
       b.target               = target_pathname
       b.library_dependencies = ['foo', 'bar']
+      b.target_parameters    = target_parameters
     end
   end
   let(:installer) do
@@ -158,6 +160,8 @@ describe Rake::Builder do
       Dir.stub(:chdir).with(builder.rakefile_path)
       builder.stub(:system)
       Dir.stub(:chdir).with(@old_dir)
+      # Run a successful command, so Process:Status $? gets set to success
+      `ls`
     end
 
     it 'changes directory to the Rakefile path' do
@@ -176,6 +180,18 @@ describe Rake::Builder do
       end
     end
 
+    context 'target_parameters' do
+      let(:target_parameters) { %w(--ciao) }
+
+      it 'are passed as command line options to the target' do
+        builder.should_receive(:system).with("./#{builder.target} --ciao", anything)
+
+        capturing_output do
+          builder.run
+        end
+      end
+    end
+
     it 'outputs the stdout results, then the stderr results' do
       builder.stub(:system) do |command|
         $stdout.puts 'standard output'
@@ -258,12 +274,6 @@ describe Rake::Builder do
     end
   end
 
-  context '#primary_name' do
-    it 'returns a relative path' do
-      expect(builder.primary_name).to eq(File.join('foo', 'bar', 'my_prog.exe'))
-    end
-  end
-
   context '#label' do
     it 'replaces dots with underscores' do
       expect(builder.label).to eq(File.join('foo', 'bar', 'my_prog_exe'))
@@ -437,6 +447,43 @@ describe Rake::Builder do
     end
   end
 
+  context '#create_local_config' do
+    let(:compiler) do
+      stub(
+        'Compiler',
+        :default_include_paths => [],
+        :missing_headers       => [],
+        :include_paths         => [],
+      )
+    end
+    let(:local_config) do
+      stub(
+        'Rake::Builder::LocalConfig',
+        :include_paths=        => nil,
+        :save                  => nil
+      )
+    end
+
+    before do
+      Compiler::Base.stub(:for).with(:gcc).and_return(compiler)
+      Rake::Builder::LocalConfig.stub(:new).and_return(local_config)
+    end
+
+    it 'gets extra paths for missing headers' do
+      compiler.should_receive(:missing_headers).
+        with(['./include'], source_paths).
+        and_return([])
+
+      builder.create_local_config
+    end
+
+    it 'saves a LocalConfig' do
+      local_config.should_receive(:save)
+
+      builder.create_local_config
+    end
+  end
+
   context '#install' do
     before { Rake::Builder::Installer.stub(:new).and_return(installer) }