cxxproject 0.6.29 → 0.6.30

data/lib/cxxproject/ext/rake_listener.rb

@@ -22,31 +22,29 @@ module Rake
     end
   end
 
-  class MultiTask
-    invoke_prerequisites_original = self.instance_method(:invoke_prerequisites)
-    define_method(:invoke_prerequisites) do |task_args, invocation_chain|
+  def self.augmented_invoke_prerequisites(o, name, invoke_prerequisites_original, obj, task_args, invocation_chain)
       Rake::notify_listener(:before_prerequisites, name)
-      invoke_prerequisites_original.bind(self).call(task_args, invocation_chain)
+      invoke_prerequisites_original.bind(obj).call(task_args, invocation_chain)
       Rake::notify_listener(:after_prerequisites, name)
-      if !needed?
+      if !o.needed?
         Rake::notify_listener(:after_execute, name)
       end
+  end
+
+  class MultiTask
+    invoke_prerequisites_original = self.instance_method(:invoke_prerequisites)
+    define_method(:invoke_prerequisites) do |task_args, invocation_chain|
+      Rake::augmented_invoke_prerequisites(self, name, invoke_prerequisites_original, self, task_args, invocation_chain)
     end
   end
 
   class Task
     invoke_prerequisites_original = self.instance_method(:invoke_prerequisites)
-    execute_original = self.instance_method(:execute)
-
     define_method (:invoke_prerequisites) do |task_args, invocation_chain|
-      Rake::notify_listener(:before_prerequisites, name)
-      invoke_prerequisites_original.bind(self).call(task_args, invocation_chain)
-      Rake::notify_listener(:after_prerequisites, name)
-      if !needed?
-        Rake::notify_listener(:after_execute, name)
-      end
+      Rake::augmented_invoke_prerequisites(self, name, invoke_prerequisites_original, self, task_args, invocation_chain)
     end
 
+    execute_original = self.instance_method(:execute)
     define_method(:execute) do |args|
       Rake::notify_listener(:before_execute, name)
       execute_original.bind(self).call(args)

data/lib/cxxproject/plugin_context.rb

@@ -101,13 +101,15 @@ module Cxxproject
       return res[0] if res.length > 0
     end
 
-
+    def check_compiler_hash(hash, sym)
+      check_hash(hash[sym], Cxxproject::Toolchain::Provider.default[:COMPILER][sym].keys << :BASED_ON) if hash[sym]
+    end
     def check_compiler(hash)
       raise "not a hash" unless hash.is_a?(Hash)
       check_hash(hash, Cxxproject::Toolchain::Provider.default[:COMPILER].keys)
-      check_hash(hash[:CPP], Cxxproject::Toolchain::Provider.default[:COMPILER][:CPP].keys << :BASED_ON) if hash[:CPP]
-      check_hash(hash[:C], Cxxproject::Toolchain::Provider.default[:COMPILER][:C].keys << :BASED_ON) if hash[:C]
-      check_hash(hash[:ASM], Cxxproject::Toolchain::Provider.default[:COMPILER][:ASM].keys << :BASED_ON) if hash[:ASM]
+      [:CPP, :C, :ASM].each do |sym|
+        check_compiler_hash(hash, sym)
+      end
     end
 
     def check_linker(hash)

data/lib/cxxproject/toolchain/colorizing_formatter.rb

@@ -37,24 +37,27 @@ module Cxxproject
       end
       ColorizingFormatter.setColorScheme(:black) # default
 
+      def print_color_style(str, color, style)
+        [color, style].inject(str) {|m,x| m.send(x)}
+      end
       def printError(str)
-        [@@error_color,:bold].inject(str) {|m,x| m.send(x)}
+        print_color_style(str, @@error_color, :bold)
       end
 
       def printWarning(str)
-        [@@warning_color,:bold].inject(str) {|m,x| m.send(x)}
+        print_color_style(str, @@warning_color, :bold)
       end
 
       def printInfo(str)
-        [@@info_color,:bold].inject(str) {|m,x| m.send(x)}
+        print_color_style(str, @@info_color, :bold)
       end
 
       def printAdditionalInfo(str)
-        [@@additional_info_color,:bold].inject(str) {|m,x| m.send(x)}
+        print_color_style(str, @@additional_info_color, :bold)
       end
 
       def printSuccess(str)
