watobo 0.9.12 → 0.9.13

data/lib/watobo/gui/dashboard.rb

@@ -1,7 +1,7 @@
 # .
 # dashboard.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
 
    module Gui
 
@@ -27,22 +28,33 @@ module Watobo
         
         def increment(i)
            @lock.synchronize do
-             @progress += i
+             @pbar.progress += i
              #@total += i
            end  
         end
         
         def progress(i)
            @lock.synchronize do
-             @progress = i
-             #@total += i
+             @pbar.progress = i
+             update_bar_color
            end  
         end
         
+        def update_bar_color          
+          if @pbar.total == 0 then
+            @pbar.barColor = 'grey'
+          else
+            @pbar.barColor = FXRGB(255,0,0)
+          end
+          if @pbar.progress == @pbar.total
+               @pbar.barColor = 'green' 
+          end
+        end
+        
         def total(i)
            @lock.synchronize do
              #@progress = i
-             @total = i
+             @pbar.total = i
            end  
         end
         
@@ -52,21 +64,10 @@ module Watobo
            end  
         end
         
-        def update_progress
-          @lock.synchronize do
-            @pbar.increment(@progress)
-            @progress = 0
-            @pbar.barColor = 'green' if @pbar.progress >= @pbar.total
-            @label.text = "#{@check_name} #{@pbar.progress}/#{@pbar.total}"
-          end
-        end
-        
         def initialize(owner, check_name, num_checks)
         begin
                super(owner, :opts => LAYOUT_FILL_X|FRAME_GROOVE|LAYOUT_TOP)
                @lock = Mutex.new
-               @progress = 0
-               @total = 0
                @check_name = check_name
                @label = FXLabel.new(self, check_name, :opts => LAYOUT_LEFT)
 
@@ -75,12 +76,7 @@ module Watobo
                @pbar.progress = 0
                @pbar.total = num_checks
                 puts "#{check_name} has #{num_checks} Checks"
-               @pbar.barColor = 0
-               if num_checks == 0 then
-                  @pbar.barColor = 'grey'
-               else
-                  @pbar.barColor = FXRGB(255,0,0)
-               end
+               update_bar_color
             rescue => bang
                puts "!!!ERROR: could not add progress info"
                puts bang
@@ -106,7 +102,7 @@ module Watobo
             #@progress_bars = Hash.new
             modules.each do |check_name, num_checks|
                puts "* new ProgressInfo: #{check_name} - #{num_checks}"
-               pi = ProgressInfo.new(@progress_frame, check_name, num_checks)
+               pi = ProgressInfo.new(@progress_frame, check_name, num_checks[:total])
                pi.create
 
                @progress_bars[check_name] = pi
@@ -135,16 +131,16 @@ module Watobo
       end
 
       class ProjectInfo < FXVerticalFrame
-         def update(project)
-            if project then
-               @project_name.text = project.settings[:project_name]
-               @session_name.text = project.settings[:session_name]
-               @project_path.text = project.settings[:project_path]
-               @session_path.text = project.settings[:session_path]
-
-               @number_active_checks.text = project.active_checks.length.to_s
-               @number_passive_checks = project.passive_checks.length.to_s
-               @number_total_chats.text = project.chats.length.to_s
+         def update()
+            if Watobo.project then
+               @project_name.text = Watobo.project.settings[:project_name]
+               @session_name.text = Watobo.project.settings[:session_name]
+               @project_path.text = Watobo.project.settings[:project_path]
+               @session_path.text = Watobo.project.settings[:session_path]
+
+               @number_active_checks.text = Watobo::ActiveModules.length.to_s
+               @number_passive_checks = Watobo::PassiveModules.length.to_s
+               @number_total_chats.text = Watobo::Chats.length.to_s
             end
 
          end
@@ -168,11 +164,11 @@ module Watobo
             @session_path = FXLabel.new(frame,"-")
 
             frame = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X)
-            FXLabel.new(frame, "Number available ActiveChecks:")
+            FXLabel.new(frame, "Number available ActiveModules:")
             @number_active_checks = FXLabel.new(frame,"-")
 
             frame = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X)
