redcar 0.6.1 → 0.7

data/plugins/scm_svn/lib/scm_svn/change.rb

@@ -0,0 +1,116 @@
+module Redcar
+  module Scm
+    module Subversion
+      class Change
+        include Redcar::Scm::ScmChangesMirror::Change
+        include_package 'org.tmatesoft.svn.core.wc'
+        include_package 'org.tmatesoft.svn.core'
+
+        def initialize(path,status,children,diff_client)
+          case Redcar.platform
+          when :osx, :linux
+            @path = path.gsub("//","/")
+          when :windows
+            @path = path.gsub("//","\\")
+          end
+          @status = status
+          @children = children
+          @diff_client = diff_client
+        end
+
+        def text
+         File.basename(@path)
+        end
+
+        def tooltip_text
+          @path
+        end
+
+        def icon
+          case @status
+          when :unmerged
+            if File.file?(@path)
+              File.join(Redcar::ICONS_DIRECTORY, "blue-document--exclamation.png")
+            else
+              File.join(Redcar::ICONS_DIRECTORY, "blue-folder--exclamation.png")
+            end
+          when :indexed
+            if File.file?(@path)
+              File.join(Redcar::ICONS_DIRECTORY, "blue-document--plus.png")
+            else
+              File.join(Redcar::ICONS_DIRECTORY, "blue-folder--plus.png")
+            end
+          when :deleted
+            if File.file?(@path)
+              File.join(Redcar::ICONS_DIRECTORY, "blue-document-shred.png")
+            else
+              File.join(Redcar::ICONS_DIRECTORY, "blue-folder-shred.png")
+            end
+          when :changed
+            if File.file?(@path)
+              File.join(Redcar::ICONS_DIRECTORY, "blue-document--pencil.png")
+            else
+              File.join(Redcar::ICONS_DIRECTORY, "blue-folder--pencil.png")
+            end
+          when :missing
+            File.join(Redcar::ICONS_DIRECTORY, "question-white.png")
+          when :new
+            if File.directory?(@path.to_s)
+              :directory
+            else
+              :file
+            end
+          else
+            :file
+          end
+        end
+
+        def leaf?
+          File.file?(@path)
+        end
+
+        def status
+          [@status]
+        end
+
+        def log_status
+          "#{log_codes[status] || ''} #{path}"
+        end
+
+        def path
+          @path
+        end
+
+        def children
+          @children
+        end
+
+        def diff
+          unless @status == :new
+            stream = Java::JavaIo::ByteArrayOutputStream.new
+            file   = Java::JavaIo::File.new(path)
+            @diff_client.doDiff(
+              file, SVNRevision::BASE,
+              file, SVNRevision::WORKING,
+              SVNDepth::IMMEDIATES,
+              false,
+              stream,
+              Java::JavaUtil::ArrayList.new
+            )
+            stream.toString()
+          end
+        end
+
+        def log_codes
+          {
+            [:indexed]  => "A",
+            [:changed]  => "M",
+            [:deleted]  => "D",
+            [:missing]  => "!",
+            [:unmerged] => "C"
+          }
+        end
+      end
+    end
+  end
+end

data/plugins/swt/lib/swt.rb

@@ -175,18 +175,3 @@ module Swt
     display # must be created before we import the Clipboard class.
   end
 end
-
-module JFace
-  Dir[Redcar.asset_dir + "/jface/*.jar"].each do |jar_fn|
-    require jar_fn
-  end
-  
-  module Viewers
-  end
-  
-  module Text
-  end
-  
-  module Dialogs
-  end
-end

data/plugins/swt/lib/swt/cucumber_patches.rb

@@ -27,7 +27,9 @@ module Cucumber
             end
           end
         end
+        
         Redcar::ApplicationSWT.display.syncExec(block)
+
         if ENV["SLOW_CUKES"]
           sleep ENV["SLOW_CUKES"].to_f
         end
@@ -37,28 +39,6 @@ module Cucumber
     end
   end
 
-    #   module Ast
-    #     class TreeWalker
-    #       def visit_steps(steps)
-    #         broadcast(steps) do
-    #           block = Swt::RRunnable.new do
-    #             steps.accept(self)
-    #           end
-    #           Redcar::ApplicationSWT.display.syncExec(block)
-    #         end
-    #       end
-    # 
-    #       def visit_step(step)
-    #         broadcast(step) do
-    #           block = Swt::RRunnable.new do
-    #             step.accept(self)
-    #           end
-    #           Redcar::ApplicationSWT.display.syncExec(block)
-    #         end
-    #       end
-    #     end
-    #   end
-
   module RbSupport
     class RbLanguage
       def require_support_files(path)
@@ -78,21 +58,6 @@ module Cucumber
       end
     end
     
