cxxproject 0.5.76 → 0.6.0

data/lib/cxxproject/utils/graphstream.rb

@@ -1,154 +1,154 @@
-module Cxxproject
-  module Utils
-    define_graphstream = lambda do
-      require 'socket'
-      require 'thread'
-
-      class GraphStream
-        def initialize
-          begin
-            @server = TCPSocket.open('localhost', 31217)
-            @queue = Queue.new
-            Thread.new do
-              while true
-                command = @queue.pop
-                @server.puts(command)
-              end
-            end
-          rescue Exception => bang
-            puts bang
-          end
-        end
-        def send(command)
-          @queue << command
-        end
-
-        def clear
-          send('Clear()')
-        end
-
-        def set_stylesheet(s)
-          send("SetStylesheet(#{s})")
-        end
-        def add_vertex(id)
-          send("AddVertex(#{id})")
-        end
-        def add_edge(from, to)
-          send("AddEdge(#{from},#{to})")
-        end
-        def set_class(id, clazz)
-          send("SetClass(#{id},#{clazz})")
-        end
-      end
-
-      class GraphStreamSupport
-
-        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("Objects of") == 0
-        end
-        def interesting?(name)
-          exe?(name) || object?(name) || library?(name) || multitask?(name)
-        end
-
-        def initialize(gs)
-          @gs = gs
-
-          @interesting_tasks = Rake::Task.tasks.select { |i| interesting?(i.name) }
-          create_vertices
-          create_edges
-
-          @vertices.each do |name, task|
-            set_attributes(name, task)
-          end
-
-        end
-
-        def create_vertices
-          @vertices = {}
-          @interesting_tasks.each do |task|
-            @vertices[task.name] = task
-            @gs.add_vertex(task.name)
-          end
-        end
-
-        def create_edges
-          @interesting_tasks.each do |task|
-            from = task.name
-            task.prerequisites.each do |to|
-              @gs.add_edge(from, to)
-            end
-          end
-        end
-
-        def set_attributes(name, task)
-          @gs.set_class(name, state2color(task))
-        end
-
-        def state2color(t)
-          begin
-            if t.dirty?
-              return 'dirty'
-            else
-              return 'ready'
-            end
-          rescue StandardError => bang
-            puts bang
-            return '#ff00ff'
-          end
-        end
-
-        def update(name, color)
-          @gs.set_class(name, color)
-        end
-
-        def before_prerequisites(name)
-          update(name, 'before_prerequisites')
-        end
-
-        def after_prerequisites(name)
-          update(name, 'after_prerequisites')
-        end
-
-        def before_execute(name)
-          update(name, 'before_execute')
-        end
-
-        def after_execute(name)
-          update(name, 'after_execute')
-        end
-      end
-
-      namespace :graphstream do
-        gs = nil
-        task :init do
-          gs = GraphStream.new
-        end
-
-        desc 'clear graphstream'
-        task :clear => :init do
-          gs.clear
-        end
-
-        desc 'update graphstream'
-        task :update => :init do
-          gs.set_stylesheet('node {fill-color:green;}node.dirty{fill-color:red;}node.before_prerequisites{fill-color:yellow;}node.after_prerequisites{fill-color:orange;}node.before_execute{fill-color:blue;}node.after_execute{fill-color:green;}node.ready{fill-color:yellow;}')
-          require 'cxxproject/ext/rake_listener'
-          require 'cxxproject/ext/rake_dirty'
-          Rake::add_listener(GraphStreamSupport.new(gs))
-        end
-      end
-    end
-
-    optional_package(define_graphstream, nil)
-  end
-end
+module Cxxproject
+  module Utils
+    define_graphstream = lambda do
+      require 'socket'
+      require 'thread'
+
+      class GraphStream
+        def initialize
+          begin
+            @server = TCPSocket.open('localhost', 31217)
+            @queue = Queue.new
+            Thread.new do
+              while true
+                command = @queue.pop
+                @server.puts(command)
+              end
+            end
+          rescue Exception => bang
+            puts bang
+          end
+        end
+        def send(command)
+          @queue << command
+        end
+
+        def clear
+          send('Clear()')
+        end
+
+        def set_stylesheet(s)
+          send("SetStylesheet(#{s})")
+        end
+        def add_vertex(id)
+          send("AddVertex(#{id})")
+        end
+        def add_edge(from, to)
+          send("AddEdge(#{from},#{to})")
+        end
+        def set_class(id, clazz)
+          send("SetClass(#{id},#{clazz})")
+        end
+      end
+
+      class GraphStreamSupport
+
+        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("Objects of") == 0
+        end
+        def interesting?(name)
+          exe?(name) || object?(name) || library?(name) || multitask?(name)
+        end
+
+        def initialize(gs)
+          @gs = gs
+
+          @interesting_tasks = Rake::Task.tasks.select { |i| interesting?(i.name) }
+          create_vertices
+          create_edges
+
+          @vertices.each do |name, task|
+            set_attributes(name, task)
+          end
+
+        end
+
+        def create_vertices
+          @vertices = {}
+          @interesting_tasks.each do |task|
+            @vertices[task.name] = task
+            @gs.add_vertex(task.name)
+          end
+        end
+
+        def create_edges
+          @interesting_tasks.each do |task|
+            from = task.name
+            task.prerequisites.each do |to|
+              @gs.add_edge(from, to)
+            end
+          end
+        end
+
+        def set_attributes(name, task)
+          @gs.set_class(name, state2color(task))
+        end
+
+        def state2color(t)
+          begin
+            if t.dirty?
+              return 'dirty'
+            else
+              return 'ready'
+            end
+          rescue StandardError => bang
+            puts bang
+            return '#ff00ff'
+          end
+        end
+
+        def update(name, color)
+          @gs.set_class(name, color)
+        end
+
+        def before_prerequisites(name)
+          update(name, 'before_prerequisites')
+        end
+
+        def after_prerequisites(name)
+          update(name, 'after_prerequisites')
+        end
+
+        def before_execute(name)
+          update(name, 'before_execute')
+        end
+
+        def after_execute(name)
+          update(name, 'after_execute')
+        end
+      end
+
+      namespace :graphstream do
+        gs = nil
+        task :init do
+          gs = GraphStream.new
+        end
+
+        desc 'clear graphstream'
+        task :clear => :init do
+          gs.clear
+        end
+
+        desc 'update graphstream'
+        task :update => :init do
+          gs.set_stylesheet('node {fill-color:green;}node.dirty{fill-color:red;}node.before_prerequisites{fill-color:yellow;}node.after_prerequisites{fill-color:orange;}node.before_execute{fill-color:blue;}node.after_execute{fill-color:green;}node.ready{fill-color:yellow;}')
+          require 'cxxproject/ext/rake_listener'
+          require 'cxxproject/ext/rake_dirty'
+          Rake::add_listener(GraphStreamSupport.new(gs))
+        end
+      end
+    end
+
+    optional_package(define_graphstream, nil)
+  end
+end

