rake-builder 0.0.17 → 0.0.18

data/examples/01_hello_world_cpp/vendor/bundle/gems/rake-10.0.3/doc/example/a.c

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+void a()
+{
+    printf ("In function a\n");
+}

data/examples/01_hello_world_cpp/vendor/bundle/gems/rake-10.0.3/doc/example/b.c

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+void b()
+{
+    printf ("In function b\n");
+}

data/examples/01_hello_world_cpp/vendor/bundle/gems/rake-10.0.3/doc/example/main.c

@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+extern void a();
+extern void b();
+
+int main ()
+{
+    a();
+    b();
+    return 0;
+}

data/lib/rake/builder.rb

@@ -1,8 +1,10 @@
-require 'rubygems' if RUBY_VERSION < '1.9'
 require 'json'
 require 'logger'
 require 'rake'
 require 'rake/tasklib'
+
+require 'rake/builder/presenters/makefile_am/builder_presenter'
+require 'rake/builder/presenters/makefile_am/builder_collection_presenter'
 require 'rake/path'
 require 'rake/local_config'
 require 'rake/file_task_alias'
@@ -236,62 +238,12 @@ EOT
     end
 
     def self.create_makefile_am
-      libraries = []
-      binaries  = []
-      instances.each do | instance |
-        entry = instance.makefile_am_entry
-        case entry[ :type ]
-        when :static_library, :shared_library
-          libraries << entry
-        else
-          binaries << entry
-        end
-      end
-
-      File.open( 'Makefile.am', 'w' ) do | f |
-        if libraries.size > 0
-          names = libraries.map { | lib | lib[ :name ] }.join( ' ' )
-          f.write "lib_LIBRARIES = #{ names }\n\n"
-          libraries.each do | lib |
-            f.write <<EOT
-#{ lib[ :label ] }_SOURCES = #{ lib[ :sources ] }
-#{ lib[ :label ] }_CPPFLAGS = #{ lib[ :compiler_flags ] }
-
-EOT
-          end
-        end
-        if binaries.size > 0
-          names = binaries.map { | bin | bin[ :name ] }.join( ' ' )
-          f.write "bin_PROGRAMS = #{ names }\n\n"
-          binaries.each do | bin |
-            f.write <<EOT
-#{ bin[ :label ] }_SOURCES  = #{ bin[ :sources ] }
-#{ bin[ :label ] }_CPPFLAGS = #{ bin[ :compiler_flags ] }
-#{ bin[ :label ] }_LDFLAGS  = -L.
-#{ bin[ :label ] }_LDADD    = #{ bin[ :libraries ] }
-
-EOT
-          end
-        end
-
+      presenter = Rake::Builder::Presenters::MakefileAm::BuilderCollectionPresenter.new(instances)
+      File.open('Makefile.am', 'w') do |f|
+        f.write presenter.to_s
       end
     end
 
-    def makefile_am_entry
-      primary_name = Rake::Path.relative_path( target, rakefile_path, :initial_dot_slash => false )
-      sources      = source_files.map{ | file | Rake::Path.relative_path( file, rakefile_path) }.join( ' ' )
-      sources_label = primary_name.gsub( %r(\.), '_' )
-
-      {
-      :type         => @target_type,
-      :name         => primary_name, 
-      :label        => sources_label,
-      :sources      => sources,
-      :compiler_flags => compiler_flags,
-      :libraries      => library_dependencies_list,
-      }
-    end
-
     #########################################
     # VERSION file
 
@@ -360,6 +312,34 @@ EOT
       @header_files = find_files( @header_search_paths, @header_file_extension ).uniq
     end
 
+    def is_library?
+      [:static_library, :shared_library].include?(target_type)
+    end
+
+    def primary_name
+      Rake::Path.relative_path(target, rakefile_path, :initial_dot_slash => false)
+    end
+
+    def label
+      primary_name.gsub(%r(\.), '_')
+    end
+
+    def source_paths
+      source_files.map{ |file| Rake::Path.relative_path(file, rakefile_path) }
+    end
+
+    def compiler_flags
+      flags = include_path
+      options = compilation_options.join( ' ' )
+      flags << ' ' + options             if options != ''
+      flags << ' ' + architecture_option if RUBY_PLATFORM =~ /darwin/i
+      flags
+    end
+
+    def library_dependencies_list
+      @library_dependencies.map { |lib| "-l#{ lib }"}.join('')
+    end
+
     private
 
     def initialize_attributes
@@ -402,7 +382,7 @@ EOT
       raise BuilderError.new( "The target name cannot be an empty string", task_namespace ) if @target == ''
       @objects_path          = Rake::Path.expand_with_root( @objects_path, @rakefile_path )
       @target                = File.expand_path( @target, @rakefile_path )
-      @target_type           ||= type( @target )
+      @target_type           ||= to_target_type( @target )
       raise BuilderError.new( "Building #{ @target_type } targets is not supported", task_namespace ) if ! TARGET_TYPES.include?( @target_type )
 
       @install_path          ||= default_install_path( @target_type )
@@ -572,7 +552,7 @@ EOT
         begin
           shell "rm '#{ destination }'", Logger::INFO
         rescue Errno::EACCES => e
