redcar 0.8.1 → 0.9.0

data/plugins/project/lib/project/commands.rb

@@ -40,10 +40,8 @@ module Redcar
 
       def execute
         if tab.edit_view.document.modified?
-          result = Application::Dialog.message_box(
-            "This tab has unsaved changes. \n\nReload?",
-            :buttons => :yes_no_cancel
-          )
+          result = Application::Dialog.message_box("This tab has unsaved changes. \n\nReload?",
+            :buttons => :yes_no_cancel)
           case result
           when :yes
             tab.edit_view.document.update_from_mirror
@@ -82,13 +80,8 @@ module Redcar
       button :connect, "Connect", "Return" do
         selected = self.class.connections.find { |c| c.name == connection.value }
 
-        Manager.connect_to_remote(
-          selected[:protocol],
-          selected[:host],
-          selected[:user],
-          selected[:path],
-          ConnectionManager::PrivateKeyStore.paths
-        )
+        Manager.connect_to_remote(selected[:protocol], selected[:host],
+          selected[:user], selected[:path], ConnectionManager::PrivateKeyStore.paths)
       end
 
       button :quick, "Quick Connection", "Ctrl+Q" do
@@ -123,13 +116,8 @@ module Redcar
       textbox :path
 
       button :connect, "Connect", "Return" do
-        Manager.connect_to_remote(
-            protocol.value,
-            host.value,
-            user.value,
-            path.value,
-            ConnectionManager::PrivateKeyStore.paths
-          )
+        Manager.connect_to_remote(protocol.value, host.value, user.value,
+          path.value, ConnectionManager::PrivateKeyStore.paths)
       end
     end
 
@@ -217,13 +205,6 @@ module Redcar
       end
     end
 
-    class DirectoryCloseCommand < ProjectCommand
-
-      def execute
-        project.close
-      end
-    end
-
     class RefreshDirectoryCommand < ProjectCommand
 
       def execute
@@ -247,13 +228,17 @@ module Redcar
       def execute
         if project and project.window.trees_visible?
           tab = Redcar.app.focussed_window.focussed_notebook_tab
-          return unless tab.is_a?(EditTab) && tab.edit_view.document.mirror
+          if tab.is_a?(EditTab)
+            return unless mirror = tab.edit_view.document.mirror and mirror.respond_to? :path
+          else
+            return
+          end
 
-          path = tab.edit_view.document.mirror.path
+          path = mirror.path
           tree = project.tree
           current = tree.tree_mirror.top
           while current.any?
