redcar-dev 0.12.17dev → 0.12.18dev

data/CHANGES

@@ -1,8 +1,8 @@
 Version 0.12 (TBA)
 ==================
 
- * Features run all the way through again, and can be run in the background 
-   (the test window no longer needs to be focussed) (Dan Lucraft)
+ * Features run all the way through again, and use Swtbot in places to 
+   allow us to simulate events more accurately (Helpful for macros) (Dan Lucraft)
  * Added --no-splash option (Dan Lucraft)
  * Fix runnables for JRuby 1.6.1 (Chris Nelson)
  * Improved developer first experience (Dr Nic Williams)
@@ -22,6 +22,8 @@ Version 0.12 (TBA)
  * Project tree has colourful icons (Delisa Mason)
  * Uses gems to install everything (Dan Lucraft)
  * Wildcards permitted in project search (Delisa Mason)
+ * Installation entirely through Rubygems (Dan Lucraft)
+ * Rad new icon (Delisa Mason)
 
 Version 0.11 (23 March 2011)
 ============================

data/README.md

@@ -43,34 +43,6 @@ To see full usage details.
 * Irc at #redcar on irc.freenode.net
 * Mailing list at http://groups.google.com/group/redcar-editor
 
-## INSTALLING FROM SOURCE
-
-If you want to contribute to Redcar, you can install it from the source code and make modifications before submitting a patch.
-
-If you're on any platform, you'll need the bundler and rake gems installed as prerequisites.
-If you're running Windows, you'll also need to install the rubyzip gem:
-
-    $ gem install rubyzip
-
-Download from github, checkout the submodules and install the jars:
-
-    $ git clone http://github.com/redcar/redcar.git
-    $ cd redcar
-    $ bundle
-    $ rake initialise
-    $ ruby bin/redcar install
-
-To run:
-
-    $ ruby bin/redcar
-
-### Updating a source build
-
-If you are running a source version of Redcar and you have pulled updates from master, then you may have to update your local repo:
-
-    $ rake initialise
-    $ ruby bin/redcar install
-
 ## TESTS
 
 NB. Redcar features are known to work with Cucumber 0.9.2, and known NOT to work with Cucumber < 0.9
@@ -79,7 +51,7 @@ To run the tests you need JRuby installed. You also need rspec and cucumber inst
 
 To install the necessary gems:
 
-$ jruby -S bundle install
+    $ jruby -S bundle install
 
 To run all specs and all features:
 
@@ -87,27 +59,19 @@ To run all specs and all features:
 
 ### Specs
 
-On OSX:
-
-    $ jruby -J-XstartOnFirstThread -S spec plugins/#{plugin_name}/spec/
-
-On Linux/Windows:
-
-    $ jruby -S spec plugins/#{plugin_name}/spec/
-
-To just run all specs:
+To run all specs:
 
-   $ rake specs  
+   $ rspec plugins/*/spec/
 
 ### Features
 
 On OSX:
 
-    $ jruby -J-XstartOnFirstThread bin/cucumber --exclude ".*fixtures.*" plugins/#{plugin_name}/features
+    $ jruby -J-XstartOnFirstThread swt_cucumber plugins/#{plugin_name}/features
 
 On Linux/Windows:
 
-    $ jruby bin/cucumber --exclude ".*fixtures.*" plugins/#{plugin_name}/features/
+    $ jruby -J-XstartOnFirstThread swt_cucumber plugins/#{plugin_name}/features
 
 To just run all features:
 

data/Rakefile

@@ -1,13 +1,8 @@
 require 'bundler'
-REDCAR_VERSION = "0.12.0dev" # also change in lib/redcar.rb!
 require 'fileutils'
 
-# explitely use rspec < 2.0
-gem 'rspec', '<2.0'
-require 'spec/rake/spectask'
 require 'cucumber/rake/task'
-require "rake/gempackagetask"
-require "rake/rdoctask"
+
 Dir[File.expand_path("../lib/tasks/*.rake", __FILE__)].each { |f| load f }
 
 if RUBY_PLATFORM =~ /mswin|mingw/
@@ -136,13 +131,8 @@ task :default => ["specs", "cucumber"]
 
 desc "Run all specs"
 task :specs do
-  files = Dir['plugins/*/spec/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*/*_spec.rb']
-  case Config::CONFIG["host_os"]
-  when "darwin"
-    sh("jruby -J-XstartOnFirstThread -S bundle exec spec -c #{files.join(" ")} && echo 'done'")
-  else
-    sh("jruby -S bundle exec spec -c #{files.join(" ")} && echo 'done'")
-  end
+  plugin_spec_dirs = Dir["plugins/*/spec"]
+  sh("jruby -S bundle exec rspec -c #{plugin_spec_dirs.join(" ")}")
 end
 
 desc "Run all features"