-    # class RbStepDefinition
-    #   def invoke(args)
-    #     args = args.map{|arg| Ast::PyString === arg ? arg.to_s : arg}
-    #     begin
-    #       args = @rb_language.execute_transforms(args)
-    #       block = Swt::RRunnable.new do
-    #         @rb_language.current_world.cucumber_instance_exec(true, regexp_source, *args, &@proc)
-    #       end
-    #       Redcar::ApplicationSWT.display.syncExec(block)
-    #     rescue Cucumber::ArityMismatchError => e
-    #       e.backtrace.unshift(self.backtrace_line)
-    #       raise e
-    #     end
-    #   end
-    # end
   end
   
   module Cli

data/plugins/swt/lib/swt/cucumber_runner.rb

@@ -13,6 +13,7 @@ module Swt
           main = Cucumber::Cli::Main.new(args)
           main.execute!(Cucumber::StepMother.new)
           Redcar.app.quit
+          Redcar::ApplicationSWT.display.wake
         rescue Object => e
           puts e.message
           puts e.backtrace

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

@@ -71,10 +71,12 @@ module Swt
     import org.eclipse.swt.graphics.Font
     import org.eclipse.swt.graphics.GC
     import org.eclipse.swt.graphics.Point
+    import org.eclipse.swt.graphics.RGB
   end
   
   module Events
     import org.eclipse.swt.events.KeyEvent
+    import org.eclipse.swt.events.MouseListener
   end
   
   import org.eclipse.swt.browser.Browser

data/plugins/textmate/vendor/redcar-bundles/Bundles/Clojure.tmbundle/Syntaxes/Clojure.tmLanguage

@@ -120,6 +120,12 @@
 					<key>name</key>
 					<string>constant.numeric.octal.clojure</string>
 				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(=|\+|-|/|\*|if|var|accessor|aclone|add-classpath|add-watch|agent|agent-error|agent-errors|aget|alength|alias|all-ns|alter|alter-meta!|alter-var-root|amap|ancestors|and|apply|areduce|array-map|aset|aset-boolean|aset-byte|aset-char|aset-double|aset-float|aset-int|aset-long|aset-short|assert|assoc|assoc!|assoc-in|associative\?|atom|await|await-for|bases|bean|bigdec|bigint|binding|bit-and|bit-and-not|bit-clear|bit-flip|bit-not|bit-or|bit-set|bit-shift-left|bit-shift-right|bit-test|bit-xor|boolean|boolean-array|booleans|bound-fn|bound-fn\*|bound\?|butlast|byte|byte-array|bytes|case|cast|char|char-array|char-escape-string|char-name-string|char\?|chars|class|class\?|clear-agent-errors|clojure-version|coll\?|comment|commute|comp|comparator|compare|compare-and-set!|compile|complement|concat|cond|condp|conj|conj!|cons|constantly|construct-proxy|contains\?|count|counted\?|create-ns|create-struct|cycle|dec|decimal\?|declare|definline|defmacro|defmethod|defmulti|defn|defn-|defonce|defprotocol|defrecord|defstruct|deftype|delay|delay\?|deliver|denominator|deref|derive|descendants|disj|disj!|dissoc|dissoc!|distinct|distinct\?|doall|doc|dorun|doseq|dosync|dotimes|doto|double|double-array|doubles|drop|drop-last|drop-while|empty|empty\?|ensure|enumeration-seq|error-handler|error-mode|eval|even\?|every\?|extend|extend-protocol|extend-type|extenders|extends\?|false\?|ffirst|file-seq|filter|find|find-doc|find-ns|find-var|first|flatten|float|float-array|float\?|floats|flush|fn|fn\?|fnext|fnil|for|force|format|frequencies|future|future-call|future-cancel|future-cancelled\?|future-done\?|future\?|gen-class|gen-interface|gensym|get|get-in|get-method|get-proxy-class|get-thread-bindings|get-validator|group-by|hash|hash-map|hash-set|identical\?|identity|if-let|if-not|ifn\?|import|in-ns|inc|init-proxy|instance\?|int|int-array|integer\?|interleave|intern|interpose|into|into-array|ints|io!|isa\?|iterate|iterator-seq|juxt|keep|keep-indexed|key|keys|keyword|keyword\?|last|lazy-cat|lazy-seq|let|letfn|line-seq|list|list\*|list\?|load|load-file|load-reader|load-string|loaded-libs|locking|long|long-array|longs|loop|macroexpand|macroexpand-1|make-array|make-hierarchy|map|map-indexed|map\?|mapcat|max|max-key|memfn|memoize|merge|merge-with|meta|methods|min|min-key|mod|name|namespace|namespace-munge|neg\?|newline|next|nfirst|nil\?|nnext|not|not-any\?|not-empty|not-every\?|not=|ns|ns-aliases|ns-imports|ns-interns|ns-map|ns-name|ns-publics|ns-refers|ns-resolve|ns-unalias|ns-unmap|nth|nthnext|num|number\?|numerator|object-array|odd\?|or|parents|partial|partition|partition-all|partition-by|pcalls|peek|persistent!|pmap|pop|pop!|pop-thread-bindings|pos\?|pr|pr-str|prefer-method|prefers|print|print-namespace-doc|print-str|printf|println|println-str|prn|prn-str|promise|proxy|proxy-mappings|proxy-super|push-thread-bindings|pvalues|quot|rand|rand-int|rand-nth|range|ratio\?|rationalize|re-find|re-groups|re-matcher|re-matches|re-pattern|re-seq|read|read-line|read-string|reduce|reductions|ref|ref-history-count|ref-max-history|ref-min-history|ref-set|refer|refer-clojure|reify|release-pending-sends|rem|remove|remove-all-methods|remove-method|remove-ns|remove-watch|repeat|repeatedly|replace|replicate|require|reset!|reset-meta!|resolve|rest|restart-agent|resultset-seq|reverse|reversible\?|rseq|rsubseq|satisfies\?|second|select-keys|send|send-off|seq|seq\?|seque|sequence|sequential\?|set|set-error-handler!|set-error-mode!|set-validator!|set\?|short|short-array|shorts|shuffle|shutdown-agents|slurp|some|sort|sort-by|sorted-map|sorted-map-by|sorted-set|sorted-set-by|sorted\?|special-form-anchor|special-symbol\?|spit|split-at|split-with|str|string\?|struct|struct-map|subs|subseq|subvec|supers|swap!|symbol|symbol\?|sync|syntax-symbol-anchor|take|take-last|take-nth|take-while|test|the-ns|thread-bound\?|time|to-array|to-array-2d|trampoline|transient|tree-seq|true\?|type|unchecked-add|unchecked-dec|unchecked-divide|unchecked-inc|unchecked-multiply|unchecked-negate|unchecked-remainder|unchecked-subtract|underive|update-in|update-proxy|use|val|vals|var-get|var-set|var\?|vary-meta|vec|vector|vector-of|vector\?|when|when-first|when-let|when-not|while|with-bindings|with-bindings\*|with-in-str|with-local-vars|with-meta|with-open|with-out-str|with-precision|xml-seq|zero\?|zipmap)\b</string>