-            FXLabel.new(frame, "Number of PassiveChecks:")
+            FXLabel.new(frame, "Number of PassiveModules:")
             @number_passive_checks = FXLabel.new(frame,"-")
 
             frame = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X)
@@ -201,8 +197,11 @@ module Watobo
       class Dashboard < FXVerticalFrame
          include Watobo::Gui::Icons
 
-         def setupScanProgressFrame(scan_modules)
-            @scan_progress_frame.setup(scan_modules)
+         def setupScanProgressFrame(scanner)
+           @progress_lock.synchronize do
+           @scanner = scanner
+            @scan_progress_frame.setup(scanner.progress)
+          end
          end
 
          def setScanStatus(status)
@@ -238,9 +237,8 @@ module Watobo
             end
          end
 
-         def updateProjectInfo(project)
-            @project = project
-            @project_info_frame.update(@project)
+         def updateProjectInfo()           
+            @project_info_frame.update()
          end
 
          def update_status(check_module, progress_index)
@@ -295,8 +293,12 @@ module Watobo
 
 def start_update_timer
          @timer = FXApp.instance.addTimeout( 50, :repeat => true) {
-           @scan_progress_frame.progress_bars.each_value do |p|
-             p.update_progress
+           unless @scanner.nil?
+             progress = @scanner.progress
+             progress.each do |m, info|
+               @scan_progress_frame.progress_bars[m].progress info[:progress]
+               
+             end
            end
           }
       end
