redcar 0.5 → 0.5.1dev

data/plugins/project/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.load
 
 def write_dir_contents(dirname, files)
   FileUtils.mkdir_p(dirname)

data/plugins/redcar/redcar.rb

@@ -5,18 +5,17 @@ module Redcar
       yield
     rescue => e
       message = "Error in: " + (text || e.message)
-      $stderr.puts message
-      $stderr.puts e.class.to_s + ": " + e.message
-      $stderr.puts e.backtrace
-      return if Redcar.no_gui_mode?
       Application::Dialog.message_box(
         message,
         :type => :error, :buttons => :ok)
+      puts message
+      puts e.class.to_s + ": " + e.message
+      puts e.backtrace
     end
   end
 
   def self.update_gui
-    Swt.sync_exec do
+    ApplicationSWT.sync_exec do
       safely do
         yield
       end
@@ -225,12 +224,11 @@ module Redcar
     class AboutCommand < Command
       def execute
         new_tab = Top::NewCommand.new.run
-        new_tab.document.text = <<-TXT
-About: Redcar\nVersion: #{Redcar::VERSION}
-Ruby Version: #{RUBY_VERSION}
-Jruby version: #{JRUBY_VERSION}
-Redcar.environment: #{Redcar.environment}
-        TXT
+        new_tab.document.text = "About: Redcar\nVersion: #{Redcar::VERSION}\n" +
+          "Ruby Version: #{RUBY_VERSION}\n" +
+          "Jruby version: #{JRUBY_VERSION}\n" +
+          "Redcar.environment: #{Redcar.environment}\n" +
+          "http://redcareditor.com"
         new_tab.title= 'About'
         new_tab.edit_view.reset_undo
         new_tab.document.set_modified(false)
@@ -555,31 +553,29 @@ Redcar.environment: #{Redcar.environment}
         cursor_line  = doc.cursor_line
         cursor_line_offset = doc.cursor_line_offset
         diff = 0
-        doc.controllers(AutoIndenter::DocumentController).first.disable do
-          doc.selection_ranges.each do |range|
-            doc.delete(range.begin - diff, range.count)
-            diff += range.count
-          end
-          texts = Redcar.app.clipboard.last.dup
-          texts.each_with_index do |text, i|
-            line_ix = start_line + i
-            if line_ix == doc.line_count
-              doc.insert(doc.length, "\n" + " "*line_offset)
-            else
-              line = doc.get_line(line_ix).chomp
-              if line.length < line_offset
-                doc.insert(
+        doc.selection_ranges.each do |range|
+          doc.delete(range.begin - diff, range.count)
+          diff += range.count
+        end
+        texts = Redcar.app.clipboard.last.dup
+        texts.each_with_index do |text, i|
+          line_ix = start_line + i
+          if line_ix == doc.line_count
+            doc.insert(doc.length, "\n" + " "*line_offset)
+          else
+            line = doc.get_line(line_ix).chomp
+            if line.length < line_offset
+              doc.insert(
                 doc.offset_at_inner_end_of_line(line_ix),
                 " "*(line_offset - line.length)
-                )
-              end
+              )
             end
-            doc.insert(
+          end
+          doc.insert(
             doc.offset_at_line(line_ix) + line_offset,
             text
-            )
-            doc.cursor_offset = doc.offset_at_line(line_ix) + line_offset + text.length
-          end
+          )
+          doc.cursor_offset = doc.offset_at_line(line_ix) + line_offset + text.length
         end
       end
     end
@@ -965,15 +961,15 @@ Redcar.environment: #{Redcar.environment}
              end
           end
           separator
-          item "Show Invisibles", :command => ToggleInvisibles, :type => :check, :active => EditView.show_invisibles?
-          item "Show Line Numbers", :command => ToggleLineNumbers, :type => :check, :active => EditView.show_line_numbers?
-          item "Show Annotations", :command => ToggleAnnotations, :type => :check, :active => EditView.show_annotations?
+          item "Toggle Invisibles", :command => ToggleInvisibles, :type => :check, :active => EditView.show_invisibles?
+          item "Toggle Line Numbers", :command => ToggleLineNumbers, :type => :check, :active => EditView.show_line_numbers?
+          item "Toggle Annotations", :command => ToggleAnnotations, :type => :check, :active => EditView.show_annotations?
         end
         sub_menu "Bundles", :priority => 45 do
           group(:priority => :first) do
             item "Find Snippet", Snippets::OpenSnippetExplorer
             item "Installed Bundles", Textmate::InstalledBundles
