cxxproject 0.5.76 → 0.6.0

data/lib/cxxproject/utils/ubigraph.rb

@@ -1,228 +1,228 @@
-module Cxxproject
-  define_ubigraph = lambda do
-    require 'rubigraph'
-
-    module Rubigraph
-      class Vertex
-        alias_method :initialize_original, :initialize
-        def initialize(id = nil)
-          if id != nil
-            @id = id
-          else
-            initialize_original
-          end
-        end
-      end
-    end
-
-    class IdsAndEdges
-      attr_reader :ids, :edges
-      def initialize
-        @ids = Hash.new
-        @edges = Hash.new
-      end
-    end
-
-    class V
-
-      def self.shutdown
-        File.open('id_cache', 'w') do |f|
-          f.write(@@ids_and_edges.to_yaml)
-        end
-      end
-
-      def self.reset
-        begin
-          File.delete('id_cache')
-        rescue StandardError => e
-          puts e
-          puts 'problem deleting id_cache'
-        end
-        @@ids_and_edges = IdsAndEdges.new
-      end
-
-      def self.startup
-        begin
-          @@ids_and_edges = YAML.load_file('id_cache')
-        rescue
-          @@ids_and_edges = IdsAndEdges.new
-        end
-      end
-
-      attr_reader :v
-
-      def initialize(name)
-        h = @@ids_and_edges.ids
-        id = h[name]
-        if !id
-          @v = Rubigraph::Vertex.new
-          @@ids_and_edges.ids()[name] = @v.id
-        else
-          @v = Rubigraph::Vertex.new(id)
-        end
-      end
-      def self.create_edge(edge_and_task1, edge_and_task2)
-        complete_name = "#{edge_and_task1[:task].name}->#{edge_and_task2[:task].name}"
-        if @@ids_and_edges.edges.has_key?(complete_name)
-          return nil
-        else
-          e = Rubigraph::Edge.new(edge_and_task1[:vertex].v, edge_and_task2[:vertex].v)
-          @@ids_and_edges.edges[complete_name] = true
-          return e
-        end
-      end
-    end
-
-    class UbiGraphSupport
-
-      def object?(name)
-        name.match(/.*\.o\Z/) != nil
-      end
-
-      def exe?(name)
-        name.match(/.*\.exe\Z/) != nil
-      end
-      def library?(name)
-        name.match(/.*\.a\Z/) != nil
-      end
-      def multitask?(name)
-        name.index("Sources") == 0
-      end
-      def interesting?(name)
-        exe?(name) || object?(name) || library?(name) || multitask?(name)
-      end
-      def create_vertices
-        @vertices = {}
-        @interesting_tasks.each do |task|
-          v = V.new(task.name)
-          @vertices[task.name] = {:vertex=>v, :task=>task}
-        end
-      end
-      def create_edges
-        @interesting_tasks.each do |task|
-          name = task.name
-          v1 = @vertices[name]
-          task.prerequisites.each do |p|
-            v2 = @vertices[p]
-            if (v2 != nil)
-              e = V.create_edge(v1, v2)
-              e.width=2 if e
-            end
-          end
-        end
-      end
-      def color_vertices
-        @vertices.each do |k, value|
-          v = value[:vertex]
-          v.v.label = k
-          set_attributes(v, k)
-        end
-      end
-      def initialize
-        @interesting_tasks = Rake::Task.tasks.select { |i| interesting?(i.name) }
-        create_vertices
-        create_edges
-        color_vertices
-      end
-
-      def update_colors
-        @vertices.each_key do |k|
-          set_attributes(v, k)
-        end
-      end
-
-      def set_attributes(v, name)
-        v.v.color = state2color(name)
-        v.v.shape = name2shape(name)
-        v.v.size = name2size(name)
-      end
-
-      def name2shape(name)
-        if object?(name)
-          return 'cube'
-        elsif exe?(name)
-          return 'sphere'
-        elsif multitask?(name)
-          return 'torus'
-        else
-          return 'octahedron'
-        end
-      end
-      def name2size(name)
-        if object?(name)
-          return 0.7
-        elsif exe?(name)
-          return 1.2
-        else
-          return 1.0
-        end
-      end
-      def state2color(name)
-        t = @vertices[name][:task]
-        begin
-          if t.dirty?
-            return '#ff0000'
-          else
-            return '#00ff00'
-          end
-        rescue StandardError => bang
-          puts bang
-          return '#ff00ff'
-        end
-      end
-
-      def update(name, color)
-        @vertices[name][:vertex].v.color = color if @vertices[name]
-      end
-
-      YELLOW = '#ffff00'
-      def before_prerequisites(name)
-        update(name, YELLOW)
-      end
-
-      ORANGE = '#ff7f00'
-      def after_prerequisites(name)
-        update(name, ORANGE)
-      end
-
-      BLUE = '#0000ff'
-      def before_execute(name)
-        update(name, BLUE)
-      end
-
-      GREEN = '#00ff00'
-      def after_execute(name)
-        update(name, GREEN)
-      end
-    end
-
-    namespace :rubygraph do
-      task :init do
-        Rubigraph.init
-        V.startup
-        at_exit do
-          V.shutdown
-        end
-      end
-
-      desc 'clear rubygraph'
-      task :clear => :init do
-        Rubigraph.clear
-        V.reset
-      end
-
-      desc 'update rubygraph'
-      task :update => :init do
-        begin
-          require 'cxxproject/ext/rake_listener'
-          require 'cxxproject/ext/rake_dirty'
-          Rake::add_listener(UbiGraphSupport.new)
-        rescue StandardError => e
-          puts e
-        end
-      end
-    end
-  end
-
-  Utils.optional_package(define_ubigraph, nil)
-end
+module Cxxproject
+  define_ubigraph = lambda do
+    require 'rubigraph'
+
+    module Rubigraph
+      class Vertex
+        alias_method :initialize_original, :initialize
+        def initialize(id = nil)
+          if id != nil
+            @id = id
+          else
+            initialize_original
+          end
+        end
+      end
+    end
+
+    class IdsAndEdges
+      attr_reader :ids, :edges
+      def initialize
+        @ids = Hash.new
+        @edges = Hash.new
+      end
+    end
+
+    class V
+
+      def self.shutdown
+        File.open('id_cache', 'w') do |f|
+          f.write(@@ids_and_edges.to_yaml)
+        end
+      end
+
+      def self.reset
+        begin
+          File.delete('id_cache')
+        rescue StandardError => e
+          puts e
+          puts 'problem deleting id_cache'
+        end
+        @@ids_and_edges = IdsAndEdges.new
+      end
+
+      def self.startup
+        begin
+          @@ids_and_edges = YAML.load_file('id_cache')
+        rescue
+          @@ids_and_edges = IdsAndEdges.new
+        end
+      end
+
+      attr_reader :v
+
+      def initialize(name)
+        h = @@ids_and_edges.ids
+        id = h[name]
+        if !id
+          @v = Rubigraph::Vertex.new
+          @@ids_and_edges.ids()[name] = @v.id
+        else
+          @v = Rubigraph::Vertex.new(id)
+        end
+      end
+      def self.create_edge(edge_and_task1, edge_and_task2)
+        complete_name = "#{edge_and_task1[:task].name}->#{edge_and_task2[:task].name}"
+        if @@ids_and_edges.edges.has_key?(complete_name)
+          return nil
+        else
+          e = Rubigraph::Edge.new(edge_and_task1[:vertex].v, edge_and_task2[:vertex].v)
+          @@ids_and_edges.edges[complete_name] = true
+          return e
+        end
+      end
+    end
+
+    class UbiGraphSupport
+
+      def object?(name)
+        name.match(/.*\.o\Z/) != nil
+      end
+
+      def exe?(name)
+        name.match(/.*\.exe\Z/) != nil
+      end
+      def library?(name)
+        name.match(/.*\.a\Z/) != nil
+      end
+      def multitask?(name)
+        name.index("Sources") == 0
+      end
+      def interesting?(name)
+        exe?(name) || object?(name) || library?(name) || multitask?(name)
+      end
+      def create_vertices
+        @vertices = {}
+        @interesting_tasks.each do |task|
+          v = V.new(task.name)
+          @vertices[task.name] = {:vertex=>v, :task=>task}
+        end
+      end
+      def create_edges
+        @interesting_tasks.each do |task|
+          name = task.name
+          v1 = @vertices[name]
+          task.prerequisites.each do |p|
+            v2 = @vertices[p]
+            if (v2 != nil)
+              e = V.create_edge(v1, v2)
+              e.width=2 if e
+            end
+          end
+        end
+      end
+      def color_vertices
+        @vertices.each do |k, value|
+          v = value[:vertex]
+          v.v.label = k
+          set_attributes(v, k)
+        end
+      end
+      def initialize
+        @interesting_tasks = Rake::Task.tasks.select { |i| interesting?(i.name) }
+        create_vertices
+        create_edges
+        color_vertices
+      end
+
+      def update_colors
+        @vertices.each_key do |k|
+          set_attributes(v, k)
+        end
+      end
+
+      def set_attributes(v, name)
+        v.v.color = state2color(name)
+        v.v.shape = name2shape(name)
+        v.v.size = name2size(name)
+      end
+
+      def name2shape(name)
+        if object?(name)
+          return 'cube'
+        elsif exe?(name)
+          return 'sphere'
+        elsif multitask?(name)
+          return 'torus'
+        else
+          return 'octahedron'
+        end
+      end
+      def name2size(name)
+        if object?(name)
+          return 0.7
+        elsif exe?(name)
+          return 1.2
+        else
+          return 1.0
+        end
+      end
+      def state2color(name)
+        t = @vertices[name][:task]
+        begin
+          if t.dirty?
+            return '#ff0000'
+          else
+            return '#00ff00'
+          end
+        rescue StandardError => bang
+          puts bang
+          return '#ff00ff'
+        end
+      end
+
+      def update(name, color)
+        @vertices[name][:vertex].v.color = color if @vertices[name]
+      end
+
+      YELLOW = '#ffff00'
+      def before_prerequisites(name)
+        update(name, YELLOW)
+      end
+
+      ORANGE = '#ff7f00'
+      def after_prerequisites(name)
+        update(name, ORANGE)
+      end
+
+      BLUE = '#0000ff'
+      def before_execute(name)
+        update(name, BLUE)
+      end
+
+      GREEN = '#00ff00'
+      def after_execute(name)
+        update(name, GREEN)
+      end
+    end
+
+    namespace :rubygraph do
+      task :init do
+        Rubigraph.init
+        V.startup
+        at_exit do
+          V.shutdown
+        end
+      end
+
+      desc 'clear rubygraph'
+      task :clear => :init do
+        Rubigraph.clear
+        V.reset
+      end
+
+      desc 'update rubygraph'
+      task :update => :init do
+        begin
+          require 'cxxproject/ext/rake_listener'
+          require 'cxxproject/ext/rake_dirty'
+          Rake::add_listener(UbiGraphSupport.new)
+        rescue StandardError => e
+          puts e
+        end
+      end
+    end
+  end
+
+  Utils.optional_package(define_ubigraph, nil)
+end