@@ -191,28 +181,6 @@ task :run_ci do
   contrl.run
 end
 
-desc "Release gem"
-task :release => :gem do
-  require 'aws/s3'
-  credentials = YAML.load(File.read("/Users/danlucraft/.s3-creds.yaml"))
-  AWS::S3::Base.establish_connection!(
-    :access_key_id     => credentials['access_key_id'],
-    :secret_access_key => credentials["secret_access_key"]
-  )
-  
-  redcar_bucket = AWS::S3::Bucket.find('redcar')
-  s3_uploads = {
-    "vendor/java-mateview/release/java-mateview.jar" => "java-mateview-#{REDCAR_VERSION}.jar",
-    "plugins/application_swt/lib/dist/application_swt.jar"   => "application_swt-#{REDCAR_VERSION}.jar",
-    "pkg/redcar-#{REDCAR_VERSION}.gem"                       => "redcar-#{REDCAR_VERSION}.gem"
-  }
-  
-  s3_uploads.each do |source, target|
-    p [source, target]
-    AWS::S3::S3Object.store(target, open(source), 'redcar', :access => :public_read)
-  end
-end
-
 namespace :redcar do
   def hash_with_hash_default
     Hash.new {|h,k| h[k] = hash_with_hash_default }

data/lib/redcar.rb

@@ -1,7 +1,5 @@
 
 $:.push(File.expand_path(File.join(File.dirname(__FILE__))))
-$:.push(File.expand_path(File.join(File.dirname(__FILE__), %w{.. vendor spoon lib})))
-$:.push(File.expand_path(File.join(File.dirname(__FILE__), %w{.. vendor ffi lib})))
 
 require 'redcar/usage'
 
@@ -16,14 +14,17 @@ require 'uri'
 require 'fileutils'
 
 require 'rubygems'
+require "bundler/setup"
 require 'redcar-icons'
 
 begin
   if Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
+=begin
     gem "spoon"
     require 'spoon'
     module Redcar; SPOON_AVAILABLE = true; end
   else
+=end
     module Redcar; SPOON_AVAILABLE = false; end
   end
 rescue LoadError
@@ -57,7 +58,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.17dev' # also change in the gemspec!
+  VERSION         = '0.12.18dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 12
   VERSION_RELEASE = 0
@@ -103,10 +104,12 @@ module Redcar
   def self.add_plugin_sources(manager)
     manager.add_plugin_source(File.join(root, "plugins"))
     manager.add_plugin_source(File.join(user_dir, "plugins"))
-    manager.add_gem_plugin_source
+    unless Redcar.environment == :test
+      manager.add_gem_plugin_source
+    end
   end
 
-  def self.load_prerequisites
+  def self.load_prerequisites(options={})
     exit if ARGV.include?("--quit-immediately")
     require 'java'
     
@@ -127,18 +130,17 @@ module Redcar
     
     gem 'swt'
     require 'swt/minimal'
+      
+    unless no_gui_mode?
+      gui = Redcar::Gui.new("swt")
+      gui.register_event_loop(Swt::EventLoop.new)
+      gui.register_features_runner(Swt::CucumberRunner.new)
+      Redcar.gui = gui
     
-    gui = Redcar::Gui.new("swt")
-    gui.register_event_loop(Swt::EventLoop.new)
-    gui.register_features_runner(Swt::CucumberRunner.new)
-    Redcar.gui = gui
-    
-    plugin_manager.load("splash_screen")
+      plugin_manager.load("splash_screen")
+    end
   end
   
-  def self.load_useful_libraries
-  end
-
   def self.load_plugins
     begin
       exit if ARGV.include?("--quit-after-splash")
@@ -174,8 +176,8 @@ module Redcar
     end
   end
   
-  def self.load_unthreaded
-    load_prerequisites
+  def self.load_unthreaded(options={})
+    load_prerequisites(options)
     load_plugins
   end
   
@@ -286,7 +288,7 @@ module Redcar
   end
   
   def self.show_log?