-            item "Browse Snippets", Textmate::ShowSnippetTree
+            item "View Bundles in Tree", Textmate::ShowSnippetTree
           end
           group(:priority => 15) do
             separator
@@ -1017,35 +1013,20 @@ Redcar.environment: #{Redcar.environment}
 
     def self.start(args=[])
       puts "loading plugins took #{Time.now - PROCESS_START_TIME}"
-      Redcar.update_gui do
-        Application.start
-        ApplicationSWT.start
-        Swt.splash_screen.inc(1) if Swt.splash_screen
-        EditViewSWT.start
-        Swt.splash_screen.inc(7) if Swt.splash_screen
-        s = Time.now
-        if Redcar.gui
-          Redcar.app.controller = ApplicationSWT.new(Redcar.app)
-        end
-        Redcar.app.refresh_menu!
-        Redcar.app.load_sensitivities
-        puts "initializing gui took #{Time.now - s}s"
-      end
-      Redcar.update_gui do
-        Swt.splash_screen.inc(2) if Swt.splash_screen
-        s = Time.now
-        Redcar::Project::Manager.start(args)
-        puts "project start took #{Time.now - s}s"
-        Redcar.app.make_sure_at_least_one_window_open
-      end
-      Redcar.update_gui do
-        Swt.splash_screen.close if Swt.splash_screen
-      end
+      Application.start
+      ApplicationSWT.start
+      EditViewSWT.start
+      s = Time.now
+      Redcar.gui = ApplicationSWT.gui
+      Redcar.app.controller = ApplicationSWT.new(Redcar.app)
+      Redcar.app.refresh_menu!
+      Redcar.app.load_sensitivities
+      puts "initializing gui took #{Time.now - s}s"
+      s = Time.now
+      Redcar::Project::Manager.start(args)
+      puts "project start took #{Time.now - s}s"
+      Redcar.app.make_sure_at_least_one_window_open
       puts "start time: #{Time.now - $redcar_process_start_time}"
-      if args.include?("--compute-textmate-cache-and-quit")
-        Redcar::Textmate.all_bundles
-        exit
-      end
     end
   end
 end

data/plugins/repl/spec/repl/clojure_mirror_spec.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-
 class Redcar::REPL
   describe ClojureMirror do
     before(:all) do

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

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

data/plugins/repl/spec/spec_helper.rb

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

data/plugins/runnables/spec/spec_helper.rb

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

data/plugins/scm/lib/scm.rb

@@ -74,7 +74,7 @@ module Redcar
       
       # should we print debugging messages? this can get pretty verbose
       def self.debug
-        ARGV.include?('--debug')
+        true
       end
       
       def self.modules

data/plugins/scm/lib/scm/scm_changes_mirror/change.rb

@@ -38,8 +38,6 @@ module Redcar
         #
         # Possible values and their implications:
         #   :new - can be passed to index_add, index_ignore
-        #   :unmerged - The file is in a conflicted state. 
-        #               Can be passed to index_save or index_delete
         #   :indexed - can be passed to index_revert, index_unsave
         #   :deleted - can be passed to index_restore, index_unsave
         #   :missing - can be passed to index_restore, index_delete

data/plugins/scm/spec/spec_helper.rb

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

data/plugins/scm_git/vendor/ruby-git/lib/git/lib.rb

@@ -662,7 +662,7 @@ module Git
     end
 
     def required_command_version
-      [1, 7, 0, 0]
+      [1, 6, 0, 0]
     end
 
     def meets_required_version?

data/plugins/textmate/lib/textmate.rb

@@ -4,9 +4,14 @@ require 'textmate/environment'
 require 'textmate/plist'
 require 'textmate/preference'
 require 'textmate/snippet'
