redcar 0.11.0dev → 0.11

data/plugins/repl/features/step_definitions/repl_steps.rb

@@ -1,9 +1,9 @@
 When /^I open a "([^"]*)" repl$/ do |repl|
-  Redcar.const_get(repl.camelize).const_get(repl.camelize + "OpenREPL").new.run
+  Redcar.const_get(repl.camelize).const_get("Open" + repl.camelize + "REPL").new.run
 end
 
 When /^I open a new repl$/ do
-  Redcar::REPL::FakeOpenREPL.new.run
+  Redcar::REPL::OpenFakeREPL.new.run
 end
 
 Then /^the REPL output should be "([^"]*)"$/ do |output|
@@ -16,4 +16,4 @@ end
 
 Then /^the current command should be blank$/ do
   current_tab.current_command.should == nil
-end
+end

data/plugins/repl/features/support/fake_repl.rb

@@ -7,7 +7,7 @@ module Redcar
       end
     end
 
-    class FakeOpenREPL < OpenREPL
+    class OpenFakeREPL < OpenREPL
       def execute
         open_repl(ReplMirror.new)
       end

data/plugins/ruby/lib/ruby.rb

@@ -8,7 +8,7 @@ module Redcar
       Menu::Builder.build do
         sub_menu "Plugins" do
           sub_menu "REPL" do
-            item "Open Ruby REPL", RubyOpenREPL
+            item "Open Ruby REPL", OpenRubyREPL
           end
         end
       end
@@ -16,17 +16,17 @@ module Redcar
 
     def self.keymaps
       osx = Keymap.build("main", :osx) do
-        link "Cmd+Shift+R", RubyOpenREPL
+        link "Cmd+Shift+R", OpenRubyREPL
       end
 
       linwin = Keymap.build("main", [:linux, :windows]) do
-        link "Ctrl+Shift+R", RubyOpenREPL
+        link "Ctrl+Shift+R", OpenRubyREPL
       end
 
       [linwin, osx]
     end
 
-    class RubyOpenREPL < Redcar::REPL::OpenREPL
+    class OpenRubyREPL < Redcar::REPL::OpenREPL
       def execute
         open_repl(ReplMirror.new)
       end

data/plugins/runnables/features/fixtures/alternate.ruby

@@ -0,0 +1 @@
+ARGV.each { |it| print it+' '}

data/plugins/runnables/features/fixtures/line_app.rb

@@ -0,0 +1 @@
+ARGV.each { |it| println it}

data/plugins/runnables/features/fixtures/name_app.rb

@@ -0,0 +1 @@
+ARGV.each { |it| println it}

data/plugins/runnables/features/fixtures/params_app.rb

@@ -0,0 +1 @@
+ARGV.each { |it| print it+' '}

data/plugins/runnables/features/fixtures/runnable_app.rb

@@ -0,0 +1 @@
+puts "hello world"

data/plugins/runnables/lib/runnables.rb

@@ -155,5 +155,26 @@ module Redcar
         storage
       end
     end
+
+    def self.quit_guard
+      Runnables::RunningProcessChecker.new(
+        Redcar.app.all_tabs.select {|t| t.is_a?(HtmlTab)},
+        "Kill all and quit?"
+      ).check
+    end
+
+    def self.close_window_guard(win)
+      Runnables::RunningProcessChecker.new(
+        win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(HtmlTab)},
+        "Kill them and close the window?"
+      ).check
+    end
+
+    def self.project_closed(project,window)
+        rtree = window.treebook.trees.detect { |t|
+          t.tree_mirror.is_a? Runnables::TreeMirror
+        }
+        rtree.close if rtree
+      end
   end
 end

data/plugins/runnables/lib/runnables/command_output_controller.rb

@@ -18,14 +18,14 @@ module Redcar
       end
       
       def ask_before_closing
-        if @shell
+        if @pid
           "This tab contains an unfinished process. \n\nKill the process and close?"
         end
       end
       
       def close
-        if @shell
-          Process.kill(9, @shell.pid.to_i + 1)
+        if @pid
+          Process.kill(9, @pid.to_i + 1)
         end
       end
       
@@ -82,21 +82,26 @@ module Redcar
           # TODO: Find browser's onload rather than sleeping
           sleep 1
           start_output_block
-          Redcar.logger.info "Running: #{cmd}"
+          Redcar.log.info "Running: #{cmd}"
           
           # JRuby-specific
