cxxproject 0.5.48 → 0.5.59

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,53 +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
-      
-      # 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
-
+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

@@ -1,66 +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
+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

data/lib/cxxproject/utils/progress_helper.rb

@@ -1,77 +1,77 @@
-module Cxxproject
-  module Utils
-    class ProgressHelper
-
-      attr_reader :todo
-
-      attr_reader :needed_tasks
-
-      def initialize
-        @todo = 0.0
-        @needed_tasks = {}
-      end
-
-      def count_with_filter(name)
-        tasks = find_tasks_for_toplevel_task(name)
-        tasks.each do |t|
-          count(t)
-        end
-        if @todo < 1
-          @todo = 1
-        end
-      end
-
-      def find_tasks_for_toplevel_task(name)
-        regex = create_regex_for_name(name)
-        return filter_all_tasks(regex)
-      end
-
-      def create_regex_for_name(name)
-        res = Regexp.new(name)
-        res = create_regex_for_filter(name, res)
-        return res
-      end
-
-      def is_filter(name)
-        return name.index('filter')
-      end
-
-      def create_regex_for_filter(name, res)
-        return res unless is_filter(name)
-
-        name = name.gsub('filter', '')
-        if name.index('[') == nil
-          name = name + '.*'
-        else
-          name = name.gsub('[', '')
-          name = name.gsub(']', '')
-        end
-        return Regexp.new(name)
-      end
-
-      def filter_all_tasks(regex)
-        return Rake::Task::tasks.find_all do |t|
-          task_name = t.name
-          res = ((task_name.index('filter') == nil) && regex.match(task_name)!=nil)
-        end
-      end
-
-      def count(task)
-        task.visit() do |t|
-          count_needed_tasks(t)
-          true
-        end
-      end
-
-      def count_needed_tasks(t)
-        c = t.progress_count
-        if c && c > 0
-          if t.needed? && @needed_tasks[t.name] == nil
-            @needed_tasks[t.name] = true
-            @todo += c
-          end
-        end
-      end
-    end
-  end
-end
+module Cxxproject
+  module Utils
+    class ProgressHelper
+
+      attr_reader :todo
+
+      attr_reader :needed_tasks
+
+      def initialize
+        @todo = 0.0
+        @needed_tasks = {}
+      end
+
+      def count_with_filter(name)
+        tasks = find_tasks_for_toplevel_task(name)
+        tasks.each do |t|
+          count(t)
+        end
+        if @todo < 1
+          @todo = 1
+        end
+      end
+
+      def find_tasks_for_toplevel_task(name)
+        regex = create_regex_for_name(name)
+        return filter_all_tasks(regex)
+      end
+
+      def create_regex_for_name(name)
+        res = Regexp.new(name)
+        res = create_regex_for_filter(name, res)
+        return res
+      end
+
+      def is_filter(name)
+        return name.index('filter')
+      end
+
+      def create_regex_for_filter(name, res)
+        return res unless is_filter(name)
+
+        name = name.gsub('filter', '')
+        if name.index('[') == nil
+          name = name + '.*'
+        else
+          name = name.gsub('[', '')
+          name = name.gsub(']', '')
+        end
+        return Regexp.new(name)
+      end
+
+      def filter_all_tasks(regex)
+        return Rake::Task::tasks.find_all do |t|
+          task_name = t.name
+          res = ((task_name.index('filter') == nil) && regex.match(task_name)!=nil)
+        end
+      end
+
+      def count(task)
+        task.visit() do |t|
+          count_needed_tasks(t)
+          true
+        end
+      end
+
+      def count_needed_tasks(t)
+        c = t.progress_count
+        if c && c > 0
+          if t.needed? && @needed_tasks[t.name] == nil
+            @needed_tasks[t.name] = true
+            @todo += c
+          end
+        end
+      end
+    end
+  end
+end