cxxproject 0.5.76 → 0.6.0

data/spec/file_ext_spec.rb

@@ -1,30 +1,30 @@
-require 'spec_helper'
-require 'cxxproject'
-
-describe File do
-
-  it 'should calc if a pathname is absolute' do
-    File.is_absolute?('/test').should eq(true)
-    File.is_absolute?('a:test').should eq(true)
-    File.is_absolute?('test').should eq(false)
-  end
-
-  it 'should find a good relative directory for subdirectories' do
-    File.rel_from_to_project('x/main/a', 'x/main/b').should eq('../b/')
-    File.rel_from_to_project('x/main/a/b', 'x/main').should eq('../../')
-    File.rel_from_to_project('x/main', 'x/main/a/b').should eq('a/b/')
-    File.rel_from_to_project('x/main', 'x/main').should eq('')
-    File.rel_from_to_project('x/main', nil).should eq(nil)
-    File.rel_from_to_project(nil, 'x/main').should eq(nil)
-    File.rel_from_to_project('x/a', 'y/b').should eq("../../y/b/")
-    File.rel_from_to_project('x/x', 'x/x').should eq('')
-  end
-
-  it 'add prefix only if file is not absolute' do
-    File.add_prefix('abc/', '/usr/local').should eq('/usr/local')
-    File.add_prefix('abc/', 'nix/usr/local').should eq('abc/nix/usr/local')
-    File.add_prefix('abc/', 'c:/usr/local').should eq('c:/usr/local')
-    File.add_prefix('abc/', 'c:\\usr/local').should eq('c:\\usr/local')
-  end
-
-end
+require 'spec_helper'
+require 'cxxproject'
+
+describe File do
+
+  it 'should calc if a pathname is absolute' do
+    File.is_absolute?('/test').should eq(true)
+    File.is_absolute?('a:test').should eq(true)
+    File.is_absolute?('test').should eq(false)
+  end
+
+  it 'should find a good relative directory for subdirectories' do
+    File.rel_from_to_project('x/main/a', 'x/main/b').should eq('../b/')
+    File.rel_from_to_project('x/main/a/b', 'x/main').should eq('../../')
+    File.rel_from_to_project('x/main', 'x/main/a/b').should eq('a/b/')
+    File.rel_from_to_project('x/main', 'x/main').should eq('')
+    File.rel_from_to_project('x/main', nil).should eq(nil)
+    File.rel_from_to_project(nil, 'x/main').should eq(nil)
+    File.rel_from_to_project('x/a', 'y/b').should eq("../../y/b/")
+    File.rel_from_to_project('x/x', 'x/x').should eq('')
+  end
+
+  it 'add prefix only if file is not absolute' do
+    File.add_prefix('abc/', '/usr/local').should eq('/usr/local')
+    File.add_prefix('abc/', 'nix/usr/local').should eq('abc/nix/usr/local')
+    File.add_prefix('abc/', 'c:/usr/local').should eq('c:/usr/local')
+    File.add_prefix('abc/', 'c:\\usr/local').should eq('c:\\usr/local')
+  end
+
+end

data/spec/ide_interface_spec.rb