data/lib/cxxproject/utils/utils.rb

@@ -1,69 +1,37 @@
-module Cxxproject
-  module Utils
-  
-    def self.flagSplit(str, removeQuotes)
-      hasQuote = false
-      hasDoubleQuote = false
-      hadQuote = false
-      ar = []
-      s = ""
-  
-      #puts str
-      
-      str.split("").each do |i|
-        hasDoubleQuote = !hasDoubleQuote if !hasQuote and i == '"'
-        hasQuote = !hasQuote if !hasDoubleQuote and i == '\''
-        hadQuote = true if hasDoubleQuote
-        if i == ' '
-          if not hasDoubleQuote and not hasQuote
-            if hadQuote and removeQuotes
-              ar << s[1..-2] if s.length > 2
-              hadQuote = false
-            else
-              ar << s if s.length > 0
-            end
-            s = ""
-            next
-          end
-        end
-        s << i
-      end
-      ar << s if s.length > 0
-      ar
-    end  
-  
-    # Simple helper query the operating system we are running in
-    module OS
-
-      # Is it windows
-      def OS.windows?
-        (RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/) != nil
-      end
-
-      # Is it osx
-      def OS.mac?
-        (RUBY_PLATFORM =~ /darwin/) != nil
-      end
-
-      # Is it kind of unix
-      def OS.unix?
-        !OS.windows?
-      end
-
-      # Is it linux
-      def OS.linux?
-        OS.unix? and not OS.mac?
-      end
-
-    end
-
-    def self.deep_copy(x)
-      Marshal.load(Marshal.dump(x))
-    end
-
-    def self.old_ruby?
-      RUBY_VERSION[0..2] == "1.8"
-    end
-
-  end
-end
+module Cxxproject
+  module Utils
+    # Simple helper query the operating system we are running in
+    module OS
+
+      # Is it windows
+      def OS.windows?
+        (RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/) != nil
+      end
+
+      # Is it osx
+      def OS.mac?
+        (RUBY_PLATFORM =~ /darwin/) != nil
+      end
+
+      # Is it kind of unix
+      def OS.unix?
+        !OS.windows?
+      end
+
+      # Is it linux
+      def OS.linux?
+        OS.unix? and not OS.mac?
+      end
+
+    end
+
+    def self.deep_copy(x)
+      Marshal.load(Marshal.dump(x))
+    end
+
+    def self.old_ruby?
+      RUBY_VERSION[0..2] == "1.8"
+    end
+
+  end
+end

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
-module Cxxproject
-  class Version
-    def self.cxxproject
-      "0.5.76"
-    end
-  end
-end
+module Cxxproject
+  class Version
+    def self.cxxproject
+      "0.6.0"
+    end
+  end
+end