-          raise BuilderError.new( "You do not have premission to uninstall '#{ destination }'\nTry\n $ sudo rake #{ scoped_task( :uninstall ) }", task_namespace )
+          raise BuilderError.new( "You do not have permission to uninstall '#{ destination }'\nTry\n $ sudo rake #{ scoped_task( :uninstall ) }", task_namespace )
         end
       end
 
@@ -660,7 +640,8 @@ EOT
       file object => [ source ] do |t|
         @logger.add( Logger::DEBUG, "Compiling '#{ source }'" )
         command = "#{ @compiler } -c #{ compiler_flags } -o #{ object } #{ source }"
-        shell command
+        stdout, stderr = shell(command)
+        raise BuildFailure.new("Error: command '#{command}' failed: #{stderr} #{stdout}") if not $?.success?
       end
     end
 
@@ -676,7 +657,7 @@ EOT
       end
     end
 
-    def type( target )
+    def to_target_type(target)
       case target
       when /\.a/
         :static_library
@@ -703,14 +684,6 @@ EOT
       paths.map { |p| "-I#{ p }" }.join( ' ' )
     end
 
-    def compiler_flags
-      flags = include_path
-      options = compilation_options.join( ' ' )
-      flags << ' ' + options             if options != ''
-      flags << ' ' + architecture_option if RUBY_PLATFORM =~ /darwin/i
-      flags
-    end
-
     def architecture_option
       "-arch #{ @architecture }"
     end
@@ -794,10 +767,6 @@ EOT
     def library_paths_list
       @library_paths.map { | path | "-L#{ path }" }.join( " " )
     end
-    
-    def library_dependencies_list
-      @library_dependencies.map { | lib | "-l#{ lib }" }.join( " " )
-    end
 
     def install_headers
       # TODO: make install_headers_path a configuration option

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

@@ -0,0 +1,46 @@
+module Rake; class Builder; module Presenters; module MakefileAm
+  class BuilderCollectionPresenter
+    attr_accessor :builders
+
+    def initialize(builders)
+      @builders = builders
+    end
+
+    def to_s
+      programs_list + program_sections + libraries_list + library_sections
+    end
+
+    private
+
+    def programs
+      @builders.reject(&:is_library?)
+    end
+
+    def libraries
+      @builders.select(&:is_library?)
+    end
+
+    def programs_list
+      'bin_PROGRAMS = ' + programs.map(&:label).join(' ') + "\n\n"
+    end
+
+    def libraries_list
+      'lib_LIBRARIES = ' + libraries.map(&:label).join(' ') + "\n\n"
+    end
+
+    def program_sections
+      programs.map do |program|
+        presenter = Rake::Builder::Presenters::MakefileAm::BuilderPresenter.new(program)
+        presenter.to_s
+      end.join("\n")
+    end
+
+    def library_sections
+      libraries.map do |lib|
+        presenter = Rake::Builder::Presenters::MakefileAm::BuilderPresenter.new(lib)
+        presenter.to_s
+      end.join("\n")
+    end
+  end
+end; end; end; end
+

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

@@ -0,0 +1,40 @@
+module Rake; class Builder; module Presenters; module MakefileAm
+  class BuilderPresenter
+    attr_accessor :builder
+
+    def initialize(builder)
+      @builder = builder
+    end
+
+    def to_s
+      [sources, cpp_flags, ld_flags, libraries, ''].compact.join("/n")
+    end
+
+    private
+
+    def sources
+      "#{builder.label}_SOURCES = #{builder.source_paths.join(' ')}"
+    end
+
+    def cpp_flags
+      "#{builder.label}_CPPFLAGS = #{builder.compiler_flags}"
+    end
+
+    def ld_flags
+      if builder.is_library?
+        nil
+      else
+        "#{builder.label}_LDFLAGS  = -L."
+      end
+    end
+
+    def libraries
+      if builder.is_library?
+        nil
+      else
+        "#{builder.label}_LDADD  = #{builder.library_dependencies_list}"
+      end
+    end
+  end
+end; end; end; end
+

data/lib/rake/builder/version.rb

@@ -6,7 +6,7 @@ module Rake
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 0
-      TINY  = 17
+      TINY  = 18
 
       STRING = [ MAJOR, MINOR, TINY ].join('.')
     end

data/spec/autoconf_spec.rb

@@ -159,32 +159,11 @@ describe 'autoconf' do
   end
 
   context 'Makefile.am' do
-
     it 'is created' do
-      File.                       should_receive(:open).
-                                  with('Makefile.am', 'w')
-
-      Rake::Task['autoconf'].execute(@args)
-    end
+      Rake::Builder.should_receive(:create_makefile_am)
 
-    it 'has sources' do
       Rake::Task['autoconf'].execute(@args)
-
-      @output['Makefile.am'].     should     =~ /the_executable_SOURCES\s*=\s+cpp_project\/main\.cpp/
     end