-    ARGV.include?("--show-log")
+    ARGV.include?("--show-log") or ENV["REDCAR_SHOW_LOG"]
   end
   
   def self.custom_log_level

data/lib/redcar/runner.rb

@@ -2,7 +2,7 @@ module Redcar
   # Cribbed from ruby-processing. Many thanks!
   class Runner
     def run
-      forking = ARGV.include?("--fork") and ARGV.first != "install"
+      forking = ARGV.include?("--fork")
       no_runner = ARGV.include?("--no-sub-jruby")
       jruby = Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
       osx = (not [:linux, :windows].include?(Redcar.platform))
@@ -60,11 +60,6 @@ module Redcar
       end      
 
       jruby_complete = RedcarJRuby.jar_path
-      unless File.exist?(jruby_complete)
-        puts "\nCan't find jruby jar at #{jruby_complete}, did you run 'redcar install' ?"
-        exit 1
-      end
-
       command = (RUBY_PLATFORM.downcase =~ /mswin|mingw|win32/ ? ["javaw"] : ["java"])
       command.push(*java_args)
       command.push("-Xbootclasspath/a:#{jruby_complete}")
@@ -89,7 +84,6 @@ module Redcar
           arg
         end
       end
-      result.delete("install")
       result
     end
     

data/lib/redcar_quick_start.rb

@@ -5,14 +5,14 @@ module Redcar
   DRB_PORTS = {"user" => 10021, "test" => 10022, "development" => 10021}
   DONT_READ_STDIN_ARG = "--ignore-stdin"
 
-  def self.environment
-    :user
-  end
-  
   def self.drb_port
     DRB_PORTS[Redcar.environment.to_s]
   end
 
+  def self.environment
+    :user
+  end
+
   def self.read_stdin
     if not $stdin.tty? and not ARGV.include?(DONT_READ_STDIN_ARG)
       data = ""
@@ -51,7 +51,7 @@ module Redcar
           if arg =~ /--untitled-file=(.*)/
             path = $1 if File.file?($1)
             untitled = true
-          elsif arg !~ /^--/ # not --something
+          elsif arg !~ /^-/ # not --something
             path = File.expand_path(arg)
             if !File.exist?(path)
               require 'fileutils'

data/plugins/application/features/main_menu.feature

@@ -6,4 +6,4 @@ Feature: Main menu
   
   Scenario: There should be a File|New entry
     Then there should be a main menu
-    And the "File" menu should contain a "New" entry
+    And the "File" menu should contain a "New" entry

data/plugins/application/features/step_definitions/command_steps.rb

@@ -1,10 +1,11 @@
-
 When /^I run the command ([^\s]+)$/ do |command_name|
-  command_class = eval(command_name)
-  command = command_class.new
-  if command.is_a?(Redcar::DocumentCommand)
-    command.run(:env => {:edit_view => implicit_edit_view})
-  else
-    command.run
+  Swt.sync_exec do
+    command_class = eval(command_name)
+    command = command_class.new
+    if command.is_a?(Redcar::DocumentCommand)
+      command.run(:env => {:edit_view => implicit_edit_view})
+    else
+      command.run
+    end
   end
 end

data/plugins/application/features/step_definitions/filter_list_dialog_steps.rb

@@ -8,35 +8,50 @@ def filter_dialog_items
 end
 
 Then /^there should be a filter dialog open$/ do
-  filter_dialog.should_not be_nil
+  Swt.sync_exec do
+    filter_dialog.should_not be_nil
+  end
 end
 
 Then /^there should be no filter dialog open$/ do
-  filter_dialog.should be_nil
+  Swt.sync_exec do
+    filter_dialog.should be_nil
+  end
 end
 
 When /^I set the filter to "(.*)"$/ do |text|
-  filter_dialog.text.set_text(text)
+  Swt.sync_exec do
+    filter_dialog.text.set_text(text)
+  end
 end
 
 When /^I select in the filter dialog$/ do
-  filter_dialog.controller.selected
+  Swt.sync_exec do
+    filter_dialog.controller.selected
+  end
 end
 
 When /^I wait "(.*)" seconds?$/ do |time|
-  Cucumber::Ast::StepInvocation.wait_time = time.to_f
+  s = Time.now + time.to_f
+  sleep 0.1 until Time.now > s
 end
 
 Then /^the filter dialog should have (no|\d+) entr(?:y|ies)$/ do |num|
