godo 1.0.7 → 1.0.8

data/History.txt

@@ -18,3 +18,7 @@
   * Max depth in Finder
   * Terminal.app sessions
   * Nice job Lee!
+
+=== 1.0.8 / 2008-05-30
+
+* Lots of small improvements including more from Lee Marlow

data/README.txt

@@ -1,7 +1,7 @@
 = godo
 
-* version: 1.0.7
-* released: 2008-05-21
+* version: 1.0.8
+* released: 2008-05-28
 * http://simplyruby.rubyforge.org/godo
 
 == DESCRIPTION:
@@ -69,6 +69,10 @@ a project level .godo file):
 
 godo -o <matcher> <project>
 
+To see what project types are available:
+
+godo --list-types
+
 == REQUIREMENTS:
 
 * Trollop

data/bin/godo

@@ -8,8 +8,21 @@ require 'ick'
 Ick.sugarize
 
 opts = Trollop::options do
+  version "godo (#{Godo::VERSION})"
+  banner <<EOS
+  go (to project) do (stuffs)
+
+  godo provides a smart way of opening a project folder in multiple terminal tabs and, in each tab,
+  invoking a commands appropriate to that project
+
+  Usage:
+    godo [options] <project>
+
+  where [options] are:
+EOS
   opt :install, "Create a fresh ~/.godo configuration file"
   opt :override, "Override heuristics to specify project type", :short => 'o', :type => :string
+  opt :list_types, "List available project types", :short => 'l'
 end
 
 if opts[:install]

data/lib/finder.rb

@@ -1,4 +1,5 @@
 require 'find'
+require 'set'
 
 module Godo
   
@@ -48,7 +49,12 @@ module Godo
     # base path, the first path would be returned.
     #
     def find( query )
-      matches = @roots.inject( [] ) { |results,root| results.concat( find_in_root( root, query ) ) }
+      matches = []
+      searched = Set.new
+      @roots.each do |root|
+        find_in_path( root, root, query, matches, searched )
+      end
+
       if matches.size > 1
         matches = strip_inexact_matches( query, matches )
         if matches.size > 1
@@ -65,37 +71,36 @@ module Godo
       end
     end
     
-    def find_in_root( root, query )
-      matches = []
-      Find.find( root ) do |path|
-        if @max_depth > 0
-          # limit to @max_depth
-          partial_path = path.gsub(root, '')
-          Find.prune if partial_path =~ /\A\.+\Z/
-          depth = partial_path.split('/').length
-          Find.prune if depth > @max_depth + 1
-        end
+    def find_in_path( root, start_path, query, matches, searched )
+      Find.find( start_path ) do |path|
+        Find.prune unless File.directory?(path) # only look at directories
+        Find.prune unless searched.add?(path) # prevent infinite recursions from symlinks
+        Find.prune if past_max_depth?(root, path)
+        Find.prune if ignored?(path)
 
-        if filtered?( path )
-          Find.prune
-        elsif matches?( path, query )
+        if path.match( query )
           matches << path
+        elsif File.symlink?( path )
+          # Find.find does not recurse into symlinked directories, so do it manually
+          find_in_path( root, File.join(path, '/'), query, matches, searched )
         end
       end
       matches
     end
-    
-    def matches?( path, query )
-      path.match( query )
-    end
 
-    def filtered?( path )
-      !File.directory?( path ) || excluded?( path )
+    # is path more than @max_depth levels below root?
+    def past_max_depth?( root, path )
+      if @max_depth > 0
+        partial_path = path.gsub(root, '')
+        return true if partial_path =~ /\A\.+\Z/
+        depth = partial_path.split('/').length
+        return true if depth > @max_depth + 1
+      end
+      false
     end
 
-    def excluded?( path )
-      ignore = !!@ignores.detect { |ignore| ignore.match( path ) }
-      ignore
+    def ignored?( path )
+      @ignores.any? { |ignore| path.match( ignore ) }
     end
     
     def strip_inexact_matches( query, paths )

data/lib/godo.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module Godo
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
   LIBPATH = File.expand_path( File.dirname( __FILE__ ) )
   
   # When called with no arguments this will return the path to the gem
@@ -35,6 +35,20 @@ module Godo
   # project and invoke the appropriate actions.
   def self.godo( query, options )
     config = YAML::load( File.read( File.expand_path( "~/.godo" ) ) )
+    
+    if options[:list_types]
+      matchers = config["matchers"]
+      if matchers && !matchers.empty?
+        puts "Available project types:"
+        config["matchers"].each do |matcher|
+          puts " - #{matcher['name']}"
+        end
+      else
+        puts "No available matchers found, please check your ~/.godo file"
+      end
+      return
+    end
+    
     require 'finder'
     paths = Finder.find( query, config )
     found_path = if paths.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: godo
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - Matt Mower
@@ -30,7 +30,7 @@ cert_chain:
   yMQ/kUco
   -----END CERTIFICATE-----
 
-date: 2008-05-21 00:00:00 +01:00
+date: 2008-05-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,7 +103,7 @@ files:
 - lib/sessions/iterm_session.rb
 - lib/sessions/terminal_session.rb
 has_rdoc: true
-homepage: "version: 1.0.7"
+homepage: "version: 1.0.8"
 post_install_message: 
 rdoc_options: 
 - --main