ruber 0.0.8 → 0.0.9

data/CHANGES

@@ -1,5 +1,26 @@
 h1. Changes
 
+h2. Ruber 0.0.9
+
+h3. Features
+
+h2. Ruber 0.0.9
+
+h3. Features
+
+* It is now possible to have more than one open project at the same time
+* When a project is active, only the editors associated with it are visibile
+* Editors not associated with a project are visible only when there's no active
+  project
+* Made the Auto End plugin recognize some other keywords: @unless@, @for@, @while@,
+  @until@ (the last two were already recognized when followed by a @do@)
+  
+h3. Bug fixes
+
+* The RSpec plugin now correctly displays pending examples
+* Fixed a crash when creating a new document and saving it as a ruby file while
+  using the Syntax Checker plugin
+  
 h2. Ruber 0.0.8
 
 h3. Features

data/data/share/apps/ruber/ruberui.rc

@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM 'kpartgui.dtd'>
-<kpartgui version="13" name="ruber" >
+<kpartgui version="14" name="ruber" >
  <MenuBar>
   <Menu name="file" >
    <text>&amp;File</text>
@@ -65,6 +65,8 @@
    <Separator/>
    <Action name="project-close"/>
    <Separator/>
+   <Action name="project-active_project"/>
+   <Separator/>
    <Action name="project-quick_open_file" />
    <Separator/>
    <Action name="project-configure"/>

data/lib/ruber/application/application.rb

@@ -85,6 +85,7 @@ Ruber can be in three states:
   it (either with the @File/Quit@ menu entry or clicking on the button on the title
   bar)
 - *quitting*:= from when the user chooses to quit Ruber onwards
+- *asking_to_quit*:= while asking the user to confirm quitting Ruber
 
 >>>>>>> master
 @return [Symbol] the status of the application. It can be: @:starting@, @:running@
@@ -141,6 +142,25 @@ write the change to file. It's up to whoever called this method to do so.
     end
     alias :plugin_dirs= :plugin_directories=
     