@@ -1,41 +1,41 @@
-require 'spec_helper'
-require 'cxxproject/ide_interface'
-require 'cxxproject/utils/utils'
-require 'cxxproject/errorparser/error_parser'
-
-def check_long(e, l)
-  e.next.should eq(l)
-  e.next.should eq(0)
-  e.next.should eq(0)
-  e.next.should eq(0)
-end
-def check_string(e, s)
-  s.bytes do |i|
-    e.next.should eq(i)
-  end
-end
-
-describe Cxxproject::IDEInterface do
-
-  it 'should create a correct package from an error-array' do
-    ide = Cxxproject::IDEInterface.new
-    error = Cxxproject::ErrorDesc.new
-    error.severity = 2
-    error.line_number = 10
-    error.file_name = 'filename'
-    error.message = 'error'
-    packet = ide.create_error_packet(error)
-    
-    if not Cxxproject::Utils.old_ruby? # in Ruby 1.8.6 there is no bytes methods...    
-      e = packet.bytes.to_enum
-      e.next.should eq(1)
-      check_long(e, 22)
-      check_long(e, 8)
-      check_string(e, 'filename')
-      check_long(e, 10)
-      e.next.should eq(2)
-      check_string(e, 'error')
-    end
-  end
-
-end
+require 'spec_helper'
+require 'cxxproject/ide_interface'
+require 'cxxproject/utils/utils'
+require 'cxxproject/errorparser/error_parser'
+
+def check_long(e, l)
+  e.next.should eq(l)
+  e.next.should eq(0)
+  e.next.should eq(0)
+  e.next.should eq(0)
+end
+def check_string(e, s)
+  s.bytes do |i|
+    e.next.should eq(i)
+  end
+end
+
+describe Cxxproject::IDEInterface do
+
+  it 'should create a correct package from an error-array' do
+    ide = Cxxproject::IDEInterface.new
+    error = Cxxproject::ErrorDesc.new
+    error.severity = 2
+    error.line_number = 10
+    error.file_name = 'filename'
+    error.message = 'error'
+    packet = ide.create_error_packet(error)
+    
+    if not Cxxproject::Utils.old_ruby? # in Ruby 1.8.6 there is no bytes methods...    
+      e = packet.bytes
+      e.next.should eq(1)
+      check_long(e, 22)
+      check_long(e, 8)
+      check_string(e, 'filename')
+      check_long(e, 10)
+      e.next.should eq(2)
+      check_string(e, 'error')
+    end
+  end
+
+end

data/spec/object_dependency_spec.rb

@@ -1,83 +1,83 @@
-require 'spec_helper'
-require 'cxxproject'
-require 'cxxproject/ext/rake_listener.rb'
-require 'cxxproject/utils/cleanup'
-
-describe Rake::Task do
-
-  before(:each) do
-    Rake::application.options.silent = true
-    Cxxproject::Utils.cleanup_rake
-  end
-  after(:each) do
-    Cxxproject::Utils.cleanup_rake
-  end
-
-  it 'should fail if source of object is missing' do
-    file 'test.cc' => 'compiler'
-    File.delete('test.cc') if File.exists?('test.cc')
-    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    cxx = CxxProject2Rake.new([], 'build', GCCChain)
-
-    task = Rake::application['lib:testlib']
-    task.invoke
-    task.failure.should eq(true)
-
-    FileUtils.rm_rf('build')
-  end
-
-  it 'should not fail if include-dependency of object is missing' do
-    File.open('test.cc', 'w') do |io|
-      io.puts('#include "test.h"')
-    end
-
-    File.open('test.h', 'w') do |io|
-    end
-
-    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', GCCChain)
-
-    task = Rake::application['lib:testlib']
-    task.invoke
-    task.failure.should eq(false)
-
-    Cxxproject::Utils.cleanup_rake
-
-    FileUtils.rm_rf('test.h')
-    File.open('test.cc', 'w') do |io|
-    end
-
-    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', GCCChain)
-
-    task = Rake::application['build/libs/libtestlib.a']
-    task.invoke
-    task.failure.should eq(false)
-
-    FileUtils.rm_rf('test.cc')
-  end
-
-  it 'should not fail if generated headerfile is missing' do
-    file 'test.h' do
-      sh 'touch test.h'
-    end
-
-    file 'test.cc' => 'test.h' do |t|
-      File.open(t.name, 'w') do |io|
-        io.puts('#include "test.h"')
-      end
-    end
-
-    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', GCCChain)
-
-    task = Rake::application['build/libs/libtestlib.a']
-    task.invoke
-    task.failure.should eq(false)
-
-    FileUtils.rm_rf('build')
-    FileUtils.rm_rf('test.cc')
-    FileUtils.rm_rf('test.h')
-  end
-
-end
+require 'spec_helper'
+require 'cxxproject'
+require 'cxxproject/ext/rake_listener.rb'
+require 'cxxproject/utils/cleanup'
+
+describe Rake::Task do
+
+  before(:each) do
+    Rake::application.options.silent = true
+    Cxxproject::Utils.cleanup_rake
+  end
+  after(:each) do
+    Cxxproject::Utils.cleanup_rake
+  end
+
+  it 'should fail if source of object is missing' do
+    file 'test.cc' => 'compiler'
+    File.delete('test.cc') if File.exists?('test.cc')
+    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
+    cxx = CxxProject2Rake.new([], 'build', GCCChain)
+
+    task = Rake::application['lib:testlib']
+    task.invoke
+    task.failure.should eq(true)
+
+    FileUtils.rm_rf('build')
+  end
+
+  it 'should not fail if include-dependency of object is missing' do
+    File.open('test.cc', 'w') do |io|
+      io.puts('#include "test.h"')
+    end
+
+    File.open('test.h', 'w') do |io|
+    end
+
+    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
+    CxxProject2Rake.new([], 'build', GCCChain)
+
+    task = Rake::application['lib:testlib']
+    task.invoke
+    task.failure.should eq(false)
+
+    Cxxproject::Utils.cleanup_rake
+
+    FileUtils.rm_rf('test.h')
+    File.open('test.cc', 'w') do |io|
+    end
+
+    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
+    CxxProject2Rake.new([], 'build', GCCChain)
+
+    task = Rake::application['build/libs/libtestlib.a']
+    task.invoke
+    task.failure.should eq(false)
+
+    FileUtils.rm_rf('test.cc')
+  end
+
+  it 'should not fail if generated headerfile is missing' do
+    file 'test.h' do
+      sh 'touch test.h'
+    end
+
+    file 'test.cc' => 'test.h' do |t|
+      File.open(t.name, 'w') do |io|
+        io.puts('#include "test.h"')
+      end
+    end
+
+    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
+    CxxProject2Rake.new([], 'build', GCCChain)
+
+    task = Rake::application['build/libs/libtestlib.a']
+    task.invoke
+    task.failure.should eq(false)
+
+    FileUtils.rm_rf('build')
+    FileUtils.rm_rf('test.cc')
+    FileUtils.rm_rf('test.h')
+  end
+
+end