-        [@@success_color,:bold].inject(str) {|m,x| m.send(x)}
+        print_color_style(str, @@success_color, :bold)
       end
 
       # formats several lines of usually compiler output

data/lib/cxxproject/utils/printer.rb

@@ -1,10 +1,10 @@
 require 'cxxproject/toolchain/colorizing_formatter'
 
 module Cxxproject
-  
+
   class Printer
     @@cf = ColorizingFormatter.new
-    
+
     def self.printInfo(str)
       if @@cf.enabled?
         puts @@cf.printInfo(str)
@@ -12,7 +12,7 @@ module Cxxproject
         puts str
       end
     end
-    
+
     def self.printAdditionalInfo(str)
       if @@cf.enabled?
         puts @@cf.printAdditionalInfo(str)
@@ -20,7 +20,7 @@ module Cxxproject
         puts str
       end
     end
-    
+
     def self.printWarning(str)
       if @@cf.enabled?
         puts @@cf.printWarning(str)
@@ -44,7 +44,7 @@ module Cxxproject
         puts str
       end
     end
-   
+
   end
-  
+
 end

data/lib/cxxproject/version.rb

@@ -1,5 +1,5 @@
 module Cxxproject
-  VERSION = '0.6.29'
+  VERSION = '0.6.30'
 
   class Version
     def self.cxxproject

data/lib/cxxproject.rb

@@ -3,7 +3,6 @@ require 'rubygems'
 require 'yaml'
 require 'rake/clean'
 
-require 'cxxproject/ext/string'
 require 'cxxproject/ext/hash'
 
 require 'cxxproject/utils/optional'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxxproject
 version: !ruby/object:Gem::Version
-  version: 0.6.29
+  version: 0.6.30
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -51,158 +51,53 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- Rakefile.rb
-- cxxproject.gemspec
-- example/.gitignore
-- example/Rakefile.rb
-- example/big_project/.gitignore
-- example/big_project/Rakefile_generator.rb
-- example/big_project/fak.h
-- example/custom/.gitignore
-- example/custom/Rakefile.rb
-- example/custom/foo.cpp
-- example/custom/project.rb
-- example/dependency_tests/Rakefile.rb
-- example/dependency_tests/help1.h
-- example/dependency_tests/help2.h
-- example/dependency_tests/main.cpp
-- example/dependency_tests/project.rb
-- example/generator/Rakefile.rb
-- example/generator/main/main.cpp
-- example/generator/main/project/project.rb
-- example/oneFileOnly/Rakefile.rb
-- example/oneFileOnly/config.h
-- example/oneFileOnly/main.cpp
-- example/oneFileOnly/project_compile.rb
-- example/protobuf/.gitignore
-- example/protobuf/Rakefile.rb
-- example/protobuf/addressbook/addressbook.proto
-- example/protobuf/addressbook/addressbook_read.cc
-- example/protobuf/addressbook/addressbook_write.cc
-- example/protobuf/addressbook/project.rb
-- example/protobuf/protobuf.files
-- example/protobuf/protobuf_project.rb
-- example/simpleUnitTest/Rakefile.rb
-- example/simpleUnitTest/atest.cpp
-- example/simpleUnitTest/atest.h
-- example/simpleUnitTest/project.rb
-- example/simpleUnitTest/test.cpp
-- example/strange_dirs/Rakefile.rb
-- example/strange_dirs/lazyLib/project.rb
-- example/strange_dirs/main/main.cpp
-- example/strange_dirs/main/project.rb
-- example/strange_dirs/src/test.cpp
-- example/test.rb
-- example/three_tests/Rakefile.rb
-- example/three_tests/allsuites/project.rb
-- example/three_tests/main/main.cpp
-- example/three_tests/main/project.rb
-- example/three_tests/suite1/project.rb
-- example/three_tests/suite1/suite1.cpp
-- example/three_tests/suite1/suite1.h
-- 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
-- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
-- lib/cxxproject/buildingblocks/has_includes_mixin.rb
-- lib/cxxproject/buildingblocks/has_libraries_mixin.rb
-- lib/cxxproject/buildingblocks/has_sources_mixin.rb
-- lib/cxxproject/buildingblocks/makefile.rb
-- lib/cxxproject/buildingblocks/module.rb
-- lib/cxxproject/buildingblocks/single_source.rb
-- lib/cxxproject/buildingblocks/source_library.rb
 - lib/cxxproject/context.rb
 - lib/cxxproject/errorparser/error_parser.rb