data/lib/cxxproject/utils/optional.rb

@@ -1,16 +1,16 @@
-require 'rake'
-
-module Cxxproject
-  module Utils
-    def self.optional_package(block1, block2)
-      begin
-        block1.call
-      rescue LoadError => e
-        if RakeFileUtils.verbose == true
-          puts e
-        end
-        block2.call if block2
-      end
-    end
-  end
-end
+require 'rake'
+
+module Cxxproject
+  module Utils
+    def self.optional_package(block1, block2)
+      begin
+        block1.call
+      rescue LoadError => e
+        if RakeFileUtils.verbose == true
+          puts e
+        end
+        block2.call if block2
+      end
+    end
+  end
+end

data/lib/cxxproject/utils/printer.rb

@@ -1,50 +1,50 @@
-require 'cxxproject/toolchain/colorizing_formatter'
-
-module Cxxproject
-  
-  class Printer
-    @@cf = ColorizingFormatter.new
-    
-    def self.printInfo(str)
-      if @@cf.enabled?
-        puts @@cf.printInfo(str)
-      else
-        puts str
-      end
-    end
-    
-    def self.printAdditionalInfo(str)
-      if @@cf.enabled?
-        puts @@cf.printAdditionalInfo(str)
-      else
-        puts str
-      end
-    end
-    
-    def self.printWarning(str)
-      if @@cf.enabled?
-        puts @@cf.printWarning(str)
-      else
-        puts str
-      end
-    end
-
-    def self.printError(str)
-      if @@cf.enabled?
-        puts @@cf.printError(str)
-      else
-        puts str
-      end
-    end
-
-    def self.printSuccess(str)
-      if @@cf.enabled?
-        puts @@cf.printSuccess(str)
-      else
-        puts str
-      end
-    end
-   
-  end
-  
-end
+require 'cxxproject/toolchain/colorizing_formatter'
+
+module Cxxproject
+  
+  class Printer
+    @@cf = ColorizingFormatter.new
+    
+    def self.printInfo(str)
+      if @@cf.enabled?
+        puts @@cf.printInfo(str)
+      else
+        puts str
+      end
+    end
+    
+    def self.printAdditionalInfo(str)
+      if @@cf.enabled?
+        puts @@cf.printAdditionalInfo(str)
+      else
+        puts str
+      end
+    end
+    
+    def self.printWarning(str)
+      if @@cf.enabled?
+        puts @@cf.printWarning(str)
+      else
+        puts str
+      end
+    end
+
+    def self.printError(str)
+      if @@cf.enabled?
+        puts @@cf.printError(str)
+      else
+        puts str
+      end
+    end
+
+    def self.printSuccess(str)
+      if @@cf.enabled?
+        puts @@cf.printSuccess(str)
+      else
+        puts str
+      end
+    end
+   
+  end
+  
+end

data/lib/cxxproject/utils/process.rb

