ruber 0.0.9 → 0.0.10

data/lib/ruber/settings_container.rb

@@ -367,15 +367,15 @@ This method resets the dialog.
 @param [Object] w the object describing the widget. It must have the methods documented
 below
 @option w [String] caption the name of the page the widget should be put into. If
-the page doesn't exist in the dialog, it will be added. Otherwise, the widget will
-be added to the one already existing in the page
+  the page doesn't exist in the dialog, it will be added. Otherwise, the widget will
+  be added to the one already existing in the page
 @option w [Class] class_obj (nil) the class of the widget to create. The class's
-@initialize@ method must take no parameters. Either this method or the @code@
-method must not be *nil*
+  @initialize@ method must take no parameters. Either this method or the @code@
+  method must not be *nil*
 @option w [String] code (nil) a piece of ruby code which, when executed in the
-@TOPLEVEL_BINDING@, will return the widget to add to the dialog. Either this
-method or the @class_obje@ method must not be *nil*. If both are not *nil*, this
-method will have the precedence
+  @TOPLEVEL_BINDING@, will return the widget to add to the dialog. Either this
+  method or the @class_obje@ method must not be *nil*. If both are not *nil*, this
+  method will have the precedence
 @option w [String] pixmap ('') the path of the pixmap to associate to the page
 @return [nil]
 @see SettingsDialog#initialize

data/lib/ruber/settings_dialog.rb

@@ -51,34 +51,34 @@ that each option corresponds to a single widget, you can't use it. So, you defin
 a <tt>read_settings</tt>, a <tt>store_settings</tt> and a <tt>read_default_settings</tt>
 method in your widget class like this:
 
-  class MyWidget < Qt::Widget
+bc.. class MyWidget < Qt::Widget
 
-    def initialize parent = nil
-      super
-      @default_dir_widget = KDE::LineEdit.new self
-      @default_file_widget = KDE::LineEdit.new self
-    end
-
-    def read_settings
-      path = @settings_dialog.settings_container[:general, :default_path]
-      @default_dir_widget.text = File.dirname(path)
-      @default_file_widget.text = File.basename(path)
-    end
-    
-    def store_settings
-      path = File.join @default_dir_widget.text, @default_file_widget.text
-      @settings_dialog.settings_container[:general, :default_path] = path
-    end
-    
-    def read_default_settings
-      path = @settings_dialog.settings_container.default(:general, :default_path)
-      @default_dir_widget.text = File.dirname(path)
-      @default_file_widget.text = File.basename(path)
-    end
+  def initialize parent = nil
+    super
+    @default_dir_widget = KDE::LineEdit.new self
+    @default_file_widget = KDE::LineEdit.new self
+  end
 
+  def read_settings
+    path = @settings_dialog.settings_container[:general, :default_path]
+    @default_dir_widget.text = File.dirname(path)
+    @default_file_widget.text = File.basename(path)
+  end
+  
+  def store_settings
+    path = File.join @default_dir_widget.text, @default_file_widget.text
+    @settings_dialog.settings_container[:general, :default_path] = path
+  end
+  
+  def read_default_settings
+    path = @settings_dialog.settings_container.default(:general, :default_path)
+    @default_dir_widget.text = File.dirname(path)
+    @default_file_widget.text = File.basename(path)
   end
 
-Note that the <tt>@settings_dialog</tt> instance variable has been automatically
+end
+  
+p. Note that the <tt>@settings_dialog</tt> instance variable has been automatically
 created by the dialog when the widget has been created and contains a reference
 to the dialog itself.
 

data/lib/ruber/version.rb

@@ -1,5 +1,5 @@
 module Ruber
   
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
   
 end

data/lib/ruber/world/environment.rb

