watobo 0.9.8.680 → 0.9.8.686

data/lib/watobo/defaults.rb

@@ -22,19 +22,20 @@
 module Watobo
   def self.load_defaults
     config_path = File.expand_path(File.join(File.dirname(__FILE__),"..","..", "config"))
-    puts "* loading defaults from #{config_path}"
+    #   puts "* loading defaults from #{config_path}"
     Dir.glob("#{config_path}/*.yml").each do |cf|
       dummy = File.basename(cf).gsub!(/.yml/,'')
       cc = dummy.strip.gsub(/[^[a-zA-Z\-_]]/,"").gsub( "-" , "_").split("_").map{ |s| s.downcase.capitalize }.join
-
-      print " - #{cc} ... "
-      settings = YAML.load_file(cf)
-      Watobo::Conf.add(cc,  settings )
-      print "OK\n"
+      begin
+        settings = YAML.load_file(cf)
+        Watobo::Conf.add(cc,  settings )
+      rescue => bang
+        puts "[#{self}] Could not load config #{cf}"
+      end
     end
   end
 
 end
 
-puts "=== loading defaults ==="
+#puts "=== loading defaults ==="
 Watobo.load_defaults

data/lib/watobo/framework/create_project.rb

@@ -49,6 +49,8 @@ module Watobo
     puts "Total: " + project_settings[:active_checks].length.to_s
 
     project = Project.new(project_settings)
+    @running_projects << project
+    project
     
   end
   

data/lib/watobo/framework/init.rb

@@ -23,6 +23,12 @@ module Watobo
 
   @active_checks = []
   @passive_checks = []
+  @running_projects = []
+  
+  def self.running_projects
+    @running_projects
+  end
+  
   def self.active_checks
     @active_checks
   end
@@ -32,12 +38,8 @@ module Watobo
   end
 
   def self.init_framework()
-    puts "* Initializing Framework"
     init_working_directory
 
-    # @settings.update settings
-
-    puts "* loading custom settings ..."
     Watobo::Conf.each do |cm|
       cm.update
     end
@@ -101,8 +103,6 @@ module Watobo
   end
 
   def self.init_working_directory
-    puts "* init_working_directory ..."
-
     watobo_folder = ".watobo"
     watobo_folder = Conf::General.watobo_folder if Conf::General.respond_to? :watobo_folder
 
@@ -121,7 +121,6 @@ module Watobo
       puts "!!! WATOBO is not tested for this platform (#{RUBY_PLATFORM})!!!"
       exit
       end
-      puts ">> " + Conf::General.working_directory
     end
 
     unless File.exist? Conf::General.working_directory

data/lib/watobo/gui/about_watobo.rb

@@ -37,7 +37,7 @@ module Watobo
         version = FXHorizontalFrame.new(main, :opts => LAYOUT_FILL_X, :padding => 0)
         version.backColor = FXColor::White
         