+- lib/cxxproject/version.rb
+- lib/cxxproject/plugin_context.rb
+- lib/cxxproject/ide_interface.rb
 - lib/cxxproject/ext/file.rb
-- lib/cxxproject/ext/filelist.rb
 - lib/cxxproject/ext/hash.rb
-- lib/cxxproject/ext/progressbar.rb
-- lib/cxxproject/ext/rake.rb
 - lib/cxxproject/ext/rake_dirty.rb
+- lib/cxxproject/ext/filelist.rb
 - lib/cxxproject/ext/rake_listener.rb
 - lib/cxxproject/ext/stdout.rb
-- lib/cxxproject/ext/string.rb
-- lib/cxxproject/ide_interface.rb
-- lib/cxxproject/plugin_context.rb
-- lib/cxxproject/toolchain/colorizing_formatter.rb
-- lib/cxxproject/toolchain/provider.rb
-- lib/cxxproject/toolchain/toolchain.rb
-- lib/cxxproject/utils/cleanup.rb
-- lib/cxxproject/utils/exit_helper.rb
+- lib/cxxproject/ext/rake.rb
+- lib/cxxproject/ext/progressbar.rb
+- lib/cxxproject/buildingblocks/has_libraries_mixin.rb
+- lib/cxxproject/buildingblocks/executable.rb
+- lib/cxxproject/buildingblocks/has_includes_mixin.rb
+- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
+- lib/cxxproject/buildingblocks/custom_building_block.rb
+- lib/cxxproject/buildingblocks/binary_library.rb
+- lib/cxxproject/buildingblocks/module.rb
+- lib/cxxproject/buildingblocks/building_block.rb
+- lib/cxxproject/buildingblocks/source_library.rb
+- lib/cxxproject/buildingblocks/building_blocks.rb
+- lib/cxxproject/buildingblocks/single_source.rb
+- lib/cxxproject/buildingblocks/makefile.rb
+- lib/cxxproject/buildingblocks/command_line.rb
+- lib/cxxproject/buildingblocks/has_sources_mixin.rb
+- lib/cxxproject/utils/rbcurse_progress.rb
+- lib/cxxproject/utils/ubigraph.rb
 - lib/cxxproject/utils/graphstream.rb
-- lib/cxxproject/utils/optional.rb
-- lib/cxxproject/utils/printer.rb
-- lib/cxxproject/utils/process.rb
 - lib/cxxproject/utils/progress.rb
+- lib/cxxproject/utils/utils.rb
+- lib/cxxproject/utils/optional.rb
 - lib/cxxproject/utils/progress_helper.rb
-- lib/cxxproject/utils/rbcurse.rb
-- lib/cxxproject/utils/rbcurse_executable_ext.rb
-- lib/cxxproject/utils/rbcurse_progress.rb
+- lib/cxxproject/utils/exit_helper.rb
+- lib/cxxproject/utils/cleanup.rb
 - lib/cxxproject/utils/rbcurse_tasktable.rb
