redcar 0.9.2 → 0.10

data/plugins/plugin_manager_ui/lib/plugin_manager_ui.rb

@@ -17,7 +17,7 @@ module Redcar
             separator
           }
         end
-        if Redcar.platform == :linux or Redcar.platform == :windows
+        if [:linux,:windows].include?(Redcar.platform)
           sub_menu "Edit" do
             group(:priority => :last) do
               separator
@@ -28,6 +28,15 @@ module Redcar
       end
     end
 
+    def self.keymaps
+      if [:linux,:windows].include?(Redcar.platform)
+        map = Redcar::Keymap.build("main", [:linux,:windows]) do
+          link "F2", PluginManagerUi::OpenPreferencesCommand
+        end
+        [map]
+      end
+    end
+
     class OpenPreferencesCommand < Redcar::Command
       def execute
         project = Project::Manager.open_project_for_path(Redcar::Plugin::Storage.storage_dir)

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

@@ -12,6 +12,8 @@ td.yellow {
 
 <% jquery_path = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets jquery-1.4.min.js))) %>
 <script type="text/javascript" src="file://<%= jquery_path %>"></script>
+<% json_path = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets json2.js))) %>
+<script type="text/javascript" src="file://<%= json_path %>"></script>
 <% redcar_css = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets redcar.css))) %>
 <link rel="stylesheet" href="file://<%= redcar_css %>" type="text/css" media="screen">
 

data/plugins/project/features/find_file.feature

@@ -5,41 +5,57 @@ Feature: Find file
     When I open a directory
 
   Scenario: No files initially and with nothing typed
-    When I run the command Redcar::Project::FindFileCommand
+    When I open the find file dialog
     Then there should be a filter dialog open
     And the filter dialog should have no entries
-    
+
   Scenario: No matching files
-    When I run the command Redcar::Project::FindFileCommand
+    When I open the find file dialog
     And I set the filter to "xxx"
     And I wait "0.4" seconds
     Then the filter dialog should have 0 entries
-    
+
   Scenario: One matching file
-    When I run the command Redcar::Project::FindFileCommand
+    When I open the find file dialog
     And I set the filter to "foo_spec"
     And I wait "0.4" seconds
     Then the filter dialog should have 1 entry
     And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
 
+  Scenario: One matching file - spaces ignored
+    When I open the find file dialog
+    And I set the filter to "foo spec"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 1 entry
+    And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
+
   Scenario: Two matching files
-    When I run the command Redcar::Project::FindFileCommand
+    When I open the find file dialog
     And I set the filter to "foo"
     And I wait "0.4" seconds
     Then the filter dialog should have 3 entries
     And I should see "foo_lib.rb (myproject/lib)" at 0 the filter dialog
     And I should see "foo_lib.rb (myproject/lib_symlink)" at 1 the filter dialog
     And I should see "foo_spec.rb (myproject/spec)" at 2 the filter dialog
-    
+
+  Scenario: Two matching files - spaces ignored
+    When I open the find file dialog
+    And I set the filter to "foo rb"
+    And I wait "0.4" seconds
+    Then the filter dialog should have 3 entries
+    And I should see "foo_lib.rb (myproject/lib)" at 0 the filter dialog
+    And I should see "foo_lib.rb (myproject/lib_symlink)" at 1 the filter dialog
+    And I should see "foo_spec.rb (myproject/spec)" at 2 the filter dialog
+
   Scenario: One matching file with arbitrary letters
-    When I run the command Redcar::Project::FindFileCommand
+    When I open the find file dialog
     And I set the filter to "fsc"
     And I wait "0.4" seconds
     Then the filter dialog should have 1 entry
     And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
 
   Scenario: Open a file
-    When I run the command Redcar::Project::FindFileCommand
+    When I open the find file dialog
     And I set the filter to "fsc"
     And I wait "0.4" seconds
     And I select in the filter dialog