-require 'textmate/tree_mirror'
-require 'textmate/commands'
-  
+begin
+  require 'textmate/tree_mirror'
+  require 'textmate/commands'
+rescue NameError => e
+  puts "Textmate plugin loading deferred until core loading is complete"
+  # In the installer we don't have all of core loaded yet
+end
+
 module Redcar
   module Textmate
     def self.all_bundle_paths
@@ -154,26 +159,30 @@ module Redcar
       end
     end
 
-    class InstalledBundles < Redcar::Command
-      def execute
-        controller = Controller.new
-        tab = win.new_tab(HtmlTab)
-        tab.html_view.controller = controller
-        tab.focus
-      end
+    begin
+      class InstalledBundles < Redcar::Command
+        def execute
+          controller = Controller.new
+          tab = win.new_tab(HtmlTab)
+          tab.html_view.controller = controller
+          tab.focus
+        end
 
-      class Controller
-        include Redcar::HtmlController
+        class Controller
+          include Redcar::HtmlController
 
-        def title
-          "Installed Bundles"
-        end
+          def title
+            "Installed Bundles"
+          end
 
-        def index
-          rhtml = ERB.new(File.read(File.join(File.dirname(__FILE__), "..", "views", "installed_bundles.html.erb")))
-          rhtml.result(binding)
+          def index
+            rhtml = ERB.new(File.read(File.join(File.dirname(__FILE__), "..", "views", "installed_bundles.html.erb")))
+            rhtml.result(binding)
+          end
         end
       end
+    rescue  NameError => e
+      puts "Textmate plugin loading deferred until core loading is complete"
     end
   end
 end

data/plugins/textmate/plugin.rb

@@ -4,5 +4,5 @@ Plugin.define do
   version "1.0"
   file    "lib", "textmate"
   object  "Redcar::Textmate"
-  dependencies "core", ">0", "application", ">0", "HTML View", ">=0.3.2", "tree", ">0"
+  dependencies "core", ">0", "application", ">0", "HTML View", ">=0.3.2"
 end

data/plugins/textmate/vendor/redcar-bundles/Bundles/Apache.tmbundle/Preferences/next_Completions___Modules.tmPreferences

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>Completions: Modules</string>
+	<key>scope</key>
+	<string>source.apache-config</string>
+	<key>settings</key>
+	<dict>
+		<key>completions</key>
+		<array>
+			<string>access_module</string>
+			<string>actions_module</string>
+			<string>action_module</string>
+			<string>alias_module</string>
+			<string>anon_auth_module</string>
+			<string>asis_module</string>
+			<string>authn_anon_module</string>
+			<string>authn_dbd_module</string>
+			<string>authn_dbm_module</string>
+			<string>authn_default_module</string>
+			<string>authn_file_module</string>
+			<string>authz_dbm_module</string>
+			<string>authz_default_module</string>
+			<string>authz_groupfile_module</string>
+			<string>authz_host_module</string>
+			<string>authz_owner_module</string>
+			<string>authz_user_module</string>
+			<string>auth_basic_module</string>
+			<string>auth_digest_module</string>
+			<string>auth_module</string>
+			<string>autoindex_module</string>
+			<string>bonjour_module</string>
+			<string>cache_module</string>
+			<string>cern_meta_module</string>
+			<string>cgi_module</string>
+			<string>config_log_module</string>
+			<string>dav_fs_module</string>
+			<string>dav_module</string>
+			<string>dbd_module</string>
+			<string>dbm_auth_module</string>
+			<string>deflate_module</string>
+			<string>digest_module</string>
+			<string>dir_module</string>
+			<string>disk_cache_module</string>
+			<string>dumpio_module</string>
+			<string>env_module</string>
+			<string>expires_module</string>
+			<string>ext_filter_module</string>
+			<string>filter_module</string>
+			<string>foo_module</string>
+			<string>headers_module</string>
+			<string>hfs_apple_module</string>
+			<string>ident_module</string>
+			<string>imagemap_module</string>
+			<string>imap_module</string>
+			<string>includes_module</string>
+			<string>include_module</string>
+			<string>info_module</string>
+			<string>jk_module</string>
+			<string>logio_module</string>
+			<string>log_config_module</string>
+			<string>log_forensic_module</string>
+			<string>mem_cache_module</string>
+			<string>mime_magic_module</string>
+			<string>mime_module</string>
+			<string>negotiation_module</string>
+			<string>perl_module</string>
+			<string>php4_module</string>
+			<string>php5_module</string>
+			<string>proxy_ajp_module</string>
+			<string>proxy_balancer_module</string>
+			<string>proxy_connect_module</string>
+			<string>proxy_ftp_module</string>
+			<string>proxy_http_module</string>
+			<string>proxy_module</string>
+			<string>rendezvous_apple_module</string>
+			<string>rendezvous_module</string>
+			<string>rewrite_module</string>
+			<string>setenvif_module</string>
+			<string>speling_module</string>
+			<string>ssl_module</string>
+			<string>status_module</string>
+			<string>unique_id_module</string>
+			<string>userdir_module</string>
+			<string>usertrack_module</string>
+			<string>version_module</string>
+			<string>vhost_alias_module</string>
+		</array>
+	</dict>
+	<key>uuid</key>
+	<string>6AB0D8D7-1536-407B-BF47-15204E4622CE</string>
+</dict>
+</plist>