@@ -1,59 +1,53 @@
-module Cxxproject
-
-  class ProcessHelper
-    @@pid = nil
-
-    def self.readOutput(sp, rd, wr)
-      wr.close
-        
-      consoleOutput = ""
-      begin
-        while not rd.eof? 
-           tmp = rd.read(1000)
-           if (tmp != nil)
-             consoleOutput << tmp
-           end  
-        end
-      rescue Exception=>e
-        # Seems to be a bug in ruby: sometimes there is a bad file descriptor on Windows instead of eof, which causes
-        # an exception on read(). However, this happens not before everything is read, so there is no practical difference
-        # how to "break" the loop.
-        # This problem occurs on Windows command shell and Cygwin.
-      end
-        
-      Process.wait(sp)
-      rd.close
-      
-      consoleOutput.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
-      consoleOutput.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
-      
-      consoleOutput
-    end
-
-    def self.spawnProcess(cmdLine)
-      return system(cmdLine) if Cxxproject::Utils.old_ruby?
-      @@pid = spawn(cmdLine)
-      pid, status = Process.wait2(@@pid)
-      @@pid = nil
-      status.success? 
-    end
-
-    def self.killProcess
-      begin
-        Process.kill("KILL",@@pid)
-      rescue
-      end
-      @@pid = nil
-    end
-    
-    def self.safeExecute
-      begin
-        consoleOutput = yield
-        [($?.to_i >> 8) == 0, consoleOutput, false]
-      rescue Exception => e
-        [false, e.message, true]
-      end
-    end
-  end
-
+module Cxxproject
+
+  class ProcessHelper
+    @@pid = nil
+
+    def self.readOutput(sp, rd, wr)
+      wr.close
+        
+      consoleOutput = ""
+      begin
+        while not rd.eof? 
+           tmp = rd.read(1000)
+           if (tmp != nil)
+             consoleOutput << tmp
+           end  
+        end
+      rescue Exception=>e
+        # Seems to be a bug in ruby: sometimes there is a bad file descriptor on Windows instead of eof, which causes
+        # an exception on read(). However, this happens not before everything is read, so there is no practical difference
+        # how to "break" the loop.
+        # This problem occurs on Windows command shell and Cygwin.
+      end
+        
+      Process.wait(sp)
+      rd.close
+      
+      # seems that pipe cannot handle non-ascii characters right on windows (even with correct encoding)  
+      consoleOutput.gsub!(/\xE2\x80\x98/,"`") # ���
+      consoleOutput.gsub!(/\xE2\x80\x99/,"'") # ���
+      
+      consoleOutput
+    end
+
+    def self.spawnProcess(cmdLine)
+      return system(cmdLine) if Cxxproject::Utils.old_ruby?
+      
+      @@pid = spawn(cmdLine)
+      pid, status = Process.wait2(@@pid)
+      @@pid = nil
+      status.success? 
+    end
+
+    def self.killProcess
+      begin
+        Process.kill("KILL",@@pid)
+      rescue
+      end
+      @@pid = nil
+    end
+    
+  end
+
 end

data/lib/cxxproject/utils/progress.rb

@@ -0,0 +1,66 @@
+module Cxxproject
+  module Utils
+    define_progress = lambda do
+      require 'rake'
+      require 'cxxproject/ext/rake'
+
+      require 'progressbar'
+      require 'cxxproject/ext/progressbar'
+      require 'colored'
+      require 'cxxproject/utils/progress_helper'
+
+      class ProgressListener
+        def initialize
+          @progress_helper = ProgressHelper.new
+          Rake::application.top_level_tasks.each do |name|
+            @progress_helper.count_with_filter(name)
+          end
+          @progress = ProgressBar.new('all tasks', @progress_helper.todo)
+          @progress.title_width = 30
+          @progress.unblock
+        end
+
+        def after_execute(name)
+          needed_tasks = @progress_helper.needed_tasks
+          if needed_tasks[name]
+            task = Rake::Task[name]
+            @progress.title = task.name
+            @progress.inc(task.progress_count)
+            if (@progress.total == @progress.current)
+              puts
+            end
+          end
+        end
+      end
+
+      require 'benchmark'
+      class BenchmarkedProgressListener < ProgressListener
+        def initialize
+          Benchmark.bm do |x|
+            x.report('ProgressListener.initialize') do
+              super
+            end
+          end
+        end
+      end
+
+      desc 'show a progressbar for the build (use with -s for best results)'
+      task :progress do
+        require 'cxxproject/ext/rake_listener'
+        Rake::add_listener(ProgressListener.new)
+      end
+
+      task :benchmark_progress do
+        require 'cxxproject/ext/rake_listener'
+        Rake::add_listener(BenchmarkedProgressListener.new)
+      end
+    end
+
+    could_not_define_progress = lambda {
+      task :progress do
+        puts 'could not define progress'
+      end
+    }
+    optional_package(define_progress, could_not_define_progress)
+  end
+end