redcar-dev 0.12.17dev → 0.12.18dev

data/plugins/project/spec/project/adapters/remote_protocols/ftp_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")
+require "spec_helper"
 
 require 'net/ssh'
 require 'net/ftp'

data/plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")
+require "spec_helper"
 
 require 'net/ssh'
 require 'net/sftp'

data/plugins/project/spec/project/adapters/remote_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 class Redcar::Project
   # describe Adapters::Remote do

data/plugins/project/spec/project/dir_mirror_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 class Redcar::Project
   describe DirMirror do

data/plugins/project/spec/project/file_list_spec.rb

@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), *%w".. spec_helper")
+require "spec_helper"
 
 FileList = Redcar::Project::FileList
 

data/plugins/project/spec/project/file_mirror_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+require "spec_helper"
 
 class Redcar::Project
   describe FileMirror do

data/plugins/project/spec/spec_helper.rb

@@ -1,8 +1,5 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("project")
 
 require File.dirname(__FILE__) + "/fixture_helper"
 

data/plugins/project_search/spec/project_search/binary_data_detector_spec.rb

@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe ProjectSearch::BinaryDataDetector do
   

data/plugins/project_search/spec/project_search/word_search_spec.rb

@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + "/../spec_helper"
+require "spec_helper"
 
 describe ProjectSearch::WordSearch do
   after do

data/plugins/project_search/spec/spec_helper.rb

@@ -1,8 +1,5 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("project_search")
 
 class ImmediateTaskQueue
   class Future

data/plugins/{application → redcar}/features/navigation_history.feature

@@ -5,12 +5,12 @@ Background:
   And I move to line 2
   And I run the command Redcar::OutlineView::OpenOutlineViewCommand
   And I select the outline view
-  Then the cursor should be on line 1
+  Then the cursor should be on line 3
   And I run the command Redcar::OutlineView::OpenOutlineViewCommand
   When I set the outline filter to "con"
-  And I wait 2 seconds
+  And I wait "2" seconds
   And I select the outline view
-  Then the cursor should be on line 14
+  Then the cursor should be on line 16
   Given I have opened "plugins/application/lib/application/navigation_history.rb"
   And I move to line 5
   And I run the command Redcar::OutlineView::OpenOutlineViewCommand
@@ -23,19 +23,19 @@ Scenario: Backward/forward history
   And the cursor should be on line 5
   When I run the command Redcar::Top::BackwardNavigationCommand
   Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
-  And the cursor should be on line 14
+  And the cursor should be on line 16
   When I run the command Redcar::Top::BackwardNavigationCommand
   Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
-  And the cursor should be on line 1
+  And the cursor should be on line 3
   When I run the command Redcar::Top::BackwardNavigationCommand
   Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
   And the cursor should be on line 2
   When I run the command Redcar::Top::ForwardNavigationCommand
   Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
-  And the cursor should be on line 1
+  And the cursor should be on line 3
   When I run the command Redcar::Top::ForwardNavigationCommand
   Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
-  And the cursor should be on line 14
+  And the cursor should be on line 16
   When I run the command Redcar::Top::ForwardNavigationCommand
   Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
   And the cursor should be on line 5
@@ -55,7 +55,7 @@ Scenario: Change middle history
   And the cursor should be on line 5
   And I run the command Redcar::OutlineView::OpenOutlineViewCommand
   When I set the outline filter to "can"
-  And I wait 2 seconds
+  And I wait "2" seconds
   And I select the outline view
   Then the cursor should be on line 21
   When I run the command Redcar::Top::BackwardNavigationCommand

data/plugins/redcar/features/step_definitions/font_steps.rb

@@ -11,15 +11,19 @@ When /^I set the font size to (\d+|maximum|minimum)$/ do |arg1|
 end
 
 When /^I (de|in)crease the font size$/ do |direction|
-  if direction == 'in'
-    Redcar::Top::IncreaseFontSize.new.run
-  else
-    Redcar::Top::DecreaseFontSize.new.run
+  Swt.sync_exec do
+    if direction == 'in'
+      Redcar::Top::IncreaseFontSize.new.run
+    else
+      Redcar::Top::DecreaseFontSize.new.run
+    end
   end
 end
 
 When /^I set the font size$/ do
-  Redcar::Top::SelectFontSize.new.run
+  Swt.sync_exec do
+    Redcar::Top::SelectFontSize.new.run
+  end
 end
 
 Then /^the font size should be (\d+|maximum|minimum)$/ do |size|

data/plugins/redcar/redcar.rb

@@ -25,32 +25,6 @@ module Redcar
     result
   end
 
-  class TimeoutError < StandardError; end
-
-  def self.timeout(limit)
-    x = Thread.current
-    result = nil
-    y = Thread.new do
-      begin
-        result = yield
-      rescue Object => e
-        x.raise e
-      end
-    end
-    s = Time.now
-    loop do
-      if not y.alive?
-        break
-      elsif Time.now - s > limit
-        y.kill
-        raise Redcar::TimeoutError, "timed out after #{Time.now - s}s"
-        break
-      end
-      sleep 0.1
-    end
-    result
-  end
-
   module Top
     class OpenNewEditTabCommand < Command
 

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

