hilfer 0.11.4 → 0.11.5

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.11.5 / 28-Sep-2011
+* Rails keys for lib, config and spec/test
+
 === 0.11.4 / 2011-08-16
 
 * If a a file path is specified, open its parent

data/README.txt

@@ -59,12 +59,14 @@ I wrote hilfer.
 - Shift-Ctrl-V: go to view, or view dir
 - Shift-Ctrl-C: go to controller, or controller dir
 - Shift-Ctrl-M: go to model, or model dir
-- Shift-Ctrl-T: go to test, or test dir
+- Shift-Ctrl-T: go to test/spec
 - Shift-Ctrl-H: go to helpers dir
 - Shift-Ctrl-L: go to layouts dir
 - Shift-Ctrl-I: go to migrations
 - Shift-Ctrl-S: go to stylesheets
 - Shift-Ctrl-F: go to fixtures
+- Shift-Ctrl-B: go to lib
+- Shift-Ctrl-O: go to config
 
 === Subversion colour highlighting
 

data/Rakefile

@@ -15,11 +15,11 @@ Bones do
   url  'http://hilfer.rubyforge.org/hilfer'
   version  Hilfer::VERSION
   description "Programmers file browser for SciTE"
-  
+
   gem.need_tar false
-  
-  depend_on 'gtk2'
-  
+
+  depend_on 'gtk2', '~> 1.0.0'
+
   # read file list from Manifest.txt
   gem.files File.new('Manifest.txt').to_a.map( &:chomp )
 
@@ -27,13 +27,13 @@ Bones do
   # Not the same as the rdoc -i which is list of files
   # to search for include directives
   rdoc.include %w{README.txt ^lib/clevic/.*\.rb$ models/examples.rb History.txt TODO}
-  
+
   # List of Regexs to exclude from rdoc processing
   rdoc.exclude %w{^pkg.*}