data/spec/project_path_spec.rb

@@ -1,71 +1,71 @@
-require 'spec_helper'
-require 'cxxproject'
-require 'cxxproject/utils/cleanup'
-
-RSPECDIR = File.dirname(__FILE__)
-
-describe CxxProject2Rake do
-
-  def execute_all_tasks(tasks)
-    tasks.each do |t|
-      t.invoke
-    end
-  end
-
-  def fresh_cxx(outputdir,base)
-    Cxxproject::Utils.cleanup_rake
-    project_configs = nil
-    cd base do # have to be relative to base
-      project_configs = Dir.glob('**/project.rb')
-    end
-    CxxProject2Rake.new(project_configs, outputdir, GCCChain, base)
-  end
-
-
-#  def is_older? fileA, fileB
-#    File.mtime(fileA) < File.mtime(fileB)
-#  end
-
-#  def is_newer? fileA, fileB
-#    File.mtime(fileA) > File.mtime(fileB)
-#  end
-
-  def test_on_level(base, outputdir)
-    libOne = "#{outputdir}/libs/lib1.a"
-    libTwo = "#{outputdir}/libs/lib2.a"
-    exe = "#{outputdir}/basic.exe"
-    exe2 = "#{outputdir}/debug.exe"
-
-    rm_r outputdir if File.directory?(outputdir)
-    tasks = fresh_cxx(outputdir, base).all_tasks
-    CLOBBER.each { |fn| rm_r fn rescue nil }
-
-    [libOne,libTwo,exe,exe2].all? {|f| File.exists?(f).should be_false }
-
-    execute_all_tasks(tasks)
-
-    [libOne,libTwo,exe,exe2].all? {|f| File.exists?(f).should be_true }
-
-    # cleanup
-    rm_r outputdir if File.directory?(outputdir)
-    Cxxproject::Utils.cleanup_rake
-  end
-
-  it 'should resolve paths on different levels' do
-    outputdir = 'output'
-
-    cd("#{RSPECDIR}/testdata/multiple_levels", :verbose => false) do
-      test_on_level(".", outputdir)
-    end
-
-    cd("#{RSPECDIR}/testdata/multiple_levels/mainproject", :verbose => false) do
-      test_on_level("..", outputdir)
-    end
-
-    cd("#{RSPECDIR}/testdata", :verbose => false) do
-      test_on_level("multiple_levels/", outputdir)
-    end
-  end
-
-end
-
+require 'spec_helper'
+require 'cxxproject'
+require 'cxxproject/utils/cleanup'
+
+RSPECDIR = File.dirname(__FILE__)
+
+describe CxxProject2Rake do
+
+  def execute_all_tasks(tasks)
+    tasks.each do |t|
+      t.invoke
+    end
+  end
+
+  def fresh_cxx(outputdir,base)
+    Cxxproject::Utils.cleanup_rake
+    project_configs = nil
+    cd base do # have to be relative to base
+      project_configs = Dir.glob('**/project.rb')
+    end
+    CxxProject2Rake.new(project_configs, outputdir, GCCChain, base)
+  end
+
+
+#  def is_older? fileA, fileB
+#    File.mtime(fileA) < File.mtime(fileB)
+#  end
+
+#  def is_newer? fileA, fileB
+#    File.mtime(fileA) > File.mtime(fileB)
+#  end
+
+  def test_on_level(base, outputdir)
+    libOne = "#{outputdir}/libs/lib1.a"
+    libTwo = "#{outputdir}/libs/lib2.a"
+    exe = "#{outputdir}/basic.exe"
+    exe2 = "#{outputdir}/debug.exe"
+
+    rm_r outputdir if File.directory?(outputdir)
+    tasks = fresh_cxx(outputdir, base).all_tasks
+    CLOBBER.each { |fn| rm_r fn rescue nil }
+
+    [libOne,libTwo,exe,exe2].all? {|f| File.exists?(f).should be_false }
+
+    execute_all_tasks(tasks)
+
+    [libOne,libTwo,exe,exe2].all? {|f| File.exists?(f).should be_true }
+
+    # cleanup
+    rm_r outputdir if File.directory?(outputdir)
+    Cxxproject::Utils.cleanup_rake
+  end
+
+  it 'should resolve paths on different levels' do
+    outputdir = 'output'
+
+    cd("#{RSPECDIR}/testdata/multiple_levels", :verbose => false) do
+      test_on_level(".", outputdir)
+    end
+
+    cd("#{RSPECDIR}/testdata/multiple_levels/mainproject", :verbose => false) do
+      test_on_level("..", outputdir)
+    end
+
+    cd("#{RSPECDIR}/testdata", :verbose => false) do
+      test_on_level("multiple_levels/", outputdir)
+    end
+  end
+
+end
+

