cxxproject 0.6.25 → 0.6.26

data/Gemfile

@@ -2,3 +2,4 @@ source :rubygems
 gem 'rspec'
 gem 'grit'
 gem 'roodi'
+gem 'builder'

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    builder (3.0.0)
     diff-lcs (1.1.3)
     grit (2.5.0)
       diff-lcs (~> 1.1)
@@ -14,8 +15,8 @@ GEM
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.0)
-    rspec-expectations (2.11.1)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.1)
     ruby_parser (2.3.1)
@@ -26,6 +27,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  builder
   grit
   roodi
   rspec

data/Rakefile.rb

@@ -7,7 +7,7 @@ task :default => [:install]
 
 begin
   require 'rubygems/package_task'
-  spec = Gem::Specification.load('cxx.gemspec')
+  spec = Gem::Specification.load('cxxproject.gemspec')
   Gem::PackageTask.new(spec){|pkg|}
 
   desc "install gem globally"

data/junit.rb

@@ -0,0 +1,91 @@
+=begin
+
+Copyright (c) 2012, Nathaniel Ritmeyer
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither the name Nathaniel Ritmeyer nor the names of contributors to
+this software may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=end
+
+require 'time'
+require 'builder'
+require 'rspec/core/formatters/base_formatter'
+
+class JUnit < RSpec::Core::Formatters::BaseFormatter
+  def initialize output
+    super output
+    @test_results = []
+  end
+
+  def example_passed example
+    @test_results << example
+  end
+
+  def example_failed example
+    @test_results << example
+  end
+
+  def example_pending example
+    @test_results << example
+  end
+
+  def failure_details_for example
+    exception = example.metadata[:execution_result][:exception]
+    exception.nil? ? "" : "#{exception.message}\n#{format_backtrace(exception.backtrace, example).join("\n")}"
+  end
+
+  def full_name_for example
+    test_name = ""
+    current_example_group = example.metadata[:example_group]
+    until current_example_group.nil? do
+      test_name = "#{current_example_group[:description]}." + test_name
+      current_example_group = current_example_group[:example_group]
+    end
+    test_name << example.metadata[:description]
+  end
+
+  def dump_summary duration, example_count, failure_count, pending_count
+    builder = Builder::XmlMarkup.new :indent => 2
+    builder.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
+    builder.testsuite :errors => 0, :failures => failure_count, :skipped => pending_count, :tests => example_count, :time => duration, :timestamp => Time.now.iso8601 do
+      builder.properties
+      @test_results.each do |test|
+        builder.testcase :classname => full_name_for(test), :name => test.metadata[:full_description], :time => test.metadata[:execution_result][:run_time] do
+          case test.metadata[:execution_result][:status]
+          when "failed"
+            builder.failure :message => "failed #{test.metadata[:full_description]}", :type => "failed" do
+              builder.cdata! failure_details_for test
+            end
+          when "pending" then builder.skipped
+          end
+        end
+      end
+    end
+    output.puts builder.target!
+  end
+end
+

data/lib/cxxproject/buildingblocks/building_block.rb

@@ -99,11 +99,13 @@ module Cxxproject
       @printedCmdAlternate = false
       @lastCommand = nil
 
-      if ALL_BUILDING_BLOCKS.include?(@name) and not self.instance_of?(BinaryLibrary)
-        raise "building block already exists: #{name}"
-      else
-        ALL_BUILDING_BLOCKS[@name] = self
+      if ALL_BUILDING_BLOCKS.include?(@name)
+        existing_bb = ALL_BUILDING_BLOCKS[@name]
+        if not (existing_bb.class == BinaryLibrary && self.class == BinaryLibrary)
+          raise "building block already exists: #{name} of type #{ALL_BUILDING_BLOCKS[@name].class} conflicts with #{self.class}"
+        end
       end
+      ALL_BUILDING_BLOCKS[@name] = self
     end
 
     def set_config_name(x)

data/lib/cxxproject/buildingblocks/building_blocks.rb

@@ -0,0 +1,19 @@
+require 'cxxproject/buildingblocks/binary_library'
+require 'cxxproject/buildingblocks/building_block'
+require 'cxxproject/buildingblocks/executable'
+require 'cxxproject/buildingblocks/source_library'
+require 'cxxproject/buildingblocks/module'
+require 'cxxproject/buildingblocks/custom_building_block'
+=begin
+  -rw-rw-r-- 2 ckoestlin ckoestlin  2027 Jul 10 15:12 command_line.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin   688 Jul 10 15:12 custom_building_block.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin  7241 Jul 18 11:51 executable.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin  2047 Jul 10 15:12 has_dependencies_mixin.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin   297 Jul 10 15:12 has_includes_mixin.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin   792 Jul 10 15:12 has_libraries_mixin.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin 10084 Jul 18 12:24 has_sources_mixin.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin  4034 Jul 10 15:12 makefile.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin   775 Jul 10 15:12 module.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin   811 Jul 10 15:12 single_source.rb
+  -rw-rw-r-- 2 ckoestlin ckoestlin  3582 Jul 18 12:23 source_library.rb
+=end