-  
+
   # Include URL for git browser in rdoc output
   rdoc.opts %W{-W http://gitweb.semiosix.com/hilfer.cgi?p=clevic;a=blob;f=%s;hb=HEAD} #--template=#{Gem.required_location("allison", "allison.rb")}}
-  
+
   rdoc.main 'README.txt'
 end
 

data/lib/hilfer/rails_locator.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'pathname'
 
 =begin
 This handles various keypresses that jump to specific
@@ -14,10 +15,10 @@ TODO fix multiple selections
 =end
 class RailsLocator
   attr_accessor :treeviewer
-  
+
   def initialize( treeviewer )
     @treeviewer = treeviewer
-    
+
     @controller_re =       %r|^(.*?)/app/controllers/(.*?)/?(.*?)_controller.rb$|
     @view_re =             %r|^(.*?)/app/views/(.*?)/?([^/.]*?\..*?)?$|
     @model_re =            %r|^(.*?)/app/models/(.*?/?)([^/.]*?).rb$|
@@ -27,7 +28,7 @@ class RailsLocator
   end
 
   # this does the common code for each keypress
-  # the block should return a related path for 
+  # the block should return a related path for
   # the particular keypress on the currently selected
   # item
   def select_related_paths( widget, event, &block )
@@ -41,20 +42,21 @@ class RailsLocator
       puts "new_rails_path #{new_rails_path}" if $options[:debug]
       paths_to_select << rails_root + new_rails_path
     end
-    
+
     treeviewer.select_fs_paths( paths_to_select, true )
   end
-  
+
   def rails_root
     treeviewer.root_item.path
   end
-  
+
   def goto_rails_path( fs_path )
     treeviewer.select_fs_path( rails_root + fs_path, true )
   end
-  
+
   def handle_keypress( widget, event )
     puts "RailsLocator::event: #{event.inspect}" if $options[:debug]
+    puts "RailsLocator::event.hardware_keycode: #{event.hardware_keycode}" if $options[:debug]
     retval = true
     case
     # Shift-Ctrl-V - go to view, or view dir
@@ -69,7 +71,7 @@ class RailsLocator
             '/app/views'
         end
       end
-      
+
     # Shift-Ctrl-C - go to controller, or controller dir
     when event.hardware_keycode == 54 && event.state.control_mask?  && event.state.shift_mask?
       select_related_paths( widget, event ) do |item|
@@ -82,7 +84,7 @@ class RailsLocator
             '/app/controllers'
         end
       end
-      
+
     # Shift-Ctrl-M - go to model, or model dir
     when event.hardware_keycode == 58 && event.state.control_mask? && event.state.shift_mask?
       select_related_paths( widget, event ) do |item|
@@ -95,7 +97,7 @@ class RailsLocator
           '/app/models'
         end
       end
-      
+
     # Shift-Ctrl-T - go to test, or test dir
     when event.hardware_keycode == 28 && event.state.control_mask?  && event.state.shift_mask?
       select_related_paths( widget, event ) do |item|
@@ -109,26 +111,39 @@ class RailsLocator
           when md = @fixture_re.match( item.path )
             '/test/unit/' + $2 + $3.singularize + '_test.rb'
           else
-            '/test'
+            rp = Pathname.new( rails_root )
+            if ( rp + 'test' ).exist?
+              '/test'
+            elsif (rp + 'spec').exist?
+              '/spec'
+            end
         end
       end
-    
+
     # Shift-Ctrl-H - go to helpers dir
     when event.hardware_keycode == 43 && event.state.control_mask? && event.state.shift_mask?
       goto_rails_path '/app/helpers'
-      
+
     # Shift-Ctrl-L - go to layouts dir
     when event.hardware_keycode == 46 && event.state.control_mask? && event.state.shift_mask?
       goto_rails_path '/app/views/layouts'
-      
+
+    # Shift-Ctrl-B - go to lib dir
+    when event.hardware_keycode == 56 && event.state.control_mask? && event.state.shift_mask?
+      goto_rails_path '/lib'
+
     # Shift-Ctrl-I - go to migrations
     when event.hardware_keycode == 31 && event.state.control_mask?  && event.state.shift_mask?
       goto_rails_path '/db/migrate'
-    
+
+    # Shift-Ctrl-O - go to config
+    when event.hardware_keycode == 32 && event.state.control_mask?  && event.state.shift_mask?
+      goto_rails_path '/config'
+
     # Shift-Ctrl-S - go to stylesheets
     when event.hardware_keycode == 39 && event.state.control_mask?  && event.state.shift_mask?
       goto_rails_path '/public/stylesheets'
-      
+
     # Shift-Ctrl-F - go to fixtures
     when event.hardware_keycode == 41 && event.state.control_mask?  && event.state.shift_mask?
       select_related_paths( widget, event ) do |item|
@@ -141,7 +156,7 @@ class RailsLocator
             '/test/fixtures'
         end
       end
-      
+
     else
       retval = false
     end

data/lib/hilfer/version.rb

@@ -1,3 +1,3 @@
 module Hilfer
-  VERSION = '0.11.4'
+  VERSION = '0.11.5'
 end

metadata

@@ -1,50 +1,51 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hilfer
-version: !ruby/object:Gem::Version
-  version: 0.11.4
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.11.5
 platform: ruby
-authors:
+authors: 
 - John Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000 +02:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: gtk2
-  requirement: &79176550 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *79176550
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bones
-  requirement: &79176270 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.7.0
   type: :development
-  prerelease: false
-  version_requirements: *79176270
+  version_requirements: *id002
 description: Programmers file browser for SciTE
 email: panic@semiosix.com
-executables:
+executables: 
 - hilfer
 - ssc
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - README.txt
 - TODO
-files:
+files: 
 - History.txt
 - Manifest.txt
 - README.txt
@@ -68,34 +69,35 @@ files:
 - lib/hilfer/xterm.rb
 - lib/hilfer/xfce_terminal.rb
 - test/test_key_matcher.rb
-has_rdoc: true
 homepage: http://hilfer.rubyforge.org/hilfer
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - -W
 - http://gitweb.semiosix.com/hilfer.cgi?p=clevic;a=blob;f=%s;hb=HEAD
 - --main
 - README.txt
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: hilfer
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: http://www.
-test_files:
+test_files: 
 - test/test_key_matcher.rb