@@ -110,6 +110,7 @@ The default hints used by methods like {#editor_for} and {#editor_for!}
         super parent
         @project = prj
         @tab_widget = KDE::TabWidget.new{self.document_mode = true}
+        @tab_widget.tabs_closable = true if Ruber[:config][:workspace, :close_buttons]
         connect @tab_widget, SIGNAL('currentChanged(int)'), self, SLOT('current_tab_changed(int)')
         connect @tab_widget, SIGNAL('tabCloseRequested(int)'), self, SLOT('close_tab(int)')
         @views = ViewList.new

data/lib/ruber/world/plugin.yaml

@@ -1,6 +1,6 @@
 name: world
 description: Container for all the environments
-require: [world, environment]
+require: [world, environment, project_files_widget]
 class: Ruber::World::World
 config_options:
  workspace:
@@ -8,4 +8,9 @@ config_options:
 config_widgets:
  - {caption: Workspace, pixmap: workspace.png, class: Ruber::World::WorkspaceSettingsWidget}
 extensions:
- environment: {class: Ruber::World::Environment, scope: global}
+ environment: {class: Ruber::World::Environment, scope: global}
+project_options:
+ general:
+  project_files: {default: {:include: [], :exclude: [], :extensions: ["*.rb"]}}
+project_widgets:
+ - {caption: Files, pixmap: configure, class: Ruber::ProjectFilesWidget}

data/lib/ruber/{application → world}/ui/project_files_rule_chooser_widget.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'project_files_rule_chooser_widget.ui'
 **
-** Created: gio apr 21 20:42:42 2011
-**      by: Qt User Interface Compiler version 4.7.2
+** Created: dom lug 31 08:50:39 2011
+**      by: Qt User Interface Compiler version 4.7.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end

data/lib/ruber/{application → world}/ui/project_files_widget.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'project_files_widget.ui'
 **
-** Created: gio apr 21 20:42:42 2011
-**      by: Qt User Interface Compiler version 4.7.2
+** Created: dom lug 31 08:50:39 2011
+**      by: Qt User Interface Compiler version 4.7.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end

data/plugins/auto_end/auto_end.rb

@@ -87,13 +87,7 @@ character class is used from ruby 1.9.2 onward, while @\w@ is used for previous
 versions
 =end
       IDENTIFIER_PATTERN = RUBY_VERSION >= '1.9.2' ? '\p{Word}+' : '\w+'
-      
-=begin rdoc
-The regexp fragment which matches a multiple identifier (that is, an identifier
-maybe followed by several other identifiers separated by @::@)
-=end
-      MULTI_ID_PATTERN = "#{IDENTIFIER_PATTERN}(?:::#{IDENTIFIER_PATTERN})*"
-      
+           
 =begin rdoc
 The patterns used to find out whether an @end@ keyword should be inserted after
 a line.
@@ -112,18 +106,19 @@ Each entry is itself an array with three elements:
         [/\bdo\s*$/, "\nend", [0, -1]],
         [/\bdo\s+\|/, "\nend", [0, -1]],
         [/^\s*def\s/, "\nend", [0, -1]],
-        [/^class\s+#{IDENTIFIER_PATTERN}\s*$/, "\nend", [0, -1]],
-        [/^class\s+#{MULTI_ID_PATTERN}\s*<{1,2}\s*#{MULTI_ID_PATTERN}\s*$/, "\nend", [0, -1]],
-        [/^\s*module\s+#{MULTI_ID_PATTERN}\s*$/, "\nend", [0,-1]],
+        [/\bclass\b/, "\nend", [0, -1]],
+        [/\bmodule\b/, "\nend", [0, -1]],
+        [/^\s*case\b/, "\nend", [0, -1]],
+        [/=\s*case\b/, "\nend", [0, -1]],
         [/^\s*while\s/, "\nend", [0,-1]],
         [/^\s*until\s/, "\nend", [0,-1]],
-#         [/^=begin(\s|$)/, "\n=end", [0, -1]],
+        [/^=begin(\s|$)/, "\n=end", [0, -1]],
         [/^\s*begin\s/, "\nend", [0, -1]],
         [/(^=\s+|.=\s*)begin\s/, "\nend", [0, -1]],
-        [/^\s*for\s+#{IDENTIFIER_PATTERN}\s+in.+$/, "\nend", [0,-1]],
-        [/=\s*for\s+#{IDENTIFIER_PATTERN}\s+in.+$/, "\nend", [0,-1]]
+        [/^\s*for\s/, "\nend", [0,-1]],
+        [/=\s*for\s/, "\nend", [0,-1]]
       ]
-      
+
 =begin rdoc
 @param [DocumentProject] prj the project associated with the document
 =end
@@ -149,15 +144,22 @@ position (if any) is forgotten
 @param [KTextEditor::Range] the range corresponding to the inserted text
 =end
       def text_inserted range
+        return unless @doc.active?
         text = @doc.text range
         return unless text.end_with? "\n"
         @insertion = nil
         line = @doc.line( range.end.line - 1)
         pattern = PATTERNS.find{|pat| pat[0].match line}
         if pattern and !line.start_with? '#'
-          indentation = line.match(/^\s*/)[0].size
-          next_indentation = @doc.line(range.end.line + 1).match(/^\s*/)[0].size
-          unless next_indentation > indentation
+          check_res = @doc.extension(:syntax_checker).check_syntax(:format => false, 
+              :update => false)
+          return unless check_res
+          errors = check_res[:errors]
+          # Usually, missing end errors are the last ones to be reported
+          if errors && !errors.empty? && errors[-1].error_type == :missing_end
+#           indentation = line.match(/^\s*/)[0].size
+#           next_indentation = @doc.line(range.end.line + 1).match(/^\s*/)[0].size
+#           unless next_indentation > indentation
             @insertion = Insertion.new range.end.line, pattern[1], pattern[2]
           end
         end
@@ -245,4 +247,5 @@ is called. After the text has been inserted {#connect_slots} is called.
     
   end
   
-end
+end
+

data/plugins/autosave/autosave.rb

@@ -237,7 +237,7 @@ into account the enabled option and always attempt to save the documents.
 =end
       def save_project_files opts, blk
         docs = Ruber[:world].active_environment.documents.documents_with_file
-        prj_files = Ruber[:world].active_project.project_files.abs
+        prj_files = Ruber[:world].active_project.project_files
         docs = docs.select{|d| prj_files.include? d.path}
         save_files docs, opts, blk
       end

data/plugins/find_in_files/find_in_files.rb

@@ -280,7 +280,7 @@ the following entries:
         places = case @dlg.places
         when :custom_dir then @dlg.directory
         when :project_dir then Ruber[:world].active_project.project_directory
-        when :project_files then Ruber[:world].active_project.project_files.abs.to_a
+        when :project_files then Ruber[:world].active_project.project_files.to_a
         when :open_files then Ruber[:world].documents.documents_with_file.map{|d| d.path}
         end
         opts[:places] = Array(places)

data/plugins/irb/irb.rb

@@ -0,0 +1,142 @@
+=begin 
+    Copyright (C) 2011 by Stefano Crocco   
+    stefano.crocco@alice.it   
+  
+    This program is free software; you can redistribute it andor modify  
+    it under the terms of the GNU General Public License as published by  
+    the Free Software Foundation; either version 2 of the License, or     
+    (at your option) any later version.                                   
+  
+    This program 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 this program; if not, write to the                         
+    Free Software Foundation, Inc.,                                       
+    59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             
+=end
+
+require 'irb/irb_controller'
+require_relative 'ui/irb_tool_widget'
+require_relative 'ui/irb_config_widget'
+
+module Ruber
+  
+  module IRB
+    
+    class Plugin < Ruber::Plugin
+      
+      def shutdown
+        @widget.stop
+        super
+      end
+      
+    end
+    
+    class IRBWidget < Qt::Widget
+      
+      PROMPTS = {
+        :PROMPT_I=>"%N(%m):%03n:%i> ",
+        :PROMPT_N=>"%N(%m):%03n:%i> ",
+        :PROMPT_S=>"%N(%m):%03n:%i%l ",
+        :PROMPT_C=>"%N(%m):%03n:%i* ",
+        :RETURN=>"=> "
+      }
+      
+      def initialize parent = nil
+        super
+        @ui = Ui::ToolWidget.new
+        @ui.setup_ui self
+        @view = @ui.view
+        @input = @ui.input
+        self.focus_proxy = @input
+        @controller = IRBController.new Ruber[:config][:irb, :irb], [], self
+        @controller.connect(SIGNAL(:output_ready)){ display_output @controller.output}
+        @display_output = true
+        @controller.prompts = Ruber[:config][:irb, :prompts]
+        @controller.start_irb
+        @input.connect(SIGNAL('returnPressed(QString)')){|s| send_to_irb s}
+        @input.completion_mode = KDE::GlobalSettings::CompletionAuto
+        @controller.connect SIGNAL(:ready) do
+          @input.enabled = true
+          @input.set_focus if is_active_window
+        end
+        @ui.restart_irb.connect(SIGNAL(:clicked)){ @controller.restart_irb}
+        @ui.send_abort.connect(SIGNAL(:clicked)){ @controller.interrupt}
+        @controller.connect(SIGNAL(:interrupting_evaluation)){ @display_output = false}
+        @controller.connect(SIGNAL(:evaluation_interrupted)){ @display_output = true}
+        @cursor = @view.text_cursor
+        @formats = {
+          :input => Qt::TextCharFormat.new{|c| c.foreground = Qt::Brush.new Ruber[:config][:output_colors, :message]},
+          :output => Qt::TextCharFormat.new{|c| c.foreground = Qt::Brush.new Ruber[:config][:output_colors, :output]}
+        }
+      end
+      
+      def stop
+        @controller.stop_irb
+      end
+      
+      def load_settings
+        @controller.prompts = Ruber[:config][:irb, :prompts]
+      end
+      slots :load_settings
+      
+      private
+      
+      def display_output lines
+        return unless @display_output
+        @cursor.move_position Qt::TextCursor::End
+        lines.each do |l|
+          Ruber[:app].process_events
+          @cursor.char_format = @formats[l.category]
+          @cursor.insert_text l.full_text+"\n"
+        end
+        @cursor.move_position Qt::TextCursor::End
+        @view.text_cursor = @cursor
+        @view.ensure_cursor_visible
+      end
+      
+      def send_to_irb line
+        @input.completion_object.add_item line
+        @input.insert_item 0, line
+        @input.edit_text = ''
+        @input.enabled = false
+        @controller.send_to_irb [line]
+      end
+      
+    end
+    
+    class ConfigWidget < Qt::Widget
+      
+      def initialize parent = nil
+        super
+        @ui = Ui::ConfigWidget.new
+        @ui.setup_ui self
+      end
+      
+      def read_settings
+        prompts = @settings_dialog.container[:irb, :prompts]
+        @ui.prompt_i.text = prompts[:PROMPT_I]
+        @ui.prompt_n.text = prompts[:PROMPT_N]
+        @ui.prompt_s.text = prompts[:PROMPT_S]
+        @ui.prompt_c.text = prompts[:PROMPT_C]
+        @ui.prompt_return.text = prompts[:RETURN]
+      end
+      
+      def store_settings
+        prompts = {}
+        prompts[:PROMPT_I] = @ui.prompt_i.text
+        prompts[:PROMPT_N] = @ui.prompt_n.text
+        prompts[:PROMPT_S] = @ui.prompt_s.text
+        prompts[:PROMPT_C] = @ui.prompt_c.text
+        prompts[:RETURN] = @ui.prompt_return.text
+        @settings_dialog.container[:irb, :prompts] = prompts
+      end
+      
+    end
+    
+  end
+  
+end

data/plugins/irb/irb.svg

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="irbsvg.svg"
+   inkscape:export-filename="/home/stefano/documenti/programmi/ruber/ruber/plugins/irb/irb.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3899">
+      <stop
+         style="stop-color:#777777;stop-opacity:1;"
+         offset="0"
+         id="stop3901" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3903" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3765">
+      <stop
+         id="stop3773"
+         offset="0"
+         style="stop-color:#888888;stop-opacity:1;" />
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:0.51485151;"
+         offset="1"
+         id="stop3769" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-63.904188,988.26635)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3805"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1052.2664,-64.095813)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3808"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(988.45799,-64.095813)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3811"
+       gradientUnits="userSpaceOnUse"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808"
+       gradientTransform="translate(0.09580839,988.26635)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-63.904188,988.26635)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3864"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1052.2664,-64.095813)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3867"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(988.45799,-64.095813)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3870"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.09580839,988.26635)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,64.095813,0.09581)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3883"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.09580839,-0.09583)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3886"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.09580839,-0.09583)"
+       x1="-0.095808387"
+       y1="32.095808"
+       x2="8.9101797"
+       y2="32.095808" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.4375"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="-9"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <path
+       style="fill:#999999;fill-opacity:1"
+       d="M 0 0 L 0 9 L 0 55 L 0 64 L 9 64 L 55 64 L 64 64 L 64 55 L 64 9 L 64 0 L 55 0 L 9 0 L 0 0 z M 9 9 L 55 9 L 55 55 L 9 55 L 9 9 z "
+       transform="translate(0,988.36218)"
+       id="rect2985" />
+    <rect
+       style="fill:#aa0044;fill-opacity:1"
+       id="rect3819"
+       width="51.725464"
+       height="51.832333"
+       x="6.1372685"
+       y="994.44604" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1"
+       id="rect3829"
+       width="38.514973"
+       height="2.1077843"
+       x="9.8682632"
+       y="1001.2964" />
+    <rect
+       y="1033.1049"
+       x="9.8682632"
+       height="2.1077843"
+       width="35.065868"
+       id="rect3831"
+       style="fill:#ffffff;fill-opacity:1" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1"
+       id="rect3833"
+       width="26.730541"
+       height="2.1077843"
+       x="9.8682632"
+       y="1024.2904" />
+    <rect
+       y="1016.7216"
+       x="9.8682632"
+       height="2.1077843"
+       width="42.059879"
+       id="rect3835"
+       style="fill:#ffffff;fill-opacity:1" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1"
+       id="rect3837"
+       width="31.52096"
+       height="2.1077843"
+       x="9.8682632"
+       y="1009.2485" />
+  </g>
+</svg>