redcar 0.9.2 → 0.10

data/plugins/scm_git/lib/scm_git/change.rb

@@ -4,7 +4,7 @@ module Redcar
     module Git
       class Change
         include Redcar::Scm::ScmChangesMirror::Change
-        
+
         STATUS_MAP_INDEXED = {
           'M ' => [:indexed],
           'A ' => [:indexed],
@@ -20,7 +20,7 @@ module Redcar
           'RD' => [:moved],
           'CD' => [:moved],
         }
-        
+
         STATUS_MAP_UNINDEXED = {
           '??' => [:new],
           'UU' => [:unmerged],
@@ -35,17 +35,17 @@ module Redcar
           ' M' => [:changed],
           ' D' => [:missing],
         }
-        
+
         attr_reader :repo, :type
-        
+
         def initialize(file, repo, type=:file, indexed=false, children=[])
-          @file = file
-          @repo = repo
-          @type = type
-          @indexed = indexed
+          @file     = file
+          @repo     = repo
+          @type     = type
+          @indexed  = indexed
           @children = children
         end
-        
+
         def path
           if @file.type_raw[0,1] == "R" or @file.type_raw[0,1] == "C"
             paths = @file.path.split(' -> ')
@@ -54,11 +54,11 @@ module Redcar
             @file.path
           end
         end
-        
+
         def git_status
           @file.type_raw
         end
-        
+
         def status
           # Subprojects should be commitable, but we can't update the
           # current index while they are dirty.
@@ -72,15 +72,24 @@ module Redcar
             STATUS_MAP_UNINDEXED[@file.type_raw] || []
           end
         end
-        
+
         def text
           if @file.type_raw[0,1] == "R" or @file.type_raw[0,1] == "C"
             @file.path
           else
-            "#{File.basename(@file.path)} (#{File.dirname(@file.path)})"
+            begin
+              pathname = Pathname.new(
+                File.expand_path(File.dirname(@file.path),@repo.repo.dir.path)
+              )
+              repopath = Pathname.new(@repo.path)
+              relpath  = pathname.relative_path_from(repopath).to_s
+            rescue Object => e
+              relpath = File.dirname(@file.path)
+            end
+            "#{File.basename(@file.path)} (#{relpath})"
           end
         end
-        
+
         def icon
           icon = (@type == :file ? "notebook" : "folder")
           case
@@ -99,15 +108,15 @@ module Redcar
           end
           icon.to_sym
         end
-        
+
         def leaf?
           icon == :file
         end
-        
+
         def children
           @children
         end
-        
+
         def diff
           if (not @indexed) and @file.type_raw == "??"
             # No diff available
@@ -118,11 +127,11 @@ module Redcar
             @repo.repo.lib.diff_full('HEAD', nil, {:path_limiter => path})
           end
         end
-        
+
         def to_data
           "#{@file.type_raw}:#{@file.path}:#{@repo.repo.dir.path}:#{@type.to_s}:#{@indexed}"
         end
       end
     end
   end
-end
+end

data/plugins/snippets/lib/snippets/explorer.rb

@@ -11,7 +11,7 @@ module Redcar
         matching_snippets = filter_and_rank_by(all_snippets, query, 1000) do |s| 
           display(s)
         end
-        current_scope = @document.cursor_scope
+        current_scope = Redcar.update_gui { @document.cursor_scope }
         @last_list = matching_snippets.select do |snippet|
           if snippet.scope
             !!JavaMateView::ScopeMatcher.get_match(snippet.scope, current_scope)
@@ -45,4 +45,4 @@ module Redcar
       end
     end
   end
-end
+end

data/plugins/swt/lib/swt/full_swt.rb

@@ -34,6 +34,7 @@ module Swt
     import org.eclipse.swt.custom.SashForm
     import org.eclipse.swt.custom.StackLayout
     import org.eclipse.swt.custom.ST
+    import org.eclipse.swt.custom.StyleRange
     import org.eclipse.swt.custom.StyledText
     import org.eclipse.swt.custom.TreeEditor
   end

data/plugins/syntax_check/features/step_definitions/syntax_check_steps.rb

@@ -5,3 +5,7 @@ Given /^I have (not )?suppressed syntax checking message dialogs$/ do |negate|
     Redcar::SyntaxCheck.storage['supress_message_dialogs'] = false
   end
 end
+
+Given /^I excluded "(.*)" files from being checked for syntax errors$/ do |grammar|
+  Redcar::SyntaxCheck.storage['excluded_grammars'] << grammar.downcase
+end

data/plugins/syntax_check/features/support/env.rb

@@ -0,0 +1,3 @@
+Before do
+  Redcar::SyntaxCheck.storage['excluded_grammars'] = []
+end

data/plugins/syntax_check/lib/syntax_check.rb

@@ -1,10 +1,59 @@
 require 'syntax_check/checker'