-- lib/cxxproject/utils/ubigraph.rb
-- lib/cxxproject/utils/utils.rb
-- lib/cxxproject/version.rb
-- plugins/tmp/.rvmrc
-- plugins/tmp/BuildDir/objects/testme/test.o
-- plugins/tmp/BuildDir/objects/testme/test.o.d
-- plugins/tmp/BuildDir/testme.exe
-- plugins/tmp/Rakefile.rb
-- plugins/tmp/project.rb
-- plugins/tmp/reinstall/Rakefile.rb
-- plugins/tmp/test.cpp
-- rake_helper/perftools.rb
-- rake_helper/spec.rb
-- roodi.yml
-- spec/building_block_spec.rb
-- spec/file_ext_spec.rb
-- spec/ide_interface_spec.rb
-- spec/plugin_context_spec.rb
-- spec/provider_spec.rb
-- spec/rake_listener_ext_spec.rb
-- spec/spec_helper.rb
-- spec/string_spec.rb
-- spec/testdata/basic/exe12/help.cpp
-- spec/testdata/basic/exe12/help.h
-- spec/testdata/basic/exe12/main.cpp
-- spec/testdata/basic/exe12/project.rb
-- spec/testdata/basic/lib1/lib1.cpp
-- spec/testdata/basic/lib1/lib1.h
-- spec/testdata/basic/lib1/project.rb
-- spec/testdata/basic/lib2/lib2.cpp
-- spec/testdata/basic/lib2/lib2.h
-- spec/testdata/basic/lib2/project.rb
-- spec/testdata/multiple_levels/libs/lib1/lib1.cpp
-- spec/testdata/multiple_levels/libs/lib1/lib1.h
-- spec/testdata/multiple_levels/libs/lib1/project.rb
-- spec/testdata/multiple_levels/libs/lib2/lib2.cpp
-- spec/testdata/multiple_levels/libs/lib2/lib2.h
-- spec/testdata/multiple_levels/libs/lib2/project.rb
-- spec/testdata/multiple_levels/mainproject/basic/help.cpp
-- spec/testdata/multiple_levels/mainproject/basic/help.h
-- spec/testdata/multiple_levels/mainproject/basic/main.cpp
-- spec/testdata/multiple_levels/mainproject/basic/project.rb
-- spec/testdata/onlyOneHeader/.gitignore
-- spec/testdata/onlyOneHeader/Rakefile.rb
-- spec/testdata/onlyOneHeader/help.cpp
-- spec/testdata/onlyOneHeader/help.h
-- spec/testdata/onlyOneHeader/main.cpp
-- spec/testdata/onlyOneHeader/project.rb
-- spec/testdata/onlyOneHeader/testin.c
-- spec/toolchain_spec.rb
+- lib/cxxproject/utils/rbcurse_executable_ext.rb
+- lib/cxxproject/utils/rbcurse.rb
+- lib/cxxproject/utils/printer.rb
+- lib/cxxproject/utils/process.rb
+- lib/cxxproject/toolchain/provider.rb
+- lib/cxxproject/toolchain/toolchain.rb
+- lib/cxxproject/toolchain/colorizing_formatter.rb
+- LICENSE
+- README.md
 homepage: https://github.com/marcmo/cxxproject
 licenses: []
 post_install_message: 
@@ -215,9 +110,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4389251987030978626
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.gitignore

@@ -1,18 +0,0 @@
-pkg
-temp
-.project
-.buildpath
-tags
-id_cache
-out
-.idea
-*.iml
-*_output_dir
-testdata
-*~
-coverage
-html
-*.gem
-build
-example/basic/basic/local_build
-

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@cxxproject --create

data/Gemfile

@@ -1,6 +0,0 @@
-source :rubygems
-gem 'rspec'
-gem 'grit'
-gem 'roodi'
-gem 'builder'
-gem 'frazzle'

data/Gemfile.lock

@@ -1,35 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.1.3)
-    diff-lcs (1.1.3)
-    frazzle (0.1.3)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    mime-types (1.19)
-    posix-spawn (0.3.6)
-    roodi (2.1.0)
-      ruby_parser
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  builder
-  frazzle
-  grit
-  roodi
-  rspec

data/Rakefile.rb