data/spec/rake_listener_ext_spec.rb

@@ -1,58 +1,58 @@
-require 'spec_helper'
-require 'cxxproject'
-require 'cxxproject/ext/rake_listener.rb'
-require 'cxxproject/utils/cleanup'
-
-describe Rake::Task do
-
-  before(:each) do
-    Cxxproject::Utils.cleanup_rake
-  end
-  after(:each) do
-    Cxxproject::Utils.cleanup_rake
-  end
-
-
- it "should call a listener for prerequisites and execute" do
-    task "mypre"
-    t = task "test" => "mypre"
-
-    l = mock
-    Rake::add_listener(l)
-
-    l.should_receive(:before_execute).with('mypre')
-    l.should_receive(:after_execute).with('mypre')
-    l.should_receive(:before_prerequisites).with('mypre')
-    l.should_receive(:after_prerequisites).with('mypre')
-    l.should_receive(:before_prerequisites).with('test')
-    l.should_receive(:after_prerequisites).with('test')
-    l.should_receive(:before_execute).with('test')
-    l.should_receive(:after_execute).with('test')
-    t.invoke
-
-    Rake::remove_listener(l)
-
-    t.invoke
-  end
-
-  class DummyListener
-    def calls
-      @calls ||= []
-    end
-    def after_execute(name)
-      c = calls
-      c << name
-    end
-  end
-
-  it "should work with only half implemented rake-listener" do
-    task "mypre"
-    t = task "test" => "mypre"
-    l = DummyListener.new
-    Rake::add_listener(l)
-    t.invoke
-    Rake::remove_listener(l)
-    l.calls.should eq(['mypre', 'test'])
-  end
-
-end
+require 'spec_helper'
+require 'cxxproject'
+require 'cxxproject/ext/rake_listener.rb'
+require 'cxxproject/utils/cleanup'
+
+describe Rake::Task do
+
+  before(:each) do
+    Cxxproject::Utils.cleanup_rake
+  end
+  after(:each) do
+    Cxxproject::Utils.cleanup_rake
+  end
+
+
+ it "should call a listener for prerequisites and execute" do
+    task "mypre"
+    t = task "test" => "mypre"
+
+    l = mock
+    Rake::add_listener(l)
+
+    l.should_receive(:before_execute).with('mypre')
+    l.should_receive(:after_execute).with('mypre')
+    l.should_receive(:before_prerequisites).with('mypre')
+    l.should_receive(:after_prerequisites).with('mypre')
+    l.should_receive(:before_prerequisites).with('test')
+    l.should_receive(:after_prerequisites).with('test')
+    l.should_receive(:before_execute).with('test')
+    l.should_receive(:after_execute).with('test')
+    t.invoke
+
+    Rake::remove_listener(l)
+
+    t.invoke
+  end
+
+  class DummyListener
+    def calls
+      @calls ||= []
+    end
+    def after_execute(name)
+      c = calls
+      c << name
+    end
+  end
+
+  it "should work with only half implemented rake-listener" do
+    task "mypre"
+    t = task "test" => "mypre"
+    l = DummyListener.new
+    Rake::add_listener(l)
+    t.invoke
+    Rake::remove_listener(l)
+    l.calls.should eq(['mypre', 'test'])
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,18 +1,18 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-
-require 'cxxproject/utils/optional'
-initialize_simplecov = lambda do
-  require 'simplecov'
-  if ENV['COVERAGE']
-    SimpleCov.start do
-      add_group 'buildingblocks', 'lib/cxxproject/buildingblocks'
-      add_group 'utils', 'lib/cxxproject/utils'
-      add_group 'errorparser', 'lib/cxxproject/errorparser'
-      add_group 'toolchain', 'lib/cxxproject/toolchain'
-      add_group 'ext', 'lib/cxxproject/ext'
-    end
-  end
-end
-Cxxproject::Utils::optional_package(initialize_simplecov, nil)
-
-RakeFileUtils.send(:verbose, false)
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'cxxproject/utils/optional'
+initialize_simplecov = lambda do
+  require 'simplecov'
+  if ENV['COVERAGE']
+    SimpleCov.start do
+      add_group 'buildingblocks', 'lib/cxxproject/buildingblocks'
+      add_group 'utils', 'lib/cxxproject/utils'
+      add_group 'errorparser', 'lib/cxxproject/errorparser'
+      add_group 'toolchain', 'lib/cxxproject/toolchain'
+      add_group 'ext', 'lib/cxxproject/ext'
+    end
+  end
+end
+Cxxproject::Utils::optional_package(initialize_simplecov, nil)
+
+RakeFileUtils.send(:verbose, false)