-          pid, input, output, error = IO.popen4(cmd)
+          @pid, input, output, error = IO.popen4(cmd)
           @stdout_thread = output_thread(:stdout, output)
           @stderr_thread = output_thread(:stderr, error)
           
           Thread.new do
-            sleep 0.1 until @stdout_thread_started && @stderr_thread_started &&
-                            !@stdout_thread.alive? && !@stderr_thread.alive?
+            sleep 0.1 until finished?
+            @pid = nil
             end_output_block
           end
         end
       end
       
+      def finished?
+        @stdout_thread_started && @stderr_thread_started &&
+          !@stdout_thread.alive? && !@stderr_thread.alive?
+      end
+      
       def format_time(time)
         time.strftime("%I:%M:%S %p").downcase
       end
@@ -163,8 +168,8 @@ module Redcar
       end
 
       def open_file(file, line)
-        puts "i got called: #{file}"
-        Project::Manager.open_file(file)
+        Project::Manager.open_file(File.join(Project::Manager.focussed_project.path, file))
+        Redcar.app.focussed_window.focussed_notebook_tab.edit_view.document.scroll_to_line(line.to_i)
       end
       
       def index

data/plugins/runnables/lib/runnables/output_processor.rb

@@ -18,9 +18,9 @@ module Redcar
       end
       
       def process_file_line_numbers(str)
-        file_number_regex = /(\/\S+)\:(\d+)/
+        file_number_regex = /(\S+)\:(\d+)/
         if str =~ file_number_regex