data/lib/cxxproject/version.rb

@@ -1,5 +1,5 @@
 module Cxxproject
-  VERSION = "0.6.25"
+  VERSION = "0.6.26"
 
   class Version
     def self.cxxproject

data/lib/{cxxproject/cxxproject.rb → cxxproject.rb}

@@ -3,7 +3,6 @@ require 'rubygems'
 require 'yaml'
 require 'rake/clean'
 
-
 require 'cxxproject/ext/string'
 require 'cxxproject/ext/hash'
 
@@ -15,6 +14,7 @@ require 'cxxproject/toolchain/provider'
 require 'cxxproject/version'
 
 require 'cxxproject/plugin_context'
+require 'cxxproject/buildingblocks/building_blocks'
 
 require 'frazzle/frazzle'
 registry = Frazzle::Registry.new('cxxproject', '_', '')

data/rake_helper/spec.rb

@@ -44,6 +44,7 @@ def new_rspec
   desc "Run examples"
   RSpec::Core::RakeTask.new() do |t|
     t.pattern = SPEC_PATTERN
+    t.rspec_opts = '-r ./junit.rb -f JUnit -o build/test_details.xml'    
   end
 
   desc 'Run examples with coverage'

data/spec/building_block_spec.rb

@@ -32,6 +32,26 @@ describe Cxxproject::BuildingBlock do
     deps.should == ['4', '2', '3', '1']
   end
 
+  it 'should generate an error if building block names conflict' do
+    expect {
+      Cxxproject::SourceLibrary.new('1')
+      Cxxproject::SourceLibrary.new('1')
+    }.should raise_exception
+  end
+
+  it 'should be possible to give several binary libs with the same name' do
+    Cxxproject::BinaryLibrary.new('1')
+    Cxxproject::BinaryLibrary.new('1')
+  end
+
+  it 'should be an error if the same name is used for different kinds of building blocks' do
+    expect {
+      Cxxproject::BinaryLibrary.new('1')
+      Cxxproject::SourceLibrary.new('1')
+    }.should raise_exception
+  end
+
+=begin
   it 'should have the right output-directory' do
     lib1 = Cxxproject::SourceLibrary.new('lib1').set_sources(['test.cc'])
     lib1.set_project_dir(File.join(Dir.pwd, 'lib1'))
@@ -54,5 +74,5 @@ describe Cxxproject::BuildingBlock do
       cxx = CxxProject2Rake.new([], 'build', compiler)
     end.to raise_exception(RuntimeError, 'Error: while reading config file for 1: dependent building block "unresolved" was specified but not found!')
   end
-
+=end
 end

data/spec/{project_path_spec.rb → project_path_spe.rb}

@@ -21,7 +21,6 @@ describe CxxProject2Rake do
     CxxProject2Rake.new(project_configs, outputdir, 'gcc', base)
   end
 
-
 #  def is_older? fileA, fileB
 #    File.mtime(fileA) < File.mtime(fileB)
 #  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxxproject
 version: !ruby/object:Gem::Version
-  version: 0.6.25
+  version: 0.6.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -58,7 +58,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile.rb
-- cxx.gemspec
+- cxxproject.gemspec
 - example/.gitignore
 - example/Rakefile.rb
 - example/big_project/.gitignore
@@ -109,8 +109,11 @@ files:
 - example/three_tests/suite2/project.rb
 - example/three_tests/suite2/suite2.cpp
 - example/three_tests/suite2/suite2.h
+- junit.rb
+- lib/cxxproject.rb
 - lib/cxxproject/buildingblocks/binary_library.rb
 - lib/cxxproject/buildingblocks/building_block.rb
+- lib/cxxproject/buildingblocks/building_blocks.rb
 - lib/cxxproject/buildingblocks/command_line.rb
 - lib/cxxproject/buildingblocks/custom_building_block.rb
 - lib/cxxproject/buildingblocks/executable.rb
@@ -123,7 +126,6 @@ files:
 - lib/cxxproject/buildingblocks/single_source.rb
 - lib/cxxproject/buildingblocks/source_library.rb
 - lib/cxxproject/context.rb
-- lib/cxxproject/cxxproject.rb
 - lib/cxxproject/errorparser/error_parser.rb
 - lib/cxxproject/ext/file.rb
 - lib/cxxproject/ext/filelist.rb
@@ -166,12 +168,12 @@ files:
 - rake_helper/spec.rb
 - roodi.yml
 - spec/building_block_spec.rb
-- spec/cxxproject_2_rake_spec.rb
+- spec/cxxproject_2_rake_spe.rb
 - spec/file_ext_spec.rb
 - spec/ide_interface_spec.rb
-- spec/object_dependency_spec.rb
+- spec/object_dependency_spe.rb
 - spec/plugin_context_spec.rb
-- spec/project_path_spec.rb
+- spec/project_path_spe.rb
 - spec/provider_spec.rb
 - spec/rake_listener_ext_spec.rb
 - spec/spec_helper.rb
@@ -218,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4173282394159847515
+      hash: -4608833184588443303
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: