cxxproject 0.6.11 → 0.6.12

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -172,7 +172,7 @@ module Cxxproject
 
       exclude_files = Set.new
       exclude_sources.each do |p|
-        if p.include?".."
+        if p.include?("..")
           Printer.printError "Error: Exclude source file pattern '#{p}' must not include '..'"
           return nil
         end
@@ -182,7 +182,7 @@ module Cxxproject
       files = Set.new  # do not build the same file twice
 
       sources.each do |f|
-        if f.include?".."
+        if f.include?("..")
           Printer.printError "Error: Source file '#{f}' must not include '..'"
           return nil
         end
@@ -194,7 +194,7 @@ module Cxxproject
       end
 
       source_patterns.each do |p|
-        if p.include?".."
+        if p.include?("..")
           Printer.printError "Error: Source file pattern '#{p}' must not include '..'"
           return nil
         end
@@ -253,17 +253,17 @@ module Cxxproject
       dep_file = nil
       if type != :ASM
         dep_file = get_dep_file(objectRel)
-        dep_file = "\""+dep_file+"\"" if dep_file.include?" "
+        dep_file = "\""+dep_file+"\"" if dep_file.include?(" ")
         depStr = the_tcs[:COMPILER][type][:DEP_FLAGS]
       end
 
       res = typed_file_task Rake::Task::OBJECT, object => source do
         compiler = the_tcs[:COMPILER][type]
-      
+
         if Rake::application.preproFlags and compiler[:PREPRO_FLAGS] == ""
           Printer.printInfo("Info: No preprocessor option available for " + sourceRel)
         else
-      
+
           i_array = the_tcs == @tcs ? @include_string[type] : get_include_string(the_tcs, type)
           d_array = the_tcs == @tcs ? @define_string[type] : get_define_string(the_tcs, type)
 
@@ -285,12 +285,12 @@ module Cxxproject
           cmd << sourceRel
 
           if Cxxproject::Utils.old_ruby?
-            cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
+            cmd.map! {|c| ((c.include?(" ")) ? ("\""+c+"\"") : c )}
             cmdLine = cmd.join(" ")
             if cmdLine.length > 8000
               inputName = objectRel+".tmp"
               File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
-              inputName = "\""+inputName+"\"" if inputName.include?" "
+              inputName = "\""+inputName+"\"" if inputName.include?(" ")
               consoleOutput = `#{compiler[:COMMAND] + " @" + inputName}`
             else
               consoleOutput = `#{cmd.join(" ")} 2>&1`

data/lib/cxxproject/cxxproject.rb

@@ -9,7 +9,6 @@ require 'cxxproject/ext/hash'
 
 require 'cxxproject/utils/optional'
 require 'cxxproject/utils/utils'
-require 'cxxproject/utils/stats'
 
 require 'cxxproject/toolchain/provider'
 

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.cxxproject
-      '0.6.11'
+      '0.6.12'
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,10 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 Z
+date: 2012-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colored
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -21,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: frazzle
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,7 +33,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 description: "    Some more high level building blocks for cpp projects.\n"
 email: oliver.mueller@gmail.com
@@ -43,74 +43,73 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/cxxproject/errorparser/error_parser.rb
-- lib/cxxproject/utils/optional.rb
-- lib/cxxproject/utils/cleanup.rb
-- lib/cxxproject/utils/exit_helper.rb
-- lib/cxxproject/utils/rbcurse_progress.rb
-- lib/cxxproject/utils/process.rb
-- lib/cxxproject/utils/ubigraph.rb
-- lib/cxxproject/utils/printer.rb
-- lib/cxxproject/utils/stats.rb
-- lib/cxxproject/utils/rbcurse.rb
-- lib/cxxproject/utils/progress_helper.rb
-- lib/cxxproject/utils/rbcurse_executable_ext.rb
-- lib/cxxproject/utils/utils.rb
-- lib/cxxproject/utils/rbcurse_tasktable.rb
-- lib/cxxproject/utils/progress.rb
-- lib/cxxproject/utils/graphstream.rb
-- lib/cxxproject/toolchain/provider.rb
-- lib/cxxproject/toolchain/colorizing_formatter.rb
-- lib/cxxproject/toolchain/toolchain.rb
-- lib/cxxproject/version.rb
-- lib/cxxproject/ide_interface.rb
-- lib/cxxproject/ext/rake_listener.rb
-- lib/cxxproject/ext/filelist.rb
-- lib/cxxproject/ext/string.rb
-- lib/cxxproject/ext/rake.rb
-- lib/cxxproject/ext/progressbar.rb
-- lib/cxxproject/ext/stdout.rb
-- lib/cxxproject/ext/hash.rb
-- lib/cxxproject/ext/rake_dirty.rb
-- lib/cxxproject/ext/file.rb
-- lib/cxxproject/context.rb
-- lib/cxxproject/plugin_context.rb
+- lib/cxxproject/buildingblocks/binary_library.rb
 - lib/cxxproject/buildingblocks/building_block.rb
-- lib/cxxproject/buildingblocks/has_libraries_mixin.rb
+- lib/cxxproject/buildingblocks/command_line.rb
 - lib/cxxproject/buildingblocks/custom_building_block.rb