@@ -1,19 +1,29 @@
 When /^I open a "([^"]*)" repl$/ do |repl|
-  Redcar.const_get(repl.camelize).const_get("Open" + repl.camelize + "REPL").new.run
+  Swt.sync_exec do
+    Redcar.const_get(repl.camelize).const_get("Open" + repl.camelize + "REPL").new.run
+  end
 end
 
 When /^I open a new repl$/ do
-  Redcar::REPL::OpenFakeREPL.new.run
+  Swt.sync_exec do
+    Redcar::REPL::OpenFakeREPL.new.run
+  end
 end
 
 Then /^the REPL output should be "([^"]*)"$/ do |output|
-  current_tab.edit_view.document.mirror.last_output.should == output
+  Swt.sync_exec do
+    current_tab.edit_view.document.mirror.last_output.should == output
+  end
 end
 
 Then /^the current command should be "([^"]*)"$/ do |cmd|
-  current_tab.current_command.should == cmd
+  Swt.sync_exec do
+    current_tab.current_command.should == cmd
+  end
 end
 
 Then /^the current command should be blank$/ do
-  current_tab.current_command.should == nil
+  Swt.sync_exec do
+    current_tab.current_command.should == nil
+  end
 end

data/plugins/repl/plugin.rb

@@ -4,5 +4,5 @@ Plugin.define do
   version "1.1"
   file    "lib", "repl"
   object  "Redcar::REPL"
-  dependencies "redcar", ">0"
+  dependencies "edit_view", ">0"
 end

data/plugins/repl/spec/repl/repl_mirror_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 class Redcar::REPL
   describe ReplMirror do

data/plugins/repl/spec/spec_helper.rb

@@ -1,5 +1,2 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("repl")

data/plugins/ruby/spec/ruby/repl_mirror_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 class Redcar::Ruby
   describe ReplMirror do

data/plugins/ruby/spec/spec_helper.rb

@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("ruby")

data/plugins/runnables/features/parameter_input.feature

@@ -1,43 +1,43 @@
-@runnables
-Feature: Adding parameters to commands
-  As a user
-  I want to add parameters to commands
-  So I don't need to make many similar ones
-
-  Background:
-    When I will choose "plugins/runnables/features/fixtures" from the "open_directory" dialog
-    And I open a directory
-
-  Scenario: Running a command containing parameters
-    Given I would type "runnable_app.rb" in an input box
-    When I open the runnables tree
-    And I expand the tree row "fixture_runnables"
-    And I activate the "A params app" node in the tree
-    Then my active tab should be "A params app"
-    And the HTML tab should say "hello world"
-
-  Scenario: Running a command containing parameters
-    Given I would type "hello" in an input box
-    And I would type "world" in an input box
-    When I open the runnables tree
-    And I expand the tree row "fixture_runnables"
-    And I activate the "A multi-params app" node in the tree
-    Then my active tab should be "A multi-params app"
-    And the HTML tab should say "hello world"
-
-  Scenario: Appending parameters before running a command
-    Given I would type "world" in an input box
-    When I open the runnables tree
-    And I expand the tree row "fixture_runnables"
-    And I append parameters to the "An appendable app" node in the tree
-    Then my active tab should be "An appendable app"
-    And the HTML tab should say "hello world"
-
-  Scenario: Appending parameters to a command which ends in parameters is disallowed
-    Given I would type "runnable_app.rb" in an input box
-    And I would type "there" in an input box
-    When I open the runnables tree
-    And I expand the tree row "fixture_runnables"
-    And I append parameters to the "A params app" node in the tree
-    Then my active tab should be "A params app"
-    And the HTML tab should say "hello world"
+# @runnables
+# Feature: Adding parameters to commands
+#   As a user
+#   I want to add parameters to commands
+#   So I don't need to make many similar ones
+# 
+#   Background:
+#     When I will choose "plugins/runnables/features/fixtures" from the "open_directory" dialog
+#     And I open a directory
+# 
+#   Scenario: Running a command containing parameters
+#     Given I would type "runnable_app.rb" in an input box
+#     When I open the runnables tree
+#     And I expand the tree row "fixture_runnables"
+#     And I activate the "A params app" node in the tree
+#     Then my active tab should be "A params app"
+#     And the HTML tab should say "hello world"
+# 
+#   Scenario: Running a command containing parameters
+#     Given I would type "hello" in an input box
+#     And I would type "world" in an input box
+#     When I open the runnables tree
+#     And I expand the tree row "fixture_runnables"
+#     And I activate the "A multi-params app" node in the tree
+#     Then my active tab should be "A multi-params app"
+#     And the HTML tab should say "hello world"
+# 
+#   Scenario: Appending parameters before running a command
+#     Given I would type "world" in an input box
+#     When I open the runnables tree
+#     And I expand the tree row "fixture_runnables"
+#     And I append parameters to the "An appendable app" node in the tree
+#     Then my active tab should be "An appendable app"
+#     And the HTML tab should say "hello world"
+# 
+#   Scenario: Appending parameters to a command which ends in parameters is disallowed
+#     Given I would type "runnable_app.rb" in an input box
+#     And I would type "there" in an input box
+#     When I open the runnables tree
+#     And I expand the tree row "fixture_runnables"
+#     And I append parameters to the "A params app" node in the tree
+#     Then my active tab should be "A params app"
+#     And the HTML tab should say "hello world"