@@ -306,7 +308,7 @@ def start_update_timer
 
                super(parent, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
                #db_title = FXLabel.new(self, "DASHBOARD", :opts => LAYOUT_LEFT)
-               @project = nil
+               @scanner = nil
                @progress_lock = Mutex.new
 
                main = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
@@ -341,7 +343,7 @@ def start_update_timer
                   case tabItem.to_i
                   when 0
                      #  puts "Login Script Selected"
-                     @project_info_frame.update(@project)
+                     @project_info_frame.update()
                   when 1
                      # puts "Session IDs Selected"
 

data/lib/watobo/gui/define_scope_frame.rb

@@ -1,7 +1,7 @@
 # .
 # define_scope_frame.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -23,7 +23,8 @@ require 'fox16'
 
 include Fox
 
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     
     
@@ -198,7 +199,7 @@ module Watobo
     class DefineScopeFrame < FXVerticalFrame
       
       def onDeselectAll(sender, sel, item)        
-        @dummy_scope.each do |site, val|        
+        @scope.each do |site, val|        
           @cb_sites[site].setCheck(false)  
           @edit_btns[site].disable
         end
@@ -209,7 +210,7 @@ module Watobo
       
       def onSelectAll(sender, sel, item)
         sites = []
-        @dummy_scope.each do |site, scope|
+        @scope.each do |site, scope|
           @cb_sites[site].setCheck(true)
           @edit_btns[site].enable
         end
@@ -218,10 +219,10 @@ module Watobo
       end
       
       def editSiteDetails(site)
-        dlg = EditScopeDetailsDialog.new(self, @dummy_scope[site])
+        dlg = EditScopeDetailsDialog.new(self, @scope[site])
         
         if dlg.execute != 0
-          @dummy_scope[site].update dlg.details
+          @scope[site].update dlg.details
           puts dlg.details.to_yaml
         end
       end
@@ -229,14 +230,14 @@ module Watobo
       def getScope()
         scope = Hash.new
         @cb_sites.keys.each do |site|
-          @dummy_scope.delete(site) if !@cb_sites[site].checked?
-          # scope[site] = @dummy_scope[site] if @cb_sites[site].checked?
+          @scope.delete(site) if !@cb_sites[site].checked?
+          # scope[site] = @scope[site] if @cb_sites[site].checked?
         end
-        return @dummy_scope
+        return @scope
       end
       
       def updateFrame()
-        @dummy_scope.each do |site, scope|
+        @scope.each do |site, scope|
           next if @cb_sites[site].nil? 
           @cb_sites[site].setCheck(scope[:enabled])
           @cb_sites[site].checked? ? @edit_btns[site].enable : @edit_btns[site].disable
@@ -246,18 +247,19 @@ module Watobo
       
       def setScope(scope)
         @scope = scope
-        @dummy_scope.keys.each do |site|         
-          @dummy_scope[site].update @scope[site] if !@scope[site].nil?         
+        Watobo::Scope.each do |site, scope_def|         
+          @scope[site].update @scope[site] if !@scope[site].nil?         
         end
         updateFrame()
       end
       
-      def initialize(owner, sites, scope, opts)
+      def initialize(owner, opts)
         super(owner, :opts => opts, :padding => 0)
         
-        @dummy_scope = Hash.new
-        @dummy_scope = YAML.load(YAML.dump(scope)) if scope.is_a? Hash
-        
+       # @scope = Hash.new
+       # @scope = YAML.load(YAML.dump(scope)) if scope.is_a? Hash
+       @scope = YAML.load(Watobo::Scope.to_yaml)
+       
         @cb_sites = Hash.new
         @edit_btns = Hash.new
         
@@ -288,8 +290,11 @@ EOF
           frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE, :padding => 0)
         sitesArea = FXScrollWindow.new(frame, SCROLLERS_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
         sitesFrame = FXVerticalFrame.new(sitesArea, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
-        
-        sites.sort.each do |site|         
+        puts "list sites"
+        sites = Watobo::Chats.sites()
+        puts sites.length
+        sites.sort.each do |site|     
+          puts site    
           site_frame = FXHorizontalFrame.new(sitesFrame, :opts => LAYOUT_FILL_X)
           b = FXCheckButton.new(site_frame, site, nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
           eb = FXButton.new(site_frame, "edit..", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT)
@@ -297,7 +302,7 @@ EOF
           
           b.connect(SEL_COMMAND){
             b.checked? ? @edit_btns[site].enable : @edit_btns[site].disable
-            @dummy_scope[site][:enabled] = true
+            @scope[site][:enabled] = true
           }
           
           
@@ -311,10 +316,10 @@ EOF
             #:exclude_pattern => []
           }
           
-          if !@dummy_scope[site]
-          @dummy_scope[site] = scope_details 
+          if !@scope[site]
+          @scope[site] = scope_details 
         else
-          @dummy_scope[site][:enabled] = true
+          @scope[site][:enabled] = true
           end
           
           

data/lib/watobo/gui/differ_frame.rb

@@ -0,0 +1,238 @@
+# .
+# differ_frame.rb
+# 
+# Copyright 2013 by siberas, http://www.siberas.de
+# 
+# This file is part of WATOBO (Web Application Tool Box)
+#        http://watobo.sourceforge.com
+# 
+# WATOBO is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation version 2 of the License.
+# 
+# WATOBO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with WATOBO; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# .
+# @private 
+module Watobo#:nodoc: all
+  module Gui
+    class SelectionInfo < FXVerticalFrame
+      def update(info)
+        begin
+          @hid_label.text = info[:hid] || "-"
+          @url_label.text = info[:url] || "-"
+          @length_label.text = info[:length] || "-"
+          @status_label.text = info[:status] || "-"
+
+        rescue => bang
+          puts "!!! Could not update SelectionInfo"
+          puts bang
+        end
+      end
+
+      def clear()
+        @hid_label.text = "-"
+        @url_label.text = "-"
+        @length_label.text = "-"
+        @status_label.text = "-"
+      end
+
+      def initialize(owner, opts)
+        super(owner, opts)
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_NONE|LAYOUT_FILL_X, :padding => 0)
+        FXLabel.new(frame, "History-ID: ")
+        @hid_label = FXLabel.new(frame, " - ")
+
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_NONE|LAYOUT_FILL_X, :padding => 0)
+        FXLabel.new(frame, "URL: ")
+        @url_label = FXLabel.new(frame, " - ")
+
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_NONE|LAYOUT_FILL_X, :padding => 0)
+        FXLabel.new(frame, "Length: ")
+        @length_label = FXLabel.new(frame, " - ")
+
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_NONE|LAYOUT_FILL_X, :padding => 0)
+        FXLabel.new(frame, "Status: ")
+        @status_label = FXLabel.new(frame, " - ")
+      end
+    end
+
+    class DiffFrame < FXVerticalFrame
+      include Responder
+
+      ID_HISTORY_BUTTON = FXMainWindow::ID_LAST
+      def onHistoryButton(sender, sel, event)
+        @history_slider.reset()
+        sender.parent.backColor = FXColor::Red
+        @slider_selection = sender.parent.item
+      end
+
+      def updateHistory(history)
+        @slider_selection = nil
+        @history = history
+        # @history_slider.update(history)
+        updateHistoryTable()
+      # updateSelections()
+      end
+
+      def onTableClick(sender,sel,item)
+        begin
+
+          row = item.row
+          @historyTable.selectRow(row, false)
+          hi = @historyTable.getRowText(row).to_i - 1
+
+          if @first_selection and @second_selection
+            @first_selection = nil
+            @second_selection = nil
+          end
+
+          if !@first_selection
+            @first_selection = @history[hi]
+          else
+            @second_selection = @history[hi]
+          end
+
+          updateSelection()
+
+        rescue => bang
+          puts "!!!ERROR: onTableClick"
+          puts bang
+          puts "!!!"
+
+        end
+      end
+
+      def initHistoryTable()
+        @historyTable.clearItems()
+        @historyTable.setTableSize(0, 3)
+
+        @historyTable.setColumnText( 0, "STATUS" )
+        @historyTable.setColumnText( 1, "LENGTH" )
+        @historyTable.setColumnText( 2, "URL" )
+
+        @historyTable.rowHeader.width = 50
+        @historyTable.setColumnWidth(0, 100)
+
+        @historyTable.setColumnWidth(1, 100)
+        @historyTable.setColumnWidth(2, 200)
+
+      end
+
+      def updateHistoryTable()
+        begin
+          @historyTable.clearItems()
+          initHistoryTable()
+
+          @history.each do |h|
+            lastRowIndex = @historyTable.getNumRows
+            @historyTable.appendRows(1)
+            @historyTable.setRowText(lastRowIndex, (@history.index(h) + 1 ).to_s)
+            @historyTable.setItemText(lastRowIndex, 0, h.response.status) if h.response.respond_to? :status
+            @historyTable.setItemText(lastRowIndex, 1, h.response.join.length.to_s)
+            @historyTable.setItemText(lastRowIndex, 2, h.request.url.to_s) if h.request.respond_to? :url
+            3.times do |i|
+              i = @historyTable.getItem(lastRowIndex, i)
+              i.justify = FXTableItem::LEFT unless i.nil?
+            end
+          end
+        rescue => bang
+          puts bang
+        end
+
+      end
+
+      def updateSelection()
+        @first_sel_info.clear()
+        @second_sel_info.clear()
+
+        if @first_selection
+
+          @first_sel_info.update( :url => @first_selection.request.url.to_s,
+          :hid => (@history.index(@first_selection) + 1).to_s,
+          :status => @first_selection.response.status,
+          :length => @first_selection.response.join.length.to_s)
+
+        end
+
+        if @second_selection
+          @second_sel_info.update( :url => @second_selection.request.url.to_s,
+          :hid => (@history.index(@second_selection) + 1).to_s,
+          :status => @second_selection.response.status,
+          :length => @second_selection.response.join.length.to_s)
+
+        end
+      end
+
+      def getDiffChats()
+        first = nil
+        second = nil
+        begin
+          case @first_chat_dt.value
+          when 0
+            0
+          when 1
+            0
+          end
+
+        rescue
+
+        return first, second
+        end
+      end
+
+      def initialize(owner, opts)
+        super(owner, opts)
+
+        @history_size = 10
+        @history = []
+        @slider_selection = nil
+        @first_selection = nil
+        @second_selection = nil
+
+        FXMAPFUNC(SEL_COMMAND, DiffFrame::ID_HISTORY_BUTTON, 'onHistoryButton')
+
+        frame = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
+        # frame_left = FXVerticalFrame.new(frame, :opts => LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH, :width => 70, :padding => 0)
+        # @history_slider = HistorySlider.new(frame_left, self, @history_size, opts)
+
+        frame_right = FXVerticalFrame.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        sunken = FXVerticalFrame.new(frame_right, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
+        @historyTable = FXTable.new(sunken, :opts => FRAME_SUNKEN|TABLE_COL_SIZABLE|TABLE_ROW_SIZABLE|LAYOUT_FILL_X|LAYOUT_FILL_Y|TABLE_READONLY|LAYOUT_SIDE_TOP, :padding => 2)
+        initHistoryTable()
+
+        @historyTable.connect(SEL_COMMAND, method(:onTableClick))
+
+        first_chat_gb = FXGroupBox.new(frame_right, "First Chat", LAYOUT_SIDE_TOP|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        @first_sel_info = SelectionInfo.new(first_chat_gb, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        second_chat_gb = FXGroupBox.new(frame_right, "Second Chat", LAYOUT_SIDE_TOP|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        @second_sel_info = SelectionInfo.new(second_chat_gb, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+        diff_button = FXButton.new(frame_right, "Diff it!", nil, nil, 0, :opts => LAYOUT_FILL_X|FRAME_RAISED|FRAME_THICK)
+
+        diff_button.connect(SEL_COMMAND) {
+        # new, orig = getDiffChats()
+          if @first_selection and @second_selection then
+            first_request = Watobo::Utils.copyObject(@first_selection.request)
+            first_response = Watobo::Utils.copyObject(@first_selection.response)
+            second_request = Watobo::Utils.copyObject(@second_selection.request)
+            second_response = Watobo::Utils.copyObject(@second_selection.response)
+
+            chat_one = Watobo::Chat.new(first_request, first_response, :id => 0)
+            chat_two = Watobo::Chat.new(second_request, second_response, :id => 0)
+            project = nil
+            diffViewer = ChatDiffViewer.new(FXApp.instance, chat_one, chat_two)
+            diffViewer.create
+            diffViewer.show(Fox::PLACEMENT_SCREEN)
+          end
+        }
+      end
+    end
+  end
+end

data/lib/watobo/gui/edit_comment.rb

@@ -1,7 +1,7 @@
 # .
 # edit_comment.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class EditCommentDialog < FXDialogBox
       def comment()

data/lib/watobo/gui/edit_scope_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # edit_scope_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class EditScopeDialog < FXDialogBox
 
@@ -28,17 +29,17 @@ module Watobo
       attr :scope
       def onAccept(sender, sel, event)
 
-        @scope = @defineScopeFrame.getScope()
+        Watobo::Scope.set @defineScopeFrame.getScope()
 
         getApp().stopModal(self, 1)
         self.hide()
         return 1
       end
 
-      def initialize(owner, project, prefs)
+      def initialize(owner, prefs)
         #super(owner, "Edit Target Scope", DECOR_TITLE|DECOR_BORDER, :width => 300, :height => 425)
         super(owner, "Edit Target Scope", DECOR_ALL, :width => 300, :height => 425)
-        @project = project
+        
         @scope = Hash.new
 
         FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
@@ -47,7 +48,7 @@ module Watobo
 
         #  puts "create scopeframe with scope:"
         # @project.scope
-        @defineScopeFrame = DefineScopeFrame.new(base_frame, @project.listSites(), YAML.load(YAML.dump(@project.scope)), prefs)
+        @defineScopeFrame = DefineScopeFrame.new(base_frame, prefs)
 
         buttons_frame = FXHorizontalFrame.new(base_frame,
         :opts => LAYOUT_FILL_X|LAYOUT_SIDE_TOP)

data/lib/watobo/gui/finding_info.rb

@@ -1,7 +1,7 @@
 # .
 # finding_info.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -20,7 +20,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
 require 'fox16/colors'
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class FindingInfo < FXVerticalFrame
       include Watobo::Gui::Icons