-- lib/cxxproject/buildingblocks/makefile.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/binary_library.rb
-- lib/cxxproject/buildingblocks/executable.rb
+- lib/cxxproject/buildingblocks/makefile.rb
 - lib/cxxproject/buildingblocks/module.rb
 - lib/cxxproject/buildingblocks/single_source.rb
-- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
 - lib/cxxproject/buildingblocks/source_library.rb
-- lib/cxxproject/buildingblocks/command_line.rb
-- lib/cxxproject/eval_context.rb
+- lib/cxxproject/context.rb
 - lib/cxxproject/cxxproject.rb
+- lib/cxxproject/errorparser/error_parser.rb
+- lib/cxxproject/eval_context.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/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/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/progress_helper.rb
+- lib/cxxproject/utils/rbcurse.rb
+- lib/cxxproject/utils/rbcurse_executable_ext.rb
+- lib/cxxproject/utils/rbcurse_progress.rb
+- lib/cxxproject/utils/rbcurse_tasktable.rb
+- lib/cxxproject/utils/ubigraph.rb
+- lib/cxxproject/utils/utils.rb
+- lib/cxxproject/version.rb
 - Rakefile.rb
-- spec/string_spec.rb
-- spec/project_path_spec.rb
+- spec/building_block_spec.rb
+- spec/cxxproject_2_rake_spec.rb
+- spec/file_ext_spec.rb
 - spec/ide_interface_spec.rb
-- spec/spec_helper.rb
 - spec/object_dependency_spec.rb
-- spec/building_block_spec.rb
-- spec/provider_spec.rb
 - spec/plugin_context_spec.rb
-- spec/file_ext_spec.rb
+- spec/project_path_spec.rb
+- spec/provider_spec.rb
+- spec/rake_listener_ext_spec.rb
+- spec/spec_helper.rb
+- spec/string_spec.rb
 - spec/testdata/basic/exe12/project.rb
 - spec/testdata/basic/lib1/project.rb
 - spec/testdata/basic/lib2/project.rb
-- spec/testdata/onlyOneHeader/Rakefile.rb
-- spec/testdata/onlyOneHeader/project.rb
 - spec/testdata/multiple_levels/libs/lib1/project.rb
 - spec/testdata/multiple_levels/libs/lib2/project.rb
 - spec/testdata/multiple_levels/mainproject/basic/project.rb
-- spec/cxxproject_2_rake_spec.rb
+- spec/testdata/onlyOneHeader/project.rb
+- spec/testdata/onlyOneHeader/Rakefile.rb
 - spec/toolchain_spec.rb
-- spec/rake_listener_ext_spec.rb
 homepage: https://github.com/marcmo/cxxproject
 licenses: []
 
@@ -124,9 +123,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2691399920648710728
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -137,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Cpp Support for Rake.

data/lib/cxxproject/utils/stats.rb

@@ -1,60 +0,0 @@
-module Cxxproject
-  module Utils
-    define_stats = lambda do
-      require 'haml'
-
-      def count_sources(bbs)
-        return bbs.inject(0) do |memo, bb|
-          memo += bb.sources.size if bb.kind_of?(HasSources)
-          memo
-        end
-      end
-      def print_sources(io, bbs, indent)
-        io.puts(indent + '%div.details')
-        bbs.each do |bb|
-          if bb.kind_of?(HasSources)
-            io.puts(indent + "  %p Sources of #{bb.name}: #{bb.sources.size}")
-            io.puts(indent + '  %ul')
-            bb.sources.each do |s|
-              io.puts(indent + "    %li #{s}")
-            end
-          end
-        end
-      end
-
-      def handle_exe(io, bb, indent)
-        if bb.kind_of?(Executable)
-          io.puts(indent + "%h1")
-          bbs = bb.all_dependencies.map{|name|ALL_BUILDING_BLOCKS[name]}
-          io.puts(indent + "  %p.details_toggle Executable '#{bb.name}' total sources: #{count_sources(bbs)}")
-          print_sources(io, bbs, indent + ' '*2)
-        end
-      end
-
-      directory 'build'
-
-      desc 'print building block stats'
-      task :stats => 'build' do
-        io = StringIO.new
-        io.puts('%html')
-        io.puts('  %head')
-        io.puts('    %title Some Stats')
-        io.puts('    %script{ :type => "text/javascript", :src=>"http://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js"}')
-        io.puts('    :javascript')
-        io.puts('      $(document).ready(function() {$("div.details").hide();$("p.details_toggle").click(function() {$(this).siblings().last().toggle();});});')
-        io.puts('  %body')
-        res = ALL_BUILDING_BLOCKS.inject(io) do |memo, pair|
-          key, bb = pair
-          handle_exe(memo, bb, ' '*4)
-          memo
-        end
-        engine = Haml::Engine.new(res.string)
-        File.open(File.join('build','stats.out.html'), 'w') do |out|
-          out.puts(engine.render)
-        end
-      end
-    end
-
-    optional_package(define_stats, nil)
-  end
-end