data/lib/cxxproject.rb

@@ -1,19 +1,23 @@
-# Just the default file wich is auto-required in the gem and which requires all needed stuff
-require 'rubygems'
-require 'yaml'
-require 'rake/clean'
-
-require 'cxxproject/utils/optional'
-
-require 'cxxproject/ext/string'
-require 'cxxproject/utils/utils'
-require 'cxxproject/torake'
-require 'cxxproject/utils/ubigraph'
-require 'cxxproject/utils/graphstream'
-require 'cxxproject/toolchain/provider'
-
-require 'cxxproject/utils/stats'
-
-include Cxxproject::Toolchain
-CxxProject2Rake = Cxxproject::CxxProject2Rake
-BinaryLibs = Cxxproject::BinaryLibs
+# Just the default file wich is auto-required in the gem and which requires all needed stuff
+require 'rubygems'
+require 'yaml'
+require 'rake/clean'
+
+require 'cxxproject/utils/optional'
+
+require 'cxxproject/ext/string'
+require 'cxxproject/utils/utils'
+require 'cxxproject/torake'
+require 'cxxproject/utils/ubigraph'
+require 'cxxproject/utils/graphstream'
+require 'cxxproject/toolchain/provider'
+
+require 'cxxproject/utils/progress'
+require 'cxxproject/utils/rbcurse'
+require 'cxxproject/utils/progress'
+require 'cxxproject/utils/rbcurse'
+require 'cxxproject/utils/stats'
+
+include Cxxproject::Toolchain
+CxxProject2Rake = Cxxproject::CxxProject2Rake
+BinaryLibs = Cxxproject::BinaryLibs