@@ -47,18 +63,28 @@ Feature: Find file
     And I should see "foo spec" in the edit tab
 
   Scenario: Open a file then see the file in the initial list
-    When I run the command Redcar::Project::FindFileCommand
+    When I open the find file dialog
     And I set the filter to "fsc"
     And I wait "0.4" seconds
     And I select in the filter dialog
-    And I run the command Redcar::Project::FindFileCommand
+    And I open the find file dialog
     Then the filter dialog should have 1 entry
     And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
 
+  Scenario: Ignore patterns
+    When I prefer not to see files like ".*spec\.rb$" in the find file dialog
+    And I open the find file dialog
+    And I set the filter to "foo"
+    And I wait "0.4" seconds
+    And I select in the filter dialog
+    And I open the find file dialog
+    Then the filter dialog should have 1 entry
+    And I should see "foo_lib.rb (myproject/lib)" at 0 the filter dialog
+
   Scenario: Open two files then see the files in the initial list
     When I have opened "plugins/project/spec/fixtures/myproject/spec/foo_spec.rb"
     And I have opened "plugins/project/spec/fixtures/myproject/lib/foo_lib.rb"
-    And I run the command Redcar::Project::FindFileCommand
+    And I open the find file dialog
     Then the filter dialog should have 2 entries
     And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
     And I should see "foo_lib.rb (myproject/lib)" at 1 the filter dialog
@@ -67,10 +93,8 @@ Feature: Find file
     When I have opened "plugins/project/spec/fixtures/myproject/spec/foo_spec.rb"
     And I have opened "plugins/project/spec/fixtures/myproject/lib/foo_lib.rb"
     And I have opened "plugins/project/spec/fixtures/myproject/README"
-    And I run the command Redcar::Project::FindFileCommand
+    And I open the find file dialog
     Then the filter dialog should have 3 entries
     And I should see "foo_lib.rb (myproject/lib)" at 0 the filter dialog
     And I should see "foo_spec.rb (myproject/spec)" at 1 the filter dialog
-    And I should see "README (fixtures/myproject)" at 2 the filter dialog
-
-
+    And I should see "README (fixtures/myproject)" at 2 the filter dialog

data/plugins/project/features/highlight_focussed_tab.feature

@@ -1,16 +1,15 @@
 Feature: Highlight the File of the focussed tab in tree
 
-  Scenario: Opening a file should reveal it in the tree
+  Background:
     Given I will choose "." from the "open_directory" dialog
     And I open a directory
     And I have opened "plugins/project/features/highlight_focussed_tab.feature"
+
+  Scenario: Opening a file should reveal it in the tree
     Then there should be one edit tab
     Then "highlight_focussed_tab.feature" should be selected in the project tree
 
   Scenario: Switching between tabs should highlight them in the tree
-    Given I will choose "." from the "open_directory" dialog
-    And I open a directory
-    And I have opened "plugins/project/features/highlight_focussed_tab.feature"
     Then "highlight_focussed_tab.feature" should be selected in the project tree
     And I have opened "plugins/project/features/find_file.feature"
     And I have opened "plugins/project/features/move_and_rename_files.feature"
@@ -22,9 +21,6 @@ Feature: Highlight the File of the focussed tab in tree
     Then "highlight_focussed_tab.feature" should be selected in the project tree
 
   Scenario: Project revelation should work across several notebooks
-    Given I will choose "." from the "open_directory" dialog
-    And I open a directory
-    And I have opened "plugins/project/features/highlight_focussed_tab.feature"
     And I have opened "plugins/project/features/find_file.feature"
     And I have opened "plugins/project/features/move_and_rename_files.feature"
     And I have opened "plugins/project/features/sub_project.feature"
@@ -39,9 +35,6 @@ Feature: Highlight the File of the focussed tab in tree
     Then "find_file.feature" should be selected in the project tree
 
   Scenario: Project revelation doesn't get triggered on REPLs