-require 'syntax_check/error'
+require 'syntax_check/annotation'
 
 module Redcar
   module SyntaxCheck
     def self.remove_syntax_error_annotations(edit_view)
-      edit_view.remove_all_annotations :type => Error::Type
+      edit_view.remove_all_annotations :type => Annotation.type
+      edit_view.remove_all_annotations :type => Warning.type
+      edit_view.remove_all_annotations :type => Error.type
+    end
+
+    def self.menus
+      Redcar::Menu::Builder.build do
+        sub_menu "Plugins" do
+          lazy_sub_menu "Syntax Checking" do
+            item "Enabled", :type => :check, :active => SyntaxCheck.enabled?, :command => ToggleSyntaxChecking
+            separator
+            Checker.checkers.each do |checker|
+              grammar = checker[0]
+              item "#{grammar}", :type => :check, :active => SyntaxCheck.check_type?(grammar), :command => ToggleGrammarChecking, :value => grammar
+            end
+          end
+        end
+      end
+    end
+
+    def self.enabled=(state)
+      SyntaxCheck.storage['suppress_syntax_checking'] = !state
+    end
+
+    def self.enabled?
+      if SyntaxCheck.storage['suppress_syntax_checking']
+        false
+      else
+        true
+      end
+    end
+
+    def self.check_type?(grammar)
+      excluded = SyntaxCheck.storage['excluded_grammars']
+      unless grammar and (excluded.include? grammar or
+        excluded.include? grammar.downcase)
+        true
+      end
+    end
+
+    def self.set_check_type(grammar,value)
+      if grammar
+        excluded = SyntaxCheck.storage['excluded_grammars']
+        if check_type?(grammar)
+          excluded << grammar.downcase
+        else
+          excluded = excluded - [grammar,grammar.downcase]
+        end
+        SyntaxCheck.storage['excluded_grammars'] = excluded
+      end
     end
 
     def self.storage
@@ -12,6 +61,7 @@ module Redcar
         storage = Plugin::Storage.new('syntax_checking')
         storage.set_default('suppress_message_dialogs',false)
         storage.set_default('suppress_syntax_checking',false)
+        storage.set_default('excluded_grammars',[])
         storage
       end
     end
@@ -24,11 +74,27 @@ module Redcar
     end
 
     def self.after_save(doc)
-      unless SyntaxCheck.storage['suppress_syntax_checking']
-        remove_syntax_error_annotations(doc.edit_view)
+      grammar  = doc.edit_view.grammar
+      remove_syntax_error_annotations(doc.edit_view)
+      if SyntaxCheck.enabled? and SyntaxCheck.check_type?(grammar)
         checker = Checker[doc.edit_view.grammar]
         checker.new(doc).check if checker
       end
     end
+
+    class ToggleGrammarChecking < Redcar::Command
+      def execute(options)
+        if grammar = options[:value]
+          value = !SyntaxCheck.check_type?(grammar)
+          SyntaxCheck.set_check_type(grammar,value)
+        end
+      end
+    end
+
+    class ToggleSyntaxChecking < Redcar::Command
+      def execute
+        SyntaxCheck.enabled = !SyntaxCheck.enabled?
+      end
+    end
   end
-end
+end

data/plugins/syntax_check/lib/syntax_check/annotation.rb

@@ -0,0 +1,61 @@
+module Redcar
+  module SyntaxCheck
+    class Annotation
+
+      def self.type
+        "syntax.annotation.type"
+      end
+
+      def icon
+        "application--exclamation"
+      end
+
+      def color
+        [255, 255, 255]
+      end
+
+      attr_accessor :line, :char, :message, :doc
+
+      def initialize(doc, line, message, char=0)
+        @doc       = doc
+        @line      = line
+        @message   = message
+        @char      = char
+      end
+
+      def annotate
+        edit_view = doc.edit_view
+        edit_view.add_annotation_type(self.class.type, icon, color)
+        edit_view.add_annotation(self.class.type, line, message, @char, doc.get_line(line).length-@char)
+      end
+    end
+
+    class Error < Annotation
+      def self.type
+        "syntax.error.type"
+      end
+
+      def icon
+        "compile-error"
+      end
+
+      def color
+        [255, 32, 32]
+      end
+    end
+
+    class Warning < Annotation
+      def self.type
+        "syntax.warning.type"
+      end
+
+      def icon
+        "compile-warning"
+      end
+
+      def color
+        [255, 194, 10]
+      end
+    end
+  end
+end

data/plugins/test_runner/lib/test_runner.rb

