redcar 0.7 → 0.8

data/plugins/repl/spec/repl/groovy_mirror_spec.rb

@@ -43,7 +43,7 @@ class Redcar::REPL
       it "should have a prompt" do
         wait_for_prompt
         @mirror.read.should == (<<-Groovy).chomp
-// Groovy REPL
+# Groovy REPL
 
 groovy> 
 Groovy

data/plugins/repl/spec/repl/ruby_mirror_spec.rb

@@ -10,7 +10,7 @@ class Redcar::REPL
     
     def commit_test_text1
       text = <<-RUBY
-# Redcar REPL
+# Ruby REPL
 
 >> $internal_repl_test = 707
 RUBY
@@ -19,7 +19,7 @@ RUBY
     
     def result_test_text1
       (<<-RUBY).chomp
-# Redcar REPL
+# Ruby REPL
 
 >> $internal_repl_test = 707
 => 707
@@ -29,7 +29,7 @@ RUBY
 
     def commit_test_text2
       text = <<-RUBY
-# Redcar REPL
+# Ruby REPL
 
 >> $internal_repl_test = 707
 => 707
@@ -41,7 +41,7 @@ RUBY
     
     def result_test_text2
       (<<-RUBY).chomp
-# Redcar REPL
+# Ruby REPL
 
 >> $internal_repl_test = 707
 => 707
@@ -54,7 +54,7 @@ RUBY
     
     def commit_no_input
       text = <<-RUBY
-# Redcar REPL
+# Ruby REPL
 
 >> 
 RUBY
@@ -62,7 +62,7 @@ RUBY
     end
     
     def prompt     
-      "# Redcar REPL\n\n"
+      "# Ruby REPL\n\n"
     end
     
     describe "with no history" do
@@ -72,7 +72,7 @@ RUBY
       
       it "should have a message and a prompt" do
         @mirror.read.should == (<<-RUBY).chomp
-# Redcar REPL
+# Ruby REPL
 
 >> 
 RUBY
@@ -94,13 +94,13 @@ RUBY
         
         it "should allow committing nothing as the first command" do
           commit_no_input
-          @mirror.read.should == "# Redcar REPL\n\n>> \n=> nil\n>> "
+          @mirror.read.should == "# Ruby REPL\n\n>> \n=> nil\n>> "
         end
         
         it "should allow committing nothing as an xth command" do
           committed = commit_test_text2
           @mirror.commit committed + "\n>> "
-          @mirror.read.should == "# Redcar REPL\n\n>> $internal_repl_test = 909\n=> 909\n>> \n=> nil\n>> "      
+          @mirror.read.should == "# Ruby REPL\n\n>> $internal_repl_test = 909\n=> 909\n>> \n=> nil\n>> "      
         end
         
         it "should emit changed event when text is executed" do
@@ -116,7 +116,7 @@ RUBY
         it "should display errors" do
           @mirror.commit(prompt + ">> nil.foo")
           @mirror.read.should == (<<-RUBY).chomp
