godo 1.0.5 → 1.0.7

data/README.txt

@@ -1,7 +1,7 @@
 = godo
 
-* version: 1.0.5
-* released: 2008-03-11
+* version: 1.0.7
+* released: 2008-05-21
 * http://simplyruby.rubyforge.org/godo
 
 == DESCRIPTION:
@@ -18,27 +18,15 @@ paths found in one or more configured project roots. It will make some straightf
 disambiguate among multiple matches to find the one you want.
 
 godo then uses configurable heuristics to figure out what type of project it is, for example "a RoR
-project using RSpec and Subversion". From that it will invokes a series of action appropriate to the
-type of project detected with each action being run, from the project folder, in its own terminal
-session.
+project using RSpec and Subversion". From that it will invokes a series of action appropriate to the type of project detected with each action being run, from the project folder, in its own terminal session.
 
-godo is entirely configured by a YAML file (~/.godo) that contains project types, heuristics, actions,
-project paths, and a session controller. A sample configuration file is provided that can be installed
-using godo --install.
+godo is entirely configured by a YAML file (~/.godo) that contains project types, heuristics, actions, project paths, and a session controller. A sample configuration file is provided that can be installed using godo --install.
 	
-godo comes with an iTerm session controller for MacOSX that uses the rb-appscript gem to control iTerm
-(see lib/session.rb and lib/sessions/iterm_session.rb). It should be relatively straightforward to add
-new controller (e.g. for Leopard Terminal.app), or a controller that works in a different way (e.g. by
-creating new windows instead of new tabs). There is nothing MacOSX specific about the rest of godo so
-creating controllers for other unixen should be straightforward if they can be controlled from ruby.
-
-godo is a rewrite of my original 'gp' script (http://matt.blogs.it/entries/00002674.html) which fixes
-a number of the deficiencies of that script, turns it into a gem, has a better name, and steals the
-idea of using heuristics to detect project types from Solomon White's gp variant (http://onrails.org/articles/2007/11/28/scripting-the-leopard-terminal).
+godo comes with an iTerm session controller for MacOSX that uses the rb-appscript gem to control iTerm (see lib/session.rb and lib/sessions/iterm_session.rb). It should be relatively straightforward to add new controller (e.g. for Leopard Terminal.app), or a controller that works in a different way (e.g. by creating new windows instead of new tabs). There is nothing MacOSX specific about the rest of godo so creating controllers for other unixen should be straightforward if they can be controlled from ruby.
+
+godo is a rewrite of my original 'gp' script (http://matt.blogs.it/entries/00002674.html) which fixes a number of the deficiencies of that script, turns it into a gem, has a better name, and steals the idea of using heuristics to detect project types from Solomon White's gp variant (http://onrails.org/articles/2007/11/28/scripting-the-leopard-terminal).
   
-godo now includes contributions from Lee Marlow <lee.marlow@gmail.com> including support for project
-level .godo files to override the global configuration, support for Terminal.app, and maximum depth
-support to speed up the finder.
+godo now includes contributions from Lee Marlow <lee.marlow@gmail.com> including support for project level .godo files to override the global configuration, support for Terminal.app, and maximum depth support to speed up the finder.
 	
 godo lives at the excellent GitHub: http://github.com/mmower/godo/ and accepts patches and forks.
 

data/lib/finder.rb

@@ -48,26 +48,7 @@ module Godo
     # base path, the first path would be returned.
     #
     def find( query )
-      matches = []
-      @roots.each do |root|
-        # puts "Searching for #{query} in #{root}"
-        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
-
-          if filtered?( path )
-            Find.prune
-          elsif matches?( path, query )
-            matches << path
-          end
-        end
-      end
-      
+      matches = @roots.inject( [] ) { |results,root| results.concat( find_in_root( root, query ) ) }
       if matches.size > 1
         matches = strip_inexact_matches( query, matches )
         if matches.size > 1
@@ -84,6 +65,26 @@ 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
+
+        if filtered?( path )
+          Find.prune
+        elsif matches?( path, query )
+          matches << path
+        end
+      end
+      matches
+    end
+    
     def matches?( path, query )
       path.match( query )
     end
@@ -113,6 +114,34 @@ module Godo
       paths[1..-1].all? { |path| path.match( path_match ) }
     end
     
+    def find_with_caching( query )
+      cache = if File.exist?( cache_file )
+        YAML::load( File.read( cache_file ) )
+      else
+        {}
+      end
+      
+      if cache[query]
+        results = cache[query]
+        puts "Using cached entry from #{cache_file}"
+      else
+        results = find_without_caching( query )
+        if results.size == 1
+          cache[query] = [results.first]
+          File.open( cache_file, 'w' ) { |f| YAML::dump( cache, f ) }
+        end
+      end
+      
+      results
+    end
+    
+    def cache_file
+      @@cache_file ||= File.expand_path( "~/.godo_cache" )
+    end
+    
+    alias_method :find_without_caching, :find
+    alias_method :find, :find_with_caching
+    
   end
   
 end

data/lib/godo.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module Godo
-  VERSION = '1.0.5'
+  VERSION = '1.0.7'
   LIBPATH = File.expand_path( File.dirname( __FILE__ ) )
   
   # When called with no arguments this will return the path to the gem

data/lib/project.rb

@@ -9,7 +9,7 @@ module Godo
       @heuristics = config["heuristics"]
       @actions = config["actions"]
       @matchers = config["matchers"]
-      @session_class = Godo.const_get( config["sessions"] )
+      @session_class = Session.klass( config["sessions"] )
     end
     
     def invoke( path )
@@ -23,6 +23,7 @@ module Godo
     end
     
   private
+    
     def invoke_actions( path, action_group )
       @session ||= @session_class.new( path )
       
@@ -62,7 +63,7 @@ module Godo
             false
           end
         
-          puts "\trunning: #{action["label"]} (exit: #{exit})"
+          puts "\trunning: #{action["label"] || action["command"]} (exit: #{exit})"
           @session.create( action["label"], action["command"], exit )
         else
           puts "\tMissing action: #{action_item.inspect}"

data/lib/session.rb

@@ -3,6 +3,22 @@ module Godo
   class Session
     attr_reader :path
     
+    def self.klass( name = nil )
+      klass = if name
+        Godo.const_get( name )
+      else
+        case ENV['TERM_PROGRAM']
+        when "iTerm.app"
+          Godo.const_get( "ITermSession" )
+        when "Apple_Terminal"
+          Godo.const_get( "TerminalSession" )
+        end
+      end
+      
+      raise "No session specified in config and cannot auto-detect from TERM_PROGRAM environment variable (#{ENV['TERM_PROGRAM'].inspect})." unless klass
+      klass
+    end
+    
     def initialize( path )
       @path = path
       @counters = Hash.new { 0 }

data/lib/template.yml

@@ -196,7 +196,8 @@ projects:
 # defaults to unlimited depth.
 # max_depth: 2
 
-# The session controller to use. Right now iTerm and Terminal are the
-# only options.
-sessions: ITermSession
+# The session controller to use. Will autodetect iTerm and Apple Terminal
+# using the TERM_PROGRAM environment variable. Specify to use a custom class
+# or to override for a specific project.
+# sessions: ITermSession
 # sessions: TerminalSession

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: godo
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors: 
 - Matt Mower
@@ -30,7 +30,7 @@ cert_chain:
   yMQ/kUco
   -----END CERTIFICATE-----
 
-date: 2008-03-11 00:00:00 +00:00
+date: 2008-05-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.5.3
     version: 
 description: "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. For example if the folder contains a Rails project the actions might include: starting mongrel, tailing one or more logs, starting consoles or IRB sessions, tailing production logs, opening an editor, running autospec, or gitk.  godo works by searching your project paths for a given search string and trying to match it against paths found in one or more configured project roots. It will make some straightforward efforts to disambiguate among multiple matches to find the one you want.  godo then uses configurable heuristics to figure out what type of project it is, for example \"a RoR project using RSpec and Subversion\". From that it will invokes a series of action appropriate to the type of project detected with each action being run, from the project folder, in its own terminal session.  godo is entirely configured by a YAML file (~/.godo) that contains project types, heuristics, actions, project paths, and a session controller. A sample configuration file is provided that can be installed using godo --install.  godo comes with an iTerm session controller for MacOSX that uses the rb-appscript gem to control iTerm (see lib/session.rb and lib/sessions/iterm_session.rb). It should be relatively straightforward to add new controller (e.g. for Leopard Terminal.app), or a controller that works in a different way (e.g. by creating new windows instead of new tabs). There is nothing MacOSX specific about the rest of godo so creating controllers for other unixen should be straightforward if they can be controlled from ruby.  godo is a rewrite of my original 'gp' script (http://matt.blogs.it/entries/00002674.html) which fixes a number of the deficiencies of that script, turns it into a gem, has a better name, and steals the idea of using heuristics to detect project types from Solomon White's gp variant (http://onrails.org/articles/2007/11/28/scripting-the-leopard-terminal).  godo now includes contributions from Lee Marlow <lee.marlow@gmail.com> including support for project level .godo files to override the global configuration, support for Terminal.app, and maximum depth support to speed up the finder.  godo lives at the excellent GitHub: http://github.com/mmower/godo/ and accepts patches and forks."
 email: 
@@ -103,7 +103,7 @@ files:
 - lib/sessions/iterm_session.rb
 - lib/sessions/terminal_session.rb
 has_rdoc: true
-homepage: "version: 1.0.5"
+homepage: "version: 1.0.7"
 post_install_message: 
 rdoc_options: 
 - --main
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: simplyruby
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: 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