ruber 0.0.5 → 0.0.7

data/plugins/find_in_files/find_in_files_widgets.rb

@@ -405,9 +405,6 @@ because the document corresponding to the file was modified
         it.each_row do |line, _, repl|
           lines_to_replace[line.text.to_i] = repl.text if line.checked?
         end
-# TODO see what the line below did. In my opinion, it is the remainder of some line
-# I added for testing and forgot to remove
-#         path = file.sub( '/home/stefano/tmp/ruber', '').gsub('/', '_')
         lines = File.readlines(file)
         lines_to_replace.each_pair{|idx, text| lines[idx - 1] = text + "\n"}
         new_text = lines.join ''
@@ -421,6 +418,7 @@ because the document corresponding to the file was modified
             doc.text = new_text
           end
           doc.save
+          #If the document doesn't have a view, pos will be nil
           doc.view.go_to pos.line, pos.column if pos
         else
           Tempfile.open(File.basename(file)) do |f|

data/plugins/find_in_files/ui/config_widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'config_widget.ui'
 **
-** Created: ven ott 29 17:39:04 2010
+** Created: mar nov 16 11:52:49 2010
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/plugins/find_in_files/ui/find_in_files_widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'find_in_files_widget.ui'
 **
-** Created: ven ott 29 17:39:04 2010
+** Created: mar nov 16 11:52:49 2010
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/plugins/rake/plugin.yaml

@@ -6,7 +6,7 @@ about:
  description: A Ruber interface to rake
  bug_address: http://github.com/stcrocco/ruber/issues
  icon: rake.png
-deps: ruby_runner
+deps: [ruby_runner, autosave]
 require: [rake, rake_extension]
 class: Ruber::Rake::Plugin
 ui_file: rakeui.rc

data/plugins/rake/ui/add_quick_task_widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'add_quick_task_widget.ui'
 **
-** Created: ven ott 29 17:39:04 2010
+** Created: mar nov 16 11:52:49 2010
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/plugins/rake/ui/choose_task_widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'choose_task_widget.ui'
 **
-** Created: ven ott 29 17:39:04 2010
+** Created: mar nov 16 11:52:49 2010
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/plugins/rake/ui/config_widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'config_widget.ui'
 **
-** Created: ven ott 29 17:39:04 2010
+** Created: mar nov 16 11:52:49 2010
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/plugins/rake/ui/project_widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'project_widget.ui'
 **
-** Created: ven ott 29 17:39:04 2010
+** Created: mar nov 16 11:52:49 2010
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/plugins/rspec/rspec.rb

@@ -278,21 +278,30 @@ which, most likely, will cause it to fail.
 @return [Boolean] *true* if the spec program is started and *false* otherwise
 (including the case when the process was already running or autosaving failed)
 =end
-      def run_current
+      def run_current what = :all
         prj = Ruber[:projects].current_project
         unless prj
           KDE::MessageBox.error nil, "You must have an open project to choose this entry.\nYOU SHOULD NEVER SEE THIS MESSAGE"
           return
         end
         opts = options prj
-        doc = Ruber[:main_window].current_document
+        view = Ruber[:main_window].active_editor
+        doc = view.document
+        unless doc.url.local_file?
+          KDE::MessageBox.sorry nil, 'You can\'t run rspec for remote files'
+          return
+        end
         unless doc
-          KDE::MessageBox.error nil, "You must have an open document to choose this entry.\nYOU SHOULD NEVER SEE THIS MESSAGE"
+          KDE::MessageBox.error nil, "You must have an open editor to choose this entry.\nYOU SHOULD NEVER SEE THIS MESSAGE"
           return
         end
         files = specs_for_file opts, doc.path
         files.reject!{|f| !File.exist? f}
         opts[:files] = files.empty? ? [doc.path] : files
+        if what == :current_line
+          line = view.cursor_position.line + 1
+          opts[:spec_options] += ["-l", line.to_s]
+        end
         run_rspec_for prj, opts, :files => :documents_with_file, :on_failure => :ask,
             :message => 'Do you want to run the tests all the same?'
       end
@@ -309,26 +318,9 @@ current file is the example file, not the source.
 (including the case when the process was already running or autosaving failed)
 =end
       def run_current_line