+=begin rdoc
+Asks the user to confirm quitting Ruber
+
+This method is called whenever Ruber needs to be closed and, in turn, calls the
+{PluginLike#query_close query_close} method of each plugin and component (using
+{ComponentManager#query_close}).
+
+During the execution of this method, {#status} returns @:asking_to_quit@. After
+this method returns, the status returns what it was before.
+@return [Boolean] *true* if the application can be closed and *false* otherwise
+=end
+    def ask_to_quit
+      old_status = @status
+      @status = :asking_to_quit
+      res = @components.query_close
+      @status = old_status
+      res
+    end
+    
 =begin rdoc
 Quits ruber
 
@@ -349,7 +369,7 @@ on the command line)
         current = 'config'
         @components.load_component 'config'
         register_with_config
-        %w[documents projects main_window].each do |i|
+        %w[world main_window].each do |i|
           current = i
           @components.load_component i
         end
@@ -359,20 +379,7 @@ on the command line)
         exit 1
       end
       if sessionRestored? then Ruber[:main_window].restore 1, false
-      else
-        open_command_line_files
-        if Ruber[:projects].projects.empty? and Ruber[:documents].documents.empty?
-          doc = Ruber[:documents].new_document
-          # This is the default document. Set the default_document attribute of
-          # the ruber_default_document extension to true
-          # TODO this extension is currently provided by the main window because
-          # the application component is actually loaded after the other. This
-          # is wrong. To avoid it, don't call load_core_components from initialize
-          # but have the ruber starting code (in bin/ruber) start it manually. Then
-          # move the extension to the application
-          doc.extension(:ruber_default_document).default_document = true
-          Ruber[:main_window].display_doc doc
-        end
+      else open_command_line_files
       end
     end
 
@@ -418,14 +425,6 @@ necessary to to them later
       nil
     end
     
-    class DefaultDocumentExtension
-      include Extension
-      attr_accessor :default_document
-      def initialize doc
-        @default_document = false
-      end
-    end
-
   end
   
 end

data/lib/ruber/application/plugin.yaml

@@ -1,6 +1,6 @@
 name: app
 description: The application itself
-require: application
+require: [application, project_files_widget, project_files_list]
 class: 'Ruber::Application'
 config_options: 
  :general:
@@ -8,4 +8,9 @@ config_options:
    :plugins: {:default: Ruber::Application::DEFAULT_PLUGINS}
    :auto_load_project: {:default: false }
 config_widgets:
- - {:caption: General, :pixmap: configure, :code: "w=Qt::CheckBox.new('&Open last project at startup');w.object_name='kcfg_general_auto_load_project';w"}
+ - {:caption: General, :pixmap: configure, :code: "w=Qt::CheckBox.new('&Open last project at startup');w.object_name='kcfg_general_auto_load_project';w"}
+project_options:
+ general:
+  project_files: {default: {:include: [], :exclude: [], :extensions: ["*.rb"]}}
+extensions:
+ project_files: {class: ProjectFilesList}

data/lib/ruber/application/ui/project_files_rule_chooser_widget.rb

@@ -0,0 +1,74 @@
+=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
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+=end
+
+class Ui_ProjectFilesRuleChooser
+    attr_reader :gridLayout
+    attr_reader :remove_rule_btn
+    attr_reader :add_regexp_btn
+    attr_reader :add_path_btn
+    attr_reader :rules_widget
+
+    def setupUi(projectFilesRuleChooser)
+    if projectFilesRuleChooser.objectName.nil?
+        projectFilesRuleChooser.objectName = "projectFilesRuleChooser"
+    end
+    projectFilesRuleChooser.resize(505, 143)
+    @gridLayout = Qt::GridLayout.new(projectFilesRuleChooser)
+    @gridLayout.objectName = "gridLayout"
+    @remove_rule_btn = KDE::PushButton.new(projectFilesRuleChooser)
+    @remove_rule_btn.objectName = "remove_rule_btn"
+
+    @gridLayout.addWidget(@remove_rule_btn, 3, 1, 1, 1)
+
+    @add_regexp_btn = KDE::PushButton.new(projectFilesRuleChooser)
+    @add_regexp_btn.objectName = "add_regexp_btn"
+
+    @gridLayout.addWidget(@add_regexp_btn, 0, 1, 1, 1)
+
+    @add_path_btn = KDE::PushButton.new(projectFilesRuleChooser)
+    @add_path_btn.objectName = "add_path_btn"
+
+    @gridLayout.addWidget(@add_path_btn, 1, 1, 1, 1)
+
+    @rules_widget = Qt::TreeView.new(projectFilesRuleChooser)
+    @rules_widget.objectName = "rules_widget"
+    @rules_widget.rootIsDecorated = false
+    @rules_widget.uniformRowHeights = true
+    @rules_widget.allColumnsShowFocus = true
+
+    @gridLayout.addWidget(@rules_widget, 0, 0, 5, 1)
+
+
+    retranslateUi(projectFilesRuleChooser)
+
+    Qt::MetaObject.connectSlotsByName(projectFilesRuleChooser)
+    end # setupUi
+
+    def setup_ui(projectFilesRuleChooser)
+        setupUi(projectFilesRuleChooser)
+    end
+
+    def retranslateUi(projectFilesRuleChooser)
+    projectFilesRuleChooser.windowTitle = Qt::Application.translate("ProjectFilesRuleChooser", "Form", nil, Qt::Application::UnicodeUTF8)
+    @remove_rule_btn.text = Qt::Application.translate("ProjectFilesRuleChooser", "&Remove rule", nil, Qt::Application::UnicodeUTF8)
+    @add_regexp_btn.text = Qt::Application.translate("ProjectFilesRuleChooser", "Add &regexp rule", nil, Qt::Application::UnicodeUTF8)
+    @add_path_btn.text = Qt::Application.translate("ProjectFilesRuleChooser", "Add &file rule", nil, Qt::Application::UnicodeUTF8)
+    end # retranslateUi
+
+    def retranslate_ui(projectFilesRuleChooser)
+        retranslateUi(projectFilesRuleChooser)
+    end
+
+end
+
+module Ui
+    class ProjectFilesRuleChooser < Ui_ProjectFilesRuleChooser
+    end
+end  # module Ui
+

data/lib/ruber/application/ui/project_files_widget.rb

@@ -0,0 +1,117 @@
+=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
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+=end
+
+class Ui_ProjectFilesWidget
+    attr_reader :verticalLayout
+    attr_reader :groupBox
+    attr_reader :gridLayout
+    attr_reader :label
+    attr_reader :extensions
+    attr_reader :label_2
+    attr_reader :include_rules
+    attr_reader :groupBox_2
+    attr_reader :gridLayout_2
+    attr_reader :label_3
+    attr_reader :exclude_rules
+
+    def setupUi(projectFilesWidget)
+    if projectFilesWidget.objectName.nil?
+        projectFilesWidget.objectName = "projectFilesWidget"
+    end
+    projectFilesWidget.resize(518, 576)
+    @verticalLayout = Qt::VBoxLayout.new(projectFilesWidget)
+    @verticalLayout.objectName = "verticalLayout"
+    @groupBox = Qt::GroupBox.new(projectFilesWidget)
+    @groupBox.objectName = "groupBox"
+    @gridLayout = Qt::GridLayout.new(@groupBox)
+    @gridLayout.objectName = "gridLayout"
+    @label = Qt::Label.new(@groupBox)
+    @label.objectName = "label"
+
+    @gridLayout.addWidget(@label, 0, 0, 1, 1)
+
+    @extensions = KDE::LineEdit.new(@groupBox)
+    @extensions.objectName = "extensions"
+
+    @gridLayout.addWidget(@extensions, 0, 1, 1, 1)
+
+    @label_2 = Qt::Label.new(@groupBox)
+    @label_2.objectName = "label_2"
+    @sizePolicy = Qt::SizePolicy.new(Qt::SizePolicy::Preferred, Qt::SizePolicy::Fixed)
+    @sizePolicy.setHorizontalStretch(0)
+    @sizePolicy.setVerticalStretch(0)
+    @sizePolicy.heightForWidth = @label_2.sizePolicy.hasHeightForWidth
+    @label_2.sizePolicy = @sizePolicy
+
+    @gridLayout.addWidget(@label_2, 1, 0, 1, 1)
+
+    @include_rules = Ruber::ProjectFilesRuleChooser.new(@groupBox)
+    @include_rules.objectName = "include_rules"
+    @include_rules.minimumSize = Qt::Size.new(350, 200)
+    @include_rules.focusPolicy = Qt::StrongFocus
+
+    @gridLayout.addWidget(@include_rules, 2, 0, 1, 2)
+
+
+    @verticalLayout.addWidget(@groupBox)
+
+    @groupBox_2 = Qt::GroupBox.new(projectFilesWidget)
+    @groupBox_2.objectName = "groupBox_2"
+    @gridLayout_2 = Qt::GridLayout.new(@groupBox_2)
+    @gridLayout_2.objectName = "gridLayout_2"
+    @label_3 = Qt::Label.new(@groupBox_2)
+    @label_3.objectName = "label_3"
+    @sizePolicy.heightForWidth = @label_3.sizePolicy.hasHeightForWidth
+    @label_3.sizePolicy = @sizePolicy
+
+    @gridLayout_2.addWidget(@label_3, 0, 0, 1, 1)
+
+    @exclude_rules = Ruber::ProjectFilesRuleChooser.new(@groupBox_2)
+    @exclude_rules.objectName = "exclude_rules"
+    @exclude_rules.minimumSize = Qt::Size.new(350, 200)
+    @exclude_rules.focusPolicy = Qt::StrongFocus
+
+    @gridLayout_2.addWidget(@exclude_rules, 1, 0, 1, 1)
+
+
+    @verticalLayout.addWidget(@groupBox_2)
+
+    @label.buddy = @extensions
+    @label_2.buddy = @include_rules
+    @label_3.buddy = @include_rules
+
+    retranslateUi(projectFilesWidget)
+
+    Qt::MetaObject.connectSlotsByName(projectFilesWidget)
+    end # setupUi
+
+    def setup_ui(projectFilesWidget)
+        setupUi(projectFilesWidget)
+    end
+
+    def retranslateUi(projectFilesWidget)
+    projectFilesWidget.windowTitle = Qt::Application.translate("ProjectFilesWidget", "Form", nil, Qt::Application::UnicodeUTF8)
+    @groupBox.title = Qt::Application.translate("ProjectFilesWidget", "Files to include", nil, Qt::Application::UnicodeUTF8)
+    @label.text = Qt::Application.translate("ProjectFilesWidget", "Extensions", nil, Qt::Application::UnicodeUTF8)
+    @label_2.text = Qt::Application.translate("ProjectFilesWidget", "&Rules", nil, Qt::Application::UnicodeUTF8)
+    @groupBox_2.title = Qt::Application.translate("ProjectFilesWidget", "Files to exclude", nil, Qt::Application::UnicodeUTF8)
+    @label_3.text = Qt::Application.translate("ProjectFilesWidget", "&Rules", nil, Qt::Application::UnicodeUTF8)
+    end # retranslateUi
+
+    def retranslate_ui(projectFilesWidget)
+        retranslateUi(projectFilesWidget)
+    end
+
+end
+
+module Ui
+    class ProjectFilesWidget < Ui_ProjectFilesWidget
+    end
+end  # module Ui
+

data/lib/ruber/component_manager.rb

@@ -574,8 +574,10 @@ Method required for the Plugin interface. Does nothing
  components are passed in reverse loading order (i.e., the last loaded component
  will be the first passed to the block.)
 =end
-    def each_component #:yields: comp
-      @components.reverse_each{|k, v| yield v}
+    def each_component order = :normal #:yields: comp
+      if order == :reverse then @components.reverse_each{|k, v| yield v}
+      else @components.each{|k, v| yield v}
+      end
     end
 
 =begin rdoc
@@ -584,8 +586,9 @@ Method required for the Plugin interface. Does nothing
  plugins are passed in reverse loading order (i.e., the last loaded plugin
  will be the first passed to the block.)
 =end
-    def each_plugin #:yields: plug
-      @components.reverse_each do |k, v| 
+    def each_plugin order = :normal #:yields: plug
+      meth = @components.method(order == :reverse ? :reverse_each : :each)
+      meth.call do |k, v| 
         yield v if v.is_a?(Ruber::Plugin)
       end
     end
@@ -635,7 +638,7 @@ Method required for the Plugin interface. Does nothing
       end
       file = File.join dir, 'plugin.yaml'
       pdf = PluginSpecification.full file
-      parent = Ruber[:app] rescue self
+      parent = @components[:app] || self #Ruber[:app] rescue self
       comp = pdf.class_obj.new parent, pdf
       emit component_loaded(comp)
       comp
@@ -770,9 +773,9 @@ Method required for the Plugin interface. Does nothing
   * delete all the plugins from the list of loaded components.
 =end
     def shutdown
-      each_component{|c| c.save_settings unless c.equal?(self)}
+      each_component(:reverse){|c| c.save_settings unless c.equal?(self)}
       @components[:config].write
-      each_component{|c| c.shutdown unless c.equal? self}
+      each_component(:reverse){|c| c.shutdown unless c.equal? self}
 #       @components[:config].write
 #       each_component do |c|
 #         unless c.equal? self
@@ -802,7 +805,9 @@ Method required for the Plugin interface. Does nothing
 =end
     def unload_plugin name
       plug = @components[name]
-      raise ArgumentError, "A component can't be unloaded" unless plug.is_a?(Plugin)
+      if plug.nil? then raise ArgumentError, "No plugin with name #{name}"
+      elsif !plug.is_a?(Plugin) then raise ArgumentError, "A component can't be unloaded"
+      end
 #       plug.save_settings
       plug.plugin_description.features.each do |f|
         emit method("unloading_#{f}").call( plug )
@@ -822,7 +827,7 @@ Method required for the Plugin interface. Does nothing
   This method is intented to be called from <tt>MainWindow#queryClose</tt>.
 =end
     def query_close 
-      res = each_component do |c| 
+      res = each_component(:reverse) do |c| 
         unless c.equal? self
           break false unless c.query_close 
         end

data/lib/ruber/editor/document.rb

@@ -1,5 +1,5 @@
 =begin 
-    Copyright (C) 2010 by Stefano Crocco   
+    Copyright (C) 2010, 2011 by Stefano Crocco   
     stefano.crocco@alice.it   
   
     This program is free software; you can redistribute it andor modify  
@@ -30,6 +30,36 @@ require 'ruber/document_project'
 module Ruber
   
   class Document < Qt::Object
+    
+#     @docs = {}
+#     @close_mapper = Qt::SignalMapper.new
+#     @close_mapper.connect(SIGNAL('mapped(QObject*)')) do |d|
+#       @docs.delete d.url
+#     end
+#     @rename_mapper = Qt::SignalMapper.new
+#     @rename_mapper.connect(SIGNAL('mapped(QObject*)')) do |d|
+#       @docs.reject!{|k, v| v == d}
+#       @docs[d.url] = d
+#     end
+       
+#     def self.new *args, &blk
+#       file = args[0]
+#       doc = if file
+#         url = KDE::Url.new file
+#         existing_doc = @docs[url]
+#         return existing_doc if existing_doc
+#         new_doc = super
+#         Qt::Object.connect new_doc, SIGNAL('closing(QObject*)'), @close_mapper,
+#             SLOT(:map)
+#         @close_mapper.set_mapping new_doc, new_doc
+#         new_url = new_doc.url if url.valid?
+#         @docs[new_url] = new_doc 
+#       else super
+#       end
+#       Qt::Object.connect doc, SIGNAL('document_url_changed(QObject*)'), @rename_mapper, SLOT(:map)
+#       @rename_mapper.set_mapping doc, doc
+#       doc
+#     end
         
     extend Forwardable
     
@@ -85,7 +115,7 @@ it is still included in the array returned by {#views}
 =begin rdoc
 Creates a new Ruber::Document.
 =end
-    def initialize parent = nil, file = nil
+    def initialize file = nil, parent = nil
       super parent
       @active = false
       @doc = KTextEditor::EditorChooser.editor('katepart').create_document( self)
@@ -139,7 +169,7 @@ Creates a new Ruber::Document.
     end
     
 =begin rdoc
-@return [Array<EditorView>] a list of the views assciated with the document
+  @return [Array<EditorView>] a list of all the views associated with the document
 =end
     def views
       @views.dup
@@ -325,7 +355,7 @@ Return the project with wider scope the document belongs to. This is:
   associated with a file or the file doesn't belong the global project
 =end
     def project
-      prj = Ruber[:projects].current
+      prj = Ruber[:world].active_project
       return @project if path.empty? or !prj
       prj.project_files.file_in_project?(url.to_encoded.to_s) ? prj : @project
     end
@@ -440,7 +470,7 @@ encoding here is set to UTF-8 if using ruby 1.9 and to ISO-8859-1 if using ruby
 =end
     def document_save_as
       enc = RUBY_VERSION.match(/1\.9/) ? 'UTF-8' : 'ISO-8859-1'
-      prj = Ruber[:projects].current
+      prj = Ruber[:world].active_project
       path = if !self.path.empty? then self.path
       elsif prj then prj.project_directory
       else ''