-    Given I will choose "." from the "open_directory" dialog
-    And I open a directory
-    And I have opened "plugins/project/features/highlight_focussed_tab.feature"
     Then there should be one edit tab
     Then "highlight_focussed_tab.feature" should be selected in the project tree
     And I open a "ruby" repl
@@ -50,3 +43,16 @@ Feature: Highlight the File of the focussed tab in tree
     Then "highlight_focussed_tab.feature" should be selected in the project tree
     And I open a "groovy" repl
     Then "highlight_focussed_tab.feature" should be selected in the project tree
+
+  Scenario Outline: Highlight focussed tab only works when enabled and project tree is visible
+    When I <disable highlighting>
+    When I have opened "plugins/project/features/find_file.feature"
+    Then "highlight_focussed_tab.feature" should be selected in the project tree
+    When I have opened "plugins/project/features/sub_project.feature"
+    Then "highlight_focussed_tab.feature" should be selected in the project tree
+
+    Examples:
+      | disable highlighting                     |
+      | toggle tree visibility                   |
+      | click Show Bundles in Tree               |
+      | prefer to not highlight the focussed tab |

data/plugins/project/features/step_definitions/find_file_steps.rb

@@ -0,0 +1,11 @@
+When /^I prefer not to see files like "([^"]*)" in the find file dialog$/ do |pattern|
+
+  ignored = filter_storage['ignore_files_that_match_these_regexes']
+  ignored << /#{pattern}/
+  filter_storage['ignore_file_patterns'] = true
+  filter_storage['ignore_files_that_match_these_regexes'] = ignored
+end
+
+When /^I open the find file dialog$/ do
+  Redcar::Project::FindFileCommand.new.run
+end

data/plugins/project/features/step_definitions/project_tree_steps.rb

@@ -1,3 +1,7 @@
 Then /^"([^\"]*)" should be selected in the project tree$/ do |filename|
-  Redcar.app.focussed_window.treebook.focussed_tree.selection.first.text == filename
+  Redcar::Project::Manager.focussed_project.tree.selection.first.text == filename
+end
+
+When /^I prefer to not highlight the focussed tab$/ do
+  Redcar::Project::Manager.reveal_files = false
 end

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

@@ -45,11 +45,16 @@ def delete_subproject_fixtures
   FileUtils.rm_rf(fixtures_path + "/myproject/test2")
 end
 
+def filter_storage
+  Redcar::Project::FindFileDialog.storage
+end
+
 Before do
   reset_project_fixtures
 end
 
 After do
+  Redcar::Project::Manager.reveal_files = true
   reset_project_fixtures
   delete_subproject_fixtures
   DrbShelloutHelper.kill_thread

data/plugins/project/lib/project/commands.rb

@@ -226,7 +226,7 @@ module Redcar
 
     class RevealInProjectCommand < ProjectCommand
       def execute
-        if project and project.window.trees_visible?
+        if Project::Manager.reveal_file?(project)
           tab = Redcar.app.focussed_window.focussed_notebook_tab
           if tab.is_a?(EditTab)
             return unless mirror = tab.edit_view.document.mirror and mirror.respond_to? :path
@@ -249,6 +249,13 @@ module Redcar
       end
     end
 
+    class ToggleRevealInProject < ProjectCommand
+      def execute
+        toggle = Project::Manager.reveal_files?
+        Project::Manager.reveal_files = !toggle
+      end
+    end
+
     # FIXME: XXX: The rest of this file is outright ugly. The Redcar.platform ultimately
     # needs to return a platform object which we can dispatch to for commandlines,
     # configuration, escaping and all that.

data/plugins/project/lib/project/dir_controller.rb

@@ -33,10 +33,11 @@ module Redcar
         end
 
         def can_drop?(nodes, target, position)
-          nodes.all? {|node| droppable?(node, target)}
+          nodes and nodes.all? {|node| droppable?(node, target)}
         end
 
         def do_drop(nodes, target, position)
+          return unless nodes
           paths = nodes.map {|node| node.path }
           non_nested_paths = remove_nested_paths(paths)
           non_nested_paths.each do |path|