data/lib/tools/Rakefile.rb.template

@@ -1,10 +1,10 @@
-require 'cxxproject'
-BuildDir = "BuildDir"
-
-unittest_flags = {
-  :DEFINES => ['UNIT_TEST','CPPUNIT_MAIN=main'],
-  :FLAGS => "-O0 -g3 -Wall"
-}
-toolchain = Provider.modify_cpp_compiler("GCC", unittest_flags)
-dependent_projects =  ['./project.rb']
-CxxProject2Rake.new(dependent_projects, BuildDir, toolchain, './')
+require 'cxxproject'
+BuildDir = "BuildDir"
+
+unittest_flags = {
+  :DEFINES => ['UNIT_TEST','CPPUNIT_MAIN=main'],
+  :FLAGS => "-O0 -g3 -Wall"
+}
+toolchain = Provider.modify_cpp_compiler("GCC", unittest_flags)
+dependent_projects =  ['./project.rb']
+CxxProject2Rake.new(dependent_projects, BuildDir, toolchain, './')

data/lib/tools/project.rb.template

@@ -1,6 +1,6 @@
-cxx_configuration do
-  <%= building_block %> "<%= name %>",
-    :sources => FileList['**/*.cpp'],
-    :includes => ['include'],
-    :dependencies => []
-end
+cxx_configuration do
+  <%= building_block %> "<%= name %>",
+    :sources => FileList['**/*.cpp'],
+    :includes => ['include'],
+    :dependencies => []
+end