data/spec/string_spec.rb

@@ -1,11 +1,11 @@
-require 'cxxproject'
-
-describe String do
-  it 'should remove from start if matching' do
-    s = "abcd"
-    s.remove_from_start('abc').should == 'd'
-  end
-  it 'should not change the string if the start does not match' do
-    "abcd".remove_from_start('z').should == 'abcd'
-  end
-end
+require 'cxxproject'
+
+describe String do
+  it 'should remove from start if matching' do
+    s = "abcd"
+    s.remove_from_start('abc').should == 'd'
+  end
+  it 'should not change the string if the start does not match' do
+    "abcd".remove_from_start('z').should == 'abcd'
+  end
+end

data/spec/testdata/basic/exe12/project.rb

@@ -1,5 +1,5 @@
-cxx_configuration do
-  exe "basic",
-    :sources => FileList.new('**/*.cpp'),
-    :dependencies => ['2']
-end
+cxx_configuration do
+  exe "basic",
+    :sources => FileList.new('**/*.cpp'),
+    :dependencies => ['2']
+end

data/spec/testdata/basic/lib1/project.rb

@@ -1,5 +1,5 @@
-cxx_configuration do
-  source_lib "1",
-    :sources => ['lib1.cpp'],
-    :includes => ['.']
-end
+cxx_configuration do
+  source_lib "1",
+    :sources => ['lib1.cpp'],
+    :includes => ['.']
+end