-
-    it 'has flags' do
-      Rake::Task['autoconf'].execute(@args)
-
-      @output['Makefile.am'].     should     =~ /the_executable_CPPFLAGS\s*=/
-    end
-
-    it 'has libraries' do
-      Rake::Task['autoconf'].execute(@args)
-
-      @output['Makefile.am'].     should     =~ /the_executable_LDADD\s*=/
-    end
-
   end
 
 end

data/spec/project_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Rake::Builder do
+  include RakeBuilderHelper
+
+  def builder(type)
+    c_task(type)
+  end
+
+  [
+    [:static_library, true],
+    [:shared_library, true],
+    [:executable,     false]
+  ].each do |type, is_library|
+    example type do
+      expect(builder(type).is_library?).to eq(is_library)
+    end
+  end
+end
+

data/spec/unit/rake/builder/presenters/makefile_am/builder_collection_presenter_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Rake::Builder::Presenters::MakefileAm::BuilderCollectionPresenter do
+  context '.new' do
+    it 'takes one parameter' do
+      expect {
+        Rake::Builder::Presenters::MakefileAm::BuilderCollectionPresenter.new
+      }.to raise_error(ArgumentError, 'wrong number of arguments (0 for 1)')
+    end
+  end
+
+  context '#to_s' do
+    let(:program_builder) { stub('Rake::Builder', :label => 'the_program', :is_library? => false) }
+    let(:library_builder) { stub('Rake::Builder', :label => 'the_library', :is_library? => true) }
+    let(:builders) { [program_builder, library_builder] }
+
+    subject { Rake::Builder::Presenters::MakefileAm::BuilderCollectionPresenter.new(builders) }
+
+    before do
+      Rake::Builder::Presenters::MakefileAm::BuilderPresenter.
+        stub(:new).
+        with(program_builder).
+        and_return("AAA\nBBB\n")
+      Rake::Builder::Presenters::MakefileAm::BuilderPresenter.
+        stub(:new).
+        with(library_builder).
+        and_return("XXX\nYYY\n")
+    end
+
+    it 'lists libraries' do
+      expect(subject.to_s).to include("lib_LIBRARIES = the_library\n\n")
+    end
+
+    it 'lists programs' do
+      expect(subject.to_s).to include("bin_PROGRAMS = the_program\n\n")
+    end
+
+    it 'includes builder text' do
+      Rake::Builder::Presenters::MakefileAm::BuilderPresenter.
+        should_receive(:new).
+        with(program_builder).
+        and_return("AAA\nBBB\n")
+      Rake::Builder::Presenters::MakefileAm::BuilderPresenter.
+        should_receive(:new).
+        with(library_builder).
+        and_return("XXX\nYYY\n")
+
+      output = subject.to_s
+
+      expect(output).to include("AAA\nBBB\n")
+      expect(output).to include("XXX\nYYY\n")
+    end
+  end
+end
+

data/spec/unit/rake/builder/presenters/makefile_am/builder_presenter_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Rake::Builder::Presenters::MakefileAm::BuilderPresenter do
+  context '.new' do
+    it 'takes one parameter' do
+      expect {
+        Rake::Builder::Presenters::MakefileAm::BuilderPresenter.new
+      }.to raise_error(ArgumentError, 'wrong number of arguments (0 for 1)')
+    end
+  end
+
+  context '#to_s' do
+    let(:builder) do
+      stub(
+        'Rake::Builder',
+        :is_library?               => false,
+        :label                     => 'fubar',
+        :source_paths              => ['path/to/1', 'path/to/2'],
+        :compiler_flags            => '-D FOO -D BAR',
+        :library_dependencies_list => '-lfoo -lbar'
+      )
+    end
+    let(:library) do
+      builder.stub(:is_library? => true)
+      builder.stub(:library_dependencies_list => [])
+      builder
+    end
+    let(:binary) do
+      builder.stub(:is_library? => false)
+      builder
+    end
+
+    subject { Rake::Builder::Presenters::MakefileAm::BuilderPresenter.new(builder) }
+
+    it 'lists sources' do
+      sources_match = %r(fubar_SOURCES\s+=\s+path/to/1 path/to/2)
+      expect(subject.to_s).to match(sources_match)
+    end
+
+    it 'shows cpp flags' do
+      expect(subject.to_s).to match(/fubar_CPPFLAGS\s+=\s+-D FOO -D BAR/)
+    end
+
+    it 'ends with a blank line'
+
+    context 'library builder' do
+      subject { Rake::Builder::Presenters::MakefileAm::BuilderPresenter.new(library) }
+
+      it "doesn't show ld flags" do
+        expect(subject.to_s).to_not include('fubar_LDFLAGS')
+      end
+
+      it "doesn't list library dependencies" do
+        expect(subject.to_s).to_not include('fubar_LDADD')
+      end
+    end
+
+    context 'executable builder' do
+      subject { Rake::Builder::Presenters::MakefileAm::BuilderPresenter.new(binary) }
+
+      it 'shows ld flags' do
+        expect(subject.to_s).to match(%r(fubar_LDFLAGS\s+=\s+-L))
+      end
+
+      it "lists library dependencies" do
+        expect(subject.to_s).to match(%r(fubar_LDADD\s+=\s+-lfoo -lbar))
+      end
+    end
+  end
+end
+