data/plugins/textmate/vendor/redcar-bundles/Bundles/Apache.tmbundle/Preferences/next_Completions___Modules_Identifiers.tmPreferences

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>Completions: Module Identifiers</string>
+	<key>scope</key>
+	<string>source.apache-config</string>
+	<key>settings</key>
+	<dict>
+		<key>completions</key>
+		<array>
+			<string>authn_file_module</string>
+			<string>authn_dbm_module</string>
+			<string>authn_anon_module</string>
+			<string>authn_dbd_module</string>
+			<string>authn_default_module</string>
+			<string>authz_host_module</string>
+			<string>authz_groupfile_module</string>
+			<string>authz_user_module</string>
+			<string>authz_dbm_module</string>
+			<string>authz_owner_module</string>
+			<string>authz_default_module</string>
+			<string>auth_basic_module</string>
+			<string>auth_digest_module</string>
+			<string>cache_module</string>
+			<string>disk_cache_module</string>
+			<string>mem_cache_module</string>
+			<string>dbd_module</string>
+			<string>dumpio_module</string>
+			<string>ext_filter_module</string>
+			<string>include_module</string>
+			<string>filter_module</string>
+			<string>deflate_module</string>
+			<string>log_config_module</string>
+			<string>log_forensic_module</string>
+			<string>logio_module</string>
+			<string>env_module</string>
+			<string>mime_magic_module</string>
+			<string>cern_meta_module</string>
+			<string>expires_module</string>
+			<string>headers_module</string>
+			<string>ident_module</string>
+			<string>usertrack_module</string>
+			<string>unique_id_module</string>
+			<string>setenvif_module</string>
+			<string>version_module</string>
+			<string>proxy_module</string>
+			<string>proxy_connect_module</string>
+			<string>proxy_ftp_module</string>
+			<string>proxy_http_module</string>
+			<string>proxy_ajp_module</string>
+			<string>proxy_balancer_module</string>
+			<string>ssl_module</string>
+			<string>mime_module</string>
+			<string>dav_module</string>
+			<string>status_module</string>
+			<string>autoindex_module</string>
+			<string>asis_module</string>
+			<string>info_module</string>
+			<string>cgi_module</string>
+			<string>dav_fs_module</string>
+			<string>vhost_alias_module</string>
+			<string>negotiation_module</string>
+			<string>dir_module</string>
+			<string>imagemap_module</string>
+			<string>actions_module</string>
+			<string>speling_module</string>
+			<string>userdir_module</string>
+			<string>alias_module</string>
+			<string>rewrite_module</string>
+			<string>bonjour_module</string>
+			<string>php5_module</string>
+			<string>fastcgi_module</string>
+		</array>
+	</dict>
+	<key>uuid</key>
+	<string>CC27CF7F-2E60-455B-9C95-B4CFAD52F28B</string>
+</dict>
+</plist>