-            ancestor_node = current.detect {|node| path =~ /^#{node.path}($|\/)/}
+            ancestor_node = current.detect {|node| path =~ /^#{node.path}($|\/)/ }
             return unless ancestor_node
             tree.expand(ancestor_node)
             current = ancestor_node.children
@@ -264,6 +249,9 @@ module Redcar
       end
     end
 
+    # FIXME: XXX: The rest of this file is outright ugly. The Redcar.platform ultimately
+    # needs to return a platform object which we can dispatch to for commandlines,
+    # configuration, escaping and all that.
     class OpenCommand < Command
       attr_reader :path
 
@@ -286,15 +274,12 @@ module Redcar
       end
 
       def run_application(app, *options)
-        if SPOON_AVAILABLE and ::Spoon.supported?
+        # TODO: Investigate why Spoon doesn't seem to work on osx
+        if SPOON_AVAILABLE and ::Spoon.supported? and Redcar.platform != :osx
           ::Spoon.spawn(app, *options)
         else
           # TODO: This really needs proper escaping.
-          if options
-            options = options.map {|o| "\"#{o}\""}.join(' ')
-          else
-            options = ""
-          end
+          options = options.map {|o| %{ "#{o}" } }.join(' ')
           Thread.new do
             system("#{app} #{options}")
             puts "  Finished: #{app} #{options}"
@@ -304,78 +289,95 @@ module Redcar
     end
 
     class OpenDirectoryInExplorerCommand < OpenCommand
-      def execute(options=nil)
-        @path ||= options[:value]
-        command = self
+      LinuxApps = { 'Thunar' => '%s',
+        'nautilus' => '%s',
+        'konqueror' => '%s',
+        'kfm' => '%s' }
+
+      def explorer_osx
+        ['open -a Finder', path]
+      end
+
+      def explorer_windows
+        ['explorer.exe', path.gsub("/", "\\")]
+      end
+
+      def explorer_linux
         preferred = Manager.storage['preferred_file_browser']
-        case Redcar.platform
-        when :osx
-          # Spoon doesn't seem to like `open`
-          system('open', '-a', 'Finder', path)
-        when :windows
-          run_application('explorer.exe', path.gsub("/","\\"))
-        when :linux
-          app = {
-            'Thunar' => [path],
-            'nautilus' => [path],
-            'konqueror' => [path],
-            'kfm' => [path],
-          }
-          if preferred and app[preferred] and find(preferred)
-            run = preferred
-          else
-            run = app.keys.map {|a| command.find(a)}.find{|a| a}
-            Manager.storage['preferred_file_browser'] = run if not preferred
-          end
-          if run
-            run_application(run, *app[File.basename(run)])
-          else
-            Application::Dialog.message_box("Sorry, we couldn't find your file manager. Please let us know what file manager you use, so we can fix this!")
-          end
+        run = preferred if LinuxApps[preferred] and find(preferred)
+        LinuxApps.keys.detect {|a| run = @command.find(a) } unless run
+
+        Manager.storage['preferred_file_browser'] = run unless preferred
+
+        [run, LinuxApps[File.basename(run)] % path ] if run
+      end
+
+      def execute(options = nil)
+        @path ||= options[:value]
+        @command = self
+        cmd = send(:"explorer_#{Redcar.platform}")
+        if cmd
+          run_application(*cmd)
+        else
+          Application::Dialog.message_box("Sorry, we couldn't start your file manager. Please let us know what file manager you use, so we can fix this!")
         end
       end
     end
 
     class OpenDirectoryInCommandLineCommand < OpenCommand
-      def execute(options=nil)
-        @path ||= options[:value]
-        command = self
-        preferred = Manager.storage['preferred_command_line']
-        case Redcar.platform
-        when :osx
-          unless preferred
-            preferred = "Terminal"
-            Manager.storage['preferred_command_line'] = preferred
-          end
-          command = <<-BASH.gsub(/^\s{12}/, '')
-            osascript <<END
-              tell application "#{preferred}"
-                do script "cd \\\"#{path}\\\""
-                activate
+      LinuxApps = { 'xfce4-terminal' => "--working-directory=%s",
+        'gnome-terminal' => "--working-directory=%s",
+        'konsole' => "--workdir %s" }
+
+      def osx_terminal_script(preferred)
+        if preferred.start_with? "iTerm"
+          <<-OSASCRIPT
+            tell the first terminal
+              launch session "Default Session"
+                tell the last session
+                write text "cd \\\"#{path}\\\""
               end tell
-            END
-          BASH
-          # Spoon doesn't seem to work with `osascript`
-          system(command)
-        when :windows
-          run_application('start cmd.exe', '/kcd ' + path.gsub("/","\\"))
-        when :linux
-          app = {
-            'xfce4-terminal' => ["--working-directory=#{path}"],
-            'gnome-terminal' => ["--working-directory=#{path}"],
-            'konsole' => ["--workdir", path],
-          }
-          if preferred and app[preferred] and find(preferred)
-            run = preferred
-          else
-            run = app.keys.map {|a| command.find(a)}.find{|a| a}
-            Manager.storage['preferred_command_line'] = run if not preferred
-          end
-          if run and app[File.basename(run)]
-            run_application(run, *app[File.basename(run)])
-          else
-            Application::Dialog.message_box("Sorry, we couldn't find your command line. Please let us know what command line you use, so we can fix this!")
-          end
+            end tell
+          OSASCRIPT
+        else
+          %{ do script "cd \\\"#{path}\\\"" }
+        end
+      end
+
+      def commandline_osx
+        preferred = (Manager.storage['preferred_command_line'] ||= "Terminal")
+        <<-BASH.gsub(/^\s*/, '')
+          osascript <<END
+            tell application "#{preferred}"
+              #{osx_terminal_script(preferred)}
+              activate
+            end tell
+          END
+        BASH
+      end
+
+      def commandline_windows
+        ['start cmd.exe /kcd ', path.gsub("/","\\")]
+      end
+
+      def commandline_linux
+        preferred = Manager.storage['preferred_command_line']
+        run = preferred if LinuxApps[preferred] and find(preferred)
+        LinuxApps.keys.detect {|a| run = @command.find(a) } unless run
+
+        Manager.storage['preferred_command_line'] = run unless preferred
+
+        [run, LinuxApps[File.basename(run)] % path ] if run
+      end
+
+      def execute(options = nil)
+        @path ||= options[:value]
+        @command = self
+        cmd = send(:"commandline_#{Redcar.platform}")
+        if cmd
+          run_application(*cmd)
+        else
+          Application::Dialog.message_box("Sorry, we couldn't start your command line. Please let us know what command line you use, so we can fix this!")
         end
       end
     end

data/plugins/project/lib/project/drb_service.rb

@@ -2,89 +2,79 @@ module Redcar
   class Project
     class DrbService
       def initialize
-        begin
-          address = "druby://127.0.0.1:#{DRB_PORT}"
-          @drb = DRb.start_service(address, self)
-        rescue Errno::EADDRINUSE => e
-          puts 'warning--not starting listener (perhaps theres another Redcar already open?)' + e + ' ' + address
+        address = "druby://127.0.0.1:#{DRB_PORT}"
+        @drb = DRb.start_service(address, self)
+      rescue Errno::EADDRINUSE => e
+        puts 'warning--not starting listener (perhaps theres another Redcar already open?)' + e + ' ' + address
+      end
+
+      def open_item_drb(full_path, untitled = false, wait = false)
+        puts %{drb opening #{"untitled" if untitled} #{full_path}} if $VERBOSE
+        if File.directory? full_path
+          Swt.sync_exec { open_directory(full_path) }
+        elsif full_path == 'just_bring_to_front'
+          Swt.sync_exec { bring_to_front }
+        elsif File.file?(full_path)
+          open_file(full_path, untitled, wait)
         end
+        'ok'
+      rescue Exception => e
+        puts 'drb got exception:' + e.class + " " + e.message, e.backtrace
+        raise e
       end
 
-      def open_item_drb(full_path, untitled = false)
-        begin
-          puts %{drb opening #{"untitled" if untitled} #{full_path}} if $VERBOSE
-          if File.directory? full_path
-            Swt.sync_exec do
-              if Redcar.app.windows.length == 0 and Application.storage['last_open_dir'] == full_path
-                Project::Manager.restore_last_session
-              end
-              
-              if Redcar.app.windows.length > 0
-                window = Redcar.app.windows.find do |win| 
-                  next unless win
-                  win.treebook.trees.find do |t| 
-                    t.tree_mirror.is_a?(Redcar::Project::DirMirror) and t.tree_mirror.path == full_path
-                  end
-                end        
-              end
-              Project::Manager.open_project_for_path(full_path)
-              Redcar.app.focussed_window.controller.bring_to_front
-            end
-            'ok'
-          elsif full_path == 'just_bring_to_front'          
-            Swt.sync_exec do
-              if Redcar.app.windows.length == 0
-                Project::Manager.restore_last_session
-              end
-              Redcar.app.focussed_window.controller.bring_to_front
-            end
-            'ok'
-          elsif File.file?(full_path)
-            Swt.sync_exec do
-              if Redcar.app.windows.length == 0
-                Project::Manager.restore_last_session
-              end
-              if untitled
-                Project::Manager.open_untitled_path(full_path)
-              else
-                Project::Manager.open_file(full_path)
-              end
-              Redcar.app.focussed_window.controller.bring_to_front
-            end
-            'ok'            
-          end
-        rescue Exception => e
-          puts 'drb got exception:' + e.class + " " + e.message, e.backtrace
-          raise e
+      ##
+      # Opens the specified directory in a new window, if it was not
+      # already open. Brings the project's window to the front, if this
+      # directory is already opened. If the specified directory was the last open
+      # directory, restores the complete session.
+      def open_directory(full_path)
+        if Redcar.app.windows.empty? and Application.storage['last_open_dir'] == full_path
+          Project::Manager.restore_last_session
         end
+
+        Redcar::Project.window_projects.each_pair do |window, project|
+          return window.controller.bring_to_front if project.path == full_path
+        end
+        Project::Manager.open_project_for_path(full_path)
+        Redcar.app.focussed_window.controller.bring_to_front
       end
 
-      def open_file_and_wait(file, untitled = false)
-        semaphore = Mutex.new
-        handler = nil
-        tab = nil
-        Swt.sync_exec do
-          semaphore.lock
+      ## Focuses a Redcar window
+      def bring_to_front
+        Project::Manager.restore_last_session if Redcar.app.windows.empty?
+        Redcar.app.focussed_window.controller.bring_to_front
+      end
+
+      ##
+      # Opens a file, optionally untitled, and waits for it to close, if requested
+      def open_file(file, untitled, wait)
+        file_open_block = Proc.new do
           Project::Manager.restore_last_session if Redcar.app.windows.empty?
           if untitled
             Project::Manager.open_untitled_path(file)
           else
             Project::Manager.open_file(file)
           end
-          window = Redcar.app.focussed_window
-          window.controller.bring_to_front
-          tab = window.focussed_notebook_tab
+          Redcar.app.focussed_window.controller.bring_to_front
+        end
+        wait ? open_file_and_wait(&file_open_block) : Swt.sync_exec(&file_open_block)
+      end
+
+      def open_file_and_wait
+        semaphore = Mutex.new
+        handler = nil
+        tab = nil
+        Swt.sync_exec do
+          semaphore.lock
+          yield
+          tab = Redcar.app.focussed_window.focussed_notebook_tab
           handler = tab.add_listener(:close) { semaphore.unlock }
         end
         Thread.new(tab, handler) do
           semaphore.synchronize { tab.remove_listener(handler) }
         end.join # Wait until the tab's close event was fired
-        'ok'
-      rescue Exception => e
-        puts 'drb got exception:' + e.class + " " + e.message, e.backtrace
-        raise e
       end
-      
     end
   end
 end

data/plugins/project/lib/project/manager.rb

@@ -162,6 +162,33 @@ module Redcar
         window.focus
       end
 
+      def self.pop_first_line_option(args)
+        if args.include? '-l'
+          argix = args.index('-l')
+          raise ArgumentError, "The -l Option expects an Argument" unless args[argix + 1]
+          numbers = args[argix + 1].split(',')
+          first_num = numbers.delete_at(0)
+          if (args[argix + 1] = numbers.join(',')).empty?
+            args.delete_at(argix); args.delete_at(argix)
+          end
+          first_num
+        elsif match = args.select {|a| /^\-l\d+$/.match a }.first
+          args.delete(args.index(match))
+          match[2..-1]
+        end
+      end
+
+      def self.scroll_to_line(arg)
+        begin
+          doc = Redcar.app.focussed_notebook_tab.edit_view.document
+          lineix = arg.to_i - 1
+          doc.scroll_to_line(lineix)
+          doc.cursor_offset = doc.offset_at_line(lineix)
+        rescue Exception
+          raise ArgumentError, 'The "-l" Option expects a number as Argument'
+        end
+      end
+
       def self.open_tab_with_content(text)
         win = Redcar.app.focussed_window || Redcar.app.new_window
         tab = win.new_tab(Redcar::EditTab)
@@ -224,6 +251,8 @@ module Redcar
           elsif File.file?(arg)
             found_path_args = true
             open_file(arg)
+            linearg = pop_first_line_option(args)
+            scroll_to_line(linearg) if linearg
           end
         end
         args.each do |arg|
@@ -319,10 +348,6 @@ module Redcar
               item "Save", Project::FileSaveCommand
               item "Save As", Project::FileSaveAsCommand
             end
-
-            group(:priority => 11) do
-              item "Close Directory", Project::DirectoryCloseCommand
-            end
           end
           sub_menu "Project", :priority => 15 do
             group(:priority => :first) do