+					<key>name</key>
+					<string>keyword.control.clojure</string>
+				</dict>
 				<dict>
 					<key>match</key>
 					<string>(\d+)</string>
@@ -253,7 +259,7 @@
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;=\()(def|def-)\s+(.+?)(?=\s)</string>
+					<string>(?&lt;=\()(def|def-|deftest)\s+(.+?)(?=\s)</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -281,7 +287,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;=\()(defn|defn-)\s+(.+?)(?=\s)</string>
+					<string>(?&lt;=\()(defn|defn-|deftest)\s+(.+?)(?=\s)</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -400,6 +406,12 @@
 					<key>name</key>
 					<string>meta.symbol.clojure</string>
 				</dict>
+				<dict>
+					<key>match</key>
+					<string>(:\w[\w\d]+)</string>
+					<key>name</key>
+					<string>constant.other.symbol.clojure</string>
+				</dict>
 			</array>
 		</dict>
 		<key>vector</key>

data/plugins/todo_list/lib/todo_list/todo_controller.rb

@@ -102,7 +102,7 @@ module Redcar
                 html=<<-HTML
                   <tr>
                     <td  bgcolor="#ccffcc" width="40%"><a class="action">#{action}</a></td>
-                    <td><a class="file_path" href="controller/open_file?#{path}">#{display_path}</a></td>
+                    <td  bgcolor="#dddddd"><a class="file_path" href="controller/open_file?#{path}">#{display_path}</a></td>
                   </tr>
                 HTML
                 percentage = 100

data/plugins/todo_list/views/default.css

@@ -0,0 +1,50 @@
+body {
+  margin:0;
+}
+
+h1 {
+  background: #5f282d url("redcar_small_icon.png") no-repeat 10px 10px;
+  color: #dcb663;
+  height: 30px;
+  line-height: 30px;
+  padding: 10px 10px 10px 52px;
+  font-family: Palatino, Times, serif;
+  letter-spacing: 3px;
+  font-size: 100%;
+}
+
+.content {
+  margin: 10px;
+}
+
+.refresh {
+  padding: 5px;
+}
+
+.even {
+  background-color: #ddd;
+}
+
+table {
+  font-size: 80%;
+  border-collapse: collapse;
+  border: 1px solid #888;
+}
+
+td,th {
+  border-collapse: collapse;
+  border: 1px solid #888;
+  padding: 8px;
+}
+
+.status {
+  padding:3px;
+  margin:3px;
+  font-style:italic;
+}
+
+.final_status {
+  font-size:70%;
+  font-style:italic;
+  float:right;
+}

data/plugins/todo_list/views/index.html.erb

@@ -1,22 +1,11 @@
 
 <script type="text/javascript" src="file://<%= Redcar::HtmlView.jquery_path %>"></script>
-<link rel="stylesheet" href="file://<%= Redcar::HtmlView.default_css_path %>" type="text/css" media="screen">
-<style>
-  .status {
-    padding:3px;
-    margin:3px;
-    font-style:italic;
-  }
-  .final_status {
-    font-size:70%;
-    font-style:italic;
-    float:right;
-  }
-</style>
-<h3>Todo List</h3>
+<% redcar_css = File.expand_path(File.join(Redcar.root, %w(plugins todo_list views default.css))) %>
+<link rel="stylesheet" href="file://<%= redcar_css %>" type="text/css" media="screen">
+<h1>Todo List</h1>
 <div>
   <a class="status" id="status"></a>
-  <a id="refresh" href="controller/index"></a> 
+  <a id="refresh" href="controller/index"></a>
   <a class="final_status" id="final_status"></a>
 </div>
-<div id="tags"></div>
+<div class="content" id="tags"></div>

data/plugins/tree_view_swt/lib/tree_view_swt.rb

@@ -2,7 +2,9 @@
 module Redcar
   class TreeViewSWT
     attr_reader :viewer, :model
-    
+
+    extend Forwardable
+
     def self.storage
       @storage ||= begin
          storage = Plugin::Storage.new('tree_view_swt_plugin')
@@ -13,7 +15,7 @@ module Redcar
     
     def initialize(composite, model)
       @composite, @model = composite, model
-      tree_style = Swt::SWT::MULTI
+      tree_style = Swt::SWT::MULTI | Swt::SWT::H_SCROLL | Swt::SWT::V_SCROLL
       @viewer = JFace::Viewers::TreeViewer.new(@composite, tree_style)
       grid_data = Swt::Layout::GridData.new
       grid_data.grabExcessHorizontalSpace = true
@@ -58,7 +60,13 @@ module Redcar
       @model.add_listener(:expand_element, &method(:expand_element))
       @model.add_listener(:select_element, &method(:select_element))
     end
-    
+
+    def tree_mirror
+      @model.tree_mirror
+    end
+
+    def_delegators :control, :layout_data, :layout_data=, :visible, :visible=
+
     class DragSourceListener
       attr_reader :tree, :dragged_elements
       
@@ -268,7 +276,8 @@ module Redcar
     def close
       @viewer.getControl.dispose
     end
-    
+    alias :dispose :close
+
     def right_click(mouse_event)
       if @model.tree_controller
         point = Swt::Graphics::Point.new(mouse_event.x, mouse_event.y)
@@ -438,16 +447,7 @@ module Redcar
       end
 
       def get_image(tree_node)
-        case icon = tree_node.icon
-        when :directory
-          dir_image
-        when :file
-          file_image
-        when Symbol
-          image(File.expand_path(File.join(Redcar::ICONS_DIRECTORY, icon.to_s + ".png")))
-        when String
-          image(icon)
-        end
+        ApplicationSWT::Icon.swt_image(tree_node.icon)
       end
 
       def dispose
@@ -470,25 +470,6 @@ module Redcar
       #  5000
       #end
       
-      private
-      
-      def image(path)
-        Swt::Graphics::Image.new(ApplicationSWT.display, path)
-      end
-      
-      def dir_image
-        @dir_image ||= begin
-          path = File.join(Redcar.root, %w(plugins application icons darwin-folder.png))
-          image(path)
-        end
-      end
-      
-      def file_image
-        @file_image ||= begin
-          path = File.join(Redcar.root, %w(plugins application icons darwin-file.png))
-          image(path)
-        end
-      end
     end
   end
 end

data/plugins/view_shortcuts/views/default.css

@@ -0,0 +1,31 @@
+body {
+  margin:0;
+}
+
+h1 {
+  background: #5f282d url("redcar_small_icon.png") no-repeat 10px 10px;
+  color: #dcb663;
+  height: 30px;
+  line-height: 30px;
+  padding: 10px 10px 10px 52px;
+  font-family: Palatino, Times, serif;
+  letter-spacing: 3px;
+  font-size: 100%;
+}
+
+.content {
+  margin: 10px;
+}
+
+.refresh {
+  padding: 5px;
+}
+
+.even {
+  background-color: #ddd;
+}
+
+table {
+  border: 1px solid black;
+  font-size: 80%;
+}