-          str.gsub(file_number_regex, 
+          str.gsub(file_number_regex,
             %{<a class="file_line_link" href="javascript:Controller.openFile('#{$1}', '#{$2}');">#{$1}:#{$2}</a>})
         else
           str
@@ -29,7 +29,7 @@ module Redcar
     
       def initialize
         @ansi_stack = []
-        @ansi_colors = %w(black red green yellow blue purple cyan gray) 
+        @ansi_colors = %w(black red green yellow blue purple cyan gray)
       end
       
       def color(num)
@@ -58,7 +58,7 @@ module Redcar
           if match[2] == "0" && match[4].nil?
             close_ansi_spans(:clear)
           else
-            style = ""          
+            style = ""
             style << "ansi-regular "               if match[2] == "0"
             style << "ansi-bold "                  if match[2] == "1"
             style << "ansi-light "                 if match[4] == "9"

data/plugins/runnables/lib/runnables/running_process_checker.rb

@@ -1,8 +1,8 @@
 module Redcar
   class Runnables
     class RunningProcessChecker
-      def initialize(tabs, message, options)
-        @tabs, @message, @options = tabs, message, options
+      def initialize(tabs, message)
+        @tabs, @message = tabs, message
       end
       
       def check
@@ -19,14 +19,14 @@ module Redcar
               t.focus
               t.close
             end
-            @options[:continue] ? @options[:continue].call : nil
+            true
           when :no
-            @options[:continue] ? @options[:continue].call : nil
+            true
           when :cancel
-            @options[:cancel] ? @options[:cancel].call : nil
+            false
           end
         else
-          @options[:none] ? @options[:none].call : nil
+          true
         end
       end
     end

data/plugins/runnables/plugin.rb

@@ -4,7 +4,6 @@ Plugin.define do
   version "1.0"
   file    "lib", "runnables"
   object  "Redcar::Runnables"
-  dependencies "tree",        ">0",
-               "application", ">=1.1",
+  dependencies "application", ">=1.1",
                "HTML View",   ">0"
 end

data/plugins/scm/lib/scm.rb

@@ -42,12 +42,12 @@ module Redcar
 
       def self.keymaps
         osx = Keymap.build("main", :osx) do
-          link "Cmd+Shift+C", Scm::CommitMirror::SaveCommand
-          link "Cmd+Shift+.", :command => Scm::CommitMirror::SaveCommand, :value => [:commit, [Scm::ScmChangesMirror, Scm::ScmChangesController]]
+          link "Cmd+Shift+C", Scm::CommitMirror::CommitChangesCommand
+          link "Cmd+Shift+.", :command => Scm::CommitMirror::CommitChangesCommand, :value => [:commit, [Scm::ScmChangesMirror, Scm::ScmChangesController]]
         end
 
         linwin = Keymap.build("main", [:linux, :windows]) do
-          link "Ctrl+Shift+C", Scm::CommitMirror::SaveCommand
+          link "Ctrl+Shift+C", Scm::CommitMirror::CommitChangesCommand
         end
 
         [linwin, osx]
@@ -66,8 +66,8 @@ module Redcar
                 item "Toggle Changes Tree", :command => Scm::ToggleScmTreeCommand, :value => [:commit, [Scm::ScmChangesMirror, Scm::ScmChangesController]]
                 item "Toggle Commits Tree", :command => Scm::ToggleScmTreeCommand, :value => [:push, [Scm::ScmCommitsMirror, Scm::ScmCommitsController]]
                 separator
-                item "Create Commit", :command => Scm::CommitMirror::OpenCommand
-                item "Save Commit", :command => Scm::CommitMirror::SaveCommand
+                item "Create Commit", :command => Scm::CommitMirror::CreateCommitCommand
+                item "Save Commit", :command => Scm::CommitMirror::CommitChangesCommand
               end
             end
           end
@@ -86,16 +86,16 @@ module Redcar
       def self.modules
         @modules ||= begin
           mods = []
-          puts "Loading Redcar SCM modules..." if debug
+          Redcar.log.debug "SCM Loading Redcar SCM modules..."
 
           Redcar.plugin_manager.objects_implementing(:scm_module).each do |i|
-            puts "  Found #{i.name}." if debug
+            Redcar.log.debug "SCM   Found #{i.name}."
             object = i.scm_module
 
             if object.supported?
               mods.push(object)
             elsif debug
-              puts "    but discarding because it isn't supported on the current system."
+              Redcar.log.debug  "SCM     but discarding because it isn't supported on the current system."
             end
           end
 
@@ -111,7 +111,7 @@ module Redcar
           begin
             assert_interface(mod, Redcar::Scm::Model)
           rescue RuntimeError => e
-            puts "Skipping SCM module #{m.name} because it has an invalid interface." if debug
+            Redcar.log.debug "SCM Skipping SCM module #{m.name} because it has an invalid interface."
             nil
           else
             mod
@@ -131,17 +131,17 @@ module Redcar
         # for now we only want to attempt to handle the local case
         return if project.remote?
 
-        puts "#{modules.count} SCM modules loaded." if debug
+        Redcar.log.debug "SCM #{modules.count} SCM modules loaded."
 
         repo = modules_instance.find do |m|
-          puts "Checking if #{project.path} is a #{m.repository_type} repository..." if debug
+          Redcar.log.debug "SCM Checking if #{project.path} is a #{m.repository_type} repository..."
           m.repository?(project.path)
         end
 
         # quit if we can't find something to handle this project
         return if repo.nil?
 
-        puts "  Yes it is!" if debug
+        Redcar.log.debug "SCM   Yes it is!"
 
         prepare(project, repo)
       end
@@ -156,7 +156,7 @@ module Redcar
           repo.load(project.path)
           adapter = repo.adapter(project.adapter)
           if not adapter.nil?
-            puts "Attaching a custom adapter to the project." if debug
+            Redcar.log.debug "SCM Attaching a custom adapter to the project."
             project.adapter = adapter
           end
 
@@ -165,19 +165,19 @@ module Redcar
           # cleanup
           info = project_repositories.delete project
 
-          puts "*** Error loading SCM: " + $!.message
+          Redcar.log.error "*** Error loading SCM: " + $!.message
           puts $!.backtrace
         end
 
-        puts "scm start took #{Time.now - start}s (included in project start time)" if debug
+        Redcar.log.debug "SCM start took #{Time.now - start}s"
       end
 
-      def self.project_closed(project)
+      def self.project_closed(project,window)
         # disassociate this project with any repositories
         info = project_repositories.delete project
         return if info.nil?
 
-        info['trees'].each {|t| project.window.treebook.remove_tree(t)}
+        info['trees'].each {|t| window.treebook.remove_tree(t)}
       end
 
       def self.refresh_trees
@@ -191,7 +191,7 @@ module Redcar
         # Search for the current project
         project = Project::Manager.in_window(Redcar.app.focussed_window)
         if project.nil?
-          puts "Couldn't detect the project in the current window."
+          Redcar.log.debug "SCM Couldn't detect the project in the current window."
         end
         repo_info = project_repositories[project]
         init_modules = Redcar::Scm::Manager.modules_with_init

data/plugins/scm/lib/scm/commit_mirror.rb

@@ -43,7 +43,7 @@ module Redcar
         notify_listeners(:change)
       end
       
-      class SaveCommand < Command
+      class CommitChangesCommand < Command
         sensitize :open_commit_tab
         
         def execute
@@ -57,7 +57,7 @@ module Redcar
         end
       end
       
-      class OpenCommand < Command
+      class CreateCommitCommand < Command
         sensitize :open_scm
         
         def execute

data/plugins/scm/lib/scm/scm_changes_controller.rb

@@ -21,7 +21,7 @@ module Redcar
       
       def activated(tree, node)
         if node.respond_to?(:status) and node.status == [:unmerged]
-          Project::FileOpenCommand.new(node.path).run
+          Project::FileCreateCommitCommand.new(node.path).run
         elsif node.respond_to?(:diff)
           diff = node.diff
           if diff

data/plugins/scm_hg/lib/scm_hg.rb

@@ -11,7 +11,7 @@ module Redcar
         
         def self.supported?
           # not implemented, and hence never supported
-          puts "    Mercurial support is currently unimplemented" if debug
+          Redcar.log.debug "SCM     Mercurial support is currently unimplemented"
           false
         end
       

data/plugins/snippets/lib/snippets/document_controller.rb

@@ -16,7 +16,7 @@ module Redcar
           @text         = text
         end
       end
-      
+
       def after_modify
         if in_snippet? and @start_offset and !@constructing
           left_marks = marks_at_offset(@start_offset)
@@ -53,25 +53,31 @@ module Redcar
             end
           end
         end
-        if in_snippet? and @end_offset > @start_offset and !@ignore
-          update_after_delete(@start_offset, @end_offset)
-        end
-        if in_snippet? and !@ignore and @start_offset
-          document.controllers(AutoPairer::DocumentController).first.ignore do
-            update_after_insert(@start_offset, @text.length)
+        if in_snippet?
+          if @end_offset
+            if @end_offset > @start_offset and !@ignore
+              update_after_delete(@start_offset, @end_offset)
+            end
+            if !@ignore and @start_offset
+              document.controllers(AutoPairer::DocumentController).first.ignore do
+                update_after_insert(@start_offset, @text.length)
+              end
+              @start_offset, @end_offset, @text = nil, nil, nil
+            end
+          else
+            clear_snippet
           end
-          @start_offset, @end_offset, @text = nil, nil, nil
         end
 
         false
       end
-      
+
       def cursor_moved(new_offset)
         if @current_snippet and !@ignore
           check_in_snippet
         end
       end
-      
+
       def start_snippet!(snippet)
         @current_snippet = snippet
         document.controllers(AutoPairer::DocumentController).first.ignore do
@@ -80,17 +86,17 @@ module Redcar
           end
         end
       end
-      
+
       def in_snippet?
         !!current_snippet
       end
-      
+
       SnippetMark ||= Struct.new(:mark, :order_id, :stop_id)
-      
+
       class SnippetMark
         attr_accessor :name
       end
-      
+
       def insert_snippet(snippet)
         @content = snippet.content
         @insert_line_num = document.cursor_line
@@ -102,7 +108,7 @@ module Redcar
         @marks = []
         @order_id = 0
         @stop_id = 0
-        
+
         @env = Textmate::Environment.new
         fix_line_endings
         # Not sure what to do about backticks. Currently they don't work in Redcar.
@@ -125,17 +131,17 @@ module Redcar
           select_tab_stop(@tab_stops.keys.sort.first)
         end
       end
-      
+
       def leading_whitespace(line)
         line[/^(\s*)([^\s]|$)/, 1].chomp
       end
-      
+
       def fix_line_endings
         if document.delim != "\n" # textmate uses "\n" everywhere
           @content = @content.gsub("\n", document.delim)
         end
       end
-      
+
       def compute_tab_stop(line, tab_width, soft_tabs)
         re = / {0,#{tab_width - 1}}\t|#{" "*tab_width}/
         sc = StringScanner.new(leading_whitespace(line))
@@ -143,7 +149,7 @@ module Redcar
         tab_stop += 1 while sc.skip(re)
         tab_stop
       end
-      
+
       def fix_indent
         tab_width = document.edit_view.tab_width
         soft_tabs  = document.edit_view.soft_tabs?
@@ -163,7 +169,7 @@ module Redcar
           document.delete(document.offset_at_line(line_ix) + new_indent.length, pre.length)
         end
       end
-        
+
       def unescape(text)
         text.gsub("\\$", "$").gsub("\\\\", "\\").gsub("\\}", "}").gsub("\\`", "`")
       end
@@ -172,7 +178,7 @@ module Redcar
         document.insert_at_cursor(text)
         document.cursor_offset += text.length
       end
-  
+
       def check_in_snippet
         clear_snippet unless find_current_tab_stop
       end
@@ -184,7 +190,7 @@ module Redcar
         while remaining_content.length > 0
           i += 1
           raise "Snippet failed to parse: #{text.inspect}" if i > 100
-  
+
           if md = Regexp.new("(?<!\\\\)\\$").match(remaining_content)
             insert_at_cursor_with_gravity(unescape(md.pre_match))
             @stop_id += 1
@@ -290,11 +296,11 @@ module Redcar
         end
         @end_line_num = document.cursor_line
       end
-            
+
       def onig_split(string, re)
         line = string.dup
         bits = []
-        while line.length > 0 and 
+        while line.length > 0 and
             md = re.match(line)
           line = md.post_match
           bits << md.pre_match
@@ -328,26 +334,26 @@ module Redcar
         @marks << snippet_mark
         snippet_mark
       end
-      
+
       def marks_at_cursor
         marks_at_offset(document.cursor_offset)
       end
-  
+
       def marks_at_offset(offset)
         marks.select {|m| m.mark.get_offset == offset }
       end
-      
+
       def marks
         @marks
       end
-  
+
       def update_after_insert(offset, length)
         #@buf.parser.stop_parsing
         update_mirrors(offset, offset+length)
         update_transformations(offset, offset+length)
         #@buf.parser.start_parsing
       end
-  
+
       def update_after_delete(offset1, offset2)
         #@buf.parser.stop_parsing
         delete_any_mirrors(offset1, offset2)
@@ -355,7 +361,7 @@ module Redcar
         update_transformations(offset1, offset2)
         #@buf.parser.start_parsing
       end
-  
+
       def delete_any_mirrors(offset1, offset2)
         @mirrors.each do |num, mirrors|
           (mirrors||[]).reject! do |mirror|
@@ -404,7 +410,7 @@ module Redcar
           end
         end
       end
-  
+
       def set_names
         @tab_stops.each do |i, h|
           h[:leftmark].name = "$#{i}l"
@@ -423,12 +429,12 @@ module Redcar
           end
         end
       end
-      
+
       def select_tab_stop(n)
-        document.set_selection_range(@tab_stops[n][:rightmark].mark.get_offset, 
+        document.set_selection_range(@tab_stops[n][:rightmark].mark.get_offset,
                                      @tab_stops[n][:leftmark].mark.get_offset)
       end
-  
+
       def move_forward_tab_stop
         current = find_current_tab_stop
         raise "unexpectedly outside snippet" unless current
@@ -462,7 +468,7 @@ module Redcar
           select_tab_stop(current-1)
         end
       end
-      
+
       def clear_snippet
         @current_snippet = false
         @word = nil
@@ -476,7 +482,7 @@ module Redcar
           document.delete_mark(mark.mark)
         end
       end
-      
+
       def find_current_tab_stop
         candidates = []
         @tab_stops.each do |num, hash|
@@ -495,13 +501,13 @@ module Redcar
           candidates.sort.first[1]
         end
       end
-      
+
       def get_tab_stop_range(num)
         off1 = @tab_stops[num][:leftmark].mark.get_offset
         off2 = @tab_stops[num][:rightmark].mark.get_offset
         off1..off2
       end
-  
+
       def get_tab_stop_text(num)
         i1 = @tab_stops[num][:leftmark].mark.get_offset
         i2 = @tab_stops[num][:rightmark].mark.get_offset
@@ -512,7 +518,7 @@ module Redcar
         update_mirrors
         update_transformations
       end
-  
+
       def update_mirrors(start=nil, stop=nil)
         @mirrors.each do |num, mirrors|
           next unless mirrors
@@ -541,7 +547,7 @@ module Redcar
         end
         @editing_stop_id = nil
       end
-  
+
       def update_transformations(start=nil, stop=nil)
         @transformations.each do |num, transformations|
           r = get_tab_stop_range(num)