@@ -52,6 +53,8 @@ module Redcar
         private
 
         def droppable?(from_node, target_node)
+          return false unless from_node
+
           # you can always drop into the top level of the tree
           return true if target_node == nil
 

data/plugins/project/lib/project/find_file_dialog.rb

@@ -7,14 +7,15 @@ module Redcar
       def self.storage
         @storage ||= begin
           storage = Plugin::Storage.new('find_file_dialog')
+          storage.set_default('ignore_file_patterns', false)
           storage.set_default('ignore_files_that_match_these_regexes', [])
           storage.set_default('ignore_files_that_match_these_regexes_example_for_reference', [/.*\.class/i])
           storage
         end
       end
-      
+
       attr_reader :project
-      
+
       def initialize(project)
         super()
         @project = project
@@ -77,7 +78,7 @@ module Redcar
           # show the full subdirs in the case of collisions
           n = -100
         end
-        
+
         if path.count('/') > 0
           count_back = [-path.count('/'), n].max
           path.split("/").last +
@@ -88,24 +89,27 @@ module Redcar
           path
         end
       end
-      
+
       def ignore_regexes
         self.class.storage['ignore_files_that_match_these_regexes']
       end
-      
+
       def ignore_file?(filename)
-        ignore_regexes.any? {|re| re =~ filename }
+        if self.class.storage['ignore_file_patterns']
+          ignore_regexes.any? {|re| re =~ filename }
+        end
       end
-      
+
       def find_files_from_list(text, file_list)