-        prj = Ruber[:projects].current_project
-        unless prj
-          KDE::MessageBox.error nil, "You must have an open project to choose this entry.\nYOU SHOULD NEVER SEE THIS MESSAGE"
-          return
-        end
-        opts = options prj
-        doc = Ruber[:main_window].current_document
-        unless doc
-          KDE::MessageBox.error nil, "You must have an open document to choose this entry.\nYOU SHOULD NEVER SEE THIS MESSAGE"
-          return
-        end
-        line = doc.view.cursor_position.line + 1
-        files = specs_for_file opts, doc.path
-        files.reject!{|f| !File.exist? f}
-        opts[:files] = files.empty? ? [doc.path] : files
-        opts[:spec_options] += ["-l", line.to_s]
-        run_rspec_for prj, opts, :files => :documents_with_file, :on_failure => :ask,
-            :message => 'Do you want to run the tests all the same?'
+        run_current :current_line
       end
-
+      
 =begin rdoc
 Runs the spec command for the given object
 

data/plugins/rspec/ruber_rspec_formatter.rb

@@ -272,7 +272,10 @@ by newlines
         hash = {}
         hash[:type] = :failure
         hash[:description] = ex.metadata[:full_description]
-        exception = ex.metadata[:execution_result][:exception_encountered]
+        # It seems that rspec up tp 2.2 uses :exception_encountered, while from
+        # 2.3 it uses :exception. This should work for both
+        exception = ex.metadata[:execution_result][:exception]
+        exception ||= ex.metadata[:execution_result][:exception_encountered]
         hash[:exception] = exception.class.name
         hash[:message] = exception.message
         hash[:location] = ex.metadata[:location]

data/plugins/rspec/ui/rspec_project_widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'rspec_project_widget.ui'
 **
-** Created: ven ott 29 17:39:04 2010
+** Created: mar nov 16 11:52:49 2010
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/plugins/ruby_development/plugin.yaml

@@ -11,12 +11,17 @@ class: Ruber::FilesRunner::Plugin
 require: ruby_development
 ui_file: ruby_developmentui.rc
 tool_widgets: {:class: Ruber::FilesRunner::OutputWidget, :caption: Ruby output, :position: :bottom, :name: ruby_output_widget, pixmap: ruby_development.png}
+config_options:
+ ruby:
+  run_in_terminal_cmd: {default: 'konsole --workdir %d --hold -e %r'}
+config_widgets:
+ - {caption: Ruby, class: Ruber::FilesRunner::ConfigWidget}
 project_options:
  ruby:
   main_program: {default: "''", relative_path: true}
-  options: {default: [], scope: [document, global]}
+  options: {default: [], scope: [document, global], place: all}
   working_dir: {default: '.', relative_path: true}
-  run_in_terminal: {default: false, scope: [document, global]}
+  run_in_terminal: {default: false, scope: [document, global], place: all}
 project_widgets:
  - {caption: Ruby, class: Ruber::FilesRunner::ProjectWidget, scope: [document, global]}
 actions:

data/plugins/ruby_development/ruby_development.rb

@@ -3,6 +3,7 @@ require 'ruber/filtered_output_widget'
 require 'ruby_runner/ruby_runner'
 
 require_relative 'ui/project_widget'
+require_relative 'ui/config_widget'
 
 module Ruber
   
@@ -15,6 +16,9 @@ the file corresponding to the current document or another file specified by the
 user. The output of the program (both standard output and standard error) are
 displayied in a tool widget.
 
+To allow ruby to run a remote file (or a document associated with a remote file),
+a temporary file is created and the contents of the remote file are copied in it.
+
 The interpreter to use can be set document- or project-wise using the Ruby runner
 plugin.
 
@@ -42,6 +46,8 @@ Plugin object for the Files runner plugn
 =end
     class Plugin < RubyRunner::RubyRunnerPlugin
       
+      FakeFileInfo = Struct.new :file, :url
+      
       slots :load_settings
       
 =begin rdoc
@@ -49,7 +55,7 @@ Plugin object for the Files runner plugn
 =end
       def initialize psf
         super psf, :ruby, :scope => [:document, :global], :file_extension => %w[*.rb Rakefile rakefile], 