@@ -1,125 +0,0 @@
-require 'rake/clean'
-require './rake_helper/spec.rb'
-
-desc "Default Task"
-task :default => [:install]
-
-
-begin
-  require 'rubygems/package_task'
-  spec = Gem::Specification.load('cxxproject.gemspec')
-  Gem::PackageTask.new(spec){|pkg|}
-
-  desc "install gem globally"
-  task :install => [:gem] do
-    sh "gem install pkg/#{spec.name}-#{spec.version}.gem"
-  end
-
-  desc "deploy gem to rubygems"
-  task :deploy => :gem do
-    require 'highline/import'
-    new_gem = "pkg/#{spec.name}-#{spec.version}.gem"
-    say "This will deploy #{new_gem} to rubygems server"
-    if agree("Are you sure you want to continue? [y/n]") then
-      sh "gem push #{new_gem}"
-    end
-  end
-
-  begin
-    require 'rdoc'
-    require 'rdoc/task'
-    RDoc::Task.new do |rd|
-      rd.rdoc_files.include(spec.files)
-    end
-  rescue LoadError => e
-    task :rdoc do
-      puts 'please gem install rdoc'
-    end
-  end
-
-#  begin
-#    require 'roodi'
-#    require 'roodi_task'
-#    class RoodiTask
-#      def define
-#        # copied from roodi_task.rb
-#        desc "Check for design issues in: #{patterns.join(', ')}"
-#        task name do
-#          runner = Roodi::Core::Runner.new
-#          runner.config = config if config
-#          patterns.each do |pattern|
-#            Dir.glob(pattern).each { |file| runner.check_file(file) }
-#          end
-#          runner.errors.each {|error| puts error}
-#          # raise "Found #{runner.errors.size} errors." unless runner.errors.empty?
-#        end
-#        self
-#      end
-#    end
-#    RoodiTask.new('roodi', spec.files)
-#    task :gem => [:roodi]
-#  rescue LoadError # don't bail out when people do not have roodi installed!
-#      puts 'please gem install roodi'
-#  end
-rescue LoadError => e
-    puts "please missing gems #{e}"
-end
-
-def two_digits(x)
-  if x.length > 1
-    x
-  else
-    "0#{x}"
-  end
-end
-
-begin
-  require 'grit'
-  include Grit
-
-  def git_history
-    repo = Repo.new('.')
-    tag_names = repo.tags.collect {|t| t.name }
-    relevant_tags = repo.tags.reject {|t| !t.name.start_with?("v_")}
-    sorted_tags = relevant_tags.sort_by.each do |t|
-      /v_(?<x>\d+)\.(?<y>\d+)\.(?<z>\d+)/ =~ t.name
-      "#{two_digits(x)}-#{two_digits(y)}-#{two_digits(z)}"
-    end
-
-    change_text = []
-    zipped = sorted_tags[0..-2].zip(sorted_tags[1..-1])
-    zipped.reverse.each do |a,b|
-      change_text << ""
-      change_text << "#{a.name} => #{b.name}"
-      change_text << ""
-      cs = repo.commits_between(a.commit, b.commit)
-      cm = cs.each do |c|
-        change_lines = c.message.lines.to_a
-        first = change_lines.first
-        change_text << "    * " + first + "#{change_lines[1..-1].collect {|l| "      #{l}"}.join("")}"
-      end
-    end
-    change_text
-  end
-
-  desc 'generate version history'
-  task :generate_history do
-    puts git_history
-  end
-
-  desc 'generate and update version history'
-  task :update_version_history do
-    change_line = "## Change History:"
-    readme = 'README.md'
-    content = File.read(readme)
-    File.open(readme, 'w') do |f|
-      f.puts content.gsub(/^#{change_line}.*/m, ([change_line] << git_history).join("\n"))
-    end
-  end
-
-rescue LoadError => e
-  puts 'to build the version history please gem install grit'
-end
-
-require './rake_helper/perftools'
-

data/cxxproject.gemspec

@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-gem_name = 'cxxproject'
-require File.expand_path("lib/#{gem_name}/version")
-
-
-Gem::Specification.new do |s|
-  s.name = gem_name
-  s.version = Cxxproject::VERSION
-
-  s.summary = "Cpp Support for Rake."
-  s.description = <<-EOF
-    Some more high level building blocks for cpp projects.
-  EOF
-  s.files = `git ls-files`.split($\)
-  s.require_path = 'lib'
-  s.author = 'oliver mueller'
-  s.email = 'oliver.mueller@gmail.com'
-  s.homepage = 'https://github.com/marcmo/cxxproject'
-
-  s.add_dependency('colored')
-  s.add_dependency('frazzle')
-end

data/example/.gitignore

@@ -1 +0,0 @@
-build

data/example/Rakefile.rb

@@ -1,35 +0,0 @@
-desc 'clean examples'
-task :clean do
-  run_rakefiles{ sh "rake clobber" }
-end
-
-desc 'build examples'
-task :all do
-  run_rakefiles { sh "rake" }
-end
-
-desc "run executables"
-task :execute => [:all] do
-  Dir['**/*.exe'].each do |f|
-    sh f do |ok, res|
-      puts "#{f} => #{ok}"
-    end
-  end
-end
-
-task :default => :execute
-
-Testprojects = [
-  'basic',
-  # 'ckLayout', => needs to be fixed
-  'dependency_tests',
-  'simpleUnitTest',
-  'three_tests']
-def run_rakefiles()
-  Testprojects.each do |p|
-    cd p do
-      dir = File.dirname('Rakefile.rb')
-      yield
-    end
-  end
-end

data/example/big_project/.gitignore

@@ -1,2 +0,0 @@
-build
-gen