-  num = (num == "no" ? 0 : num.to_i)
-  filter_dialog_items.length.should == num
+  Swt.sync_exec do
+    num = (num == "no" ? 0 : num.to_i)
+    filter_dialog_items.length.should == num
+  end
 end
 
 Then /^I should see "(.*)" at (\d+) the filter dialog$/ do |text, pos|
-  pos = pos.to_i
-  filter_dialog_items[pos].should == text
+  Swt.sync_exec do
+    pos = pos.to_i
+    filter_dialog_items[pos].should == text
+  end
 end
 
 Then /^I should not see "(.*)" in the filter dialog$/ do |text|
-  filter_dialog_items.include?(text).should be_false
+  Swt.sync_exec do
+    filter_dialog_items.include?(text).should be_false
+end
 end

data/plugins/application/features/step_definitions/key_steps.rb

@@ -10,9 +10,11 @@ key_presses = {
 }
 key_presses.each do |const,text|
   When "I press the #{text} key" do
-    tab = Redcar.app.focussed_window.focussed_notebook_tab
-    widget = tab.edit_view.controller.mate_text.get_control
-    key = Swt::SWT.const_get(const)
-    FakeKeyEvent.new(key,widget)
+    Swt.sync_exec do
+      tab = Redcar.app.focussed_window.focussed_notebook_tab
+      widget = tab.edit_view.controller.mate_text.get_control
+      key = Swt::SWT.const_get(const)
+      FakeKeyEvent.new(key,widget)
+    end
   end
 end

data/plugins/application/features/step_definitions/menu_steps.rb

@@ -1,42 +1,43 @@
 
 Then /^there should be a main menu$/ do
-  main_menu.should_not be_nil
+  Swt.bot.menu("File").should_not be_nil
 end
 
 Then /^the main menu should contain "([^\"]*)" entries$/ do |entries|
-  entries = entries.split(",").map {|e| e.strip }
-  items = main_menu.get_items.to_a
-  items.should_not be_empty
-  texts = items.map {|item| item.get_text }
-  entries.all? {|e| texts.include?(get_menu_name(e))}.should be_true
+  Swt.sync_exec do
+    entry_names = entries.split(",").map {|e| e.strip }
+    entry_names.each {|name| Swt.bot.menu(name).should_not be_nil }
+  end
 end
 
 Then /^the "([^\"]*)" menu should contain a "([^\"]*)" entry$/ do |menu_text, entry_text|
-  items = main_menu.get_items.to_a
-  menu = items.detect {|i| i.text == get_menu_name(menu_text)}
-  items = menu.get_menu.get_items.to_a
-  menu_texts = items.map{|i| i.text.split("\t").first}
-  menu_texts.detect {|t| t == entry_text}.should_not be_nil
+  Swt.bot.menu(menu_text).menu(entry_text).should_not be_nil
 end
 
 Then /^the menu item "([^\"]*)\|([^\"]*)" should be (active|inactive)$/ do |menu_name, menu_item, active|
-  items = main_menu.get_items.to_a
-  menu = items.detect {|i| i.text == get_menu_name(menu_name)}
-  items = menu.get_menu.get_items.to_a
-  item = items.detect {|i| i.text.split("\t").first == menu_item }
-  case active
-  when "active"
-    item.enabled.should be_true
-  when "inactive"
-    item.enabled.should be_false
+  Swt.sync_exec do
+    item = Swt.bot.menu(menu_name).menu(menu_item)
+    case active
+    when "active"
+      item.should be_enabled
+    when "inactive"
+      item.should_not be_enabled
+    end
   end
 end
 
 When /^I (?:open the|click) "([^"]*)" from the "([^"]*)" menu$/ do |menu_item, menu_name|
-  menu_items = menu_name.split("/").inject(main_menu.get_items.to_a.dup) do |items, item_name|
-    m = items.detect {|i| i.text == get_menu_name(item_name)}
-    items = m.get_menu.get_items.to_a
+  raise "use 'I select menu item ()' instead"
+end
+
+When /I select menu item "(.*)"/ do |menu_path|
+  Swt.sync_exec do
+    bits = menu_path.split(/\||\//)
+    curr = Swt.bot
+    bits.each { |bit| curr = curr.menu(bit) }
+    curr.click
   end
-  item = menu_items.detect {|i| i.text.split("\t").first == menu_item }
-  FakeEvent.new(Swt::SWT::Selection, item)
-end
+end
+
+
+