-            :mimetype => ['application/x-ruby']
+            :mimetype => ['application/x-ruby'], :place => [:local, :remote]
         process.next_open_mode = Qt::IODevice::ReadOnly | Qt::IODevice::Unbuffered
         Ruber[:autosave].register_plugin self, true
         connect self, SIGNAL('process_finished(int, QString)'), self, SLOT('ruby_exited(int, QString)')
@@ -66,6 +72,7 @@ Plugin object for the Files runner plugn
           o.register_plugin self, true if f == 'autosave'
         end
         @output_widget = @widget
+        @fake_file = nil
       end
 
 =begin rdoc
@@ -126,8 +133,8 @@ as first argument to {Autosave::AutosavePlugin#autosave}
         Ruber[:main_window].show_tool @widget
         Ruber[:main_window].change_state 'ruby_running', true
         if opts[:run_in_terminal]
-          run_process 'konsole', opts[:dir], ['--workdir', opts[:dir], '--hold',
-                                              '-e', opts[:ruby]] + cmd
+          terminal, *term_opts = terminal_command opts[:dir], ([opts[:ruby]] + cmd)
+          run_process terminal, opts[:dir], term_opts
         else run_process opts[:ruby], opts[:dir], cmd
         end
         true
@@ -206,6 +213,18 @@ successfully or not
         prj = doc.project
         file = File.basename(doc.path)
         dir = File.dirname(doc.path)
+        url = doc.url
+        if url.remote_file?
+          @fake_file = FakeFileInfo.new Tempfile.new('ruby_development'), url
+          @fake_file.file.write doc.text
+          @fake_file.file.flush
+          file = @fake_file.file.path
+          dir = ENV['HOME']
+        end
+        unless prj.has_setting?(:ruby, :options)
+          KDE::MessageBox.sorry nil, "The document #{url.pretty_url} doesn't seem to be a ruby file, so it can't be run"
+          return
+        end
         run_ruby_for prj, file, dir, prj[:ruby, :options], run_in_terminal?(doc.project),
             :files => [doc], :on_failure => :ask
       end
@@ -215,32 +234,48 @@ Runs a file in ruby.
       
 If the file is associated with a document, this method will work like {#run_document}.
 
-Ruby will be executed from the directory where the file is.
+The file can be local or remote.
+
+Ruby will be executed from the directory where the file is or from the user's
+home directory if the file is remote.
 
 The program will be run in a terminal if the corresponding action is checked.
 
 This method uses {#run_ruby_for}
 
 *Note:* it is not possible to specify command line options to be passed to _file_.
-@param [String, nil] file the path of the file to run. If *nil*, an "Open file"
+@param [String, nil] file the path or url of the file to run. If *nil*, an "Open file"
 dialog is shown to the user
 @return [Boolean, nil] *true* or *false* depending on whether the ruby process
 was started. If the user pressed the Cancel button of the dialog, *nil* is returned.
 @see #run_ruby_for
 =end
       def run_file file = nil
-        unless file
-          file = KDE::FileDialog.get_open_file_name KDE::Url.new(Ruber[:main_window].scripts_directory),
+        if file then url = KDE::Url.new file
+        else
+          url = KDE::FileDialog.get_open_url KDE::Url.new(Ruber[:config][:general, :default_script_directory]),
               "*.rb|Ruby files (*.rb)", nil, "Choose file to run"
-          return unless file
+          return unless url
+          file = url.to_encoded.to_s
         end
         
-        if doc = Ruber[:docs].document_for_file(file)
+        if doc = Ruber[:docs].document_for_url(url)
          return run_document doc 
         end
         
-        dir = File.dirname(file)
-        file = File.basename(file)
+        if url.local_file?
+          dir = File.dirname(file)
+          file = File.basename(file)
+        else
+          @fake_file = FakeFileInfo.new Tempfile.new('ruby_development'), url
+          downloaded = KIO::NetAccess.download url, @fake_file.file.path, Ruber[:main_window]
+          unless downloaded
+            KDE::MessageBox.sorry Ruber[:main_window], KDE::NetAccess.last_error_string
+            return
+          end
+          file = @fake_file.file.path
+          dir = ENV['HOME']
+        end
         run_ruby_for nil, file, dir, [], run_in_terminal?
       end
       slots :run_file
@@ -274,6 +309,30 @@ if the project has document scope
       
       private
       
+=begin rdoc
+The command line to use to run the given ruby command in a terminal
+
+This method replaces every instance of @%d@ in the @ruby/run_in_terminal_cmd@
+setting with the working directory and every instance of @%r@ with the ruby command.
+If @%r@ is sourrounded by spaces, it'll be replaced by _ruby_command_ as it is;
+it @%r@ is part of a string, it'll be replaced by the elements of _ruby_command_
+joined with spaces.
+
+@param [String] dir the working directory
+@param [Array<String>] ruby_command the ruby command to execute in the terminal
+@return [Array<String>] the command to run the terminal, in a form suitable to be
+  passed to {#run_process}
+=end
+      def terminal_command dir, ruby_command
+        cmd = Ruber[:config][:ruby, :run_in_terminal_cmd].split(/\s+/)
+        cmd.each do |c|
+          c.gsub!('%d', dir)
+          c.gsub!('%r', ruby_command.join(' ')) unless c == '%r'
+        end
+        cmd.each_with_index.find{|e, i| e == '%r'}.each_index{|i| cmd[i] = ruby_command}
+        cmd.flatten
+      end
+      
 =begin rdoc
 Starts executing a given ruby program and displays the tool widget
 
@@ -295,7 +354,7 @@ started correctly
 @see #run_ruby
 @see RubyRunner::RubyRunnerPluginInternal#ruby_command_for
 =end
-      def run_ruby_for what, file, dir, prog_options, run_in_terminal, autosave_opts, &blk
+      def run_ruby_for what, file, dir, prog_options, run_in_terminal, autosave_opts={}, &blk
         ruby, *ruby_opts = ruby_command_for what, dir
         opts = {
           :dir => dir,
@@ -318,7 +377,8 @@ was started correctly and *nil* if no document exists
 =end
       def run_current_document
         doc =  Ruber[:main_window].current_document
-        run_document doc if doc
+        return unless doc        
+        run_document doc
       end
       slots :run_current_document
 
@@ -354,9 +414,60 @@ Resets the UI, scrolls the tool widget at the end and gives focus to the editor
         Ruber[:main_window].change_state 'ruby_running', false
         @widget.scroll_to -1
         Ruber[:main_window].focus_on_editor
+        if @fake_file
+          @fake_file.file.close true
+          @fake_file = nil
+        end
         nil
       end
       slots 'ruby_exited(int, QString)'
+      
+=begin rdoc
+Replaces the path of the fake file used for running remote documents with the URL
+of the document
+
+It does nothing if there's no fake file (that is, if we're not executing the document
+associated with a remote file).
+
+*Note:* for efficency reasons the replacement is performed in place, so create a
+duplicate of the array before calling this method if you need to preserve it.
+
+@param [Array<String>] the lines of text to perform the replacement into
+@return [Array<String>] the lines with all occurrences of the fake file path replaced
+with the url of the remote file. If no fake file is in use, _lines_ will be returned
+unchanged
+=end
+      def replace_fake_file lines
+        if @fake_file
+          lines.map!{|l| l.gsub(@fake_file.file.path, @fake_file.url.pretty_url)}
+        end
+        lines
+      end
+      
+=begin rdoc
+Override of {ExternalProgramPlugin#process_standard_output}
+
+It processes the lines using {#replace_fake_file} before passing it to the base
+class's method
+@param (see Ruber::ExternalProgramPlugin#process_standard_output)
+@return (see Ruber::ExternalProgramPlugin#process_standard_output)
+=end
+      def process_standard_output lines
+        super replace_fake_file(lines)
+      end
+
+=begin rdoc
+Override of {ExternalProgramPlugin#process_standard_error}
+
+It processes the lines using {#replace_fake_file} before passing it to the base
+class's method
+@param (see Ruber::ExternalProgramPlugin#process_standard_error)
+@return (see Ruber::ExternalProgramPlugin#process_standard_error)
+=end
+      def process_standard_error lines
+        super replace_fake_file(lines)
+      end
+      
 
     end
     
@@ -447,6 +558,16 @@ project with document scope.
       end
       
     end
+		
+    class ConfigWidget < Qt::Widget
+      
+      def initialize parent = nil
+        super
+        @ui = Ui::RubyDevelopmentConfigWidget.new
+        @ui.setupUi self
+      end
+      
+    end
     
   end  
   

data/plugins/ruby_development/ui/config_widget.rb

@@ -0,0 +1,66 @@
+=begin
+** Form generated from reading ui file 'config_widget.ui'
+**
+** Created: mar gen 11 14:57:22 2011
+**      by: Qt User Interface Compiler version 4.7.1
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+=end
+
+class Ui_RubyDevelopmentConfigWidget
+    attr_reader :horizontalLayout
+    attr_reader :label
+    attr_reader :_ruby__run_in_terminal_cmd
+
+    def setupUi(rubyDevelopmentConfigWidget)
+    if rubyDevelopmentConfigWidget.objectName.nil?
+        rubyDevelopmentConfigWidget.objectName = "rubyDevelopmentConfigWidget"
+    end
+    rubyDevelopmentConfigWidget.resize(400, 38)
+    @horizontalLayout = Qt::HBoxLayout.new(rubyDevelopmentConfigWidget)
+    @horizontalLayout.objectName = "horizontalLayout"
+    @label = Qt::Label.new(rubyDevelopmentConfigWidget)
+    @label.objectName = "label"
+
+    @horizontalLayout.addWidget(@label)
+
+    @_ruby__run_in_terminal_cmd = KDE::LineEdit.new(rubyDevelopmentConfigWidget)
+    @_ruby__run_in_terminal_cmd.objectName = "_ruby__run_in_terminal_cmd"
+
+    @horizontalLayout.addWidget(@_ruby__run_in_terminal_cmd)
+
+    @label.buddy = @_ruby__run_in_terminal_cmd
+
+    retranslateUi(rubyDevelopmentConfigWidget)
+
+    Qt::MetaObject.connectSlotsByName(rubyDevelopmentConfigWidget)
+    end # setupUi
+
+    def setup_ui(rubyDevelopmentConfigWidget)
+        setupUi(rubyDevelopmentConfigWidget)
+    end
+
+    def retranslateUi(rubyDevelopmentConfigWidget)
+    rubyDevelopmentConfigWidget.windowTitle = Qt::Application.translate("RubyDevelopmentConfigWidget", "Form", nil, Qt::Application::UnicodeUTF8)
+    @label.toolTip = Qt::Application.translate("RubyDevelopmentConfigWidget", "The command to use to run a ruby script in a terminal", nil, Qt::Application::UnicodeUTF8)
+    @label.whatsThis = Qt::Application.translate("RubyDevelopmentConfigWidget", "In the command line, use %d to indicate the initial working directory for the terminal and %r to indicate where to put the ruby command line. The %r sequence should be either sourrounded by spaces or have a space before it and the end of the command after it.\n" \
+"\n" \
+"Note that you can't use arguments containing spaces in the command line.", nil, Qt::Application::UnicodeUTF8)
+    @label.text = Qt::Application.translate("RubyDevelopmentConfigWidget", "&Terminal", nil, Qt::Application::UnicodeUTF8)
+    @_ruby__run_in_terminal_cmd.toolTip = Qt::Application.translate("RubyDevelopmentConfigWidget", "The command to use to run a ruby script in a terminal", nil, Qt::Application::UnicodeUTF8)
+    @_ruby__run_in_terminal_cmd.whatsThis = Qt::Application.translate("RubyDevelopmentConfigWidget", "In the command line, use %d to indicate the initial working directory for the terminal and %r to indicate where to put the ruby command line.\n" \
+"\n" \
+"Note that you can't use arguments containing spaces in the command line", nil, Qt::Application::UnicodeUTF8)
+    end # retranslateUi
+
+    def retranslate_ui(rubyDevelopmentConfigWidget)
+        retranslateUi(rubyDevelopmentConfigWidget)
+    end
+
+end
+
+module Ui
+    class RubyDevelopmentConfigWidget < Ui_RubyDevelopmentConfigWidget
+    end
+end  # module Ui
+