data/plugins/runnables/features/step_definitions/runnable_steps.rb

@@ -1,5 +1,7 @@
 When /^I open the runnables tree$/ do
-  Redcar::Runnables::ShowRunnables.new.run
+  Swt.sync_exec do
+    Redcar::Runnables::ShowRunnables.new.run
+  end
 end
 
 When /^I change the command to "([^"]*)"$/ do |name|
@@ -10,7 +12,9 @@ When /^I change the command to "([^"]*)"$/ do |name|
 end
 
 When /^I go back to the "([^"]*)" window$/ do |title|
-  Redcar.app.windows.detect { |w| w.title == title }.focus
+  Swt.sync_exec do
+    Redcar.app.windows.detect { |w| w.title == title }.focus
+  end
 end
 
 When /^I note the number of windows$/ do
@@ -24,5 +28,7 @@ end
 When /^I append parameters to the "([^"]*)" node in the tree$/ do |node_text|
   mirror     = Redcar.app.focussed_window.treebook.focussed_tree.tree_mirror
   node       = find_node_with_text(mirror.top, node_text)
-  Redcar::Runnables::AppendParamsAndRunCommand.new(node).run
+  Swt.sync_exec do
+    Redcar::Runnables::AppendParamsAndRunCommand.new(node).run
+  end
 end

data/plugins/runnables/plugin.rb

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

data/plugins/runnables/spec/runnables/output_processor_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Redcar::Runnables::OutputProcessor do
   before do

data/plugins/runnables/spec/spec_helper.rb

@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("runnables")

data/plugins/scm_svn/features/add_and_commit.feature

@@ -1,3 +1,4 @@
+@svn
 Feature: Adding and committing files in a working copy
 
   Scenario: Adding and committing new files to a repository

data/plugins/scm_svn/features/checkout.feature

@@ -1,3 +1,4 @@
+@svn
 Feature: Checking out a repository
 
   Scenario: Checking out a repository via the 'file' protocol

data/plugins/scm_svn/features/edit_and_index.feature

@@ -1,3 +1,4 @@
+@svn
 Feature: Editing and indexing files in a working copy
 
   Scenario: Editing a file and viewing unindexed modified files

data/plugins/scm_svn/features/ignore_files.feature

@@ -1,3 +1,4 @@
+@svn
 Feature: Ignoring external files within a working directory
 
   Scenario: Ignoring certain files

data/plugins/scm_svn/features/merge.feature

@@ -1,3 +1,4 @@
+@svn
 Feature: Merging two branches together
 
   Scenario: Merging a branch into trunk

data/plugins/scm_svn/features/resolve_conflict.feature

@@ -1,3 +1,4 @@
+@svn
 Feature: Resolving conflicts
 
   Scenario: Resolving a file content conflict

data/plugins/scm_svn/features/revert_and_delete.feature

@@ -1,3 +1,4 @@
+@svn
 Feature: Reverting and deleting files in a working copy
 
   Scenario: Reverting a dirty file to base revision

data/plugins/scm_svn/features/step_definitions/branch_and_merge_steps.rb

@@ -1,17 +1,22 @@
+
 Given /^I will open "([^"]*)" branch as a new project$/ do |branch_name|
-  path = parse_branch_path(branch_name)
-  if path
-    Redcar.gui.dialog_adapter.set(:open_directory, path)
-    @svn_module = Redcar::Scm::Subversion::Manager.new
-    @svn_module.load(path)
+  Swt.sync_exec do
+    path = parse_branch_path(branch_name)
+    if path
+      Redcar.gui.dialog_adapter.set(:open_directory, path)
+      @svn_module = Redcar::Scm::Subversion::Manager.new
+      @svn_module.load(path)
+    end
   end
 end
 
 When /^I switch to "([^"]*)" branch$/ do |branch_name|
-  path = parse_branch_path(branch_name)
-  Redcar.gui.dialog_adapter.set(:open_directory, path) if path
-  svn_module.switch!(branch_name)
-  svn_module.repository?(path).should == true
+  Swt.sync_exec do
+    path = parse_branch_path(branch_name)
+    Redcar.gui.dialog_adapter.set(:open_directory, path) if path
+    svn_module.switch!(branch_name)
+    svn_module.repository?(path).should == true
+  end
 end
 
 When /^I merge the "([^"]*)" branch$/ do |branch_name|