-        version_label  = FXLabel.new(version, "Version: #{$version}", nil, :opts => JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+        version_label  = FXLabel.new(version, "Version: #{Watobo.version}", nil, :opts => JUSTIFY_CENTER_X|LAYOUT_FILL_X)
         version_label.setFont(FXFont.new(getApp(), "helvetica", 14, FONTWEIGHT_BOLD, FONTSLANT_ITALIC, FONTENCODING_DEFAULT))
         version_label.backColor = FXColor::White
         version_label.justify = JUSTIFY_CENTER_X

data/lib/watobo/gui/browser_preview.rb

@@ -21,6 +21,11 @@
 # .
 module Watobo
   module Gui
+    
+    def self.browser_preview(opts)
+      
+    end
+    
     class BrowserControl
       def initialize()
 
@@ -61,176 +66,7 @@ module Watobo
       end
     end
 
-    #
-    # Firefox Controller Class
-    #
-    class FFControl_UNUSED < BrowserControl
-      #@@fft = nil
-      def initialize()
-        @jssh = nil
-        aquireSession()
-      end
-
-      def ready?()
-        return false if @jssh == nil
-        begin
-          @jssh.cmd(""){ |s| print s }
-        rescue
-          @jssh = nil
-          return false
-        end
-
-        return true
-      end
-
-      def navigate(url)
-        # puts "* Firefox.navigate"
-        if aquireSession() then
-          res = ""
-          @jssh.cmd("tabBrowser.loadURI(\"#{url}\")"){ |l|
-            print l
-            res += l
-          }
-          if res.split(/\n/).first =~ /Error:/i then
-            @jssh.cmd("var tab = browser.addTab(\"#{url}\")"){ |s| print s }
-            @jssh.cmd("var tabBrowser = browser.getBrowserForTab(tab)"){ |s| print s }
-          end
-
-        end
-      end
-
-      def getDoc()
-        begin
-          aquireSession()
-
-          jssh_cmd = "var doc = tabBrowser.contentDocument;"
-          @jssh.cmd(jssh_cmd){ |s| print s }
-
-          jssh_cmd = "var body = doc.body;"
-          @jssh.cmd(jssh_cmd){ |s| print s }
-          @jssh.cmd("body"){ |s| print s }
-
-          jssh_cmd = "body.innerHTML;"
-          doc = @jssh.cmd(jssh_cmd)
-          puts doc
-          return doc
-
-        rescue => bang
-          puts bang
-          return false
-
-        end
-
-      end
-
-      def busy?()
-        ffcmd = "tabBrowser.webProgress.isLoadingDocument"
-        res = ""
-        begin
-
-          if ready?() then
-
-            res = ""
-            @jssh.cmd(ffcmd) {|s| res += s}
-
-            return true if res =~ /true/
-          end
-
-          return false
-
-        rescue => bang
-          puts bang
-          return false
-        end
-      end
-
-      def connect()
-        aquireSession()
-      end
-
-      def close()
-        if ready?
-          @jssh.cmd("browser.removeTab(tab)"){ |s| print s }
-        end
-      end
-
-      private
-
-      def aquireSession()
-
-        if not ready?
-          @jssh = nil
-          @jssh = ffconnect("127.0.0.1", "9997")
-        end
-
-        if @jssh != nil then
-          @jssh.cmd("var w0 = getWindows()[0]"){ |s| print s }
-          @jssh.cmd("var browser = w0.getBrowser()"){ |s| print s }
-          @jssh.cmd("browser"){ |s| print s }
-
-          #jssh.cmd("browser.loadURI(\"http://www.siberas.de\")"){ |s| print s }
-        else
-          return false
-        end
-      end
-
-      def startFireFox()
-        puts "startFireFox()"
-        path_to_firefox = ""
-        case RUBY_PLATFORM
-        when /mswin|mingw|bccwin/
-          puts "* firefox on this platform (#{RUBY_PLATFORM}) not supported, yet!"
-        when /linux|bsd|solaris|hpux/i
-          path_to_firefox = `which firefox`.strip
-        when /darwin/i
-          path_to_firefox = '/Applications/Firefox.app/Contents/MacOS/firefox'
-        else
-          puts "!Unknown OS???"
-          nil
-        end
-        if path_to_firefox != ""
-          puts "* trying to start firefox (#{path_to_firefox})"
-          Thread.new { system("#{path_to_firefox} -jssh")}
-        end
-      end
-
-      def ffconnect(host, port)
-        retry_count = 0
-
-        begin
-          puts "* connecting to firefox jssh extension"
-          jssh = Net::Telnet.new('Host' => host,
-          'Port' => port)
-          jssh.sync = true
-
-          jssh.waitfor(/>/){ |s| print s }
-        rescue Errno::ECONNREFUSED
-          puts "! BrowserControl: Connection Reset"
-
-          if retry_count < 1 then
-            retry_count += 1
-            startFireFox()
-            retry
-          elsif retry_count < 3 then
-            retry_count += 1
-            # startFireFox()
-            sleep 1.0
-            retry
-          else
-            puts "!!! Seems like JSSH is not installed !!!"
-            puts "please check the installation instructions!"
-            raise "JSSH_CONNECT_ERROR"
-          end
-        rescue => bang
-          puts "!!! Could not create FireFoxControl !!!"
-          puts bang
-          return false
-        end
-
-        return jssh
-      end
-    end
-
+   
     #
     # InternetExplorer Controller Class
     #
@@ -298,14 +134,14 @@ module Watobo
           #  require 'selenium-webdriver'
           @rc = createBrowser(browser_type, proxy)
         rescue => bang
-          puts "* Could not create selenium driver"
+          puts "[#{self}] Could not create selenium driver"
         end
       end
 
       def createBrowser( browser_type = :firefox, proxy = nil )
         profile = nil
         unless proxy.nil?
-          puts "* create preview with proxy #{proxy}"
+          puts "[Preview] create preview with proxy #{proxy}" if $DEBUG
           profile = Selenium::WebDriver::Firefox::Profile.new
 
           driver_proxy = Selenium::WebDriver::Proxy.new(:http => proxy)

data/lib/watobo/gui/chat_diff.rb

@@ -336,11 +336,10 @@ module Watobo
       end
       
       
-      def initialize(owner, project, chat_orig, chat_new)
+      def initialize(owner, chat_orig, chat_new)
         # Invoke base class initialize function first
         super(owner, "Chat Differ", :opts => DECOR_ALL,:width=>800, :height=>600)
         self.icon = ICON_DIFFER
-        @project = project
         @chat_orig = chat_orig
         @chat_new = chat_new
         @max_line_length = 80

data/lib/watobo/gui/checkboxtree.rb

@@ -50,7 +50,7 @@ module Watobo
           # puts icon.class.to_s
           node = nil
           levels = e[:name].split('|')
-          # puts "Processing: #{e[:name]}"
+          puts "Processing: #{e[:name]} > #{e[:data].class}" if $DEBUG
           levels.each do |l|
             
             item = self.findItem(l, node, SEARCH_FORWARD|SEARCH_IGNORECASE)
@@ -177,11 +177,13 @@ module Watobo
         #LAYOUT_TOP|LAYOUT_RIGHT|TREELIST_SHOWS_LINES|TREELIST_SHOWS_BOXES|TREELIST_ROOT_BOXES|TREELIST_EXTENDEDSELECT
         
         self.connect(SEL_COMMAND) do |sender, sel, item|
-          # puts "Selected Item: #{item}"
-          #  if item.parent
-          #    puts "Member Of: #{item.parent}"
-          #   puts "Has Brothers: #{item.parent.numChildren}"
-          #  end
+          if $DEBUG
+           puts "Selected Item: #{item}"
+            if item.parent
+              puts "Member Of: #{item.parent}"
+             puts "Has Brothers: #{item.parent.numChildren}"
+            end
+          end
           if self.itemLeaf?(item) then
             toggleState(item)
             updateParent(item)
@@ -204,6 +206,7 @@ module Watobo
               uncheckAllChildren(item)
               :none
             end
+            
             self.setItemData(item, new_state)
             self.setItemClosedIcon(item, icon)
             self.setItemOpenIcon(item, icon)

data/lib/watobo/gui/client_cert_dialog.rb

@@ -32,10 +32,9 @@ module Watobo
 
       include Responder
 
-      def initialize(owner, project, prefs={})
+      def initialize(owner, prefs={})
 
-        super(owner, "Client Certificates", :opts => DECOR_ALL)
-        @project = project
+        super(owner, "Client Certificates", :opts => DECOR_ALL)     
         FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
 
         @password_policy = {
@@ -45,7 +44,7 @@ module Watobo
         @cert_path = nil
         @client_certificates = {}
         @client_certificates = project.getClientCertificates unless project.getClientCertificates.nil?
-        puts client_certificates.to_yaml
+      #  puts client_certificates.to_yaml
 
         @password_policy.update prefs[:password_policy] if prefs.has_key? :password_policy
 
@@ -121,7 +120,7 @@ module Watobo
         @sites_combo.clearItems
         @sites_combo.appendItem(NO_SELECTION, nil)
         @site_dt.value = NO_SELECTION
-        @project.listSites(:in_scope => @scope_only_cb.checked? ){ |site|
+        Watobo::Gui.project.listSites(:in_scope => @scope_only_cb.checked? ){ |site|
           #puts "Site: #{site}"
           @sites_combo.appendItem(site, site)
         }

data/lib/watobo/gui/conversation_table.rb

@@ -97,16 +97,16 @@ module Watobo
         # end
         
           if @filter[:unique]
-            unless Watobo::Gui.active_project.nil?
-              uniq_hash = Watobo::Gui.active_project.uniqueRequestHash chat.request
+            unless Watobo::Gui.project.nil?
+              uniq_hash = Watobo::Gui.project.uniqueRequestHash chat.request
               return false if @uniq_chats.has_key? uniq_hash
               @uniq_chats[uniq_hash] = nil
             end
           end
           
           if @filter[:show_scope_only]           
-            unless Watobo::Gui.active_project.nil?
-              return false unless Watobo::Gui.active_project.siteInScope?(chat.request.site)
+            unless Watobo::Gui.project.nil?
+              return false unless Watobo::Gui.project.siteInScope?(chat.request.site)
             end
           end
           # puts "* passed scope"