@@ -0,0 +1,39 @@
+require 'test_runner/runnable_test_runner'
+require 'test_runner/rspec_runner'
+require 'test_runner/run_test_command'
+#
+# $:.push(File.expand_path(File.join(File.dirname(__FILE__),
+#   "vendor", "activesupport-3.0.3", "lib")))
+#
+# require 'active_support'
+# require 'active_support/inflections'
+module Redcar
+  # This class is your plugin. Try adding new commands in here
+  # and putting them in the menus.
+  class TestRunner
+  
+    # This method is run as Redcar is booting up.
+    def self.menus
+      # Here's how the plugin menus are drawn. Try adding more
+      # items or sub_menus.
+      Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "Test Runner", :priority => 139 do
+            item "Run Test", RunTestCommand
+          end
+        end
+      end
+    end
+
+    def self.keymaps
+      osx = Redcar::Keymap.build("main", :osx) do
+        link "Cmd+Alt+T", RunTestCommand
+      end
+      linwin = Redcar::Keymap.build("main", [:linux, :windows]) do
+        link "Ctrl+Alt+T", RunTestCommand
+      end
+      [osx, linwin]
+    end
+    
+  end
+end

data/plugins/test_runner/lib/test_runner/rspec_runner.rb

@@ -0,0 +1,20 @@
+module Redcar
+  class RspecRunner
+    TEST_PATTERNS = [
+      /context\s+\"(.*)\"/,
+      /describe\s+\"(.*)\"/,
+      /it\s+\"(.*)\"/
+    ]
+    
+    def self.run_test(path, current_line)
+      TEST_PATTERNS.each do |pattern|
+        if current_line =~ pattern
+          Redcar::Runnables.run_process Project::Manager.focussed_project.path, %{ruby -Ispec #{path} -e "#{$1}"}, "Running spec: #{$1}"
+          return
+        end
+      end
+      Redcar::Runnables.run_process Project::Manager.focussed_project.path, %{ruby -Ispec #{path}}, "Running spec: #{File.basename(path)}"
+    end
+  end
+end
+  

data/plugins/test_runner/lib/test_runner/run_test_command.rb

@@ -0,0 +1,63 @@
+module Redcar
+  
+  class RunTestCommand < Redcar::Command
+    
+    TEST_RUNNERS = {
+      "Redcar::TestUnitRunner" => /_test.rb$/,
+      "Redcar::RspecRunner" => /_spec.rb$/
+    }
+    
+    def self.storage
+      @storage ||= begin
+        storage = Plugin::Storage.new('test_runner')
+        storage.set_default('test_runners', [
+          {
+            "runner_class" => "Redcar::RunnableTestRunner",
+            "file_pattern" => /_test.rb$/,
+            "single_test_patterns" => [
+              /should\s+\"(.*)\"/,
+              /context\s+\"(.*)\"/,
+              /describe\s+\"(.*)\"/,
+              /def\s+(test_.*)\s+/
+            ],
+            "single_test_runner" => "ruby -Itest __FILE__ -n \"/__TEST_NAME__/\"",
+            "file_runner" => "ruby -Itest __FILE__"
+          },
+          {
+            "runner_class" => "Redcar::RunnableTestRunner",
+            "file_pattern" => /_spec.rb$/,
+            "single_test_patterns" => [
+              /it\s+\"(.*)\"/,
+              /context\s+\"(.*)\"/,
+              /describe\s+\"(.*)\"/
+            ],
+            "single_test_runner" => "ruby -Ispec __FILE__ -e \"__TEST_NAME__\"",
+            "file_runner" => "ruby -Ispec __FILE__"
+          },
+        ])
+        storage
+      end
+    end
+    
+    def test_runners
+      self.class.storage["test_runners"]
+    end
+    
+    def run_test(path, current_line)
+      test_runners.each do |test_runner_config|
+        pattern = test_runner_config["file_pattern"]
+        if path =~ pattern
+          runner = eval(test_runner_config["runner_class"]).new(test_runner_config)
+          runner.run_test(path, current_line)
+        end
+      end
+    end
+    
+    def execute
+      doc = Redcar.app.focussed_window.focussed_notebook_tab.edit_view.document
+      current_line = doc.get_line(doc.cursor_line)
+      run_test(doc.path, current_line)
+    end
+  end
+  
+end

data/plugins/test_runner/lib/test_runner/runnable_test_runner.rb

@@ -0,0 +1,26 @@
+module Redcar
+  class RunnableTestRunner
+    
+    attr_accessor :single_test_patterns, :file_runner, :single_test_runner
+    
+    def initialize(config)
+      @single_test_patterns = config["single_test_patterns"]
+      @single_test_runner = config["single_test_runner"]
+      @file_runner = config["file_runner"]
+    end
+    
+    def run_test(path, current_line)
+      single_test_patterns.each do |pattern|
+        if current_line =~ pattern
+          test_name = $1
+          command = single_test_runner.gsub("__FILE__", path).gsub("__TEST_NAME__", test_name)
+          Redcar::Runnables.run_process Project::Manager.focussed_project.path, command, "Running test: #{test_name}"
+          return
+        end
+      end
+      Redcar::Runnables.run_process Project::Manager.focussed_project.path,
+        file_runner.gsub("__FILE__", path), "Running test: #{File.basename(path)}"
+    end
+  end
+end
+