-        re = make_regex(text)
-        file_list.select { |fn| 
-          fn.split('/').last =~ re
+        re = make_regex(text.gsub(/\s/, ""))
+        file_list.select { |fn|
+          fn.split('/').last =~ re and not ignore_file?(fn)
         }.compact
       end
-      
+
       def find_files(text, directories)
-        filter_and_rank_by(project.all_files.sort, text) do |fn|
+        files = project.all_files.sort.select {|fn| not ignore_file?(fn)}
+        filter_and_rank_by(files, text.gsub(/\s/, "")) do |fn|
           fn.split("/").last
         end
       end

data/plugins/project/lib/project/manager.rb

@@ -92,7 +92,35 @@ module Redcar
       end
 
       def self.storage
-        @storage = Plugin::Storage.new('project_plugin')
+        @storage ||= begin
+          storage = Plugin::Storage.new('project_plugin')
+          storage.set_default('reveal_files_in_project_tree',true)
+          storage.set_default('reveal_files_only_when_tree_is_focussed',true)
+          storage
+        end
+      end
+
+      def self.reveal_files?
+        storage['reveal_files_in_project_tree']
+      end
+
+      def self.reveal_files=(toggle)
+        storage['reveal_files_in_project_tree'] = toggle
+      end
+
+      def self.reveal_file_only_when_tree_focussed?
+        storage['reveal_files_only_when_tree_is_focussed']
+      end
+
+      def self.reveal_file?(project)
+        if project and tree = project.tree
+          if reveal_files? and project.window.trees_visible?
+            ftree = project.window.treebook.focussed_tree
+            unless tree != ftree and reveal_file_only_when_tree_focussed?
+              true
+            end
+          end
+        end
       end
 
       def self.filter_path
@@ -354,6 +382,7 @@ module Redcar
               item "Find File", Project::FindFileCommand
               item "Refresh Directory", Project::RefreshDirectoryCommand
             end
+            item "Reveal Open File in Tree", :command => Project::ToggleRevealInProject, :type => :check, :active => Project::Manager.reveal_files?
           end
         end
       end

data/plugins/project_search/vendor/lucene/CHANGELOG

@@ -0,0 +1,147 @@
+== 0.4.6 / 2010-08-31
+* Bug fix: Using a has_one - should only delete the relationship to the old node, NOT delete the old node (#123)
+
+== 0.4.5 / 2010-08-18
+* Bug fix: When setting an indexed property = nil, raises an undefined method "root_class" exception (#122)
+
+== 0.4.4 / 2010-08-01
+* Fixed bug on traversing when using the RelationshipMixin (#121)
+* BatchInserter and JRuby 1.6 - Fix iteration error with trying to modify in-place hash
+
+== 0.4.3 / 2010-04-10
+* Fixed .gitignore - make sure that we do not include unnecessarily files like neo4j databases. Release 0.4.2 contained test data.
+* Added synchronize around Index.new so that two thread can't modify the same index at the same time.
+
+== 0.4.2 / 2010-04-08
+*  No index on properties for the initialize method bug (#116)
+*  Tidy up Thread Synchronization in Lucene wrapper - lucene indexing performance improvement (#117)
+*  Permission bug loading neo4j jar file (#118)
+*  Spike: Make NodeMixin ActiveModel complient - experimental (#115)
+
+== 0.4.1 / 2010-03-11
+* Migrations (#108)
+* BatchInserter (#111)
+* Neo4j::Relationship.new should take a hash of properties (#110)
+* Upgrade to neo4j-1.0 (#114)
+* Bigfix: has_one should replace old relationship (#106)
+* Bugfix: custom accessors for NodeMixin#update (#113)
+* Bugfix: Indexed properties problem on extented ruby classes critical "properties indexer" (#112)
+
+== 0.4.0 / 2010-02-06
+* Performance improvements and Refactoring: Use and Extend Neo4j Java Classes (#97)
+* Support for Index and Declaration of Properties on Relationships (#91)
+* Upgrade to neo4j-1.0 rc (#100)
+* All internal properties should be prefix with a '_',0.4.0 (#105)
+* Generate relationship accessor methods for declared has_n and has_one relationships (#104)
+* New way of creating relationship - Neo4j::Relationship.new (#103)
+* Neo4j#init_node method should take one or more args (#98)
+* Namespaced relationships: has_one...from using the wrong has_n...to(#92)
+* Neo4j::NodeMixin and Neo4j::Node should allow a hash for initialization (#99)
+
+== 0.3.3 / 2009-11-25
+* Support for a counter property on has_lists (#75)
+* Support for Cascade delete. On has_n, had_one and has_list (#81)
+* NodeMixin#all should work with inheritance - Child classes should have a relationship of their own. (#64)
+* Support for other lucene analyzer then StandardAnalyzer (#87)
+* NodeMixin initialize should accept block like docs (#82)
+* Add incoming relationship should work as expected: n1.relationships.incoming(:foo) << n2 (#80)
+* Delete node from a has_list relationship should work as expected (#79)
+* Improve stacktraces (#94)
+* Removed sideeffect of rspecs (#90)
+* Add debug method on NodeMixin to print it self (#88)
+* Removed to_a method (#73)
+* Upgrade to neo4j-1.0b10 (#95)
+* Upgrade to lucene 2.9.0 (#83)
+* Refactoring: RSpecs (#74)
+* Refactoring: aggregate each, renamed to property aggregator (#72)
+* BugFix: neo4j gem cannot be built  from the source (#86)
+* BugFix: Neo4j::relationship should not raise Exception if there are no relationships (#78)
+
+== 0.3.2 / 2009-09-17
+* Added support for aggregating nodes (#65)
+* Wrapped Neo4j GraphAlgo AllSimplePath (#70)
+* Added traversal with traversal position (#71)
+* Removed DynamicAccessors mixin, replaced by [] operator (#67)
+* Impl Neo4j.all_nodes (#69)
+* Upgrated Neo4j jar file to 1.0-b9
+* The Neo4j#relationship method now allows a filter parameter (#66)
+* Neo4j.rb now can read database not created by Neo4j.rb - does not require classname property (#63)
+* REST - added an "all" value for the depth traversal query parameter (#62)
+* REST - Performance improvments using the Rest Mixin (#60)
+
+== 0.3.1 / 2009-07-25
+* Feature, extension -	find path between given pair of nodes (#58)
+* Fix a messy exception on GET /nodes/UnknownClassName (#57)
+* Bug  - exception on GET /nodes/classname/rel if rel is a has_one relationship (#56)
+* Bug: GET /nodes/classname missing out nodes with no properties (#55)
+* Bug: Lucene sorting caused exception if there were no documents (#54)
+* Bug:	reindexer fails to connect nodes to the IndexNode (#53)
+
+== 0.3.0 / 2009-06-25
+* Neo4j should track node changes
+* RESTful support for lucene queries, sorting and paging
+* RESTful support for Relationships
+* RESTful support for Node and properties
+* Experimental support for Master-Slave	Replication via REST
+* RESTful Node representation should contain hyperlinks to relationships
+* Added some handy method like first and empty? on relationships
+* Use new neo4j: neo-1.0-b8
+* Add an event handler for create/delete nodes start/stop neo, update property/relationship
+* The NodeMixin should behave like a hash, added [] and []= methods
+* Support list topology - has_list and belongs_to_list Neo4j::NodeMixin Classmethods
+* Should be possible to add relationships without declaring them (Neo4j#relationships.outgoing(:friends) << node)
+* Neo4j extensions file structure, should be easy to create your own extensions
+* Rename relation to relationship (Neo4j::Relations => Neo4j::Relationships, DynamicRelation => Relationship) [data incompatible change]
+* Auto Transaction is now optional
+* Setting Float properties fails under JRuby1.2.0
+* Bug: Indexing relationships does not work
+* Make the ReferenceNode include Neo4j::NodeMixin
+* Added handy Neo4j class that simply includes the Neo4j::NodeMixin
+* Neo4j::IndexNode now holds references to all nodes (Neo4j.ref_node -> Neo4j::IndexNode -> ...)
+
+
+== 0.2.1 / 2009-03-15
+* Refactoring of lucene indexing of the node space (28)
+* Fixed bug on Neo4j::Nodemixin#property? (#22)
+
+
+== 0.2.0 / 2009-01-20
+* Impl. Neo4j::Node#traverse - enables traversal and filtering using TraversalPosition info (#17,#19)
+* Impl. traversal to any depth (#15)
+* Impl. traversal several relationships type at the same time (#16)
+* Fixed a Lucene timezone bug (#20)
+* Lots of refactoring of the neo4j.rb traversal code and RSpecs
+
+== 0.1.0 / 2008-12-18
+* Property can now be of any type (and not only String, Fixnum, Float)
+* Indexing and Query with Date and DateTime
+* YARD documentation
+* Properties can be removed
+* A property can be set to nil (it will then be removed).
+
+== 0.0.7 / 2008-12-10
+* Added method to_param and methods on the value object needed for Ruby on Rails
+* Impl. update from a value object/hash for a node
+* Impl. generation of value object classes/instances from a node.
+* Refactoring the Transaction handling (reuse PlaceboTransaction instances if possible)
+* Removed the need to start and stop neo. It will be done automatically when needed.
+
+
+== 0.0.6 / 2008-12-03
+* Removed the configuration from the Neo4j.start method. Now exist in Neo4j::Config and Lucene::Config.
+* Implemented sort_by method.
+* Lazy loading of search result. Execute the query and load the nodes only if needed.
+* Added support to use lucene query language, example: Person.find("name:foo AND age:42")
+* All test now uses RAM based lucene indexes.
+
+== 0.0.5 / 2008-11-17
+* Supports keeping lucene index in memory instead of on disk
+* Added support for lucene full text search
+* Fixed so neo4j runs on JRuby 1.1.5
+* Implemented support for reindex all instances of a node class. This is needed if the lucene index is kept in memory or if the index is changed.
+* Added ReferenceNode. All nodes now have a relationship from this reference node.
+* Lots of refactoring
+* Added the IMDB example. It shows how to create a neo database, lucene queries and node traversals.
+
+== 0.0.4 / 2008-10-23
+* First release to rubyforge