-# Redcar REPL
+# Ruby REPL
 
 >> nil.foo
 x> NoMethodError: undefined method `foo' for nil:NilClass
@@ -164,7 +164,7 @@ RUBY
       it "should execute inside a main object" do
         @mirror.commit(prompt + ">> self")
         @mirror.read.should == (<<-RUBY).chomp
-# Redcar REPL
+# Ruby REPL
 
 >> self
 => main
@@ -177,7 +177,7 @@ RUBY
         @mirror.commit(sent)
         @mirror.commit(sent + "\n>> a")
         @mirror.read.should == (<<-RUBY).chomp
-# Redcar REPL
+# Ruby REPL
 
 >> a = 13
 => 13

data/plugins/ruby/README

@@ -0,0 +1,6 @@
+== Syntax checking for Ruby in Redcar
+
+Get redcar from github.com/redcar/redcar and do a git clone in your 
+$HOME/.redcar/plugins of this repository. You will also need the 
+redcar_syntax_check plugin (timfel/redcar_syntax_check)
+

data/plugins/ruby/lib/syntax_check/ruby.rb

@@ -0,0 +1,28 @@
+require 'java'
+
+module Redcar
+  module SyntaxCheck
+    class Ruby < Checker
+      supported_grammars "Ruby", "Ruby on Rails"
+
+      def check(*args)
+        path    = manifest_path(doc)
+        file    = File.basename(path)
+        runtime = org.jruby.Ruby.global_runtime
+        io      = java.io.FileInputStream.new(java.io.File.new(path))
+        begin
+          runtime.parse_from_main(io, file)
+        rescue SyntaxError => e
+          create_syntax_error(doc, e.exception.message, file).annotate
+        end
+      end
+
+      def create_syntax_error(doc, message, file)
+        message  =~ /#{Regexp.escape(file)}:(\d+):(.*)/
+        line     = $1.to_i - 1
+        message  = $2
+        SyntaxCheck::Error.new(doc, line, message)
+      end
+    end
+  end
+end

data/plugins/ruby/plugin.rb

@@ -0,0 +1,7 @@
+Plugin.define do
+  name    "ruby"
+  version "0.1"
+  file    "lib", "syntax_check", "ruby"
+  object  "Redcar::SyntaxCheck::Ruby"
+  dependencies "syntax_check", ">0"
+end

data/plugins/runnables/features/command_tree.feature

@@ -13,6 +13,15 @@ Feature: Showing commands in a command tree
     And I expand the tree row "fixture_runnables"
     Then I should see "An app" in the tree
 
+  Scenario: Shows groups and subgroups by slash-separated type
+    When I open the runnables tree
+    And I expand the tree row "fixture_runnables"
+    Then I should see "first" in the tree
+    And I expand the tree row "first"
+    Then I should see "second" in the tree
+    And I expand the tree row "second"
+    Then I should see "A nested app" in the tree
+
   Scenario: I can manually refresh the tree
     When I open the runnables tree
     And I change the command to "A changed app"

data/plugins/runnables/features/file_runner_input.feature

@@ -0,0 +1,20 @@
+Feature: Using file properties in commands
+  As a user
+  I want to run commands that rely on the current edit view
+  So I don't have to write many similar commands
+
+  Background:
+    When I will choose "plugins/runnables/features/fixtures" from the "open_directory" dialog
+    And I open a directory
+
+  Scenario: Using the name of the current file in a command
+    Given I have opened "plugins/runnables/features/fixtures/name_app.rb"
+    And I run the command Redcar::Runnables::RunEditTabCommand
+    Then my active tab should be "Running name_app.rb"
+    And the HTML tab should say "name_app"
+
+  Scenario: Using the current line number in a command
+    Given I have opened "plugins/runnables/features/fixtures/line_app.rb"
+    And I run the command Redcar::Runnables::RunEditTabCommand
+    Then my active tab should be "Running line_app.rb"
+    And the HTML tab should say "1"

data/plugins/runnables/features/run_alternate_command.feature

@@ -0,0 +1,14 @@
+Feature: Running an alternate file runner
+  As a user
+  I want to run tabs in different ways
+  So I need a separate terminal less often
+
+  Background:
+    When I will choose "plugins/runnables/features/fixtures" from the "open_directory" dialog
+    And I open a directory
+
+  Scenario: Getting the second match from a list of file runners
+    Given I have opened "plugins/runnables/features/fixtures/alternate.ruby"
+    And I run the command Redcar::Runnables::RunAlternateEditTabCommand
+    Then my active tab should be "Running alternate.ruby"
+    And the HTML tab should say "hello world"

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

@@ -1,7 +1,3 @@
-RequireSupportFiles File.dirname(__FILE__) + "/../../../application/features/"
-RequireSupportFiles File.dirname(__FILE__) + "/../../../edit_view/features/"
-RequireSupportFiles File.dirname(__FILE__) + "/../../../html_view/features/"
-RequireSupportFiles File.dirname(__FILE__) + "/../../../project/features/"
 
 def runnable_fixtures
   File.expand_path(File.dirname(__FILE__) + "/../fixtures")
@@ -22,10 +18,21 @@ def reset_runnable_fixtures
   end
 
   File.open("#{runnable_fixtures}/params_app.rb", 'w') do |f|
-    #f.puts "puts ARGV[0] +' '+ ARGV[1]"
     f.puts "ARGV.each { |it| print it+' '}"
   end
 
+  File.open("#{runnable_fixtures}/alternate.ruby", 'w') do |f|
+    f.puts "ARGV.each { |it| print it+' '}"
+  end
+
+  File.open("#{runnable_fixtures}/name_app.rb", 'w') do |f|
+    f.puts "ARGV.each { |it| println it}"
+  end
+
+  File.open("#{runnable_fixtures}/line_app.rb", 'w') do |f|
+    f.puts "ARGV.each { |it| println it}"
+  end
+
   File.open(runnable_config, 'w') do |f|
     f.print <<-EOS
       {
@@ -61,14 +68,44 @@ def reset_runnable_fixtures
             "name":        "An appendable app",
             "command":     "jruby params_app.rb hello",
             "description": "Runs an app that prints parameters"
+          },
+          {
+            "name": "A nested app",
+            "command": "echo 'lo'",
+            "description": "A test for nesting",
+            "type": "first/second"
           }
         ],
         "file_runners":[
+          {
+            "regex":   ".*\\\\name_app.rb",
+            "name":    "Run as ruby",
+            "command": "jruby \\"__PATH__\\" __NAME__",
+            "type":    "app/ruby"
+          },
+          {
+            "regex":   ".*\\\\.ruby",
+            "name":    "Run as ruby",
+            "command": "jruby \\"__PATH__\\" 1 2 3",
+            "type":    "app/ruby"
+          },
+          {
+            "regex":   ".*\\\\line_app.rb",
+            "name":    "Run as ruby",
+            "command": "jruby \\"__PATH__\\" __LINE__",
+            "type":    "app/ruby"
+          },
           {
             "regex":   ".*\\\\.rb",
             "name":    "Run as ruby",
             "command": "jruby \\"__PATH__\\"",
             "type":    "app/ruby"
+          },
+          {
+            "regex":   ".*\\\\.ruby",
+            "name":    "Run as ruby",
+            "command": "jruby \\"__PATH__\\" hello world",
+            "type":    "app/ruby"
           }
         ]
       }

data/plugins/runnables/lib/runnables.rb

@@ -10,30 +10,22 @@ require 'runnables/tree_mirror/tree_mirror'
 
 module Redcar
   class Runnables
-    TREE_TITLE = "Runnables"
-    PARAMS = "__PARAMS__"
-    DISPLAY_PARAMS = "__?__"
+    TREE_TITLE          = "Runnables"
+    PARAMS              = "__PARAMS__"
+    DISPLAY_PARAMS      = "__?__"
     DISPLAY_NEXT_PARAMS = "_____"
+    LINE_HOLDER         = "__LINE__"
+    PATH_HOLDER         = "__PATH__"
+    NAME_HOLDER         = "__NAME__"
 
     def self.run_process(path, command, title, output = "tab")
       window = Redcar.app.focussed_window
-      while command.include?(PARAMS)
-        msg = command.sub(PARAMS,DISPLAY_PARAMS)
-        msg = msg.gsub(PARAMS,DISPLAY_NEXT_PARAMS)
-        msg = "" if msg == DISPLAY_PARAMS
-        msg_title = "Enter Command Parameters"
-        out = Redcar::Application::Dialog.input(msg_title,msg)
-        params = out[:value] || ""
-        return if out[:button] == :cancel
-        command = command.sub(PARAMS,params)
-      end
+      command = Runnables.substitute_variables(window,command)
+      return unless command
       if Runnables.storage['save_project_before_running'] == true
         window.notebooks.each do |notebook|
           notebook.tabs.each do |tab|
-            case tab
-            when EditTab
-              tab.edit_view.document.save! if tab.edit_view.document.modified?
-            end
+            tab.edit_view.document.save! if tab.is_a?(EditTab) and tab.edit_view.document.modified?
           end
         end
       end
@@ -55,6 +47,52 @@ module Redcar
       end
     end
 
+    # Replaces placeholders in commands with values, like __PATH__,
+    # __LINE__, __NAME__ and __PARAMS__
+    def self.substitute_variables(window,command)
+      tab = window.focussed_notebook_tab
+      if tab and tab.is_a?(EditTab)
+        if command.include?(PATH_HOLDER)
+          path = tab.edit_view.document.path
+          command.gsub!(PATH_HOLDER, path)
+          if command.include?(LINE_HOLDER)
+            line = tab.edit_view.document.cursor_line + 1
+            command.gsub!(LINE_HOLDER, line.to_s)
+          end
+        end
+        if command.include?(NAME_HOLDER)
+          name = File.basename(tab.edit_view.document.path)
+          idx  = name.rindex(".") if name.include?(".")
+          name = name[0,idx] if idx
+          command.gsub!(NAME_HOLDER, name.to_s)
+        end
+      end
+      while command.include?(PARAMS)
+        msg = command.sub(PARAMS,DISPLAY_PARAMS)
+        msg = msg.gsub(PARAMS,DISPLAY_NEXT_PARAMS)
+        msg = "" if msg == DISPLAY_PARAMS
+        msg_title = "Enter Command Parameters"
+        out = Redcar::Application::Dialog.input(msg_title,msg)
+        params = out[:value] || ""
+        return if out[:button] == :cancel
+        command = command.sub(PARAMS,params)
+      end
+      command
+    end
+
+    def self.file_mappings(project)
+      file_runners = []
+      if project
+        runnable_file_paths = project.config_files("runnables/*.json")
+        runnable_file_paths.each do |path|
+          json = File.read(path)
+          this_file_runners = JSON(json)["file_runners"]
+          file_runners += this_file_runners || []
+        end
+      end
+      file_runners
+    end
+
     def self.previous_tab_for(command)
       Redcar.app.all_tabs.detect do |t|
         t.respond_to?(:html_view) &&
@@ -64,19 +102,27 @@ module Redcar
     end
 
     def self.keymaps
-      map = Keymap.build("main", [:osx, :linux, :windows]) do
+      linwin = Keymap.build("main", [:linux, :windows]) do
         link "Ctrl+R", Runnables::RunEditTabCommand
+        link "Ctrl+Alt+R", Runnables::RunAlternateEditTabCommand
+      end
+
+      osx = Keymap.build("main", :osx) do
+        link "Cmd+R", Runnables::RunEditTabCommand
+        link "Cmd+Alt+R", Runnables::RunAlternateEditTabCommand
       end
-      [map, map]
+      [linwin,osx]
     end
 
     def self.menus
       Menu::Builder.build do
         sub_menu "Project" do
           group(:priority => 15) {
-          separator
+            separator
             item "Runnables", Runnables::ShowRunnables
             item "Run Tab",   Runnables::RunEditTabCommand
+            item "Alternate Run Tab", Runnables::RunAlternateEditTabCommand
+            separator
           }
         end
       end
@@ -107,4 +153,4 @@ module Redcar
       end
     end
   end
-end
+end

data/plugins/runnables/lib/runnables/commands.rb

@@ -31,34 +31,51 @@ module Redcar
     end
 
     class RunEditTabCommand < Redcar::EditTabCommand
-      def file_mappings
+      sensitize :open_project
+      def execute
         project = Project::Manager.in_window(win)
-        runnable_file_paths = project.config_files("runnables/*.json")
-
-        file_runners = []
-        runnable_file_paths.each do |path|
-          json = File.read(path)
-          this_file_runners = JSON(json)["file_runners"]
-          file_runners += this_file_runners || []
+        f = Runnables.file_mappings(project).detect do |file_mapping|
+          regex = Regexp.new(file_mapping["regex"])
+          tab.edit_view.document.mirror.path =~ regex
         end
-        file_runners
+        run_tab(project.home_dir,tab, f) if f
+      end
+
+      def run_tab(project_path,tab, file_mapping)
+        command = file_mapping["command"]
+        output = file_mapping["output"]
+        path = tab.edit_view.document.mirror.path
+        output = "tab" if output.nil?
+        Runnables.run_process(project_path,command, "Running #{File.basename(path)}", output)
+      end
+    end
+
+    class RunAlternateEditTabCommand < RunEditTabCommand
+      sensitize :open_project
+      def initialize
+        @default   = nil
+        @alternate = nil
       end
 
       def execute
         project = Project::Manager.in_window(win)
-        file_mappings.each do |file_mapping|
-          regex = Regexp.new(file_mapping["regex"])
+        i = 0
+        Runnables.file_mappings(project).each do |f|
+          regex = Regexp.new(f["regex"])
           if tab.edit_view.document.mirror.path =~ regex
-            command_schema = file_mapping["command"]
-            output = file_mapping["output"]
-            if output.nil?
-	            output = "tab"
+            if i == 0
+              @default = f
+            elsif i == 1
+              @alternate = f
             end
-            path = tab.edit_view.document.mirror.path
-            command = command_schema.gsub("__PATH__", path)
-            Runnables.run_process(project.home_dir,command, "Running #{File.basename(path)}", output)
+            i = i + 1 #increment only for matches
           end
         end
+        if @alternate
+          run_tab(project.home_dir,tab, @alternate)
+        elsif @default
+          run_tab(project.home_dir,tab, @default)
+        end
       end
     end
   end